Merge pull request #70 from vinscom/upgrade-to-3.7.1

Upgrade to 3.7.1

Author: vinscom

Jenkinsfile

@@ -1,18 +1,38 @@
 pipeline {
   agent any
   stages {
-    stage('install') {
+    stage('Build and Test') {
       steps {
          withSonarQubeEnv('SonarCloud') {
             withMaven(maven: 'M3') {
-               sh "mvn clean install sonar:sonar -Dsonar.projectKey=vinscom_api-framework -Dsonar.organization=vinscom-github -Dsonar.branch.name=${GIT_BRANCH}"
+               sh "mvn clean package sonar:sonar -Dsonar.projectKey=vinscom_api-framework -Dsonar.organization=vinscom-github -Dsonar.branch.name=${GIT_BRANCH}"
             }
+            junit 'target/surefire-reports/TEST-*.xml'
          }
       }
     }
-    stage("Quality Gate") {
+    stage('Deploy Snapshot') {
+      when {
+        branch 'master'
+      }
+      steps {
+        withMaven(maven: 'M3') {
+          sh "mvn deploy -P pgp,release"
+        }
+      }
+    }
+    stage('Deploy Release') {
+      when {
+        expression {
+          env.TAG_NAME =~ /[0-9]+.[0-9]+.[0-9]+/
+        }
+      }
       steps {
-         junit '**/target/surefire-reports/TEST-*.xml'
+        withMaven(maven: 'M3') {
+          sh "mvn versions:set -DnewVersion=${TAG_NAME}"
+          sh "mvn deploy -P pgp,release"
+          sh "mvn nexus-staging:release -P pgp,release"
+        }
       }
     }
   }

config-layers/common/io/vertx/core/VertxInstance.properties

@@ -1,5 +1,5 @@
 #/io/vertx/core/VertxInstance
 $class=io.vertx.core.VertxInstance
 
-clusterEnable^=/io/vertx/core/VertxOptions.clustered
 vertxOptions=/io/vertx/core/VertxOptions
+log=true

config-layers/common/io/vertx/core/VertxOptions.properties

@@ -1,7 +1,8 @@
 #/io/vertx/core/VertxOptions
 $class=io.vertx.core.VertxOptions
 
-clustered=true
 clusterManager=/io/vertx/spi/cluster/ClusterManager
 metricsOptions=/io/vertx/ext/dropwizard/DropwizardMetricsOptions
 preferNativeTransport=false
+workerPoolSize=1000
+eventBusOptions=/io/vertx/core/eventbus/EventBusOptions

config-layers/common/io/vertx/core/eventbus/EventBusOptions.properties

@@ -0,0 +1,4 @@
+#/io/vertx/core/eventbus/EventBusOptions
+$class=io.vertx.core.eventbus.EventBusOptions
+
+clustered=true

config-layers/common/io/vertx/ext/web/sstore/SessionStoreInstance.properties

@@ -2,4 +2,4 @@
 $class=io.vertx.reactivex.ext.web.sstore.SessionStoreInstance
 
 vertx=/io/vertx/core/Vertx
-clusterEnable^=/io/vertx/core/VertxOptions.clustered
+clusterEnable^=/io/vertx/core/Vertx.clustered

config-layers/test/io/vertx/core/VertxOptions.properties

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>in.erail</groupId>
     <artifactId>api-framework</artifactId>
-    <version>2.4.9</version>
+    <version>2.4.10-SNAPSHOT</version>
     <packaging>jar</packaging>
     <developers>
         <developer>
@@ -102,7 +102,7 @@
         </profile>
     </profiles>
     <properties>
-        <vertx.version>3.7.0</vertx.version>
+        <vertx.version>3.7.1</vertx.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
@@ -178,7 +178,7 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-transport-native-epoll</artifactId>
-            <version>4.1.30.Final</version>
+            <version>4.1.34.Final</version>
             <classifier>linux-x86_64</classifier>
         </dependency>
         <dependency>
@@ -189,7 +189,7 @@
         <dependency>
             <groupId>in.erail</groupId>
             <artifactId>glue</artifactId>
-            <version>2.4.9</version>
+            <version>2.4.10</version>
         </dependency>
         <dependency>
             <groupId>javax.persistence</groupId>

pom.xml

@@ -6,13 +6,15 @@
  */
 import in.erail.glue.annotation.StartService;
 import io.reactivex.Single;
+import io.vertx.core.eventbus.EventBusOptions;
 import io.vertx.reactivex.core.Vertx;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.util.Arrays;
 import java.util.Base64;
+import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import javax.crypto.BadPaddingException;
@@ -36,20 +38,23 @@ public class SecurityTools {
   public void startup() {
 
     setRandom(new SecureRandom());
-
-    if (!getVertx().isClustered()) {
-      mGlobalUniqueString.complete("A" + mRandom.nextInt());
-      return;
+    
+    if (getVertx().isClustered()) {
+      byte[] key = generateKey().get();
+      addValueToClusterMap("key", key)
+              .subscribe((k) -> {
+                String unique = Base64.getEncoder().encodeToString(Arrays.copyOfRange(k, 0, 5));
+                mGlobalUniqueString.complete(unique.replace("=", ""));
+                getLog().info(() -> String.format("GlobalUniqueString:[%s]", unique));
+
+                mKeySpec.complete(new SecretKeySpec(k, "AES"));
+              });
+    } else {
+      byte[] k = generateKey().get();
+      String unique = Base64.getEncoder().encodeToString(Arrays.copyOfRange(k, 0, 5));
+      mGlobalUniqueString.complete(unique.replace("=", ""));
+      mKeySpec.complete(new SecretKeySpec(k, "AES"));
     }
-
-    generateKey()
-            .flatMap(v -> addValueToClusterMap("key", v))
-            .subscribe((key) -> {
-              mKeySpec.complete(new SecretKeySpec(key, "AES"));
-              String unique = Base64.getEncoder().encodeToString(Arrays.copyOfRange(key, 0, 5));
-              mGlobalUniqueString.complete(unique.replace("=", ""));
-              getLog().info(() -> String.format("GlobalUniqueString:[%s]", unique));
-            });
   }
 
   protected Single<byte[]> addValueToClusterMap(String pKey, byte[] pValue) {
@@ -60,15 +65,15 @@ protected Single<byte[]> addValueToClusterMap(String pKey, byte[] pValue) {
             .toSingle(pValue);
   }
 
-  protected Single<byte[]> generateKey() {
-    KeyGenerator keygen;
+  protected Optional<byte[]> generateKey() {
     try {
-      keygen = KeyGenerator.getInstance("AES");
+      KeyGenerator keygen = KeyGenerator.getInstance("AES");
+      keygen.init(128);
+      return Optional.of(keygen.generateKey().getEncoded());
     } catch (NoSuchAlgorithmException ex) {
-      return Single.error(ex);
+      getLog().error(ex);
     }
-    keygen.init(128);
-    return Single.just(keygen.generateKey().getEncoded());
+    return Optional.empty();
   }
 
   /**

src/main/java/in/erail/security/SecurityTools.java

@@ -6,18 +6,24 @@
 import in.erail.glue.annotation.StartService;
 import io.reactivex.plugins.RxJavaPlugins;
 import io.vertx.reactivex.core.RxHelper;
+import org.apache.logging.log4j.Logger;
 
 public class VertxInstance {
 
+  private Logger mLog;
   private VertxOptions mVertxOptions;
-  private boolean mClusterEnable = true;
   private final CompletableFuture<Vertx> mVertx = new CompletableFuture<>();
 
   @StartService
   public void start() {
-    if (isClusterEnable()) {
-      Vertx.rxClusteredVertx(getVertxOptions()).subscribe((t) -> mVertx.complete(t));
+    if (getVertxOptions().getEventBusOptions().isClustered()) {
+      getLog().info(() -> "Starting Vertx in Cluster Mode");
+      Vertx
+              .rxClusteredVertx(getVertxOptions())
+              .doOnSuccess(v -> getLog().info(() -> "Vertx is running in cluster mode"))
+              .subscribe((t) -> mVertx.complete(t));
     } else {
+      getLog().info(() -> "Starting Vertx in Cluster Mode");
       mVertx.complete(Vertx.vertx(getVertxOptions()));
     }
 
@@ -39,12 +45,12 @@ public void setVertxOptions(VertxOptions pVertxOptions) {
     this.mVertxOptions = pVertxOptions;
   }
 
-  public boolean isClusterEnable() {
-    return mClusterEnable;
+  public Logger getLog() {
+    return mLog;
   }
 
-  public void setClusterEnable(boolean pClusterEnable) {
-    this.mClusterEnable = pClusterEnable;
+  public void setLog(Logger pLog) {
+    this.mLog = pLog;
   }
 
 }