fix issues

Issue-ID: DCAEGEN2-2469
Issue-ID: DCAEGEN2-2470

Signed-off-by: Kai Lu <lukai@chinamobile.com>
Change-Id: I13b0422e4f7a9f722c8c310eb76a66aa6a01679f

18 files changed, 21 insertions, 18 deletions

diff --git a/dcae-analytics/dcae-analytics-model/pom.xml b/dcae-analytics/dcae-analytics-model/pom.xml
index d7d2133..28d2180 100644
--- a/dcae-analytics/dcae-analytics-model/pom.xml
+++ b/dcae-analytics/dcae-analytics-model/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>dcae-analytics</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>dcae-analytics-model</artifactId>
diff --git a/dcae-analytics/dcae-analytics-tca-core/pom.xml b/dcae-analytics/dcae-analytics-tca-core/pom.xml
index f56842d..9c2b308 100644
--- a/dcae-analytics/dcae-analytics-tca-core/pom.xml
+++ b/dcae-analytics/dcae-analytics-tca-core/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>dcae-analytics</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>dcae-analytics-tca-core</artifactId>
diff --git a/dcae-analytics/dcae-analytics-tca-model/pom.xml b/dcae-analytics/dcae-analytics-tca-model/pom.xml
index ec3f1f9..b9c820a 100644
--- a/dcae-analytics/dcae-analytics-tca-model/pom.xml
+++ b/dcae-analytics/dcae-analytics-tca-model/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>dcae-analytics</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>dcae-analytics-tca-model</artifactId>
diff --git a/dcae-analytics/dcae-analytics-tca-web/pom.xml b/dcae-analytics/dcae-analytics-tca-web/pom.xml
index 57f9bdf..1d9a89a 100644
--- a/dcae-analytics/dcae-analytics-tca-web/pom.xml
+++ b/dcae-analytics/dcae-analytics-tca-web/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>dcae-analytics</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>dcae-analytics-tca-web</artifactId>
diff --git a/dcae-analytics/dcae-analytics-tca-web/src/main/java/org/onap/dcae/analytics/tca/web/service/TcaProcessingServiceImpl.java b/dcae-analytics/dcae-analytics-tca-web/src/main/java/org/onap/dcae/analytics/tca/web/service/TcaProcessingServiceImpl.java
index e05026c..7f6891d 100644
--- a/dcae-analytics/dcae-analytics-tca-web/src/main/java/org/onap/dcae/analytics/tca/web/service/TcaProcessingServiceImpl.java
+++ b/dcae-analytics/dcae-analytics-tca-web/src/main/java/org/onap/dcae/analytics/tca/web/service/TcaProcessingServiceImpl.java
@@ -27,7 +27,6 @@ import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import org.onap.dcae.analytics.model.AnalyticsModelConstants;
 import org.onap.dcae.analytics.tca.core.service.GenericTcaExecutionContext;
 import org.onap.dcae.analytics.tca.core.service.GenericTcaProcessingContext;
 import org.onap.dcae.analytics.tca.core.service.GenericTcaResultContext;
