You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pp...@apache.org on 2021/02/25 09:52:03 UTC
[camel-quarkus] branch master updated: Nitrite native support #1298
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/master by this push:
new d11a894 Nitrite native support #1298
d11a894 is described below
commit d11a8945994ad16a5414fc1b6ff491e138ed7cfe
Author: JiriOndrusek <on...@gmail.com>
AuthorDate: Mon Feb 15 14:30:14 2021 +0100
Nitrite native support #1298
---
.../ROOT/pages/reference/extensions/nitrite.adoc | 21 ++++--
.../partials/reference/components/nitrite.adoc | 6 +-
extensions-jvm/pom.xml | 1 -
.../nitrite/deployment/pom.xml | 4 +-
.../nitrite/deployment/NitriteProcessor.java | 31 +++------
{extensions-jvm => extensions}/nitrite/pom.xml | 5 +-
.../nitrite/runtime/pom.xml | 6 +-
extensions/nitrite/runtime/src/main/doc/usage.adoc | 9 +++
.../native-image/serialization-config.json | 41 +++++++++++
.../main/resources/META-INF/quarkus-extension.yaml | 3 +-
extensions/pom.xml | 1 +
.../nitrite}/pom.xml | 55 +++++++++++++--
.../quarkus/component/nitrite/it/Employee.java | 25 ++-----
.../component/nitrite/it/EmployeeMappable.java | 75 ++++++++------------
.../component/nitrite/it/EmployeeSerializable.java | 58 ++--------------
.../component/nitrite/it/NitriteResource.java | 33 +++++----
.../quarkus/component/nitrite/it/Operation.java | 25 +++++--
.../src/main/resources/application.properties | 19 ++++++
.../main/resources/my-serialization-config.json | 7 ++
.../quarkus/component/nitrite/it/NitriteIT.java | 24 +++++++
.../quarkus/component/nitrite/it/NitriteTest.java | 79 +++++++++++++++++-----
.../component/nitrite/it/NitriteTestResource.java | 0
integration-tests/pom.xml | 1 +
tooling/scripts/test-categories.yaml | 1 +
24 files changed, 334 insertions(+), 196 deletions(-)
diff --git a/docs/modules/ROOT/pages/reference/extensions/nitrite.adoc b/docs/modules/ROOT/pages/reference/extensions/nitrite.adoc
index 0fe1d45..6339b82 100644
--- a/docs/modules/ROOT/pages/reference/extensions/nitrite.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/nitrite.adoc
@@ -3,15 +3,15 @@
= Nitrite
:page-aliases: extensions/nitrite.adoc
:cq-artifact-id: camel-quarkus-nitrite
-:cq-native-supported: false
-:cq-status: Preview
+:cq-native-supported: true
+:cq-status: Stable
:cq-description: Access Nitrite databases.
:cq-deprecated: false
:cq-jvm-since: 1.0.0
-:cq-native-since: n/a
+:cq-native-since: 1.8.0
[.badges]
-[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native##[.badge-unsupported]##unsupported##
+[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native since##[.badge-supported]##1.8.0##
Access Nitrite databases.
@@ -32,3 +32,16 @@ Please refer to the above link for usage and configuration details.
----
Check the xref:user-guide/index.adoc[User guide] for more information about writing Camel Quarkus applications.
+
+== Usage
+
+If your persistence objects implement `java.io.Serializable`, you have to add configuration of all serializable classes.
+There is a new serialization support in GraalVM 21.0. Developers can configure classes
+for serialization via the serialization configuration file
+`-H:SerializationConfigurationResources=/path/to-serialization-config.json` option. For more
+information see https://github.com/oracle/graal/pull/2730[PR with feature].
+
+If your persistence objects implement `org.dizitart.no2.mapper.Mappable`. All classes have to
+implement also `java.io.Serializable` and have to be registered for serialization (see previous option),
+even though the Java serialization won't be used.
+
diff --git a/docs/modules/ROOT/partials/reference/components/nitrite.adoc b/docs/modules/ROOT/partials/reference/components/nitrite.adoc
index e2958d4..7b8ccc0 100644
--- a/docs/modules/ROOT/partials/reference/components/nitrite.adoc
+++ b/docs/modules/ROOT/partials/reference/components/nitrite.adoc
@@ -2,11 +2,11 @@
// This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page
:cq-artifact-id: camel-quarkus-nitrite
:cq-artifact-id-base: nitrite
-:cq-native-supported: false
-:cq-status: Preview
+:cq-native-supported: true
+:cq-status: Stable
:cq-deprecated: false
:cq-jvm-since: 1.0.0
-:cq-native-since: n/a
+:cq-native-since: 1.8.0
:cq-camel-part-name: nitrite
:cq-camel-part-title: Nitrite
:cq-camel-part-description: Access Nitrite databases.
diff --git a/extensions-jvm/pom.xml b/extensions-jvm/pom.xml
index 9c49414..683fa04 100644
--- a/extensions-jvm/pom.xml
+++ b/extensions-jvm/pom.xml
@@ -92,7 +92,6 @@
<module>mllp</module>
<module>mvel</module>
<module>mybatis</module>
- <module>nitrite</module>
<module>ognl</module>
<module>openstack</module>
<module>printer</module>
diff --git a/extensions-jvm/nitrite/deployment/pom.xml b/extensions/nitrite/deployment/pom.xml
similarity index 91%
rename from extensions-jvm/nitrite/deployment/pom.xml
rename to extensions/nitrite/deployment/pom.xml
index e6e1a16..6436e7d 100644
--- a/extensions-jvm/nitrite/deployment/pom.xml
+++ b/extensions/nitrite/deployment/pom.xml
@@ -17,7 +17,9 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/extensions-jvm/nitrite/deployment/src/main/java/org/apache/camel/quarkus/component/nitrite/deployment/NitriteProcessor.java b/extensions/nitrite/deployment/src/main/java/org/apache/camel/quarkus/component/nitrite/deployment/NitriteProcessor.java
similarity index 54%
rename from extensions-jvm/nitrite/deployment/src/main/java/org/apache/camel/quarkus/component/nitrite/deployment/NitriteProcessor.java
rename to extensions/nitrite/deployment/src/main/java/org/apache/camel/quarkus/component/nitrite/deployment/NitriteProcessor.java
index 2f4311f..b3f047c 100644
--- a/extensions-jvm/nitrite/deployment/src/main/java/org/apache/camel/quarkus/component/nitrite/deployment/NitriteProcessor.java
+++ b/extensions/nitrite/deployment/src/main/java/org/apache/camel/quarkus/component/nitrite/deployment/NitriteProcessor.java
@@ -16,20 +16,15 @@
*/
package org.apache.camel.quarkus.component.nitrite.deployment;
-import io.quarkus.deployment.annotations.BuildProducer;
+import java.util.Arrays;
+import java.util.List;
+
import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.annotations.ExecutionTime;
-import io.quarkus.deployment.annotations.Record;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
-import io.quarkus.deployment.pkg.steps.NativeBuild;
-import org.apache.camel.quarkus.core.JvmOnlyRecorder;
-import org.h2.store.fs.FilePathNio;
-import org.jboss.logging.Logger;
class NitriteProcessor {
- private static final Logger LOG = Logger.getLogger(NitriteProcessor.class);
private static final String FEATURE = "camel-nitrite";
@@ -38,25 +33,15 @@ class NitriteProcessor {
return new FeatureBuildItem(FEATURE);
}
- /**
- * Remove this once this extension starts supporting the native mode.
- */
- @BuildStep(onlyIf = NativeBuild.class)
- @Record(value = ExecutionTime.RUNTIME_INIT)
- void warnJvmInNative(JvmOnlyRecorder recorder) {
- JvmOnlyRecorder.warnJvmInNative(LOG, FEATURE); // warn at build time
- recorder.warnJvmInNative(FEATURE); // warn at runtime
- }
-
@BuildStep
- void runtimeInitializedClasses(BuildProducer<RuntimeInitializedClassBuildItem> runtimeInitializedClasses) {
+ RuntimeInitializedClassBuildItem runtimeInitializedClass() {
// this class uses a SecureRandom which needs to be initialised at run time
- runtimeInitializedClasses.produce(new RuntimeInitializedClassBuildItem("org.dizitart.no2.Security"));
+ return new RuntimeInitializedClassBuildItem("org.dizitart.no2.Security");
}
@BuildStep
- void reflectiveClasses(BuildProducer<ReflectiveClassBuildItem> reflectiveClasses) {
- reflectiveClasses.produce(new ReflectiveClassBuildItem(false, false, FilePathNio.class));
+ List<ReflectiveClassBuildItem> reflectiveClasses() {
+ return Arrays.asList(new ReflectiveClassBuildItem(false, false, org.h2.store.fs.FilePathNio.class),
+ new ReflectiveClassBuildItem(true, false, "sun.reflect.ReflectionFactory"));
}
-
}
diff --git a/extensions-jvm/nitrite/pom.xml b/extensions/nitrite/pom.xml
similarity index 84%
rename from extensions-jvm/nitrite/pom.xml
rename to extensions/nitrite/pom.xml
index a094786..0e277f2 100644
--- a/extensions-jvm/nitrite/pom.xml
+++ b/extensions/nitrite/pom.xml
@@ -17,7 +17,9 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
@@ -33,6 +35,5 @@
<modules>
<module>deployment</module>
<module>runtime</module>
- <module>integration-test</module>
</modules>
</project>
diff --git a/extensions-jvm/nitrite/runtime/pom.xml b/extensions/nitrite/runtime/pom.xml
similarity index 91%
rename from extensions-jvm/nitrite/runtime/pom.xml
rename to extensions/nitrite/runtime/pom.xml
index fba9106..e223181 100644
--- a/extensions-jvm/nitrite/runtime/pom.xml
+++ b/extensions/nitrite/runtime/pom.xml
@@ -17,7 +17,9 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
@@ -28,9 +30,11 @@
<artifactId>camel-quarkus-nitrite</artifactId>
<name>Camel Quarkus :: Nitrite :: Runtime</name>
+ <description>Access Nitrite databases.</description>
<properties>
<camel.quarkus.jvmSince>1.0.0</camel.quarkus.jvmSince>
+ <camel.quarkus.nativeSince>1.8.0</camel.quarkus.nativeSince>
</properties>
<dependencyManagement>
diff --git a/extensions/nitrite/runtime/src/main/doc/usage.adoc b/extensions/nitrite/runtime/src/main/doc/usage.adoc
new file mode 100644
index 0000000..3cadb6f
--- /dev/null
+++ b/extensions/nitrite/runtime/src/main/doc/usage.adoc
@@ -0,0 +1,9 @@
+If your persistence objects implement `java.io.Serializable`, you have to add configuration of all serializable classes.
+There is a new serialization support in GraalVM 21.0. Developers can configure classes
+for serialization via the serialization configuration file
+`-H:SerializationConfigurationResources=/path/to-serialization-config.json` option. For more
+information see https://github.com/oracle/graal/pull/2730[PR with feature].
+
+If your persistence objects implement `org.dizitart.no2.mapper.Mappable`. All classes have to
+implement also `java.io.Serializable` and have to be registered for serialization (see previous option),
+even though the Java serialization won't be used.
diff --git a/extensions/nitrite/runtime/src/main/resources/META-INF/native-image/serialization-config.json b/extensions/nitrite/runtime/src/main/resources/META-INF/native-image/serialization-config.json
new file mode 100644
index 0000000..6557560
--- /dev/null
+++ b/extensions/nitrite/runtime/src/main/resources/META-INF/native-image/serialization-config.json
@@ -0,0 +1,41 @@
+[
+ {
+ "name" : "org.dizitart.no2.NitriteId"
+ },
+ {
+ "name" : "java.lang.Long"
+ },
+ {
+ "name" : "java.lang.Number"
+ },
+ {
+ "name" : "org.dizitart.no2.Document"
+ },
+ {
+ "name" : "java.util.LinkedHashMap"
+ },
+ {
+ "name" : "java.util.HashMap"
+ },
+ {
+ "name" : "java.util.Date"
+ },
+ {
+ "name" : "java.lang.String"
+ },
+ {
+ "name" : "java.lang.Integer"
+ },
+ {
+ "name" : "org.dizitart.no2.meta.Attributes"
+ },
+ {
+ "name" : "org.dizitart.no2.internals.IndexMetaService$IndexMeta"
+ },
+ {
+ "name" : "java.util.concurrent.atomic.AtomicBoolean"
+ },
+ {
+ "name" : "org.dizitart.no2.Index"
+ }
+]
\ No newline at end of file
diff --git a/extensions-jvm/nitrite/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/nitrite/runtime/src/main/resources/META-INF/quarkus-extension.yaml
similarity index 97%
rename from extensions-jvm/nitrite/runtime/src/main/resources/META-INF/quarkus-extension.yaml
rename to extensions/nitrite/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 1cf1f20..b3fd519 100644
--- a/extensions-jvm/nitrite/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions/nitrite/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -24,9 +24,8 @@
name: "Camel Nitrite"
description: "Access Nitrite databases"
metadata:
- unlisted: true
guide: "https://camel.apache.org/camel-quarkus/latest/reference/extensions/nitrite.html"
categories:
- "integration"
status:
- - "preview"
+ - "stable"
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 1694dee..69112b8 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -181,6 +181,7 @@
<module>nats</module>
<module>netty</module>
<module>netty-http</module>
+ <module>nitrite</module>
<module>nsq</module>
<module>oaipmh</module>
<module>olingo4</module>
diff --git a/extensions-jvm/nitrite/integration-test/pom.xml b/integration-tests/nitrite/pom.xml
similarity index 58%
rename from extensions-jvm/nitrite/integration-test/pom.xml
rename to integration-tests/nitrite/pom.xml
index 0242e92..8baf9f9 100644
--- a/extensions-jvm/nitrite/integration-test/pom.xml
+++ b/integration-tests/nitrite/pom.xml
@@ -17,19 +17,33 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-build-parent-it</artifactId>
+ <artifactId>camel-quarkus-integration-tests</artifactId>
<version>1.8.0-SNAPSHOT</version>
- <relativePath>../../../poms/build-parent-it/pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>camel-quarkus-nitrite-integration-test</artifactId>
- <name>Camel Quarkus :: Nitrite :: Integration Test</name>
+ <artifactId>camel-quarkus-integration-test-nitrite</artifactId>
+ <name>Camel Quarkus :: Integration Tests :: Nitrite</name>
<description>Integration tests for Camel Quarkus Nitrite extension</description>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-bom-test</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
@@ -39,7 +53,6 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy</artifactId>
</dependency>
-
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy-jackson</artifactId>
@@ -73,4 +86,34 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>native</id>
+ <activation>
+ <property>
+ <name>native</name>
+ </property>
+ </activation>
+ <properties>
+ <quarkus.package.type>native</quarkus.package.type>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
diff --git a/extensions-jvm/nitrite/integration-test/src/main/java/org/apache/camel/quarkus/component/nitrite/it/Employee.java b/integration-tests/nitrite/src/main/java/org/apache/camel/quarkus/component/nitrite/it/Employee.java
similarity index 77%
copy from extensions-jvm/nitrite/integration-test/src/main/java/org/apache/camel/quarkus/component/nitrite/it/Employee.java
copy to integration-tests/nitrite/src/main/java/org/apache/camel/quarkus/component/nitrite/it/Employee.java
index ed13136..0049567 100644
--- a/extensions-jvm/nitrite/integration-test/src/main/java/org/apache/camel/quarkus/component/nitrite/it/Employee.java
+++ b/integration-tests/nitrite/src/main/java/org/apache/camel/quarkus/component/nitrite/it/Employee.java
@@ -19,18 +19,7 @@ package org.apache.camel.quarkus.component.nitrite.it;
import java.io.Serializable;
import java.util.Date;
-import org.dizitart.no2.IndexType;
-import org.dizitart.no2.objects.Id;
-import org.dizitart.no2.objects.Index;
-import org.dizitart.no2.objects.Indices;
-
-@Indices({
- @Index(value = "address", type = IndexType.NonUnique),
- @Index(value = "name", type = IndexType.Unique)
-})
-public class Employee implements Serializable, Cloneable {
- @Id
- private long empId;
+public abstract class Employee implements Serializable, Cloneable {
private Date joinDate;
@@ -42,19 +31,15 @@ public class Employee implements Serializable, Cloneable {
}
public Employee(long empId, Date joinDate, String name, String address) {
- this.empId = empId;
+ setEmpId(empId);
this.joinDate = joinDate;
this.name = name;
this.address = address;
}
- public long getEmpId() {
- return empId;
- }
+ public abstract long getEmpId();
- public void setEmpId(long empId) {
- this.empId = empId;
- }
+ public abstract void setEmpId(long empId);
public Date getJoinDate() {
return joinDate;
@@ -83,7 +68,7 @@ public class Employee implements Serializable, Cloneable {
@Override
public String toString() {
return "Employee{" +
- "empId=" + empId +
+ "empId=" + getEmpId() +
", joinDate=" + joinDate +
", name='" + name + '\'' +
", address='" + address + '\'' +
diff --git a/extensions-jvm/nitrite/integration-test/src/main/java/org/apache/camel/quarkus/component/nitrite/it/Employee.java b/integration-tests/nitrite/src/main/java/org/apache/camel/quarkus/component/nitrite/it/EmployeeMappable.java
similarity index 53%
copy from extensions-jvm/nitrite/integration-test/src/main/java/org/apache/camel/quarkus/component/nitrite/it/Employee.java
copy to integration-tests/nitrite/src/main/java/org/apache/camel/quarkus/component/nitrite/it/EmployeeMappable.java
index ed13136..7cc41b9 100644
--- a/extensions-jvm/nitrite/integration-test/src/main/java/org/apache/camel/quarkus/component/nitrite/it/Employee.java
+++ b/integration-tests/nitrite/src/main/java/org/apache/camel/quarkus/component/nitrite/it/EmployeeMappable.java
@@ -16,10 +16,12 @@
*/
package org.apache.camel.quarkus.component.nitrite.it;
-import java.io.Serializable;
import java.util.Date;
+import org.dizitart.no2.Document;
import org.dizitart.no2.IndexType;
+import org.dizitart.no2.mapper.Mappable;
+import org.dizitart.no2.mapper.NitriteMapper;
import org.dizitart.no2.objects.Id;
import org.dizitart.no2.objects.Index;
import org.dizitart.no2.objects.Indices;
@@ -28,69 +30,50 @@ import org.dizitart.no2.objects.Indices;
@Index(value = "address", type = IndexType.NonUnique),
@Index(value = "name", type = IndexType.Unique)
})
-public class Employee implements Serializable, Cloneable {
+public class EmployeeMappable extends Employee implements Mappable {
+
@Id
private long empId;
- private Date joinDate;
-
- private String name;
-
- private String address;
+ public EmployeeMappable() {
+ }
- public Employee() {
+ public EmployeeMappable(long empId, Date joinDate, String name, String address) {
+ super(empId, joinDate, name, address);
}
- public Employee(long empId, Date joinDate, String name, String address) {
- this.empId = empId;
- this.joinDate = joinDate;
- this.name = name;
- this.address = address;
+ public EmployeeMappable(EmployeeSerializable employee) {
+ super(employee.getEmpId(), employee.getJoinDate(), employee.getName(), employee.getAddress());
}
+ @Override
public long getEmpId() {
return empId;
}
+ @Override
public void setEmpId(long empId) {
this.empId = empId;
}
- public Date getJoinDate() {
- return joinDate;
- }
-
- public void setJoinDate(Date joinDate) {
- this.joinDate = joinDate;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getAddress() {
- return address;
- }
-
- public void setAddress(String address) {
- this.address = address;
- }
-
@Override
- public String toString() {
- return "Employee{" +
- "empId=" + empId +
- ", joinDate=" + joinDate +
- ", name='" + name + '\'' +
- ", address='" + address + '\'' +
- '}';
+ public Document write(NitriteMapper nitriteMapper) {
+ Document document = new Document();
+ document.put("empId", getEmpId());
+ document.put("name", getName());
+ document.put("joiningDate", getJoinDate());
+ document.put("address", getAddress());
+
+ return document;
}
- public Object clone() throws CloneNotSupportedException {
- return super.clone();
+ @Override
+ public void read(NitriteMapper nitriteMapper, Document document) {
+ if (document != null) {
+ setEmpId((Long) document.get("empId"));
+ setName((String) document.get("name"));
+ setJoinDate((Date) document.get("joiningDate"));
+ setAddress((String) document.get("address"));
+ }
}
}
diff --git a/extensions-jvm/nitrite/integration-test/src/main/java/org/apache/camel/quarkus/component/nitrite/it/Employee.java b/integration-tests/nitrite/src/main/java/org/apache/camel/quarkus/component/nitrite/it/EmployeeSerializable.java
similarity index 53%
rename from extensions-jvm/nitrite/integration-test/src/main/java/org/apache/camel/quarkus/component/nitrite/it/Employee.java
rename to integration-tests/nitrite/src/main/java/org/apache/camel/quarkus/component/nitrite/it/EmployeeSerializable.java
index ed13136..87900b7 100644
--- a/extensions-jvm/nitrite/integration-test/src/main/java/org/apache/camel/quarkus/component/nitrite/it/Employee.java
+++ b/integration-tests/nitrite/src/main/java/org/apache/camel/quarkus/component/nitrite/it/EmployeeSerializable.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.quarkus.component.nitrite.it;
-import java.io.Serializable;
import java.util.Date;
import org.dizitart.no2.IndexType;
@@ -28,69 +27,26 @@ import org.dizitart.no2.objects.Indices;
@Index(value = "address", type = IndexType.NonUnique),
@Index(value = "name", type = IndexType.Unique)
})
-public class Employee implements Serializable, Cloneable {
+public class EmployeeSerializable extends Employee {
+
@Id
private long empId;
- private Date joinDate;
-
- private String name;
-
- private String address;
-
- public Employee() {
+ public EmployeeSerializable() {
}
- public Employee(long empId, Date joinDate, String name, String address) {
- this.empId = empId;
- this.joinDate = joinDate;
- this.name = name;
- this.address = address;
+ public EmployeeSerializable(long empId, Date joinDate, String name, String address) {
+ super(empId, joinDate, name, address);
}
+ @Override
public long getEmpId() {
return empId;
}
+ @Override
public void setEmpId(long empId) {
this.empId = empId;
}
- public Date getJoinDate() {
- return joinDate;
- }
-
- public void setJoinDate(Date joinDate) {
- this.joinDate = joinDate;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getAddress() {
- return address;
- }
-
- public void setAddress(String address) {
- this.address = address;
- }
-
- @Override
- public String toString() {
- return "Employee{" +
- "empId=" + empId +
- ", joinDate=" + joinDate +
- ", name='" + name + '\'' +
- ", address='" + address + '\'' +
- '}';
- }
-
- public Object clone() throws CloneNotSupportedException {
- return super.clone();
- }
}
diff --git a/extensions-jvm/nitrite/integration-test/src/main/java/org/apache/camel/quarkus/component/nitrite/it/NitriteResource.java b/integration-tests/nitrite/src/main/java/org/apache/camel/quarkus/component/nitrite/it/NitriteResource.java
similarity index 77%
rename from extensions-jvm/nitrite/integration-test/src/main/java/org/apache/camel/quarkus/component/nitrite/it/NitriteResource.java
rename to integration-tests/nitrite/src/main/java/org/apache/camel/quarkus/component/nitrite/it/NitriteResource.java
index 9ae0bdd..cfb9b9d 100644
--- a/extensions-jvm/nitrite/integration-test/src/main/java/org/apache/camel/quarkus/component/nitrite/it/NitriteResource.java
+++ b/integration-tests/nitrite/src/main/java/org/apache/camel/quarkus/component/nitrite/it/NitriteResource.java
@@ -23,6 +23,7 @@ import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
@@ -51,12 +52,13 @@ public class NitriteResource {
@Inject
ConsumerTemplate consumerTemplate;
- @Path("/repositoryClass")
+ @Path("/getRepositoryClass")
@GET
@Produces(MediaType.APPLICATION_JSON)
- public Response getRepositoryClass() throws Exception {
- final Exchange exchange = consumerTemplate.receiveNoWait(String.format("nitrite://%s?repositoryClass=%s",
- dbFile, Employee.class.getName()));
+ public Response getRepositoryClass(@QueryParam("mappable") boolean mappable) throws Exception {
+ String className = mappable ? EmployeeMappable.class.getName() : EmployeeSerializable.class.getName();
+ final Exchange exchange = consumerTemplate.receive(String.format("nitrite://%s?repositoryClass=%s",
+ dbFile, className), 2000);
if (exchange == null) {
return Response.noContent().build();
}
@@ -71,11 +73,17 @@ public class NitriteResource {
@POST
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
- public Object postRepositoryClass(Employee object) {
+ public Object postRepositoryClass(EmployeeSerializable object, @QueryParam("mappable") boolean mappable) {
+ String className = mappable ? EmployeeMappable.class.getName() : EmployeeSerializable.class.getName();
+ //if object, is mappable, construct it from serializable (it is conversion caused by the type in method parameter)
+ Employee employee = object;
+ if (mappable) {
+ employee = new EmployeeMappable(object);
+ }
LOG.debugf("Sending to nitrite: {%s}", object);
return producerTemplate.toF("nitrite://%s?repositoryClass=%s",
- dbFile, Employee.class.getName())
- .withBody(object)
+ dbFile, className)
+ .withBody(employee)
.withHeader(NitriteConstants.OPERATION, null)
.request();
}
@@ -84,11 +92,12 @@ public class NitriteResource {
@POST
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
- public Object postRepositoryClassOperation(Operation operation) {
+ public Object postRepositoryClassOperation(Operation operation, @QueryParam("mappable") boolean mappable) {
+ String className = mappable ? EmployeeMappable.class.getName() : EmployeeSerializable.class.getName();
LOG.debugf("Sending to nitrite: {%s}", operation);
return producerTemplate.toF("nitrite://%s?repositoryClass=%s",
- dbFile, Employee.class.getName())
- .withBody(operation.getEmployee())
+ dbFile, className)
+ .withBody(mappable ? operation.getEmployeeMappable() : operation.getEmployeeSerializable())
.withHeader(NitriteConstants.OPERATION, operation.toRepositoryOperation())
.request();
}
@@ -96,7 +105,7 @@ public class NitriteResource {
@Path("/collection")
@GET
@Produces(MediaType.APPLICATION_JSON)
- public Object getCollection() throws Exception {
+ public Object collection() throws Exception {
final Exchange exchange = consumerTemplate.receiveNoWait(String.format("nitrite://%s?collection=collection",
dbFile));
LOG.debugf("Received from nitrite: %s", exchange == null ? null : exchange.getIn().getBody());
@@ -114,7 +123,7 @@ public class NitriteResource {
@POST
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
- public Object postCollection(Document doc) {
+ public Object collection(Document doc) {
LOG.debugf("Sending to nitrite: {%s}", doc);
return producerTemplate.toF("nitrite://%s?collection=collection", dbFile)
.withBody(doc)
diff --git a/extensions-jvm/nitrite/integration-test/src/main/java/org/apache/camel/quarkus/component/nitrite/it/Operation.java b/integration-tests/nitrite/src/main/java/org/apache/camel/quarkus/component/nitrite/it/Operation.java
similarity index 84%
rename from extensions-jvm/nitrite/integration-test/src/main/java/org/apache/camel/quarkus/component/nitrite/it/Operation.java
rename to integration-tests/nitrite/src/main/java/org/apache/camel/quarkus/component/nitrite/it/Operation.java
index 4a64294..c50410d 100644
--- a/extensions-jvm/nitrite/integration-test/src/main/java/org/apache/camel/quarkus/component/nitrite/it/Operation.java
+++ b/integration-tests/nitrite/src/main/java/org/apache/camel/quarkus/component/nitrite/it/Operation.java
@@ -41,7 +41,8 @@ public class Operation {
private Object value;
- private Employee employee;
+ private EmployeeSerializable employeeSerializable;
+ private EmployeeMappable employeeMappable;
private Document document;
public Operation() {
@@ -53,9 +54,11 @@ public class Operation {
this.value = value;
}
- public Operation(Type type, String field, Object value, Employee employee) {
+ public Operation(Type type, String field, Object value, EmployeeSerializable employeeSerializable,
+ EmployeeMappable employeeMappable) {
this(type, field, value);
- this.employee = employee;
+ this.employeeSerializable = employeeSerializable;
+ this.employeeMappable = employeeMappable;
}
public Operation(Type type, String field, Object value, Document document) {
@@ -87,12 +90,20 @@ public class Operation {
this.value = value;
}
- public Employee getEmployee() {
- return employee;
+ public Employee getEmployeeSerializable() {
+ return employeeSerializable;
}
- public void setEmployee(Employee employee) {
- this.employee = employee;
+ public void setEmployeeSerializable(EmployeeSerializable employeeSerializable) {
+ this.employeeSerializable = employeeSerializable;
+ }
+
+ public EmployeeMappable getEmployeeMappable() {
+ return employeeMappable;
+ }
+
+ public void setEmployeeMappable(EmployeeMappable employeeMappable) {
+ this.employeeMappable = employeeMappable;
}
public Document getDocument() {
diff --git a/integration-tests/nitrite/src/main/resources/application.properties b/integration-tests/nitrite/src/main/resources/application.properties
new file mode 100644
index 0000000..55f1ff8
--- /dev/null
+++ b/integration-tests/nitrite/src/main/resources/application.properties
@@ -0,0 +1,19 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+
+
+quarkus.native.additional-build-args=-H:SerializationConfigurationResources=my-serialization-config.json
\ No newline at end of file
diff --git a/integration-tests/nitrite/src/main/resources/my-serialization-config.json b/integration-tests/nitrite/src/main/resources/my-serialization-config.json
new file mode 100644
index 0000000..636ce1e
--- /dev/null
+++ b/integration-tests/nitrite/src/main/resources/my-serialization-config.json
@@ -0,0 +1,7 @@
+[
+ {
+ "name" : "org.apache.camel.quarkus.component.nitrite.it.EmployeeSerializable"
+ },{
+ "name" : "org.apache.camel.quarkus.component.nitrite.it.EmployeeMappable"
+ }
+]
\ No newline at end of file
diff --git a/integration-tests/nitrite/src/test/java/org/apache/camel/quarkus/component/nitrite/it/NitriteIT.java b/integration-tests/nitrite/src/test/java/org/apache/camel/quarkus/component/nitrite/it/NitriteIT.java
new file mode 100644
index 0000000..0933070
--- /dev/null
+++ b/integration-tests/nitrite/src/test/java/org/apache/camel/quarkus/component/nitrite/it/NitriteIT.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.quarkus.component.nitrite.it;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+class NitriteIT extends NitriteTest {
+
+}
diff --git a/extensions-jvm/nitrite/integration-test/src/test/java/org/apache/camel/quarkus/component/nitrite/it/NitriteTest.java b/integration-tests/nitrite/src/test/java/org/apache/camel/quarkus/component/nitrite/it/NitriteTest.java
similarity index 73%
rename from extensions-jvm/nitrite/integration-test/src/test/java/org/apache/camel/quarkus/component/nitrite/it/NitriteTest.java
rename to integration-tests/nitrite/src/test/java/org/apache/camel/quarkus/component/nitrite/it/NitriteTest.java
index fb39912..f36072b 100644
--- a/extensions-jvm/nitrite/integration-test/src/test/java/org/apache/camel/quarkus/component/nitrite/it/NitriteTest.java
+++ b/integration-tests/nitrite/src/test/java/org/apache/camel/quarkus/component/nitrite/it/NitriteTest.java
@@ -35,27 +35,57 @@ import static org.hamcrest.core.Is.is;
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
class NitriteTest {
- private static final Employee sheldon = new Employee(1L, new GregorianCalendar(2010, 10, 1).getTime(), "Sheldon",
+ private static final EmployeeSerializable sheldonSerializable = new EmployeeSerializable(1L,
+ new GregorianCalendar(2010, 10, 1).getTime(),
+ "Sheldon",
"Alpha Centauri");
- private static final Employee leonard = new Employee(2L, new GregorianCalendar(2015, 10, 1).getTime(), "Leonard", "Earth");
- private static final Employee irma = new Employee(3L, new GregorianCalendar(2011, 10, 1).getTime(), "Irma", "Jupiter");
+ private static final EmployeeSerializable leonardSerializable = new EmployeeSerializable(2L,
+ new GregorianCalendar(2015, 10, 1).getTime(),
+ "Leonard", "Earth");
+ private static final EmployeeSerializable irmaSerializable = new EmployeeSerializable(3L,
+ new GregorianCalendar(2011, 10, 1).getTime(),
+ "Irma",
+ "Jupiter");
+
+ private static final EmployeeMappable sheldonMappable = new EmployeeMappable(1L,
+ new GregorianCalendar(2010, 10, 1).getTime(),
+ "Sheldon",
+ "Alpha Centauri");
+ private static final EmployeeMappable leonardMappable = new EmployeeMappable(2L,
+ new GregorianCalendar(2015, 10, 1).getTime(),
+ "Leonard", "Earth");
+ private static final EmployeeMappable irmaMappable = new EmployeeMappable(3L, new GregorianCalendar(2011, 10, 1).getTime(),
+ "Irma",
+ "Jupiter");
+
+ @Test
+ public void repositoryClassSerializable() throws CloneNotSupportedException {
+ testRepositoryClass(sheldonSerializable, leonardSerializable, irmaSerializable);
+ }
@Test
- public void repositoryClass() throws CloneNotSupportedException {
+ public void repositoryClassMappable() throws CloneNotSupportedException {
+ testRepositoryClass(sheldonMappable, leonardMappable, irmaMappable);
+ }
+
+ private void testRepositoryClass(Employee sheldon, Employee leonard, Employee irma)
+ throws CloneNotSupportedException {
+ boolean mappable = sheldon instanceof EmployeeMappable;
/* Make sure there is no event there before we start inserting */
- RestAssured.get("/nitrite/repositoryClass")
+ RestAssured.get("/nitrite/getRepositoryClass?mappable=" + mappable)
.then()
.statusCode(204);
/* Insert Sheldon */
RestAssured.given()
.contentType(ContentType.JSON)
+ .queryParam("mappable", mappable)
.body(sheldon)
.post("/nitrite/repositoryClass")
.then()
.statusCode(200)
.body("name", is("Sheldon"));
- RestAssured.get("/nitrite/repositoryClass")
+ RestAssured.get("/nitrite/getRepositoryClass?mappable=" + mappable)
.then()
.statusCode(200)
.header(NitriteConstants.CHANGE_TYPE, "INSERT")
@@ -64,12 +94,13 @@ class NitriteTest {
/* Insert Leonard */
RestAssured.given()
.contentType(ContentType.JSON)
+ .queryParam("mappable", mappable)
.body(leonard)
.post("/nitrite/repositoryClass")
.then()
.statusCode(200)
.body("name", is("Leonard"));
- RestAssured.get("/nitrite/repositoryClass")
+ RestAssured.get("/nitrite/getRepositoryClass?mappable=" + mappable)
.then()
.statusCode(200)
.header(NitriteConstants.CHANGE_TYPE, "INSERT")
@@ -78,28 +109,38 @@ class NitriteTest {
/* Insert Irma */
RestAssured.given()
.contentType(ContentType.JSON)
+ .queryParam("mappable", mappable)
.body(irma)
.post("/nitrite/repositoryClass")
.then()
.statusCode(200)
.body("name", is("Irma"));
- RestAssured.get("/nitrite/repositoryClass")
+ RestAssured.get("/nitrite/getRepositoryClass?mappable=" + mappable)
.then()
.statusCode(200)
.header(NitriteConstants.CHANGE_TYPE, "INSERT")
.body("name", is("Irma"));
- Employee updatedSheldon = (Employee) sheldon.clone();
+ Employee updatedSheldon = null;
+ if (sheldon instanceof EmployeeSerializable) {
+ updatedSheldon = (EmployeeSerializable) sheldon.clone();
+ } else {
+ updatedSheldon = (EmployeeMappable) sheldon.clone();
+ }
updatedSheldon.setAddress("Moon");
+
RestAssured.given()
.contentType(ContentType.JSON)
- .body(new Operation(Operation.Type.update, "name", "Sheldon", updatedSheldon))
+ .body(new Operation(Operation.Type.update, "name", "Sheldon",
+ mappable ? null : (EmployeeSerializable) updatedSheldon,
+ mappable ? (EmployeeMappable) updatedSheldon : null))
+ .queryParam("mappable", mappable)
.post("/nitrite/repositoryClassOperation")
.then()
.body("name", is("Sheldon"),
"address", is("Moon"));
- RestAssured.get("/nitrite/repositoryClass")
+ RestAssured.get("/nitrite/getRepositoryClass?mappable=" + mappable)
.then()
.statusCode(200)
.header(NitriteConstants.CHANGE_TYPE, "UPDATE")
@@ -108,7 +149,8 @@ class NitriteTest {
RestAssured.given()
.contentType(ContentType.JSON)
- .body(new Operation(Operation.Type.find, "address", (Object) "Moon", (Employee) null))
+ .body(new Operation(Operation.Type.find, "address", (Object) "Moon", null, null))
+ .queryParam("mappable", mappable)
.post("/nitrite/repositoryClassOperation")
.then()
.statusCode(200)
@@ -117,7 +159,8 @@ class NitriteTest {
RestAssured.given()
.contentType(ContentType.JSON)
- .body(new Operation(Operation.Type.findGt, "empId", (Object) 0, (Employee) null))
+ .body(new Operation(Operation.Type.findGt, "empId", (Object) 0, null, null))
+ .queryParam("mappable", mappable)
.post("/nitrite/repositoryClassOperation")
.then()
.statusCode(200)
@@ -125,13 +168,14 @@ class NitriteTest {
RestAssured.given()
.contentType(ContentType.JSON)
- .body(new Operation(Operation.Type.delete, "address", "Moon", (Employee) null))
+ .body(new Operation(Operation.Type.delete, "address", "Moon", null, null))
+ .queryParam("mappable", mappable)
.post("/nitrite/repositoryClassOperation")
.then()
.statusCode(204);
RestAssured
- .get("/nitrite/repositoryClass")
+ .get("/nitrite/getRepositoryClass?mappable=" + mappable)
.then()
.statusCode(200)
.header(NitriteConstants.CHANGE_TYPE, "REMOVE")
@@ -140,7 +184,8 @@ class NitriteTest {
RestAssured.given()
.contentType(ContentType.JSON)
- .body(new Operation(Operation.Type.findGt, "empId", (Object) 0, (Employee) null))
+ .body(new Operation(Operation.Type.findGt, "empId", (Object) 0, null, null))
+ .queryParam("mappable", mappable)
.post("/nitrite/repositoryClassOperation")
.then()
.statusCode(200)
@@ -222,7 +267,7 @@ class NitriteTest {
RestAssured.given()
.contentType(ContentType.JSON)
- .body(new Operation(Operation.Type.find, "key1", (Object) "value_afterUpdate", (Document) null))
+ .body(new Operation(Operation.Type.find, "key1", (Object) "value_afterUpdate", null))
.post("/nitrite/collectionOperation")
.then()
.statusCode(200)
diff --git a/extensions-jvm/nitrite/integration-test/src/test/java/org/apache/camel/quarkus/component/nitrite/it/NitriteTestResource.java b/integration-tests/nitrite/src/test/java/org/apache/camel/quarkus/component/nitrite/it/NitriteTestResource.java
similarity index 100%
rename from extensions-jvm/nitrite/integration-test/src/test/java/org/apache/camel/quarkus/component/nitrite/it/NitriteTestResource.java
rename to integration-tests/nitrite/src/test/java/org/apache/camel/quarkus/component/nitrite/it/NitriteTestResource.java
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 58c5ce4..64c99ca 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -152,6 +152,7 @@
<module>nagios</module>
<module>nats</module>
<module>netty</module>
+ <module>nitrite</module>
<module>nsq</module>
<module>oaipmh</module>
<module>olingo4</module>
diff --git a/tooling/scripts/test-categories.yaml b/tooling/scripts/test-categories.yaml
index 342cff9..869da62 100644
--- a/tooling/scripts/test-categories.yaml
+++ b/tooling/scripts/test-categories.yaml
@@ -66,6 +66,7 @@ database:
- leveldb
- minio
- mongodb
+ - nitrite
- pgevent
- pg-replication-slot
- sql