From c44a035ed8222c2b39bd0fd522b952fac61f9a36 Mon Sep 17 00:00:00 2001 From: "Tait,Trevor(rt0435)" Date: Thu, 10 Jan 2019 16:40:32 -0500 Subject: Context Aggregator L2 Fabric Upgraded the Context Aggregator to use the latest pomba-audit-common model. Also cleaned up a lot of whitespace and import order errors that were being output by the ONAP audit. Issue-ID: LOG-920 Change-Id: I0a7e15f19f28775bbd3e9cf4e95c4de176545ae1 Signed-off-by: Tait,Trevor(rt0435) --- .../datatypes/AggregatedModels.java | 1 - .../contextaggregator/datatypes/POAEvent.java | 2 -- .../service/ContextAggregatorProcessor.java | 24 ++++++++++------------ 3 files changed, 11 insertions(+), 16 deletions(-) (limited to 'src/main') 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 552e4ba..a502425 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,6 @@ public class AggregatedModels { ModelContext context = null; if (entry.getValue().isEmpty()) { context = new ModelContext(); - context.setVfs(null); } else { context = gson.fromJson(entry.getValue(), ModelContext.class); } diff --git a/src/main/java/org/onap/pomba/contextaggregator/datatypes/POAEvent.java b/src/main/java/org/onap/pomba/contextaggregator/datatypes/POAEvent.java index 83d1065..36b2dc9 100644 --- a/src/main/java/org/onap/pomba/contextaggregator/datatypes/POAEvent.java +++ b/src/main/java/org/onap/pomba/contextaggregator/datatypes/POAEvent.java @@ -25,8 +25,6 @@ public class POAEvent { private String serviceInstanceId; private String modelVersionId; private String modelInvariantId; - private String customerId; - private String serviceType; private String xFromAppId; private String xTransactionId; diff --git a/src/main/java/org/onap/pomba/contextaggregator/service/ContextAggregatorProcessor.java b/src/main/java/org/onap/pomba/contextaggregator/service/ContextAggregatorProcessor.java index 9e9f129..8b8f8f6 100644 --- a/src/main/java/org/onap/pomba/contextaggregator/service/ContextAggregatorProcessor.java +++ b/src/main/java/org/onap/pomba/contextaggregator/service/ContextAggregatorProcessor.java @@ -17,17 +17,6 @@ */ package org.onap.pomba.contextaggregator.service; -import com.att.aft.dme2.internal.gson.Gson; -import com.att.aft.dme2.internal.gson.GsonBuilder; -import com.att.aft.dme2.internal.gson.JsonSyntaxException; -import com.att.nsa.apiClient.http.HttpException; -import com.att.nsa.mr.client.MRBatchingPublisher; -import com.att.nsa.mr.client.MRClientFactory; -import com.att.nsa.mr.client.MRConsumer; -import com.att.nsa.mr.client.MRPublisher; -import com.att.nsa.mr.client.MRTopicManager; -import com.att.nsa.mr.client.impl.MRSimplerBatchPublisher; - import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -35,12 +24,12 @@ import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; + import org.onap.pomba.contextaggregator.builder.ContextBuilder; import org.onap.pomba.contextaggregator.config.EventHeaderConfig; import org.onap.pomba.contextaggregator.datatypes.AggregatedModels; @@ -53,9 +42,18 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Component; +import com.att.aft.dme2.internal.gson.Gson; +import com.att.aft.dme2.internal.gson.GsonBuilder; +import com.att.aft.dme2.internal.gson.JsonSyntaxException; +import com.att.nsa.apiClient.http.HttpException; +import com.att.nsa.mr.client.MRBatchingPublisher; +import com.att.nsa.mr.client.MRConsumer; +import com.att.nsa.mr.client.MRPublisher; +import com.att.nsa.mr.client.MRTopicManager; +import com.att.nsa.mr.client.impl.MRSimplerBatchPublisher; + @Component public class ContextAggregatorProcessor implements Callable { -- cgit 1.2.3-korg