From a6b11ee264c2e3f4d20632b006f281025448507f Mon Sep 17 00:00:00 2001 From: Kai Date: Wed, 5 Feb 2020 13:09:23 +0800 Subject: new config not reflected in TCA processing Issue-ID: DCAEGEN2-2043 Signed-off-by: Kai Lu Change-Id: I9f757ce8931f725dd1c7c5398c0d40453d52e0d8 --- .../onap/dcae/analytics/model/AnalyticsModel.java | 4 +--- .../BaseConfigBindingServiceProperties.java | 22 ++++------------- .../ConfigBindingServiceConstants.java | 28 +++++++++++++++++++++- 3 files changed, 32 insertions(+), 22 deletions(-) (limited to 'dcae-analytics/dcae-analytics-model') diff --git a/dcae-analytics/dcae-analytics-model/src/main/java/org/onap/dcae/analytics/model/AnalyticsModel.java b/dcae-analytics/dcae-analytics-model/src/main/java/org/onap/dcae/analytics/model/AnalyticsModel.java index bb13ed6..b4139b0 100644 --- a/dcae-analytics/dcae-analytics-model/src/main/java/org/onap/dcae/analytics/model/AnalyticsModel.java +++ b/dcae-analytics/dcae-analytics-model/src/main/java/org/onap/dcae/analytics/model/AnalyticsModel.java @@ -19,12 +19,10 @@ package org.onap.dcae.analytics.model; -import java.io.Serializable; - /** * Marker Interface for all DCAE Analytics Model implementations * * @author Rajiv Singla */ -public interface AnalyticsModel extends Serializable { +public interface AnalyticsModel { } diff --git a/dcae-analytics/dcae-analytics-model/src/main/java/org/onap/dcae/analytics/model/configbindingservice/BaseConfigBindingServiceProperties.java b/dcae-analytics/dcae-analytics-model/src/main/java/org/onap/dcae/analytics/model/configbindingservice/BaseConfigBindingServiceProperties.java index 7158b2e..7da418d 100644 --- a/dcae-analytics/dcae-analytics-model/src/main/java/org/onap/dcae/analytics/model/configbindingservice/BaseConfigBindingServiceProperties.java +++ b/dcae-analytics/dcae-analytics-model/src/main/java/org/onap/dcae/analytics/model/configbindingservice/BaseConfigBindingServiceProperties.java @@ -40,8 +40,6 @@ import java.util.Map; @Data public abstract class BaseConfigBindingServiceProperties implements ConfigBindingServiceModel { - private static final long serialVersionUID = 1L; - protected Map> servicesCalls = new LinkedHashMap<>(); protected Map streamsPublishes = new LinkedHashMap<>(); protected Map streamsSubscribes = new LinkedHashMap<>(); @@ -51,9 +49,7 @@ public abstract class BaseConfigBindingServiceProperties implements ConfigBindin */ @Data @ToString(exclude = "aafPassword") - public static class PubSubCommonDetails implements ConfigBindingServiceModel { - - private static final long serialVersionUID = 1L; + public static class PubSubCommonDetails { private String type; private String aafUsername; @@ -76,8 +72,6 @@ public abstract class BaseConfigBindingServiceProperties implements ConfigBindin @EqualsAndHashCode(callSuper = true) public static class PublisherDetails extends PubSubCommonDetails { - private static final long serialVersionUID = 1L; - } @@ -91,8 +85,6 @@ public abstract class BaseConfigBindingServiceProperties implements ConfigBindin @EqualsAndHashCode(callSuper = true) public static class SubscriberDetails extends PubSubCommonDetails { - private static final long serialVersionUID = 1L; - // custom subscriber properties private String consumerGroup; private List consumerIds; @@ -107,9 +99,7 @@ public abstract class BaseConfigBindingServiceProperties implements ConfigBindin * DMaaP Info */ @Data - public static class DmaapInfo implements ConfigBindingServiceModel { - - private static final long serialVersionUID = 1L; + public static class DmaapInfo { private String clientRole; private String clientId; @@ -123,9 +113,7 @@ public abstract class BaseConfigBindingServiceProperties implements ConfigBindin * Polling Details */ @Data - public static class Polling implements ConfigBindingServiceModel { - - private static final long serialVersionUID = 1L; + public static class Polling { private Integer fixedRate; private AutoAdjusting autoAdjusting; @@ -137,9 +125,7 @@ public abstract class BaseConfigBindingServiceProperties implements ConfigBindin * Auto Adjusting Polling Details */ @Data - public static class AutoAdjusting implements ConfigBindingServiceModel { - - private static final long serialVersionUID = 1L; + public static class AutoAdjusting { private Integer min; private Integer stepUp; diff --git a/dcae-analytics/dcae-analytics-model/src/main/java/org/onap/dcae/analytics/model/configbindingservice/ConfigBindingServiceConstants.java b/dcae-analytics/dcae-analytics-model/src/main/java/org/onap/dcae/analytics/model/configbindingservice/ConfigBindingServiceConstants.java index 9776d70..619c417 100644 --- a/dcae-analytics/dcae-analytics-model/src/main/java/org/onap/dcae/analytics/model/configbindingservice/ConfigBindingServiceConstants.java +++ b/dcae-analytics/dcae-analytics-model/src/main/java/org/onap/dcae/analytics/model/configbindingservice/ConfigBindingServiceConstants.java @@ -45,7 +45,6 @@ public abstract class ConfigBindingServiceConstants { CONSUL_HOST_ENV_VARIABLE_VALUE, CONFIG_BINDING_SERVICE_ENV_VARIABLE_VALUE); public static final String CONFIG_SERVICE_QUERY_URL_STRING = "http://%s:%s/service_component/%s"; - public static final String CONFIG_BINDING_SERVICE_PROPERTIES_KEY = "config-binding-service"; public static final Set SPRING_RESERVED_PROPERTIES_KEY_PREFIXES = @@ -56,6 +55,33 @@ public abstract class ConfigBindingServiceConstants { public static final String CONFIG = "config"; public static final int CONFIG_SERVICE_REFRESHPERIOD = 1; + public static final String POLICY = "config-binding-service.tca.policy"; + public static final String PROCESSINGBATCHSIZE = "config-binding-service.tca.processing_batch_size"; + public static final String ENABLEABATEMENT = "config-binding-service.tca.enable_abatement"; + public static final String EnableEcompLogging = "config-binding-service.tca.enable_ecomp_logging"; + public static final String EnableEnrichment = "config-binding-service.tca.aai.enable_enrichment"; + public static final String AAIURL = "config-binding-service.tca.aai.url"; + public static final String AAIUSERNAME = "config-binding-service.tca.aai.username"; + public static final String AAIPASSWORD = "config-binding-service.tca.aai.password"; + public static final String AAIGENERICVNFPATH = "config-binding-service.tca.aai.generic_vnf_path"; + public static final String AAINODEQUERYPATH = "config-binding-service.tca.aai.node_query_path"; + public static final String PUBTOPICURL = "config-binding-service.streams_publishes.tca_handle_out.dmaap_info.topic_url"; + public static final String PUBTYPE = "config-binding-service.streams_publishes.tca_handle_out.type"; + public static final String PUBKEY = "tca_handle_out"; + public static final String SUBAUTOADJUSTINGSTEPUP = "config-binding-service.streams_subscribes.tca_handle_in.polling.auto_adjusting.step_up"; + public static final String SUBAUTOADJUSTINGSTEPDOWN = "config-binding-service.streams_subscribes.tca_handle_in.polling.auto_adjusting.step_down"; + public static final String SUBAUTOADJUSTINGMAX = "config-binding-service.streams_subscribes.tca_handle_in.polling.auto_adjusting.max"; + public static final String SUBAUTOADJUSTINGMIN = "config-binding-service.streams_subscribes.tca_handle_in.polling.auto_adjusting.min"; + public static final String SUBTOPICURL = "config-binding-service.streams_subscribes.tca_handle_in.dmaap_info.topic_url"; + public static final String SUBFIXEDRATE = "config-binding-service.streams_subscribes.tca_handle_in.polling.fixed_rate"; + public static final String SUBTYPE = "config-binding-service.streams_subscribes.tca_handle_in.type"; + public static final String SUBCONSUMERGROUP = "config-binding-service.streams_subscribes.tca_handle_in.consumer_group"; + public static final String SUBMESSAGELIMIT = "config-binding-service.streams_subscribes.tca_handle_in.message_limit"; + public static final String SUBTIMEOUT = "config-binding-service.streams_subscribes.tca_handle_in.timeout"; + public static final String SUBCONSUMERIDS0 = "config-binding-service.streams_subscribes.tca_handle_in.consumer_ids[0]"; + public static final String SUBCONSUMERIDS1 = "config-binding-service.streams_subscribes.tca_handle_in.consumer_ids[1]"; + public static final String SUBKEY = "tca_handle_in"; + // ============== CONFIG BINDING SERVICE UTILS ========================= // /** * Predicate which can be used to filter message router publisher or subscriber details -- cgit 1.2.3-korg