Skip to content

Commit 9e36f96

Browse files
hinermhinerm
committed
Apply imagej formatting
1 parent 19c65fd commit 9e36f96

12 files changed

Lines changed: 642 additions & 494 deletions

File tree

‎scijava/scijava-persist/src/main/java/org/scijava/persist/DefaultScijavaAdapterService.java‎

Lines changed: 46 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
package org.scijava.persist;
23

34
import org.scijava.Context;
@@ -11,50 +12,53 @@
1112
import java.util.List;
1213

1314
/**
14-
* Scijava service which provides the different Scijava Adapters available in the current context.
15-
*
16-
* {@link IObjectScijavaAdapter} plugins are automatically discovered and accessible in this service.
17-
*
18-
* In practice, serializer / deserializers are obtained via {@link ScijavaGsonHelper} helper class
15+
* Scijava service which provides the different Scijava Adapters available in
16+
* the current context. {@link IObjectScijavaAdapter} plugins are automatically
17+
* discovered and accessible in this service. In practice, serializer /
18+
* deserializers are obtained via {@link ScijavaGsonHelper} helper class
1919
*
2020
* @author Nicolas Chiaruttini, EPFL, 2021
21-
*
2221
*/
2322
@Plugin(type = Service.class)
24-
public class DefaultScijavaAdapterService extends AbstractPTService<IObjectScijavaAdapter> implements IObjectScijavaAdapterService {
25-
26-
@Override
27-
public Class<IObjectScijavaAdapter> getPluginType() {
28-
return IObjectScijavaAdapter.class;
29-
}
30-
31-
@Parameter
32-
Context ctx;
33-
34-
@Override
35-
public Context context() {
36-
return ctx;
37-
}
38-
39-
@Override
40-
public Context getContext() {
41-
return ctx;
42-
}
43-
44-
double priority = Priority.NORMAL;
45-
46-
@Override
47-
public double getPriority() {
48-
return priority;
49-
}
50-
51-
@Override
52-
public void setPriority(double priority) {
53-
this.priority = priority;
54-
}
55-
56-
@Override
57-
public <PT extends IObjectScijavaAdapter> List<PluginInfo<PT>> getAdapters(Class<PT> adapterClass) {
58-
return pluginService().getPluginsOfType(adapterClass);
59-
}
23+
public class DefaultScijavaAdapterService extends
24+
AbstractPTService<IObjectScijavaAdapter> implements
25+
IObjectScijavaAdapterService
26+
{
27+
28+
@Override
29+
public Class<IObjectScijavaAdapter> getPluginType() {
30+
return IObjectScijavaAdapter.class;
31+
}
32+
33+
@Parameter
34+
Context ctx;
35+
36+
@Override
37+
public Context context() {
38+
return ctx;
39+
}
40+
41+
@Override
42+
public Context getContext() {
43+
return ctx;
44+
}
45+
46+
double priority = Priority.NORMAL;
47+
48+
@Override
49+
public double getPriority() {
50+
return priority;
51+
}
52+
53+
@Override
54+
public void setPriority(double priority) {
55+
this.priority = priority;
56+
}
57+
58+
@Override
59+
public <PT extends IObjectScijavaAdapter> List<PluginInfo<PT>> getAdapters(
60+
Class<PT> adapterClass)
61+
{
62+
return pluginService().getPluginsOfType(adapterClass);
63+
}
6064
}

‎scijava/scijava-persist/src/main/java/org/scijava/persist/IClassAdapter.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1+
12
package org.scijava.persist;
23

34
import com.google.gson.JsonDeserializer;
45
import com.google.gson.JsonSerializer;
56

6-
public interface IClassAdapter<T> extends IObjectScijavaAdapter, JsonSerializer<T>,
7-
JsonDeserializer<T> {
7+
public interface IClassAdapter<T> extends IObjectScijavaAdapter,
8+
JsonSerializer<T>, JsonDeserializer<T>
9+
{
810

9-
Class<? extends T> getAdapterClass();
11+
Class<? extends T> getAdapterClass();
1012

1113
}

‎scijava/scijava-persist/src/main/java/org/scijava/persist/IClassRuntimeAdapter.java‎

Lines changed: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
package org.scijava.persist;
23

34
import com.google.gson.JsonDeserializer;
@@ -10,24 +11,33 @@
1011

1112
import java.lang.reflect.Type;
1213

13-
public interface IClassRuntimeAdapter<B, T extends B> extends IObjectScijavaAdapter, JsonSerializer<T>,
14-
JsonDeserializer<T> {
15-
16-
Class<? extends B> getBaseClass();
17-
18-
Class<? extends T> getRunTimeClass();
19-
20-
default boolean useCustomAdapter() {
21-
return false;
22-
}
23-
24-
@Override
25-
default T deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
26-
throw new JsonParseException("Default deserializer for class "+getBaseClass()+" ("+getRunTimeClass()+") should not be used, return false in method useCustomAdapter instead");
27-
}
28-
29-
@Override
30-
default JsonElement serialize(T src, Type typeOfSrc, JsonSerializationContext context) {
31-
throw new JsonIOException("Default serializer for class "+getBaseClass()+" ("+getRunTimeClass()+") should not be used, should not be used, return false in method useCustomAdapter instead");
32-
}
14+
public interface IClassRuntimeAdapter<B, T extends B> extends
15+
IObjectScijavaAdapter, JsonSerializer<T>, JsonDeserializer<T>
16+
{
17+
18+
Class<? extends B> getBaseClass();
19+
20+
Class<? extends T> getRunTimeClass();
21+
22+
default boolean useCustomAdapter() {
23+
return false;
24+
}
25+
26+
@Override
27+
default T deserialize(JsonElement json, Type typeOfT,
28+
JsonDeserializationContext context) throws JsonParseException
29+
{
30+
throw new JsonParseException("Default deserializer for class " +
31+
getBaseClass() + " (" + getRunTimeClass() +
32+
") should not be used, return false in method useCustomAdapter instead");
33+
}
34+
35+
@Override
36+
default JsonElement serialize(T src, Type typeOfSrc,
37+
JsonSerializationContext context)
38+
{
39+
throw new JsonIOException("Default serializer for class " + getBaseClass() +
40+
" (" + getRunTimeClass() +
41+
") should not be used, should not be used, return false in method useCustomAdapter instead");
42+
}
3343
}

‎scijava/scijava-persist/src/main/java/org/scijava/persist/IObjectScijavaAdapter.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
1+
12
package org.scijava.persist;
23

34
import org.scijava.plugin.SciJavaPlugin;
45

56
/**
6-
* Top level class for plugins which can serialize object using gson and the scijava context.
7-
*
8-
* The scijava context may provide custom adapters {@link IClassAdapter} and also
9-
* runtime adapters, see {@link IClassRuntimeAdapter}) auto-discovered via scijava plugin
7+
* Top level class for plugins which can serialize object using gson and the
8+
* scijava context. The scijava context may provide custom adapters
9+
* {@link IClassAdapter} and also runtime adapters, see
10+
* {@link IClassRuntimeAdapter}) auto-discovered via scijava plugin
1011
* extensibility mechanism.
1112
*
1213
* @author Nicolas Chiaruttini, EPFL, 2021
13-
*
1414
*/
1515

16-
public interface IObjectScijavaAdapter extends SciJavaPlugin {
17-
}
16+
public interface IObjectScijavaAdapter extends SciJavaPlugin {}

‎scijava/scijava-persist/src/main/java/org/scijava/persist/IObjectScijavaAdapterService.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
package org.scijava.persist;
23

34
import org.scijava.plugin.PTService;
@@ -6,6 +7,10 @@
67

78
import java.util.List;
89

9-
public interface IObjectScijavaAdapterService extends PTService<IObjectScijavaAdapter>, SciJavaService {
10-
<PT extends IObjectScijavaAdapter> List<PluginInfo<PT>> getAdapters(Class<PT> adapterClass);
10+
public interface IObjectScijavaAdapterService extends
11+
PTService<IObjectScijavaAdapter>, SciJavaService
12+
{
13+
14+
<PT extends IObjectScijavaAdapter> List<PluginInfo<PT>> getAdapters(
15+
Class<PT> adapterClass);
1116
}

0 commit comments

Comments
 (0)