From e0950be5a192c737708ed0d26804329516c77897 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <zanini@redhat.com>
Date: Fri, 27 Aug 2021 15:46:45 -0300
Subject: [PATCH] Putting back Infinispan Health Check

Signed-off-by: Ricardo Zanini <zanini@redhat.com>
---
 addons/deprecated/README.md                   | 12 +--
 .../pom.xml                                   | 24 -----
 ...tedQuarkusPersistenceInfinispanHealth.java | 41 ---------
 addons/deprecated/pom.xml                     |  1 -
 .../persistence/infinispan/health/pom.xml     | 88 +++++++++++++++++++
 .../health/InfinispanHealthCheck.java         |  0
 .../health/InfinispanHealthCheckIT.java       |  0
 quarkus/addons/persistence/infinispan/pom.xml |  1 +
 .../persistence/infinispan/runtime/pom.xml    | 46 +---------
 9 files changed, 96 insertions(+), 117 deletions(-)
 delete mode 100644 addons/deprecated/kogito-addons-quarkus-persistence-infinispan-health/pom.xml
 delete mode 100644 addons/deprecated/kogito-addons-quarkus-persistence-infinispan-health/src/main/java/org/kie/kogito/addon/persistence/infinispan/quarkus/deprecated/DeprecatedQuarkusPersistenceInfinispanHealth.java
 create mode 100644 quarkus/addons/persistence/infinispan/health/pom.xml
 rename quarkus/addons/persistence/infinispan/{runtime => health}/src/main/java/org/kie/kogito/infinispan/health/InfinispanHealthCheck.java (100%)
 rename quarkus/addons/persistence/infinispan/{runtime => health}/src/test/java/org/kie/kogito/infinispan/health/InfinispanHealthCheckIT.java (100%)

diff --git a/addons/deprecated/README.md b/addons/deprecated/README.md
index f1b7e932a7c..903573b134a 100644
--- a/addons/deprecated/README.md
+++ b/addons/deprecated/README.md
@@ -137,9 +137,9 @@ Classes and namespaces remains the same, you won't need to make any change in yo
 #### Quarkus Add-ons
 
 | Add-On Description      | Old Artifact ID | New Artifact ID |
-|-------------------------|-----------------------------------------------------|----------------------------------------------|
-| Persistence Infinispan  | kogito-addons-quarkus-persistence-infinispan-health | kogito-addons-quarkus-persistence-infinispan |
-| Persistence FileSystem  | kogito-addons-persistence-filesystem                | kogito-addons-quarkus-persistence-filesystem |
-| Persistence JDBC        | kogito-addons-persistence-jdbc                      | kogito-addons-quarkus-persistence-jdbc       |
-| Persistence MongoDB     | kogito-addons-persistence-mongodb                   | kogito-addons-quarkus-persistence-mongodb    |
-| Persistence Postgresql  | kogito-addons-persistence-postgresql                | kogito-addons-quarkus-persistence-postgresql |
+|-------------------------|--------------------------------------|----------------------------------------------|
+| Persistence Infinispan  | kogito-addons-persistence-infinispan | kogito-addons-quarkus-persistence-infinispan |
+| Persistence FileSystem  | kogito-addons-persistence-filesystem | kogito-addons-quarkus-persistence-filesystem |
+| Persistence JDBC        | kogito-addons-persistence-jdbc       | kogito-addons-quarkus-persistence-jdbc       |
+| Persistence MongoDB     | kogito-addons-persistence-mongodb    | kogito-addons-quarkus-persistence-mongodb    |
+| Persistence Postgresql  | kogito-addons-persistence-postgresql | kogito-addons-quarkus-persistence-postgresql |
diff --git a/addons/deprecated/kogito-addons-quarkus-persistence-infinispan-health/pom.xml b/addons/deprecated/kogito-addons-quarkus-persistence-infinispan-health/pom.xml
deleted file mode 100644
index 9df7cfdfab6..00000000000
--- a/addons/deprecated/kogito-addons-quarkus-persistence-infinispan-health/pom.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         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.kie.kogito</groupId>
-    <artifactId>kogito-addons-deprecated-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>kogito-addons-quarkus-persistence-infinispan-health</artifactId>
-  <name>Kogito :: Add-Ons :: Deprecated :: Persistence :: Infinispan Health</name>
-  <description>
-    The library kogito-addons-quarkus-persistence-infinispan-health is deprecated and will be removed in a future release!.
-    Please use kogito-addons-quarkus-persistence-infinispan instead.
-  </description>
-
-
-  <dependencies>
-    <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-persistence-infinispan</artifactId>
-    </dependency>
-  </dependencies>
-</project>
\ No newline at end of file
diff --git a/addons/deprecated/kogito-addons-quarkus-persistence-infinispan-health/src/main/java/org/kie/kogito/addon/persistence/infinispan/quarkus/deprecated/DeprecatedQuarkusPersistenceInfinispanHealth.java b/addons/deprecated/kogito-addons-quarkus-persistence-infinispan-health/src/main/java/org/kie/kogito/addon/persistence/infinispan/quarkus/deprecated/DeprecatedQuarkusPersistenceInfinispanHealth.java
deleted file mode 100644
index 895f6df1313..00000000000
--- a/addons/deprecated/kogito-addons-quarkus-persistence-infinispan-health/src/main/java/org/kie/kogito/addon/persistence/infinispan/quarkus/deprecated/DeprecatedQuarkusPersistenceInfinispanHealth.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2021 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed 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.kie.kogito.addon.persistence.infinispan.quarkus.deprecated;
-
-import javax.enterprise.context.ApplicationScoped;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import io.quarkus.runtime.Startup;
-
-/**
- * @deprecated The library kogito-addons-quarkus-persistence-infinispan-health is deprecated and will be removed in a future release! The functionality provided by this addon was merged into
- *             kogito-addons-quarkus-persistence-infinispan
- */
-@Startup
-@ApplicationScoped
-@Deprecated
-public class DeprecatedQuarkusPersistenceInfinispanHealth {
-
-    public static final Logger LOGGER = LoggerFactory.getLogger(DeprecatedQuarkusPersistenceInfinispanHealth.class);
-
-    public DeprecatedQuarkusPersistenceInfinispanHealth() {
-        LOGGER.warn(
-                "The library kogito-addons-quarkus-persistence-infinispan-health is deprecated and will be removed in a future release! The functionality provided by this addon was merged into kogito-addons-quarkus-persistence-infinispan");
-    }
-
-}
diff --git a/addons/deprecated/pom.xml b/addons/deprecated/pom.xml
index a7cd2ce812b..4d91bebc39c 100644
--- a/addons/deprecated/pom.xml
+++ b/addons/deprecated/pom.xml
@@ -25,7 +25,6 @@
     <module>monitoring-prometheus-common</module>
     <module>monitoring-prometheus-quarkus-addon</module>
     <module>monitoring-prometheus-springboot-addon</module>
