From: Jennie Jia Date: Fri, 31 Aug 2018 15:15:26 +0000 (+0000) Subject: Update Common Model and Context Builder API X-Git-Tag: 1.3.2~8 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=f4c4eaf31ecfed85b658339c9402d227852a326a;p=logging-analytics%2Fpomba%2Fpomba-context-aggregator.git Update Common Model and Context Builder API Issue-ID: LOG-640 Change-Id: I7d50dac7d5665edb56caa4985e4255308b9d8535 Signed-off-by: Jennie Jia --- diff --git a/pom.xml b/pom.xml index 39de0a6..dda22d7 100644 --- a/pom.xml +++ b/pom.xml @@ -1,286 +1,286 @@ - 4.0.0 + 4.0.0 - org.onap.logging-analytics.pomba - pomba-context-aggregator - 1.3.0-SNAPSHOT + org.onap.logging-analytics.pomba + pomba-context-aggregator + 1.3.1-SNAPSHOT - - org.onap.oparent - oparent - 1.2.0 - - + + org.onap.oparent + oparent + 1.2.0 + + - - 1.8 - 1.1.5 - 1.2.1 - - ${project.version}-${timestamp} - ${project.version}-latest - + + 1.8 + 1.1.5 + 1.2.1 + + ${project.version}-${timestamp} + ${project.version}-latest + - - - - org.springframework.boot - spring-boot-dependencies - 1.5.12.RELEASE - pom - import - - - + + + + org.springframework.boot + spring-boot-dependencies + 1.5.12.RELEASE + pom + import + + + - - - org.eclipse.jetty - jetty-security - - - org.onap.dmaap.messagerouter.dmaapclient - dmaapClient - ${dmaap.client.version} - - - org.onap.aai - rest-client - ${aai.rest.client.version} - - - org.apache.logging.log4j - log4j-slf4j-impl - - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-actuator - - - org.onap.logging-analytics.pomba - pomba-audit-common - 1.3.0-SNAPSHOT - - - com.google.code.gson - gson - - - - org.slf4j - slf4j-api - - - org.onap.logging-analytics - logging-slf4j - 1.2.2-SNAPSHOT - - - com.att.eelf - eelf-core - - - + + + org.eclipse.jetty + jetty-security + + + org.onap.dmaap.messagerouter.dmaapclient + dmaapClient + ${dmaap.client.version} + + + org.onap.aai + rest-client + ${aai.rest.client.version} + + + org.apache.logging.log4j + log4j-slf4j-impl + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-actuator + + + org.onap.logging-analytics.pomba + pomba-audit-common + 1.3.1-SNAPSHOT + + + com.google.code.gson + gson + + + + org.slf4j + slf4j-api + + + org.onap.logging-analytics + logging-slf4j + 1.2.2-SNAPSHOT + + + com.att.eelf + eelf-core + + + - - - junit - junit - test - - - org.springframework - spring-test - 4.3.6.RELEASE - test - - - org.springframework.boot - spring-boot-test - 1.5.1.RELEASE - test - - - org.mockito - mockito-all - 1.10.19 - test - - - org.springframework.boot - spring-boot-configuration-processor - true - + + + junit + junit + test + + + org.springframework + spring-test + 4.3.6.RELEASE + test + + + org.springframework.boot + spring-boot-test + 1.5.1.RELEASE + test + + + org.mockito + mockito-all + 1.10.19 + test + + + org.springframework.boot + spring-boot-configuration-processor + true + - + - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + - - - config - config - true - - **/* - - - - + + + config + config + true + + **/* + + + + - - - docker - - - - io.fabric8 - docker-maven-plugin - 0.19.1 - - true - 1.23 - - - onap/${project.artifactId} - ${project.artifactId} - - try - ${project.basedir}/target/docker-stage - - ${docker.snapshot.tag} - ${docker.latest.tag} - - - - - - - - generate-images - generate-sources - - build - - - - push-images - deploy - - build - push - - - - - - maven-resources-plugin - 2.6 - - - copy-dockerfile - - copy-resources - - package - - ${project.basedir}/target/docker-stage - - - src/main/docker - - Dockerfile - - true - - - - - - copy-properties - - copy-resources - - package - - ${project.basedir}/target/docker-stage/config - - - config - - *.properties - builders/*.properties - *.xml - - false - - - - - - copy-script - - copy-resources - - package - - ${project.basedir}/target/docker-stage/ - - - src/main/docker - - *.sh - - false - - - - - - copy-jar - - copy-resources - - package - - ${project.basedir}/target/docker-stage/ - - - target - - *.jar - - false - - - - - - - - - - + + + docker + + + + io.fabric8 + docker-maven-plugin + 0.19.1 + + true + 1.23 + + + onap/${project.artifactId} + ${project.artifactId} + + try + ${project.basedir}/target/docker-stage + + ${docker.snapshot.tag} + ${docker.latest.tag} + + + + + + + + generate-images + generate-sources + + build + + + + push-images + deploy + + build + push + + + + + + maven-resources-plugin + 2.6 + + + copy-dockerfile + + copy-resources + + package + + ${project.basedir}/target/docker-stage + + + src/main/docker + + Dockerfile + + true + + + + + + copy-properties + + copy-resources + + package + + ${project.basedir}/target/docker-stage/config + + + config + + *.properties + builders/*.properties + *.xml + + false + + + + + + copy-script + + copy-resources + + package + + ${project.basedir}/target/docker-stage/ + + + src/main/docker + + *.sh + + false + + + + + + copy-jar + + copy-resources + + package + + ${project.basedir}/target/docker-stage/ + + + target + + *.jar + + false + + + + + + + + + + diff --git a/src/main/java/org/onap/pomba/contextaggregator/datatypes/AggregatedModels.java b/src/main/java/org/onap/pomba/contextaggregator/datatypes/AggregatedModels.java index 5648b91..552e4ba 100644 --- a/src/main/java/org/onap/pomba/contextaggregator/datatypes/AggregatedModels.java +++ b/src/main/java/org/onap/pomba/contextaggregator/datatypes/AggregatedModels.java @@ -53,7 +53,7 @@ public class AggregatedModels { ModelContext context = null; if (entry.getValue().isEmpty()) { context = new ModelContext(); - context.setVf(null); + context.setVfs(null); } else { context = gson.fromJson(entry.getValue(), ModelContext.class); } diff --git a/src/main/java/org/onap/pomba/contextaggregator/rest/RestRequest.java b/src/main/java/org/onap/pomba/contextaggregator/rest/RestRequest.java index cacc8e6..6ec63f7 100644 --- a/src/main/java/org/onap/pomba/contextaggregator/rest/RestRequest.java +++ b/src/main/java/org/onap/pomba/contextaggregator/rest/RestRequest.java @@ -38,9 +38,7 @@ public class RestRequest { private static final String SERVICE_INSTANCE_ID = "serviceInstanceId"; private static final String MODEL_VERSION_ID = "modelVersionId"; - private static final String MODE_INVARIANT_ID = "modelInvariantId"; - private static final String CUSTOMER_ID = "customerId"; - private static final String SERVICE_TYPE = "serviceType"; + private static final String MODEL_INVARIANT_ID = "modelInvariantId"; private static final String APP_NAME = "context-aggregator"; @@ -91,9 +89,7 @@ public class RestRequest { .host(builder.getHost()).port(builder.getPort()).path(builder.getBaseUri()) .queryParam(SERVICE_INSTANCE_ID, event.getServiceInstanceId()) .queryParam(MODEL_VERSION_ID, event.getModelVersionId()) - .queryParam(MODE_INVARIANT_ID, event.getModelInvariantId()) - .queryParam(SERVICE_TYPE, event.getServiceType()).queryParam(CUSTOMER_ID, event.getCustomerId()).build() - .encode(); + .queryParam(MODEL_INVARIANT_ID, event.getModelInvariantId()).build().encode(); return uriComponents.toUriString(); }