diff options
| author |   Kai <lukai@chinamobile.com> | 2020-02-22 15:54:23 +0800 |
|---|---|---|
| committer | LUKAI <lukai@chinamobile.com> | 2020-02-25 03:17:03 +0000 |
| commit | 8ff4faad57fceb3c62ad04da0cf9b6bae5f6bc4f (patch) | |
| tree | 320ade2d13390ca5ff6537c06a554eb95b362e6a /dcae-analytics/dcae-analytics-model | |
| parent | ef75d53326ad27f4bfe21e341e43a4c916ea9fbc (diff) | |
fix debug log1.0.0
Issue-ID: DCAEGEN2-2077
Signed-off-by: Kai Lu <lukai@chinamobile.com>
Change-Id: Ice1b21ae478a6311f6202cac48ba10dc1b859bc3
Diffstat (limited to 'dcae-analytics/dcae-analytics-model')
3 files changed, 23 insertions, 9 deletions
diff --git a/dcae-analytics/dcae-analytics-model/pom.xml b/dcae-analytics/dcae-analytics-model/pom.xml index fc6c32d..c7d6ddb 100644 --- a/dcae-analytics/dcae-analytics-model/pom.xml +++ b/dcae-analytics/dcae-analytics-model/pom.xml @@ -114,6 +114,11 @@ <scope>provided</scope> </dependency> + <dependency> + <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId> + <artifactId>eelf-logger-logback-impl</artifactId> + </dependency> + </dependencies> </project> diff --git a/dcae-analytics/dcae-analytics-model/src/main/java/org/onap/dcae/analytics/model/DmaapMrConstants.java b/dcae-analytics/dcae-analytics-model/src/main/java/org/onap/dcae/analytics/model/DmaapMrConstants.java index 26f2210..ca14ff6 100644 --- a/dcae-analytics/dcae-analytics-model/src/main/java/org/onap/dcae/analytics/model/DmaapMrConstants.java +++ b/dcae-analytics/dcae-analytics-model/src/main/java/org/onap/dcae/analytics/model/DmaapMrConstants.java @@ -30,13 +30,6 @@ public abstract class DmaapMrConstants { // ================== DMaaP MR CONSTANTS ============================== // - public static final Set<String> DMAAP_MAPPED_HEADERS = Stream.of( - AnalyticsHttpConstants.REQUEST_ID_HEADER_KEY, - AnalyticsHttpConstants.REQUEST_TRANSACTION_ID_HEADER_KEY, - AnalyticsHttpConstants.REQUEST_BEGIN_TS_HEADER_KEY, - AnalyticsHttpConstants.REQUEST_END_TS_HEADER_KEY).collect(Collectors.toSet()); - - // MR SUBSCRIBER public static final String SUBSCRIBER_EMPTY_MESSAGE_RESPONSE_STRING = "[]"; public static final String SUBSCRIBER_RANDOM_CONSUMER_GROUP_PREFIX = "DCAE-SUB-"; @@ -67,4 +60,15 @@ public abstract class DmaapMrConstants { private DmaapMrConstants() { // private constructor } + + /** + * getDmaapmappedHeaders + */ + public static final Set<String> getDmaapmappedHeaders () { + return Stream.of( + AnalyticsHttpConstants.REQUEST_ID_HEADER_KEY, + AnalyticsHttpConstants.REQUEST_TRANSACTION_ID_HEADER_KEY, + AnalyticsHttpConstants.REQUEST_BEGIN_TS_HEADER_KEY, + AnalyticsHttpConstants.REQUEST_END_TS_HEADER_KEY).collect(Collectors.toSet()); + } } 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 7384e97..423e951 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 @@ -40,8 +40,6 @@ public abstract class ConfigBindingServiceConstants { public static final String ENV_CBS_PORT = "CONFIG_BINDING_SERVICE_SERVICE_PORT"; public static final String CONFIG_BINDING_SERVICE_PROPERTIES_KEY = "config-binding-service"; - public static final Set<String> SPRING_RESERVED_PROPERTIES_KEY_PREFIXES = - Stream.of("spring", "endpoints", "server", "logging", "management").collect(Collectors.toSet()); public static final String CONFIG_SERVICE_MESSAGE_ROUTER_VALUE = "message_router"; // CONVERT JSON TO MAP public static final String KEY_SEPARATOR = "."; @@ -86,4 +84,11 @@ public abstract class ConfigBindingServiceConstants { private ConfigBindingServiceConstants() { // private constructor } + + /** + * getSpringReservedPropertiesKeyPrefixes + */ + public static final Set<String> getSpringReservedPropertiesKeyPrefixes() { + return Stream.of("spring", "endpoints", "server", "logging", "management").collect(Collectors.toSet()); + } } |