@@ -69,8 +68,7 @@ public class TcaProcessingServiceImpl implements TcaProcessingService {
         return IntStream.range(0, cefMessages.size())
                 // generate initial Processing contexts
                 .mapToObj(cefMessageIndex -> GenericTcaExecutionContext.builder()
-                        .requestId(executionRequestId +
-                                AnalyticsModelConstants.ANALYTICS_REQUEST_ID_DELIMITER + cefMessageIndex)
+                        .requestId(executionRequestId)
                         .transactionId(executionTransactionId)
                         .messageIndex(cefMessageIndex)
                         .cefMessage(cefMessages.get(cefMessageIndex))
diff --git a/dcae-analytics/dcae-analytics-test/pom.xml b/dcae-analytics/dcae-analytics-test/pom.xml
index e6ff020..6530e5c 100644
--- a/dcae-analytics/dcae-analytics-test/pom.xml
+++ b/dcae-analytics/dcae-analytics-test/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>dcae-analytics</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>dcae-analytics-test</artifactId>
diff --git a/dcae-analytics/dcae-analytics-web/pom.xml b/dcae-analytics/dcae-analytics-web/pom.xml
index 2f2ef9f..e6f7237 100644
--- a/dcae-analytics/dcae-analytics-web/pom.xml
+++ b/dcae-analytics/dcae-analytics-web/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>dcae-analytics</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>dcae-analytics-web</artifactId>
diff --git a/dcae-analytics/dcae-analytics-web/src/main/java/org/onap/dcae/analytics/web/spring/ConfigBindingServiceEnvironmentPostProcessor.java b/dcae-analytics/dcae-analytics-web/src/main/java/org/onap/dcae/analytics/web/spring/ConfigBindingServiceEnvironmentPostProcessor.java
index 453cd9c..0a94f8d 100644
--- a/dcae-analytics/dcae-analytics-web/src/main/java/org/onap/dcae/analytics/web/spring/ConfigBindingServiceEnvironmentPostProcessor.java
+++ b/dcae-analytics/dcae-analytics-web/src/main/java/org/onap/dcae/analytics/web/spring/ConfigBindingServiceEnvironmentPostProcessor.java
@@ -234,6 +234,7 @@ public class ConfigBindingServiceEnvironmentPostProcessor implements Environment
         String policies = null;
         if (jsonPolicyConfig != null) {
             policies = jsonPolicyConfig.getAsJsonObject().getAsJsonArray(ConfigBindingServiceConstants.ITEMS).get(0)
+                                       .getAsJsonObject().get(ConfigBindingServiceConstants.CONFIG)
                                        .getAsJsonObject().get(ConfigBindingServiceConstants.TCAPOLICY).toString();
         }
 
diff --git a/dcae-analytics/dcae-analytics-web/src/test/java/org/onap/dcae/analytics/web/spring/ConfigBindingServiceEnvironmentPostProcessorTest.java b/dcae-analytics/dcae-analytics-web/src/test/java/org/onap/dcae/analytics/web/spring/ConfigBindingServiceEnvironmentPostProcessorTest.java
index 0fce3c2..c673933 100644
--- a/dcae-analytics/dcae-analytics-web/src/test/java/org/onap/dcae/analytics/web/spring/ConfigBindingServiceEnvironmentPostProcessorTest.java
+++ b/dcae-analytics/dcae-analytics-web/src/test/java/org/onap/dcae/analytics/web/spring/ConfigBindingServiceEnvironmentPostProcessorTest.java
@@ -211,6 +211,7 @@ public class ConfigBindingServiceEnvironmentPostProcessorTest extends BaseAnalyt
                 "    \"policies\": {\r\n" + 
                 "        \"event\": {},\r\n" + 
                 "        \"items\": [{\r\n" + 
+                "        \"config\": {\r\n" + 
                 "            \"tca.policy\": {\r\n" + 
                 "                \"domain\": \"measurementsForVfScaling\",\r\n" + 
                 "                \"metricsPerEventName\": [{\r\n" + 
@@ -238,6 +239,7 @@ public class ConfigBindingServiceEnvironmentPostProcessorTest extends BaseAnalyt
                 "                    \"policyVersion\": \"v0.0.1\"\r\n" + 
                 "                }]\r\n" + 
                 "            }\r\n" + 
+                "            }\r\n" + 
                 "        }]\r\n" + 
                 "    }\r\n" + 
                 "}";
@@ -286,6 +288,7 @@ public class ConfigBindingServiceEnvironmentPostProcessorTest extends BaseAnalyt
                 "    \"policies\": {\r\n" + 
                 "        \"event\": {},\r\n" + 
                 "        \"items\": [{\r\n" + 
+                "        \"config\": {\r\n" + 
                 "            \"tca.policy\": {\r\n" + 
                 "                \"domain\": \"measurementsForVfScaling\",\r\n" + 
                 "                \"metricsPerEventName\": [{\r\n" + 
@@ -313,6 +316,7 @@ public class ConfigBindingServiceEnvironmentPostProcessorTest extends BaseAnalyt
                 "                    \"policyVersion\": \"v0.0.1\"\r\n" + 
                 "                }]\r\n" + 
                 "            }\r\n" + 
+                "            }\r\n" + 
                 "        }]\r\n" + 
                 "    }\r\n" + 
                 "}"; 
diff --git a/dcae-analytics/pom.xml b/dcae-analytics/pom.xml
index c419983..5a6311e 100644
--- a/dcae-analytics/pom.xml
+++ b/dcae-analytics/pom.xml
@@ -27,7 +27,7 @@
 	<parent>
 		<groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
 		<artifactId>tca-gen2-parent</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.2.1-SNAPSHOT</version>
 	</parent>
 
     <artifactId>dcae-analytics</artifactId>
diff --git a/dcae-analytics/version.properties b/dcae-analytics/version.properties
index 99c1da7..e2869cd 100644
--- a/dcae-analytics/version.properties
+++ b/dcae-analytics/version.properties
@@ -18,7 +18,7 @@
 #
 major=1
 minor=2
-patch=0
+patch=1
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT
diff --git a/eelf-logger/eelf-logger-api/pom.xml b/eelf-logger/eelf-logger-api/pom.xml
index 5157e81..d5a9987 100644
--- a/eelf-logger/eelf-logger-api/pom.xml
+++ b/eelf-logger/eelf-logger-api/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>eelf-logger</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>eelf-logger-api</artifactId>
diff --git a/eelf-logger/eelf-logger-logback-impl/pom.xml b/eelf-logger/eelf-logger-logback-impl/pom.xml
index 429457f..cc6e89d 100644
--- a/eelf-logger/eelf-logger-logback-impl/pom.xml
+++ b/eelf-logger/eelf-logger-logback-impl/pom.xml
@@ -27,7 +27,7 @@
     <parent>
 		<groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>eelf-logger</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>eelf-logger-logback-impl</artifactId>
diff --git a/eelf-logger/eelf-logger-model/pom.xml b/eelf-logger/eelf-logger-model/pom.xml
index e3d941b..75038f8 100644
--- a/eelf-logger/eelf-logger-model/pom.xml
+++ b/eelf-logger/eelf-logger-model/pom.xml
@@ -27,7 +27,7 @@
     <parent>
 		<groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>eelf-logger</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>eelf-logger-model</artifactId>
diff --git a/eelf-logger/pom.xml b/eelf-logger/pom.xml
index bb762ae..b68d308 100644
--- a/eelf-logger/pom.xml
+++ b/eelf-logger/pom.xml
@@ -26,7 +26,7 @@
 	<parent>
 		<groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
 		<artifactId>tca-gen2-parent</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.2.1-SNAPSHOT</version>
 	</parent>
 
     <artifactId>eelf-logger</artifactId>
diff --git a/eelf-logger/version.properties b/eelf-logger/version.properties
index bef49d7..06e4c47 100644
--- a/eelf-logger/version.properties
+++ b/eelf-logger/version.properties
@@ -17,7 +17,7 @@
 
 major=1
 minor=2
-patch=0
+patch=1
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT
diff --git a/pom.xml b/pom.xml
index 088736b..e187db9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 
     <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
     <artifactId>tca-gen2-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
 
     <name>dcaegen2-analytics-tca-gen2</name>
     <packaging>pom</packaging>
diff --git a/version.properties b/version.properties
index 00ef564..755adf7 100644
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
 major=1
 minor=2
-patch=0
+patch=1
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT