Update dependencies and cleanup code
diff --git a/cayenne-jdbc-type-other/pom.xml b/cayenne-jdbc-type-other/pom.xml
index ce36e1d..8b7803d 100644
--- a/cayenne-jdbc-type-other/pom.xml
+++ b/cayenne-jdbc-type-other/pom.xml
@@ -12,10 +12,10 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <bootique.version>2.0.M1</bootique.version>
- <cayenne.version>4.2.M2</cayenne.version>
+ <bootique.version>2.0.1</bootique.version>
+ <cayenne.version>4.2.RC1</cayenne.version>
- <postgres.jdbc.version>9.4.1209</postgres.jdbc.version>
+ <postgres.jdbc.version>42.3.3</postgres.jdbc.version>
<mysql.jdbc.version>8.0.28</mysql.jdbc.version>
<slf4j.version>1.7.30</slf4j.version>
diff --git a/cayenne-jdbc-type-other/src/main/java/org/apache/cayenne/demo/GeoTestCommand.java b/cayenne-jdbc-type-other/src/main/java/org/apache/cayenne/demo/GeoTestCommand.java
index af11120..28a9093 100644
--- a/cayenne-jdbc-type-other/src/main/java/org/apache/cayenne/demo/GeoTestCommand.java
+++ b/cayenne-jdbc-type-other/src/main/java/org/apache/cayenne/demo/GeoTestCommand.java
@@ -14,6 +14,9 @@
import org.apache.cayenne.query.SQLExec;
import org.apache.cayenne.value.Wkt;
+/**
+ * Command that demonstrates usage of the {@link Wkt} type
+ */
public class GeoTestCommand extends CommandWithMetadata {
@Inject
diff --git a/cayenne-jdbc-type-other/src/main/java/org/apache/cayenne/demo/JsonTestCommand.java b/cayenne-jdbc-type-other/src/main/java/org/apache/cayenne/demo/JsonTestCommand.java
index 3a009fc..8dc97d7 100644
--- a/cayenne-jdbc-type-other/src/main/java/org/apache/cayenne/demo/JsonTestCommand.java
+++ b/cayenne-jdbc-type-other/src/main/java/org/apache/cayenne/demo/JsonTestCommand.java
@@ -5,7 +5,6 @@
import javax.inject.Provider;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
import io.bootique.cli.Cli;
import io.bootique.command.CommandOutcome;
import io.bootique.command.CommandWithMetadata;
@@ -15,7 +14,11 @@
import org.apache.cayenne.demo.model.TestJson;
import org.apache.cayenne.query.ObjectSelect;
import org.apache.cayenne.query.SQLExec;
+import org.apache.cayenne.value.Json;
+/**
+ * Command that demonstrates usage of the {@link Json} type
+ */
class JsonTestCommand extends CommandWithMetadata {
@Inject
@@ -45,12 +48,10 @@
}
private void createJsonObject(ObjectContext context) {
+ Pojo pojo = new Pojo(123, "abc", false);
+
TestJson testJson = context.newObject(TestJson.class);
- ObjectNode objectNode = new ObjectNode(objectMapper.getNodeFactory());
- objectNode.put("test", 123);
- objectNode.put("field1", "abc");
- objectNode.put("field2", false);
- testJson.setJson(objectNode);
+ testJson.setJson(objectMapper.valueToTree(pojo));
context.commitChanges();
}
@@ -71,4 +72,31 @@
System.out.println("JSON values for path 'test':");
testValues.forEach(v -> System.out.println("\t" + v));
}
+
+ /**
+ * Simple value-object to convert to Json
+ */
+ static class Pojo {
+ private final int test;
+ private final String field1;
+ private final boolean field2;
+
+ Pojo(int test, String field1, boolean field2) {
+ this.test = test;
+ this.field1 = field1;
+ this.field2 = field2;
+ }
+
+ public int getTest() {
+ return test;
+ }
+
+ public String getField1() {
+ return field1;
+ }
+
+ public boolean isField2() {
+ return field2;
+ }
+ }
}
diff --git a/cayenne-jdbc-type-other/src/main/java/org/apache/cayenne/demo/model/types/JsonValueType.java b/cayenne-jdbc-type-other/src/main/java/org/apache/cayenne/demo/model/types/JsonValueType.java
index 2005783..b2c35ea 100644
--- a/cayenne-jdbc-type-other/src/main/java/org/apache/cayenne/demo/model/types/JsonValueType.java
+++ b/cayenne-jdbc-type-other/src/main/java/org/apache/cayenne/demo/model/types/JsonValueType.java
@@ -7,6 +7,9 @@
import org.apache.cayenne.value.Json;
import org.apache.cayenne.di.Inject;
+/**
+ * This value type allows to use Jackson's {@link ObjectNode} directly as a Json value
+ */
public class JsonValueType implements ValueObjectType<ObjectNode, Json> {
@Inject
diff --git a/cayenne-jdbc-type-other/src/main/resources/config.yml b/cayenne-jdbc-type-other/src/main/resources/config.yml
index 28755cc..cbcc8fc 100644
--- a/cayenne-jdbc-type-other/src/main/resources/config.yml
+++ b/cayenne-jdbc-type-other/src/main/resources/config.yml
@@ -12,5 +12,5 @@
datasource: geo
createSchema: true
maps:
- - location: classpath:demo.map.xml
- name: map1
\ No newline at end of file
+ map1:
+ location: classpath:demo.map.xml
\ No newline at end of file
