From f4c4eaf31ecfed85b658339c9402d227852a326a Mon Sep 17 00:00:00 2001 From: Jennie Jia Date: Fri, 31 Aug 2018 15:15:26 +0000 Subject: Update Common Model and Context Builder API Issue-ID: LOG-640 Change-Id: I7d50dac7d5665edb56caa4985e4255308b9d8535 Signed-off-by: Jennie Jia --- .../onap/pomba/contextaggregator/datatypes/AggregatedModels.java | 2 +- .../java/org/onap/pomba/contextaggregator/rest/RestRequest.java | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'src') 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(); } -- cgit 1.2.3-korg