Skip to content

Commit ef9e0ea

Browse files
committed
java-0.9.1 - expose static func for getting current adapter by type (also cache default adapter in each)
1 parent c2db13c commit ef9e0ea

File tree

6 files changed

+31
-21
lines changed

6 files changed

+31
-21
lines changed

java/json-transform/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99
}
1010

1111
group 'co.nlighten'
12-
version = '0.9.0'
12+
version = '0.9.1'
1313

1414
ext {
1515
gsonVersion = "2.10.1"

java/json-transform/src/main/java/co/nlighten/jsontransform/adapters/gson/GsonJsonTransformer.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,21 @@
66

77
public class GsonJsonTransformer extends JsonTransformer {
88

9-
private static GsonJsonAdapter getGsonAdapter() {
9+
public static GsonJsonAdapter DEFAULT_ADAPTER = new GsonJsonAdapter();
10+
11+
public static GsonJsonAdapter getAdapter() {
1012
var currentAdapter = JsonTransformerConfiguration.get().getAdapter();
1113
if (currentAdapter instanceof GsonJsonAdapter gja) {
1214
return gja;
1315
}
14-
return new GsonJsonAdapter();
16+
return DEFAULT_ADAPTER;
1517
}
1618

1719
public GsonJsonTransformer(final Object definition) {
18-
super(definition, getGsonAdapter());
20+
super(definition, getAdapter());
1921
}
2022

2123
public GsonJsonTransformer(final Object definition, TransformerFunctionsAdapter functionsAdapter) {
22-
super(definition, getGsonAdapter(), functionsAdapter);
24+
super(definition, getAdapter(), functionsAdapter);
2325
}
2426
}

java/json-transform/src/main/java/co/nlighten/jsontransform/adapters/jackson/JacksonJsonTransformer.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,21 @@
66

77
public class JacksonJsonTransformer extends JsonTransformer {
88

9-
private static JacksonJsonAdapter getJacksonAdapter() {
9+
public static JacksonJsonAdapter DEFAULT_ADAPTER = new JacksonJsonAdapter();
10+
11+
public static JacksonJsonAdapter getAdapter() {
1012
var currentAdapter = JsonTransformerConfiguration.get().getAdapter();
1113
if (currentAdapter instanceof JacksonJsonAdapter jja) {
1214
return jja;
1315
}
14-
return new JacksonJsonAdapter();
16+
return DEFAULT_ADAPTER;
1517
}
1618

1719
public JacksonJsonTransformer(final Object definition) {
18-
super(definition, getJacksonAdapter());
20+
super(definition, getAdapter());
1921
}
2022

2123
public JacksonJsonTransformer(final Object definition, TransformerFunctionsAdapter functionsAdapter) {
22-
super(definition, getJacksonAdapter(), functionsAdapter);
24+
super(definition, getAdapter(), functionsAdapter);
2325
}
2426
}

java/json-transform/src/main/java/co/nlighten/jsontransform/adapters/jsonorg/JsonOrgJsonTransformer.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,21 @@
66

77
public class JsonOrgJsonTransformer extends JsonTransformer {
88

9-
private static JsonOrgJsonAdapter getJsonOrgAdapter() {
9+
public static JsonOrgJsonAdapter DEFAULT_ADAPTER = new JsonOrgJsonAdapter();
10+
11+
public static JsonOrgJsonAdapter getAdapter() {
1012
var currentAdapter = JsonTransformerConfiguration.get().getAdapter();
1113
if (currentAdapter instanceof JsonOrgJsonAdapter joa) {
1214
return joa;
1315
}
14-
return new JsonOrgJsonAdapter();
16+
return DEFAULT_ADAPTER;
1517
}
1618

1719
public JsonOrgJsonTransformer(final Object definition) {
18-
super(definition, getJsonOrgAdapter());
20+
super(definition, getAdapter());
1921
}
2022

2123
public JsonOrgJsonTransformer(final Object definition, TransformerFunctionsAdapter functionsAdapter) {
22-
super(definition, getJsonOrgAdapter(), functionsAdapter);
24+
super(definition, getAdapter(), functionsAdapter);
2325
}
2426
}

java/json-transform/src/main/java/co/nlighten/jsontransform/adapters/jsonsmart/JsonSmartJsonTransformer.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,21 @@
66

77
public class JsonSmartJsonTransformer extends JsonTransformer {
88

9-
private static JsonSmartJsonAdapter getJsonOrgAdapter() {
9+
public static JsonSmartJsonAdapter DEFAULT_ADAPTER = new JsonSmartJsonAdapter();
10+
11+
public static JsonSmartJsonAdapter getAdapter() {
1012
var currentAdapter = JsonTransformerConfiguration.get().getAdapter();
1113
if (currentAdapter instanceof JsonSmartJsonAdapter joa) {
1214
return joa;
1315
}
14-
return new JsonSmartJsonAdapter();
16+
return DEFAULT_ADAPTER;
1517
}
1618

1719
public JsonSmartJsonTransformer(final Object definition) {
18-
super(definition, getJsonOrgAdapter());
20+
super(definition, getAdapter());
1921
}
2022

2123
public JsonSmartJsonTransformer(final Object definition, TransformerFunctionsAdapter functionsAdapter) {
22-
super(definition, getJsonOrgAdapter(), functionsAdapter);
24+
super(definition, getAdapter(), functionsAdapter);
2325
}
2426
}

java/json-transform/src/main/java/co/nlighten/jsontransform/adapters/pojo/PojoJsonTransformer.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,21 @@
66

77
public class PojoJsonTransformer extends JsonTransformer {
88

9-
private static PojoJsonAdapter getPojoAdapter() {
9+
public static PojoJsonAdapter DEFAULT_ADAPTER = new PojoJsonAdapter();
10+
11+
public static PojoJsonAdapter getAdapter() {
1012
var currentAdapter = JsonTransformerConfiguration.get().getAdapter();
1113
if (currentAdapter instanceof PojoJsonAdapter pja) {
1214
return pja;
1315
}
14-
return new PojoJsonAdapter();
16+
return DEFAULT_ADAPTER;
1517
}
1618

1719
public PojoJsonTransformer(final Object definition) {
18-
super(definition, getPojoAdapter());
20+
super(definition, getAdapter());
1921
}
2022

2123
public PojoJsonTransformer(final Object definition, TransformerFunctionsAdapter functionsAdapter) {
22-
super(definition, getPojoAdapter(), functionsAdapter);
24+
super(definition, getAdapter(), functionsAdapter);
2325
}
2426
}

0 commit comments

Comments
 (0)