OptaPlanner native support fixes #1721

docs/modules/ROOT/pages/reference/extensions/optaplanner.adoc

@@ -2,15 +2,15 @@
 // This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page
 = OptaPlanner
 :cq-artifact-id: camel-quarkus-optaplanner
-:cq-native-supported: false
-:cq-status: Preview
+:cq-native-supported: true
+:cq-status: Stable
 :cq-description: Solve planning problems with OptaPlanner.
 :cq-deprecated: false
 :cq-jvm-since: 1.1.0
-:cq-native-since: n/a
+:cq-native-since: 1.5.0
 
 [.badges]
-[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native##[.badge-unsupported]##unsupported##
+[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native since##[.badge-supported]##1.5.0##
 
 Solve planning problems with OptaPlanner.
 

docs/modules/ROOT/partials/reference/components/optaplanner.adoc

@@ -2,11 +2,11 @@
 // This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page
 :cq-artifact-id: camel-quarkus-optaplanner
 :cq-artifact-id-base: optaplanner
-:cq-native-supported: false
-:cq-status: Preview
+:cq-native-supported: true
+:cq-status: Stable
 :cq-deprecated: false
 :cq-jvm-since: 1.1.0
-:cq-native-since: n/a
+:cq-native-since: 1.5.0
 :cq-camel-part-name: optaplanner
 :cq-camel-part-title: OptaPlanner
 :cq-camel-part-description: Solve planning problems with OptaPlanner.

extensions-jvm/pom.xml

@@ -108,7 +108,6 @@
         <module>nitrite</module>
         <module>ognl</module>
         <module>openstack</module>
-        <module>optaplanner</module>
         <module>printer</module>
         <module>pubnub</module>
         <module>pulsar</module>

extensions-jvm/optaplanner/deployment/pom.xml → extensions/optaplanner/deployment/pom.xml

@@ -29,6 +29,18 @@
     <artifactId>camel-quarkus-optaplanner-deployment</artifactId>
     <name>Camel Quarkus :: OptaPlanner :: Deployment</name>
 
+    <dependencyManagement>
+        <dependencies>
+          <dependency>
+                <groupId>org.optaplanner</groupId>
+                <artifactId>optaplanner-quarkus-deployment</artifactId>
+                <version>${optaplanner.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
@@ -38,6 +50,10 @@
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-optaplanner</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.optaplanner</groupId>
+            <artifactId>optaplanner-quarkus-deployment</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

extensions-jvm/optaplanner/deployment/src/main/java/org/apache/camel/quarkus/component/optaplanner/deployment/OptaplannerProcessor.java → extensions/optaplanner/deployment/src/main/java/org/apache/camel/quarkus/component/optaplanner/deployment/OptaplannerProcessor.java

@@ -17,11 +17,7 @@
 package org.apache.camel.quarkus.component.optaplanner.deployment;
 
 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.pkg.steps.NativeBuild;
-import org.apache.camel.quarkus.core.JvmOnlyRecorder;
 import org.jboss.logging.Logger;
 
 class OptaplannerProcessor {
@@ -33,14 +29,4 @@ class OptaplannerProcessor {
     FeatureBuildItem feature() {
         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
-    }
 }

extensions-jvm/optaplanner/pom.xml → extensions/optaplanner/pom.xml

@@ -33,6 +33,5 @@
     <modules>
         <module>deployment</module>
         <module>runtime</module>
-        <module>integration-test</module>
     </modules>
 </project>

extensions-jvm/optaplanner/runtime/pom.xml → extensions/optaplanner/runtime/pom.xml

@@ -32,6 +32,7 @@
 
     <properties>
         <camel.quarkus.jvmSince>1.1.0</camel.quarkus.jvmSince>
+        <camel.quarkus.nativeSince>1.5.0</camel.quarkus.nativeSince>
     </properties>
 
     <dependencyManagement>
@@ -55,6 +56,10 @@
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-optaplanner</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.optaplanner</groupId>
+            <artifactId>optaplanner-quarkus</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

extensions-jvm/optaplanner/runtime/src/main/resources/META-INF/quarkus-extension.yaml → extensions/optaplanner/runtime/src/main/resources/META-INF/quarkus-extension.yaml

@@ -24,9 +24,8 @@
 name: "Camel OptaPlanner"
 description: "Solve planning problems with OptaPlanner"
 metadata:
-  unlisted: true
   guide: "https://camel.apache.org/camel-quarkus/latest/reference/extensions/optaplanner.html"
   categories:
   - "integration"
   status:
-  - "preview"
+  - "stable"

extensions/pom.xml

@@ -163,6 +163,7 @@
         <module>olingo4</module>
         <module>openapi-java</module>
         <module>opentracing</module>
+        <module>optaplanner</module>
         <module>paho</module>
         <module>pdf</module>
         <module>pg-replication-slot</module>

extensions-jvm/optaplanner/integration-test/pom.xml → integration-tests/optaplanner/pom.xml

@@ -21,13 +21,12 @@
     <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.5.0-SNAPSHOT</version>
-        <relativePath>../../../poms/build-parent-it/pom.xml</relativePath>
     </parent>
 
-    <artifactId>camel-quarkus-optaplanner-integration-test</artifactId>
-    <name>Camel Quarkus :: OptaPlanner :: Integration Test</name>
+    <artifactId>camel-quarkus-integration-test-optaplanner</artifactId>
+    <name>Camel Quarkus :: Integration Tests :: OptaPlanner</name>
     <description>Integration tests for Camel Quarkus OptaPlanner extension</description>
 
     <dependencyManagement>
@@ -51,6 +50,18 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-resteasy</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-jackson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel.quarkus</groupId>
+            <artifactId>camel-quarkus-direct</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel.quarkus</groupId>
+            <artifactId>camel-quarkus-bean</artifactId>
+        </dependency>
 
         <!-- test dependencies -->
         <dependency>
@@ -65,6 +76,32 @@
         </dependency>
 
         <!-- The following dependencies guarantee that this module is built after them. You can update them by running `mvn process-resources -Pformat -N` from the source tree root directory -->
+        <dependency>
+            <groupId>org.apache.camel.quarkus</groupId>
+            <artifactId>camel-quarkus-bean-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel.quarkus</groupId>
+            <artifactId>camel-quarkus-direct-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-optaplanner-deployment</artifactId>
@@ -80,4 +117,33 @@
         </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>

integration-tests/optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner/it/MyBean.java

@@ -0,0 +1,48 @@
+/*
+ * 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.optaplanner.it;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import io.quarkus.runtime.annotations.RegisterForReflection;
+import org.apache.camel.Exchange;
+import org.apache.camel.component.optaplanner.OptaPlannerConstants;
+import org.apache.camel.quarkus.component.optaplanner.it.domain.TimeTable;
+
+@RegisterForReflection
+@ApplicationScoped
+public class MyBean {
+
+    public TimeTable bestSolution;
+
+    public TimeTable getBestSolution() {
+        return bestSolution;
+    }
+
+    public void setBestSolution(TimeTable bestSolution) {
+        this.bestSolution = bestSolution;
+    }
+
+    public void updateBestSolution(Exchange exchange) {
+        if (exchange != null) {
+            TimeTable newBestSolution = exchange.getMessage().getHeader(OptaPlannerConstants.BEST_SOLUTION, TimeTable.class);
+            if (newBestSolution != null) {
+                this.bestSolution = newBestSolution;
+            }
+        }
+    }
+}

integration-tests/optaplanner/src/main/java/org/apache/camel/quarkus/component/optaplanner/it/OptaplannerResource.java

@@ -0,0 +1,89 @@
+/*
+ * 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.optaplanner.it;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.component.optaplanner.OptaPlannerConstants;
+import org.apache.camel.quarkus.component.optaplanner.it.bootstrap.DataGenerator;
+import org.apache.camel.quarkus.component.optaplanner.it.domain.TimeTable;
+import org.jboss.logging.Logger;
+import org.optaplanner.core.api.solver.SolverManager;
+import org.optaplanner.core.api.solver.SolverStatus;
+
+@Path("/optaplanner")
+@ApplicationScoped
+@Produces(MediaType.APPLICATION_JSON)
+public class OptaplannerResource {
+
+    private static final Logger LOG = Logger.getLogger(OptaplannerResource.class);
+
+    public static final Long SINGLETON_TIME_TABLE_ID = 1L;
+
+    @Inject
+    SolverManager<TimeTable, Long> solverManager;
+
+    @Inject
+    ProducerTemplate producerTemplate;
+
+    @Inject
+    MyBean bean;
+
+    @GET
+    @Path("solveSync")
+    public TimeTable solveSync() {
+        if (SolverStatus.NOT_SOLVING == solverManager.getSolverStatus(SINGLETON_TIME_TABLE_ID)) {
+            TimeTable finalSolution = producerTemplate.requestBodyAndHeader(
+                    "direct:solveSync", DataGenerator.timeTable,
+                    OptaPlannerConstants.SOLVER_MANAGER, solverManager, TimeTable.class);
+            return finalSolution;
+        }
+        return DataGenerator.timeTable;
+    }
+
+    @GET
+    @Path("solveAsync")
+    public TimeTable solveAsync() throws ExecutionException, InterruptedException {
+        // reset best Solution
+        bean.setBestSolution(null);
+        if (SolverStatus.NOT_SOLVING == solverManager.getSolverStatus(SINGLETON_TIME_TABLE_ID)) {
+            CompletableFuture<TimeTable> response = producerTemplate.asyncRequestBodyAndHeader(
+                    "direct:solveAsync", DataGenerator.timeTable, OptaPlannerConstants.SOLVER_MANAGER,
+                    solverManager, TimeTable.class);
+
+            TimeTable finalSolution = response.get();
+            return finalSolution;
+        }
+        return DataGenerator.timeTable;
+    }
+
+    @GET
+    @Path("newBestSolution")
+    public TimeTable getNewBestSolution() {
+        return bean.getBestSolution();
+    }
+
+}