fixed @nonnull annotation

Moved gateway-common to apiml-common

Signed-off-by: janda06 <david.janda@broadcom.com>

Jenkinsfile

@@ -277,7 +277,7 @@ pipeline {
             archiveArtifacts artifacts: 'integration-enabler-spring-v2/build/libs/**/*.jar'
             archiveArtifacts artifacts: 'integration-enabler-spring-v1-sample-app/build/libs/**/*.jar'
             archiveArtifacts artifacts: 'common-service-core/build/libs/**/*.jar'
-            archiveArtifacts artifacts: 'gateway-common/build/libs/**/*.jar'
+            archiveArtifacts artifacts: 'apiml-common/build/libs/**/*.jar'
             archiveArtifacts artifacts: 'scripts/apiml_cm.sh'
             archiveArtifacts artifacts: 'api-layer.tar.gz'
 

api-catalog-services/build.gradle

@@ -32,7 +32,7 @@ gitProperties {
 }
 
 dependencies {
-    compile(project(':gateway-common'))
+    compile(project(':apiml-common'))
     compile(project(':integration-enabler-spring-v2'))
     compile(project(':common-service-core'))
     compile(project(':security-module'))

gateway-common/src/main/java/com/ca/mfaas/product/monitoring/LatencyUtilsConfigInitializer.java → apiml-common/src/main/java/com/ca/mfaas/product/monitoring/LatencyUtilsConfigInitializer.java

@@ -10,9 +10,9 @@
 
 package com.ca.mfaas.product.monitoring;
 
-import lombok.NonNull;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
+import javax.annotation.Nonnull;
 
 /**
  * This class initializes the system property that disables LatencyUtils thread that measures time by low level java api
@@ -21,7 +21,7 @@
 public class LatencyUtilsConfigInitializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
     private static final String PROPERTY_KEY = "LatencyUtils.useActualTime";
     @Override
-    public void initialize(@NonNull ConfigurableApplicationContext applicationContext) {
+    public void initialize(@Nonnull ConfigurableApplicationContext applicationContext) {
         if (System.getProperties().getProperty(PROPERTY_KEY) == null) {
             System.getProperties().setProperty(PROPERTY_KEY, "false");
         }

discoverable-client/build.gradle

@@ -32,7 +32,7 @@ gitProperties {
 
 dependencies {
     compile(project(':integration-enabler-spring-v2'))
-    compile(project(':gateway-common'))
+    compile(project(':apiml-common'))
 
     compile libraries.gson
     compile libraries.spring_boot_starter_actuator

discovery-service/build.gradle

@@ -32,7 +32,7 @@ gitProperties {
 }
 
 dependencies {
-    compile(project(':gateway-common'))
+    compile(project(':apiml-common'))
 
     compile libraries.spring_boot_starter_web
     compile libraries.spring_boot_starter_security

gateway-service/build.gradle

@@ -33,7 +33,7 @@ gitProperties {
 
 dependencies {
     compile(project(':common-service-core'))
-    compile(project(':gateway-common'))
+    compile(project(':apiml-common'))
     compile(project(':integration-enabler-spring-v2'))
     compile(project(':security-service-client-spring'))
 

gradle/coverage.gradle

@@ -3,7 +3,7 @@ ext.javaProjectsWithUnitTests = [
     'common-service-core',
     'discoverable-client',
     'discovery-service',
-    'gateway-common',
+    'apiml-common',
     'gateway-service',
     'integration-enabler-spring-v2',
     'integration-enabler-java',

gradle/publish.gradle

@@ -9,7 +9,7 @@ ext.javaEnablers = [
 
 ext.javaLibraries = [
     'common-service-core',
-    'gateway-common'
+    'apiml-common'
 ]
 
 ext.serviceJars = [ 'zowe-install' ]

security-module/build.gradle

@@ -1,6 +1,6 @@
 dependencies {
     compile(project(':common-service-core'))
-    compile(project(':gateway-common'))
+    compile(project(':apiml-common'))
 
     compile libraries.jjwt
     compile libraries.apacheCommons

settings.gradle

@@ -4,7 +4,7 @@ include 'helloworld-jersey'
 include 'discovery-service'
 include 'integration-enabler-spring-v2'
 include 'integration-enabler-spring-v1'
-include 'gateway-common'
+include 'apiml-common'
 include 'gateway-service'
 include 'common-service-core'
 include 'discoverable-client'