-    <module>kogito-addons-quarkus-persistence-infinispan-health</module>
   </modules>
 
   <profiles>
diff --git a/quarkus/addons/persistence/infinispan/health/pom.xml b/quarkus/addons/persistence/infinispan/health/pom.xml
new file mode 100644
index 00000000000..189df0cc110
--- /dev/null
+++ b/quarkus/addons/persistence/infinispan/health/pom.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2020 Red Hat, Inc. and/or its affiliates.
+  ~
+  ~ Licensed 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.
+  -->
+
+<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">
+  <parent>
+    <artifactId>kogito-addons-quarkus-persistence-infinispan-parent</artifactId>
+    <groupId>org.kie.kogito</groupId>
+    <version>2.0.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>kogito-addons-quarkus-persistence-infinispan-health</artifactId>
+  <name>Kogito Add-On Persistence Infinispan Health Check</name>
+
+  <description>Infinispan Health Check support for Quarkus</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-infinispan-client</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.smallrye</groupId>
+      <artifactId>smallrye-health</artifactId>
+    </dependency>
+
+    <!-- test dependencies -->
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-junit5</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.kie.kogito</groupId>
+      <artifactId>kogito-quarkus-test-utils</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.jboss.jandex</groupId>
+        <artifactId>jandex-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>make-index</id>
+            <goals>
+              <goal>jandex</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <configuration>
+          <systemPropertyVariables combine.children="append">
+            <container.image.infinispan>${container.image.infinispan}</container.image.infinispan>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
\ No newline at end of file
diff --git a/quarkus/addons/persistence/infinispan/runtime/src/main/java/org/kie/kogito/infinispan/health/InfinispanHealthCheck.java b/quarkus/addons/persistence/infinispan/health/src/main/java/org/kie/kogito/infinispan/health/InfinispanHealthCheck.java
similarity index 100%
rename from quarkus/addons/persistence/infinispan/runtime/src/main/java/org/kie/kogito/infinispan/health/InfinispanHealthCheck.java
rename to quarkus/addons/persistence/infinispan/health/src/main/java/org/kie/kogito/infinispan/health/InfinispanHealthCheck.java
diff --git a/quarkus/addons/persistence/infinispan/runtime/src/test/java/org/kie/kogito/infinispan/health/InfinispanHealthCheckIT.java b/quarkus/addons/persistence/infinispan/health/src/test/java/org/kie/kogito/infinispan/health/InfinispanHealthCheckIT.java
similarity index 100%
rename from quarkus/addons/persistence/infinispan/runtime/src/test/java/org/kie/kogito/infinispan/health/InfinispanHealthCheckIT.java
rename to quarkus/addons/persistence/infinispan/health/src/test/java/org/kie/kogito/infinispan/health/InfinispanHealthCheckIT.java
diff --git a/quarkus/addons/persistence/infinispan/pom.xml b/quarkus/addons/persistence/infinispan/pom.xml
index 4a4fa0894ac..15a79740734 100644
--- a/quarkus/addons/persistence/infinispan/pom.xml
+++ b/quarkus/addons/persistence/infinispan/pom.xml
@@ -15,5 +15,6 @@
   <modules>
     <module>runtime</module>
     <module>deployment</module>
+    <module>health</module>
   </modules>
 </project>
diff --git a/quarkus/addons/persistence/infinispan/runtime/pom.xml b/quarkus/addons/persistence/infinispan/runtime/pom.xml
index f2ef5857bdd..8eee74a79ed 100644
--- a/quarkus/addons/persistence/infinispan/runtime/pom.xml
+++ b/quarkus/addons/persistence/infinispan/runtime/pom.xml
@@ -35,59 +35,15 @@
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-infinispan-client</artifactId>
     </dependency>
-    <dependency>
-      <groupId>io.smallrye</groupId>
-      <artifactId>smallrye-health</artifactId>
-    </dependency>
     <!-- TODO: for now we have the common Infinispan Add-On added as a dependency, but ideally we should stick with Quarkus way. -->
     <dependency>
       <groupId>org.kie.kogito</groupId>
       <artifactId>kogito-addons-persistence-infinispan</artifactId>
     </dependency>
-
-    <!-- test dependencies -->
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-quarkus-test-utils</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.jboss.jandex</groupId>
-        <artifactId>jandex-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>make-index</id>
-            <goals>
-              <goal>jandex</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <configuration>
-          <systemPropertyVariables combine.children="append">
-            <container.image.infinispan>${container.image.infinispan}</container.image.infinispan>
-          </systemPropertyVariables>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
@@ -118,4 +74,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>