Merge pull request #11493 from ecostanzi/fix-infinispan-build

fix infinispan service discovery configuration
jhipster · Mar 22, 2020 · b9240e6 · b9240e6
2 parents 594fc34 + 9b6728d
commit b9240e6
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 6 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -58,6 +58,9 @@ jobs:
               ms-micro-eureka-jwt:
                   JHI_APP: ms-micro-eureka-jwt
                   JHI_ENTITY: micro
+              ms-micro-eureka-infinispan:
+                  JHI_APP: ms-micro-eureka-infinispan
+                  JHI_ENTITY: micro
               ms-react-gateway-consul-jwt:
                   JHI_APP: ms-react-gateway-consul-jwt
                   JHI_ENTITY: sqllight

diff --git a/generators/server/templates/src/main/java/package/config/CacheConfiguration.java.ejs b/generators/server/templates/src/main/java/package/config/CacheConfiguration.java.ejs
@@ -126,6 +126,7 @@ import org.jgroups.protocols.pbcast.STABLE;
 import org.jgroups.stack.IpAddress;
 import org.jgroups.stack.ProtocolStack;
 import java.net.InetAddress;
+import java.net.InetSocketAddress;
 import org.springframework.beans.factory.BeanInitializationException;
 import java.util.ArrayList;
 import java.util.List;
@@ -586,13 +587,12 @@ public class CacheConfiguration {
      * from registry and sends only unicast messages to the host list.
      */
     private JChannel getTransportChannel() {
-        JChannel channel = null;
-        List<PhysicalAddress> initialHosts = new ArrayList<>();
+        JChannel channel;
+        List<InetSocketAddress> initialHosts = new ArrayList<>();
         try {
             for (ServiceInstance instance : discoveryClient.getInstances(registration.getServiceId())) {
-                String clusterMember = instance.getHost() + ":7800";
-                log.debug("Adding Infinispan cluster member {}", clusterMember);
-                initialHosts.add(new IpAddress(clusterMember));
+                log.debug("Adding Infinispan cluster member {}:{}", instance.getHost(), 7800);
+                initialHosts.add(new InetSocketAddress(instance.getHost(), 7800));
             }
             TCP tcp = new TCP();
             tcp.setBindAddress(InetAddress.getLocalHost());
@@ -602,7 +602,7 @@ public class CacheConfiguration {
             tcp.setThreadPoolKeepAliveTime(60000);
 
             TCPPING tcpping = new TCPPING();
-            initialHosts.add(new IpAddress(InetAddress.getLocalHost(), 7800));
+            initialHosts.add(new InetSocketAddress(InetAddress.getLocalHost(), 7800));
             tcpping.setInitialHosts(initialHosts);
             tcpping.setErgonomics(false);
             tcpping.setPortRange(10);

diff --git a/test-integration/samples/README.md b/test-integration/samples/README.md
@@ -10,6 +10,7 @@ Those are described in `.yo-rc.json` files which is the descriptor file created
 - jdl-default
 - ms-micro-consul
 - ms-micro-eureka
+- ms-micro-eureka-infinispan
 - ms-micro-eureka-jwt
 - ms-ngx-gateway-consul
 - ms-ngx-gateway-eureka

diff --git a/test-integration/samples/ms-micro-eureka-infinispan/.yo-rc.json b/test-integration/samples/ms-micro-eureka-infinispan/.yo-rc.json
@@ -0,0 +1,34 @@
+{
+    "generator-jhipster": {
+        "applicationType": "microservice",
+        "baseName": "samplesMicroserviceEurekaInfinispan",
+        "packageName": "io.github.jhipster.sample",
+        "packageFolder": "io/github/jhipster/sample",
+        "authenticationType": "jwt",
+        "cacheProvider": "infinispan",
+        "enableHibernateCache": true,
+        "databaseType": "sql",
+        "devDatabaseType": "h2Disk",
+        "prodDatabaseType": "mysql",
+        "searchEngine": false,
+        "serviceDiscoveryType": "eureka",
+        "buildTool": "maven",
+        "enableTranslation": true,
+        "nativeLanguage": "en",
+        "languages": ["en", "fr"],
+        "testFrameworks": ["gatling"],
+        "skipClient": true,
+        "skipUserManagement": true,
+        "serverPort": "8081",
+        "jhiPrefix": "jhi",
+        "websocket": false,
+        "messageBroker": false,
+        "clientPackageManager": "npm",
+        "jwtSecretKey": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=",
+        "embeddableLaunchScript": false,
+        "entitySuffix": "",
+        "dtoSuffix": "DTO",
+        "otherModules": [],
+        "blueprints": []
+    }
+}