diff options
| author |   Lisa Revel <lr0306@att.com> | 2017-02-20 19:15:19 +0000 |
|---|---|---|
| committer | Lisa Revel <lr0306@att.com> | 2017-02-20 19:59:27 +0000 |
| commit | e37de6e66c5cc554384a1f27f68f4d27962fe15d (patch) | |
| tree | d39b5eba26f98a54cc9bae303ff9959909931e5f | |
| parent | aa823a95745de3c42f306609a044e8c9ff459c98 (diff) | |
Re-add source from correct branch
Change-Id: I515f8378ea1d2baf0aa2434ec46272f1b5bdb229
Signed-off-by: Lisa Revel <lr0306@att.com>
238 files changed, 2482 insertions, 2258 deletions
@@ -101,3 +101,10 @@ curl -vk --user ${OPENECOMP_NEXUS_USER}:${OPENECOMP_NEXUS_PASSWORD} --upload-fil SEND_TO=${OPENECOMP_NEXUS_RAW}"/org.openecomp.dcae/deb-snapshots/"${PACKAGE_GROUP_ID}"/"${OUTPUT_FILE_DATE_STAMPED} curl -vk --user ${OPENECOMP_NEXUS_USER}:${OPENECOMP_NEXUS_PASSWORD} --upload-file ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} ${SEND_TO} ``` + +#### TCA Application Configuration + +TCA Application is setup to do batching of publisher alerts (defaults to 10) which means publisher will +flush the alerts to DMaaP Topic only when total 10 alerts are available. To disable publisher batching set +"publisherMaxBatchSize" CDAP runtime argument to 1. This will flush alert message to DMaaP MR topic +instantaneously and will disable publisher batching. diff --git a/cpd-exclude.properties b/cpd-exclude.properties index 52abdf9..e4fb771 100644 --- a/cpd-exclude.properties +++ b/cpd-exclude.properties @@ -22,5 +22,4 @@ # List comma separated fully qualified names of classes that can be excluded for CPD (COPY-PASTE-DETECTOR) # Builders for DMaaP MR Configs can have redundant code as they are used as temp place holders for building Immutable # Configs -org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRPublisherConfig,org.openecomp.dcae.analytics.dmaap.domain.config -.DMaaPMRSubscriberConfig +org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRPublisherConfig,org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig diff --git a/dcae-analytics-common/pom.xml b/dcae-analytics-common/pom.xml index 1c58693..7da767f 100644 --- a/dcae-analytics-common/pom.xml +++ b/dcae-analytics-common/pom.xml @@ -27,7 +27,7 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.openecomp.dcae.analytics</groupId> + <groupId>org.openecomp.dcae.apod.analytics</groupId> <artifactId>dcae-analytics</artifactId> <version>1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> @@ -49,7 +49,7 @@ <!-- DCAE PROJECT DEPENDENCIES --> <dependency> - <groupId>org.openecomp.dcae.analytics</groupId> + <groupId>org.openecomp.dcae.apod.analytics</groupId> <artifactId>dcae-analytics-model</artifactId> <version>1.0-SNAPSHOT</version> </dependency> @@ -108,7 +108,7 @@ <!-- TEST DEPENDENCIES --> <dependency> - <groupId>org.openecomp.dcae.analytics</groupId> + <groupId>org.openecomp.dcae.apod.analytics</groupId> <artifactId>dcae-analytics-test</artifactId> <version>1.0-SNAPSHOT</version> <scope>test</scope> diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/AnalyticsConstants.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/AnalyticsConstants.java index 6c51069..4294d6a 100644 --- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/AnalyticsConstants.java +++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/AnalyticsConstants.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.common; +package org.openecomp.dcae.apod.analytics.common; /** * Contains static variable for all DCAE Components. diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/CDAPComponentsConstants.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/CDAPComponentsConstants.java index 50aad3c..ab39ee9 100644 --- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/CDAPComponentsConstants.java +++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/CDAPComponentsConstants.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.common; +package org.openecomp.dcae.apod.analytics.common; /** * Contains static constant variable names and values of all DCAE CDAP Components for diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/CDAPMetricsConstants.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/CDAPMetricsConstants.java index 12df643..63ac7e0 100644 --- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/CDAPMetricsConstants.java +++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/CDAPMetricsConstants.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.common; +package org.openecomp.dcae.apod.analytics.common; /** * Contains all metrics names used for DCAE CDAP modules diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/DCAEAnalyticsPreferences.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/DCAEAnalyticsPreferences.java index dc345f4..c912179 100644 --- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/DCAEAnalyticsPreferences.java +++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/DCAEAnalyticsPreferences.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.common; +package org.openecomp.dcae.apod.analytics.common; /** * A Marker Interface for all DCAE Analytics Preferences diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/cdap/settings/CDAPAppConfig.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/cdap/settings/CDAPAppConfig.java index 3fc6f22..a47170f 100644 --- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/cdap/settings/CDAPAppConfig.java +++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/cdap/settings/CDAPAppConfig.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.common.cdap.settings; +package org.openecomp.dcae.apod.analytics.common.cdap.settings; /** *<p> diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/cdap/settings/CDAPAppPreferences.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/cdap/settings/CDAPAppPreferences.java index 52ec1af..67fbfc1 100644 --- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/cdap/settings/CDAPAppPreferences.java +++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/cdap/settings/CDAPAppPreferences.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.common.cdap.settings; +package org.openecomp.dcae.apod.analytics.common.cdap.settings; /** * <p> diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/cdap/settings/CDAPAppSettings.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/cdap/settings/CDAPAppSettings.java index d59e6f4..9e96cfe 100644 --- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/cdap/settings/CDAPAppSettings.java +++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/cdap/settings/CDAPAppSettings.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.common.cdap.settings; +package org.openecomp.dcae.apod.analytics.common.cdap.settings; import java.io.Serializable; diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/cdap/settings/CDAPBaseAppConfig.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/cdap/settings/CDAPBaseAppConfig.java index 1360b20..38c882f 100644 --- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/cdap/settings/CDAPBaseAppConfig.java +++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/cdap/settings/CDAPBaseAppConfig.java @@ -18,10 +18,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.common.cdap.settings; +package org.openecomp.dcae.apod.analytics.common.cdap.settings; import co.cask.cdap.api.Config; -import org.openecomp.dcae.analytics.common.CDAPComponentsConstants; +import org.openecomp.dcae.apod.analytics.common.CDAPComponentsConstants; /** * Base class for all DACE Analytics Application Configurations diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/cdap/validation/CDAPAppSettingsValidator.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/cdap/validation/CDAPAppSettingsValidator.java index df00eff..7ebe8e3 100644 --- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/cdap/validation/CDAPAppSettingsValidator.java +++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/cdap/validation/CDAPAppSettingsValidator.java @@ -18,11 +18,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.common.cdap.validation; +package org.openecomp.dcae.apod.analytics.common.cdap.validation; -import org.openecomp.dcae.analytics.common.cdap.settings.CDAPAppSettings; -import org.openecomp.dcae.analytics.common.validation.DCAEValidator; -import org.openecomp.dcae.analytics.common.validation.ValidationResponse; +import org.openecomp.dcae.apod.analytics.common.cdap.settings.CDAPAppSettings; +import org.openecomp.dcae.apod.analytics.common.validation.DCAEValidator; +import org.openecomp.dcae.apod.analytics.common.validation.ValidationResponse; /** * <p> diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/exception/CDAPSettingsException.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/exception/CDAPSettingsException.java index f6859e2..f5a8037 100644 --- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/exception/CDAPSettingsException.java +++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/exception/CDAPSettingsException.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.common.exception; +package org.openecomp.dcae.apod.analytics.common.exception; import org.slf4j.Logger; diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/exception/DCAEAnalyticsRuntimeException.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/exception/DCAEAnalyticsRuntimeException.java index cc00e33..559e6ae 100644 --- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/exception/DCAEAnalyticsRuntimeException.java +++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/exception/DCAEAnalyticsRuntimeException.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.common.exception; +package org.openecomp.dcae.apod.analytics.common.exception; import org.slf4j.Logger; diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/exception/MessageProcessingException.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/exception/MessageProcessingException.java index b40f604..44ef147 100644 --- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/exception/MessageProcessingException.java +++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/exception/MessageProcessingException.java @@ -18,9 +18,9 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.common.exception; +package org.openecomp.dcae.apod.analytics.common.exception; -import org.openecomp.dcae.analytics.common.service.processor.MessageProcessor; +import org.openecomp.dcae.apod.analytics.common.service.processor.MessageProcessor; import org.slf4j.Logger; /** diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/service/processor/AbstractMessageProcessor.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/service/processor/AbstractMessageProcessor.java index e5b9afc..c90858a 100644 --- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/service/processor/AbstractMessageProcessor.java +++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/service/processor/AbstractMessageProcessor.java @@ -18,10 +18,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.common.service.processor; +package org.openecomp.dcae.apod.analytics.common.service.processor; import com.google.common.base.Optional; -import org.openecomp.dcae.analytics.common.exception.MessageProcessingException; +import org.openecomp.dcae.apod.analytics.common.exception.MessageProcessingException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/service/processor/AbstractProcessorContext.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/service/processor/AbstractProcessorContext.java index 15145b5..2274f0e 100644 --- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/service/processor/AbstractProcessorContext.java +++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/service/processor/AbstractProcessorContext.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.common.service.processor; +package org.openecomp.dcae.apod.analytics.common.service.processor; import com.google.common.base.Objects; diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/service/processor/GenericMessageChainProcessor.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/service/processor/GenericMessageChainProcessor.java index b86d3ad..b289a32 100644 --- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/service/processor/GenericMessageChainProcessor.java +++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/service/processor/GenericMessageChainProcessor.java @@ -18,9 +18,9 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.common.service.processor; +package org.openecomp.dcae.apod.analytics.common.service.processor; -import org.openecomp.dcae.analytics.common.utils.MessageProcessorUtils; +import org.openecomp.dcae.apod.analytics.common.utils.MessageProcessorUtils; import java.util.List; diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/service/processor/GenericProcessorInfo.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/service/processor/GenericProcessorInfo.java index 665f787..681bb4d 100644 --- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/service/processor/GenericProcessorInfo.java +++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/service/processor/GenericProcessorInfo.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.common.service.processor; +package org.openecomp.dcae.apod.analytics.common.service.processor; import javax.annotation.Nonnull; diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/service/processor/MessageProcessor.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/service/processor/MessageProcessor.java index 3c09da9..73414db 100644 --- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/service/processor/MessageProcessor.java +++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/service/processor/MessageProcessor.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.common.service.processor; +package org.openecomp.dcae.apod.analytics.common.service.processor; import com.google.common.base.Function; import com.google.common.base.Optional; diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/service/processor/ProcessingState.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/service/processor/ProcessingState.java index c5090f7..8f97d63 100644 --- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/service/processor/ProcessingState.java +++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/service/processor/ProcessingState.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.common.service.processor; +package org.openecomp.dcae.apod.analytics.common.service.processor; /** * <p> diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/service/processor/ProcessorContext.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/service/processor/ProcessorContext.java index 74eabd7..3c70919 100644 --- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/service/processor/ProcessorContext.java +++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/service/processor/ProcessorContext.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.common.service.processor; +package org.openecomp.dcae.apod.analytics.common.service.processor; import java.io.Serializable; import java.util.List; diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/service/processor/ProcessorInfo.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/service/processor/ProcessorInfo.java index e657ed7..6bb74b0 100644 --- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/service/processor/ProcessorInfo.java +++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/service/processor/ProcessorInfo.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.common.service.processor; +package org.openecomp.dcae.apod.analytics.common.service.processor; import java.io.Serializable; diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/utils/HTTPUtils.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/utils/HTTPUtils.java index 4c36cb3..c10935f 100644 --- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/utils/HTTPUtils.java +++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/utils/HTTPUtils.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.common.utils; +package org.openecomp.dcae.apod.analytics.common.utils; /** * Contains common utils to check HTTP Related Utils diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/utils/MessageProcessorUtils.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/utils/MessageProcessorUtils.java index 10c8d7c..20deb72 100644 --- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/utils/MessageProcessorUtils.java +++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/utils/MessageProcessorUtils.java @@ -18,11 +18,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.common.utils; +package org.openecomp.dcae.apod.analytics.common.utils; -import org.openecomp.dcae.analytics.common.exception.MessageProcessingException; -import org.openecomp.dcae.analytics.common.service.processor.MessageProcessor; -import org.openecomp.dcae.analytics.common.service.processor.ProcessorContext; +import org.openecomp.dcae.apod.analytics.common.exception.MessageProcessingException; +import org.openecomp.dcae.apod.analytics.common.service.processor.MessageProcessor; +import org.openecomp.dcae.apod.analytics.common.service.processor.ProcessorContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/utils/PersistenceUtils.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/utils/PersistenceUtils.java index e408171..a10280f 100644 --- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/utils/PersistenceUtils.java +++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/utils/PersistenceUtils.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.common.utils; +package org.openecomp.dcae.apod.analytics.common.utils; import java.util.Date; diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/utils/ValidationUtils.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/utils/ValidationUtils.java index 694529f..f4f50a7 100644 --- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/utils/ValidationUtils.java +++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/utils/ValidationUtils.java @@ -18,12 +18,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.common.utils; +package org.openecomp.dcae.apod.analytics.common.utils; -import org.openecomp.dcae.analytics.common.cdap.settings.CDAPAppSettings; -import org.openecomp.dcae.analytics.common.cdap.validation.CDAPAppSettingsValidator; -import org.openecomp.dcae.analytics.common.exception.CDAPSettingsException; -import org.openecomp.dcae.analytics.common.validation.ValidationResponse; +import org.openecomp.dcae.apod.analytics.common.cdap.settings.CDAPAppSettings; +import org.openecomp.dcae.apod.analytics.common.cdap.validation.CDAPAppSettingsValidator; +import org.openecomp.dcae.apod.analytics.common.exception.CDAPSettingsException; +import org.openecomp.dcae.apod.analytics.common.validation.ValidationResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/validation/DCAEValidator.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/validation/DCAEValidator.java index 065411f..a42b53a 100644 --- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/validation/DCAEValidator.java +++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/validation/DCAEValidator.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.common.validation; +package org.openecomp.dcae.apod.analytics.common.validation; /** * Marker interface for all DCAE Validators diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/validation/GenericValidationResponse.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/validation/GenericValidationResponse.java index 7015ffe..3acb0c8 100644 --- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/validation/GenericValidationResponse.java +++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/validation/GenericValidationResponse.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.common.validation; +package org.openecomp.dcae.apod.analytics.common.validation; import com.google.common.base.Joiner; import com.google.common.base.Objects; diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/validation/ValidationResponse.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/validation/ValidationResponse.java index b1b7a16..11591a3 100644 --- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/analytics/common/validation/ValidationResponse.java +++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/validation/ValidationResponse.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.common.validation; +package org.openecomp.dcae.apod.analytics.common.validation; import java.util.Collection; import java.util.Map; diff --git a/dcae-analytics-common/src/test/java/org/openecomp/dcae/analytics/common/BaseAnalyticsCommonUnitTest.java b/dcae-analytics-common/src/test/java/org/openecomp/dcae/apod/analytics/common/BaseAnalyticsCommonUnitTest.java index 06b7e63..bd38168 100644 --- a/dcae-analytics-common/src/test/java/org/openecomp/dcae/analytics/common/BaseAnalyticsCommonUnitTest.java +++ b/dcae-analytics-common/src/test/java/org/openecomp/dcae/apod/analytics/common/BaseAnalyticsCommonUnitTest.java @@ -18,13 +18,13 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.common; +package org.openecomp.dcae.apod.analytics.common; -import org.openecomp.dcae.analytics.common.service.processor.TestEarlyTerminatingProcessor; -import org.openecomp.dcae.analytics.common.service.processor.TestMessageProcessor1; -import org.openecomp.dcae.analytics.common.service.processor.TestMessageProcessor2; -import org.openecomp.dcae.analytics.common.service.processor.TestProcessorContext; -import org.openecomp.dcae.analytics.test.BaseDCAEAnalyticsUnitTest; +import org.openecomp.dcae.apod.analytics.common.service.processor.TestEarlyTerminatingProcessor; +import org.openecomp.dcae.apod.analytics.common.service.processor.TestMessageProcessor1; +import org.openecomp.dcae.apod.analytics.common.service.processor.TestMessageProcessor2; +import org.openecomp.dcae.apod.analytics.common.service.processor.TestProcessorContext; +import org.openecomp.dcae.apod.analytics.test.BaseDCAEAnalyticsUnitTest; /** * Base class from all DCEA Analytics Common Module Unit Tests diff --git a/dcae-analytics-common/src/test/java/org/openecomp/dcae/analytics/common/service/processor/GenericMessageChainProcessorTest.java b/dcae-analytics-common/src/test/java/org/openecomp/dcae/apod/analytics/common/service/processor/GenericMessageChainProcessorTest.java index 2ab9d40..2ed82b6 100644 --- a/dcae-analytics-common/src/test/java/org/openecomp/dcae/analytics/common/service/processor/GenericMessageChainProcessorTest.java +++ b/dcae-analytics-common/src/test/java/org/openecomp/dcae/apod/analytics/common/service/processor/GenericMessageChainProcessorTest.java @@ -18,12 +18,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.common.service.processor; +package org.openecomp.dcae.apod.analytics.common.service.processor; import com.google.common.collect.ImmutableList; import org.junit.Test; -import org.openecomp.dcae.analytics.common.BaseAnalyticsCommonUnitTest; -import org.openecomp.dcae.analytics.common.exception.MessageProcessingException; +import org.openecomp.dcae.apod.analytics.common.BaseAnalyticsCommonUnitTest; +import org.openecomp.dcae.apod.analytics.common.exception.MessageProcessingException; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertNull; diff --git a/dcae-analytics-common/src/test/java/org/openecomp/dcae/analytics/common/service/processor/TestEarlyTerminatingProcessor.java b/dcae-analytics-common/src/test/java/org/openecomp/dcae/apod/analytics/common/service/processor/TestEarlyTerminatingProcessor.java index c5852de..a015677 100644 --- a/dcae-analytics-common/src/test/java/org/openecomp/dcae/analytics/common/service/processor/TestEarlyTerminatingProcessor.java +++ b/dcae-analytics-common/src/test/java/org/openecomp/dcae/apod/analytics/common/service/processor/TestEarlyTerminatingProcessor.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.common.service.processor; +package org.openecomp.dcae.apod.analytics.common.service.processor; /** * diff --git a/dcae-analytics-common/src/test/java/org/openecomp/dcae/analytics/common/service/processor/TestMessageProcessor1.java b/dcae-analytics-common/src/test/java/org/openecomp/dcae/apod/analytics/common/service/processor/TestMessageProcessor1.java index 6c56cb8..ac29080 100644 --- a/dcae-analytics-common/src/test/java/org/openecomp/dcae/analytics/common/service/processor/TestMessageProcessor1.java +++ b/dcae-analytics-common/src/test/java/org/openecomp/dcae/apod/analytics/common/service/processor/TestMessageProcessor1.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.common.service.processor; +package org.openecomp.dcae.apod.analytics.common.service.processor; /** * diff --git a/dcae-analytics-common/src/test/java/org/openecomp/dcae/analytics/common/service/processor/TestMessageProcessor2.java b/dcae-analytics-common/src/test/java/org/openecomp/dcae/apod/analytics/common/service/processor/TestMessageProcessor2.java index 0ecbedf..a0704db 100644 --- a/dcae-analytics-common/src/test/java/org/openecomp/dcae/analytics/common/service/processor/TestMessageProcessor2.java +++ b/dcae-analytics-common/src/test/java/org/openecomp/dcae/apod/analytics/common/service/processor/TestMessageProcessor2.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.common.service.processor; +package org.openecomp.dcae.apod.analytics.common.service.processor; /** * diff --git a/dcae-analytics-common/src/test/java/org/openecomp/dcae/analytics/common/service/processor/TestProcessorContext.java b/dcae-analytics-common/src/test/java/org/openecomp/dcae/apod/analytics/common/service/processor/TestProcessorContext.java index 9d9342f..85e8c74 100644 --- a/dcae-analytics-common/src/test/java/org/openecomp/dcae/analytics/common/service/processor/TestProcessorContext.java +++ b/dcae-analytics-common/src/test/java/org/openecomp/dcae/apod/analytics/common/service/processor/TestProcessorContext.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.common.service.processor; +package org.openecomp.dcae.apod.analytics.common.service.processor; import java.util.LinkedList; import java.util.List; diff --git a/dcae-analytics-dmaap/pom.xml b/dcae-analytics-dmaap/pom.xml index ce54088..94d84cf 100644 --- a/dcae-analytics-dmaap/pom.xml +++ b/dcae-analytics-dmaap/pom.xml @@ -28,7 +28,7 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.openecomp.dcae.analytics</groupId> + <groupId>org.openecomp.dcae.apod.analytics</groupId> <artifactId>dcae-analytics</artifactId> <version>1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> @@ -52,7 +52,7 @@ <!-- DCAE COMMON DEPENDENCIES --> <dependency> - <groupId>org.openecomp.dcae.analytics</groupId> + <groupId>org.openecomp.dcae.apod.analytics</groupId> <artifactId>dcae-analytics-common</artifactId> <version>1.0-SNAPSHOT</version> </dependency> @@ -98,7 +98,7 @@ <!-- TEST DEPENDENCIES --> <dependency> - <groupId>org.openecomp.dcae.analytics</groupId> + <groupId>org.openecomp.dcae.apod.analytics</groupId> <artifactId>dcae-analytics-test</artifactId> <version>1.0-SNAPSHOT</version> <scope>test</scope> diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/DMaaPMRFactory.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/DMaaPMRFactory.java index 6966a46..6a6e064 100644 --- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/DMaaPMRFactory.java +++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/DMaaPMRFactory.java @@ -18,18 +18,18 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.dmaap; +package org.openecomp.dcae.apod.analytics.dmaap; import com.google.inject.AbstractModule; import com.google.inject.Guice; import com.google.inject.Injector; -import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRPublisherConfig; -import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig; -import org.openecomp.dcae.analytics.dmaap.module.AnalyticsDMaaPModule; -import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisher; -import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisherFactory; -import org.openecomp.dcae.analytics.dmaap.service.subscriber.DMaaPMRSubscriber; -import org.openecomp.dcae.analytics.dmaap.service.subscriber.DMaaPMRSubscriberFactory; +import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRPublisherConfig; +import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig; +import org.openecomp.dcae.apod.analytics.dmaap.module.AnalyticsDMaaPModule; +import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisher; +import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisherFactory; +import org.openecomp.dcae.apod.analytics.dmaap.service.subscriber.DMaaPMRSubscriber; +import org.openecomp.dcae.apod.analytics.dmaap.service.subscriber.DMaaPMRSubscriberFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/domain/config/DMaaPMRBaseConfig.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/domain/config/DMaaPMRBaseConfig.java index f2435f1..bb594f8 100644 --- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/domain/config/DMaaPMRBaseConfig.java +++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/domain/config/DMaaPMRBaseConfig.java @@ -18,16 +18,16 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.dmaap.domain.config; +package org.openecomp.dcae.apod.analytics.dmaap.domain.config; import com.google.common.base.Objects; -import org.openecomp.dcae.analytics.common.exception.DCAEAnalyticsRuntimeException; +import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.Locale; -import static org.openecomp.dcae.analytics.common.utils.HTTPUtils.JSON_APPLICATION_TYPE; +import static org.openecomp.dcae.apod.analytics.common.utils.HTTPUtils.JSON_APPLICATION_TYPE; /** * <p> diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/domain/config/DMaaPMRConfig.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/domain/config/DMaaPMRConfig.java index f5ef71e..fd55c4c 100644 --- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/domain/config/DMaaPMRConfig.java +++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/domain/config/DMaaPMRConfig.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.dmaap.domain.config; +package org.openecomp.dcae.apod.analytics.dmaap.domain.config; /** * <p> diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/domain/config/DMaaPMRPublisherConfig.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/domain/config/DMaaPMRPublisherConfig.java index 4a08cd3..5a0e601 100644 --- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/domain/config/DMaaPMRPublisherConfig.java +++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/domain/config/DMaaPMRPublisherConfig.java @@ -18,14 +18,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.dmaap.domain.config; +package org.openecomp.dcae.apod.analytics.dmaap.domain.config; import com.google.common.base.Objects; import javax.annotation.Nonnull; -import static org.openecomp.dcae.analytics.common.AnalyticsConstants.DEFAULT_PUBLISHER_MAX_BATCH_SIZE; -import static org.openecomp.dcae.analytics.common.AnalyticsConstants.DEFAULT_PUBLISHER_MAX_RECOVERY_QUEUE_SIZE; +import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.DEFAULT_PUBLISHER_MAX_BATCH_SIZE; +import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.DEFAULT_PUBLISHER_MAX_RECOVERY_QUEUE_SIZE; /** * <p> diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/domain/config/DMaaPMRSubscriberConfig.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/domain/config/DMaaPMRSubscriberConfig.java index 9741fa5..5e30738 100644 --- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/domain/config/DMaaPMRSubscriberConfig.java +++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/domain/config/DMaaPMRSubscriberConfig.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.dmaap.domain.config; +package org.openecomp.dcae.apod.analytics.dmaap.domain.config; import com.google.common.base.Objects; @@ -26,9 +26,9 @@ import java.util.UUID; import javax.annotation.Nonnull; -import static org.openecomp.dcae.analytics.common.AnalyticsConstants.DEFAULT_SUBSCRIBER_GROUP_PREFIX; -import static org.openecomp.dcae.analytics.common.AnalyticsConstants.DEFAULT_SUBSCRIBER_MESSAGE_LIMIT; -import static org.openecomp.dcae.analytics.common.AnalyticsConstants.DEFAULT_SUBSCRIBER_TIMEOUT_MS; +import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.DEFAULT_SUBSCRIBER_GROUP_PREFIX; +import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.DEFAULT_SUBSCRIBER_MESSAGE_LIMIT; +import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.DEFAULT_SUBSCRIBER_TIMEOUT_MS; /** * <p> diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/domain/response/DMaaPMRPublisherResponse.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/domain/response/DMaaPMRPublisherResponse.java index ad6a86f..d7c6f5c 100644 --- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/domain/response/DMaaPMRPublisherResponse.java +++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/domain/response/DMaaPMRPublisherResponse.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.dmaap.domain.response; +package org.openecomp.dcae.apod.analytics.dmaap.domain.response; /** * <p> diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/domain/response/DMaaPMRPublisherResponseImpl.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/domain/response/DMaaPMRPublisherResponseImpl.java index dd1dfe8..0ee241d 100644 --- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/domain/response/DMaaPMRPublisherResponseImpl.java +++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/domain/response/DMaaPMRPublisherResponseImpl.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.dmaap.domain.response; +package org.openecomp.dcae.apod.analytics.dmaap.domain.response; import com.google.common.base.Objects; diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/domain/response/DMaaPMRResponse.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/domain/response/DMaaPMRResponse.java index 7dc7523..a8ded96 100644 --- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/domain/response/DMaaPMRResponse.java +++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/domain/response/DMaaPMRResponse.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.dmaap.domain.response; +package org.openecomp.dcae.apod.analytics.dmaap.domain.response; /** * <p> diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/domain/response/DMaaPMRSubscriberResponse.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/domain/response/DMaaPMRSubscriberResponse.java index fd1a9e3..8b7c847 100644 --- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/domain/response/DMaaPMRSubscriberResponse.java +++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/domain/response/DMaaPMRSubscriberResponse.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.dmaap.domain.response; +package org.openecomp.dcae.apod.analytics.dmaap.domain.response; import java.util.List; diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/domain/response/DMaaPMRSubscriberResponseImpl.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/domain/response/DMaaPMRSubscriberResponseImpl.java index 1254654..2ae0c5c 100644 --- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/domain/response/DMaaPMRSubscriberResponseImpl.java +++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/domain/response/DMaaPMRSubscriberResponseImpl.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.dmaap.domain.response; +package org.openecomp.dcae.apod.analytics.dmaap.domain.response; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/module/AnalyticsDMaaPModule.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/module/AnalyticsDMaaPModule.java index 1296798..c46995f 100644 --- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/module/AnalyticsDMaaPModule.java +++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/module/AnalyticsDMaaPModule.java @@ -18,21 +18,21 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.dmaap.module; +package org.openecomp.dcae.apod.analytics.dmaap.module; import com.google.inject.AbstractModule; import com.google.inject.assistedinject.FactoryModuleBuilder; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; -import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisher; -import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisherFactory; -import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisherImpl; -import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisherQueue; -import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisherQueueFactory; -import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisherQueueImpl; -import org.openecomp.dcae.analytics.dmaap.service.subscriber.DMaaPMRSubscriber; -import org.openecomp.dcae.analytics.dmaap.service.subscriber.DMaaPMRSubscriberFactory; -import org.openecomp.dcae.analytics.dmaap.service.subscriber.DMaaPMRSubscriberImpl; +import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisher; +import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisherFactory; +import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisherImpl; +import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisherQueue; +import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisherQueueFactory; +import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisherQueueImpl; +import org.openecomp.dcae.apod.analytics.dmaap.service.subscriber.DMaaPMRSubscriber; +import org.openecomp.dcae.apod.analytics.dmaap.service.subscriber.DMaaPMRSubscriberFactory; +import org.openecomp.dcae.apod.analytics.dmaap.service.subscriber.DMaaPMRSubscriberImpl; /** * Guice Module to wire concrete implementations with interfaces diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/BaseDMaaPMRComponent.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/BaseDMaaPMRComponent.java index e7e8ea4..7e16b8d 100644 --- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/BaseDMaaPMRComponent.java +++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/BaseDMaaPMRComponent.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.dmaap.service; +package org.openecomp.dcae.apod.analytics.dmaap.service; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; @@ -33,16 +33,16 @@ import org.apache.http.HttpResponse; import org.apache.http.client.ResponseHandler; import org.apache.http.client.utils.URIBuilder; import org.apache.http.util.EntityUtils; -import org.openecomp.dcae.analytics.common.AnalyticsConstants; -import org.openecomp.dcae.analytics.common.exception.DCAEAnalyticsRuntimeException; -import org.openecomp.dcae.analytics.common.utils.HTTPUtils; -import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRPublisherConfig; -import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig; -import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRPublisherResponse; -import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRPublisherResponseImpl; -import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse; -import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRSubscriberResponseImpl; -import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisherQueue; +import org.openecomp.dcae.apod.analytics.common.AnalyticsConstants; +import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException; +import org.openecomp.dcae.apod.analytics.common.utils.HTTPUtils; +import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRPublisherConfig; +import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig; +import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRPublisherResponse; +import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRPublisherResponseImpl; +import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse; +import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRSubscriberResponseImpl; +import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisherQueue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/DMaaPMRComponent.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/DMaaPMRComponent.java index 6f9a0ce..9d891f1 100644 --- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/DMaaPMRComponent.java +++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/DMaaPMRComponent.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.dmaap.service; +package org.openecomp.dcae.apod.analytics.dmaap.service; /** * Marker interface for all DMaaP MR Components e.g. MR Publishers, MR Subscribers diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisher.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisher.java index afbdf9f..dcd46d9 100644 --- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisher.java +++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisher.java @@ -18,11 +18,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.dmaap.service.publisher; +package org.openecomp.dcae.apod.analytics.dmaap.service.publisher; -import org.openecomp.dcae.analytics.common.exception.DCAEAnalyticsRuntimeException; -import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRPublisherConfig; -import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRPublisherResponse; +import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException; +import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRPublisherConfig; +import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRPublisherResponse; import java.util.Date; import java.util.List; diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisherFactory.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherFactory.java index 74245f8..1d84011 100644 --- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisherFactory.java +++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherFactory.java @@ -18,10 +18,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.dmaap.service.publisher; +package org.openecomp.dcae.apod.analytics.dmaap.service.publisher; -import org.openecomp.dcae.analytics.dmaap.DMaaPMRFactory; -import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRPublisherConfig; +import org.openecomp.dcae.apod.analytics.dmaap.DMaaPMRFactory; +import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRPublisherConfig; /** * <p> diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisherImpl.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherImpl.java index 425bead..cb62ee1 100644 --- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisherImpl.java +++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherImpl.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.dmaap.service.publisher; +package org.openecomp.dcae.apod.analytics.dmaap.service.publisher; import com.google.common.base.Optional; import com.google.common.collect.Iterables; @@ -32,11 +32,11 @@ import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.ContentType; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.CloseableHttpClient; -import org.openecomp.dcae.analytics.common.AnalyticsConstants; -import org.openecomp.dcae.analytics.common.exception.DCAEAnalyticsRuntimeException; -import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRPublisherConfig; -import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRPublisherResponse; -import org.openecomp.dcae.analytics.dmaap.service.BaseDMaaPMRComponent; +import org.openecomp.dcae.apod.analytics.common.AnalyticsConstants; +import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException; +import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRPublisherConfig; +import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRPublisherResponse; +import org.openecomp.dcae.apod.analytics.dmaap.service.BaseDMaaPMRComponent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,7 +45,7 @@ import java.net.URI; import java.util.Date; import java.util.List; -import static org.openecomp.dcae.analytics.common.utils.HTTPUtils.isSuccessfulResponseCode; +import static org.openecomp.dcae.apod.analytics.common.utils.HTTPUtils.isSuccessfulResponseCode; import static java.lang.String.format; /** diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisherQueue.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherQueue.java index cb3c113..bb8fd9b 100644 --- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisherQueue.java +++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherQueue.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.dmaap.service.publisher; +package org.openecomp.dcae.apod.analytics.dmaap.service.publisher; import java.util.List; diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueFactory.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueFactory.java index bfc3dab..75df65e 100644 --- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueFactory.java +++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueFactory.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.dmaap.service.publisher; +package org.openecomp.dcae.apod.analytics.dmaap.service.publisher; import com.google.inject.assistedinject.Assisted; diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueImpl.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueImpl.java index 0367950..b293998 100644 --- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueImpl.java +++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueImpl.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.dmaap.service.publisher; +package org.openecomp.dcae.apod.analytics.dmaap.service.publisher; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/subscriber/DMaaPMRSubscriber.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/subscriber/DMaaPMRSubscriber.java index 096c0a9..33fe83e 100644 --- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/subscriber/DMaaPMRSubscriber.java +++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/subscriber/DMaaPMRSubscriber.java @@ -18,11 +18,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.dmaap.service.subscriber; +package org.openecomp.dcae.apod.analytics.dmaap.service.subscriber; -import org.openecomp.dcae.analytics.common.exception.DCAEAnalyticsRuntimeException; -import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRPublisherConfig; -import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse; +import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException; +import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRPublisherConfig; +import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse; import java.util.Date; diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/subscriber/DMaaPMRSubscriberFactory.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/subscriber/DMaaPMRSubscriberFactory.java index 33c405e..be114f6 100644 --- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/subscriber/DMaaPMRSubscriberFactory.java +++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/subscriber/DMaaPMRSubscriberFactory.java @@ -18,10 +18,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.dmaap.service.subscriber; +package org.openecomp.dcae.apod.analytics.dmaap.service.subscriber; -import org.openecomp.dcae.analytics.dmaap.DMaaPMRFactory; -import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig; +import org.openecomp.dcae.apod.analytics.dmaap.DMaaPMRFactory; +import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig; /** * Factory to initialize instance of {@link DMaaPMRSubscriber} for Guice DI injection purposes. diff --git a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/subscriber/DMaaPMRSubscriberImpl.java b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/subscriber/DMaaPMRSubscriberImpl.java index 6d98189..2729b55 100644 --- a/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/analytics/dmaap/service/subscriber/DMaaPMRSubscriberImpl.java +++ b/dcae-analytics-dmaap/src/main/java/org/openecomp/dcae/apod/analytics/dmaap/service/subscriber/DMaaPMRSubscriberImpl.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.dmaap.service.subscriber; +package org.openecomp.dcae.apod.analytics.dmaap.service.subscriber; import com.google.common.base.Optional; import com.google.inject.Inject; @@ -28,10 +28,10 @@ import org.apache.http.HttpHeaders; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.CloseableHttpClient; -import org.openecomp.dcae.analytics.common.exception.DCAEAnalyticsRuntimeException; -import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig; -import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse; -import org.openecomp.dcae.analytics.dmaap.service.BaseDMaaPMRComponent; +import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException; +import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig; +import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse; +import org.openecomp.dcae.apod.analytics.dmaap.service.BaseDMaaPMRComponent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,7 +41,7 @@ import java.util.Date; import java.util.LinkedList; import java.util.List; -import static org.openecomp.dcae.analytics.common.utils.HTTPUtils.isSuccessfulResponseCode; +import static org.openecomp.dcae.apod.analytics.common.utils.HTTPUtils.isSuccessfulResponseCode; import static java.lang.String.format; /** diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/BaseAnalyticsDMaaPGuiceUnitTest.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/BaseAnalyticsDMaaPGuiceUnitTest.java index 522b057..133cf84 100644 --- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/BaseAnalyticsDMaaPGuiceUnitTest.java +++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/BaseAnalyticsDMaaPGuiceUnitTest.java @@ -18,10 +18,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.dmaap; +package org.openecomp.dcae.apod.analytics.dmaap; import org.junit.runner.RunWith; -import org.openecomp.dcae.analytics.test.runner.GuiceJUnitRunner; +import org.openecomp.dcae.apod.analytics.test.runner.GuiceJUnitRunner; /** * @author Rajiv Singla. Creation Date: 10/20/2016. diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/BaseAnalyticsDMaaPUnitTest.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/BaseAnalyticsDMaaPUnitTest.java index 75e3ec4..c9c07a7 100644 --- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/BaseAnalyticsDMaaPUnitTest.java +++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/BaseAnalyticsDMaaPUnitTest.java @@ -18,11 +18,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.dmaap; +package org.openecomp.dcae.apod.analytics.dmaap; -import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRPublisherConfig; -import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig; -import org.openecomp.dcae.analytics.test.BaseDCAEAnalyticsUnitTest; +import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRPublisherConfig; +import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig; +import org.openecomp.dcae.apod.analytics.test.BaseDCAEAnalyticsUnitTest; import java.util.List; diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/DMaaPMRFactoryTest.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/DMaaPMRFactoryTest.java index 646b48d..38f6381 100644 --- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/DMaaPMRFactoryTest.java +++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/DMaaPMRFactoryTest.java @@ -18,16 +18,16 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.dmaap; +package org.openecomp.dcae.apod.analytics.dmaap; import org.junit.Before; import org.junit.Test; -import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRPublisherResponse; -import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse; -import org.openecomp.dcae.analytics.dmaap.module.AnalyticsDMaaPTestModule; -import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisher; -import org.openecomp.dcae.analytics.dmaap.service.subscriber.DMaaPMRSubscriber; -import org.openecomp.dcae.analytics.test.annotation.GuiceModules; +import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRPublisherResponse; +import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse; +import org.openecomp.dcae.apod.analytics.dmaap.module.AnalyticsDMaaPTestModule; +import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisher; +import org.openecomp.dcae.apod.analytics.dmaap.service.subscriber.DMaaPMRSubscriber; +import org.openecomp.dcae.apod.analytics.test.annotation.GuiceModules; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/domain/config/DMaaPMRPublisherConfigTest.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/domain/config/DMaaPMRPublisherConfigTest.java index a66d3f2..4699700 100644 --- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/domain/config/DMaaPMRPublisherConfigTest.java +++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/domain/config/DMaaPMRPublisherConfigTest.java @@ -18,19 +18,19 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.dmaap.domain.config; +package org.openecomp.dcae.apod.analytics.dmaap.domain.config; import org.junit.Test; -import org.openecomp.dcae.analytics.dmaap.BaseAnalyticsDMaaPUnitTest; +import org.openecomp.dcae.apod.analytics.dmaap.BaseAnalyticsDMaaPUnitTest; import static org.junit.Assert.assertTrue; -import static org.openecomp.dcae.analytics.common.AnalyticsConstants.DEFAULT_PUBLISHER_MAX_BATCH_SIZE; -import static org.openecomp.dcae.analytics.common.AnalyticsConstants.DEFAULT_PUBLISHER_MAX_RECOVERY_QUEUE_SIZE; -import static org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRConfig.DEFAULT_CONTENT_TYPE; -import static org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRConfig.DEFAULT_PORT_NUMBER; -import static org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRConfig.DEFAULT_PROTOCOL; -import static org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRConfig.DEFAULT_USER_NAME; -import static org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRConfig.DEFAULT_USER_PASSWORD; +import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.DEFAULT_PUBLISHER_MAX_BATCH_SIZE; +import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.DEFAULT_PUBLISHER_MAX_RECOVERY_QUEUE_SIZE; +import static org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRConfig.DEFAULT_CONTENT_TYPE; +import static org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRConfig.DEFAULT_PORT_NUMBER; +import static org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRConfig.DEFAULT_PROTOCOL; +import static org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRConfig.DEFAULT_USER_NAME; +import static org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRConfig.DEFAULT_USER_PASSWORD; /** * @author Rajiv Singla. Creation Date: 10/14/2016. diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/domain/config/DMaaPMRSubscriberConfigTest.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/domain/config/DMaaPMRSubscriberConfigTest.java index 10edc0c..4490c6f 100644 --- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/domain/config/DMaaPMRSubscriberConfigTest.java +++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/domain/config/DMaaPMRSubscriberConfigTest.java @@ -18,19 +18,19 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.dmaap.domain.config; +package org.openecomp.dcae.apod.analytics.dmaap.domain.config; import org.junit.Test; -import org.openecomp.dcae.analytics.dmaap.BaseAnalyticsDMaaPUnitTest; +import org.openecomp.dcae.apod.analytics.dmaap.BaseAnalyticsDMaaPUnitTest; import static org.junit.Assert.assertTrue; -import static org.openecomp.dcae.analytics.common.AnalyticsConstants.DEFAULT_SUBSCRIBER_GROUP_PREFIX; -import static org.openecomp.dcae.analytics.common.AnalyticsConstants.DEFAULT_SUBSCRIBER_MESSAGE_LIMIT; -import static org.openecomp.dcae.analytics.common.AnalyticsConstants.DEFAULT_SUBSCRIBER_TIMEOUT_MS; -import static org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRConfig.DEFAULT_CONTENT_TYPE; -import static org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRConfig.DEFAULT_PORT_NUMBER; -import static org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRConfig.DEFAULT_PROTOCOL; -import static org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRConfig.DEFAULT_USER_NAME; +import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.DEFAULT_SUBSCRIBER_GROUP_PREFIX; +import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.DEFAULT_SUBSCRIBER_MESSAGE_LIMIT; +import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.DEFAULT_SUBSCRIBER_TIMEOUT_MS; +import static org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRConfig.DEFAULT_CONTENT_TYPE; +import static org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRConfig.DEFAULT_PORT_NUMBER; +import static org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRConfig.DEFAULT_PROTOCOL; +import static org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRConfig.DEFAULT_USER_NAME; /** * @author Rajiv Singla. Creation Date: 10/14/2016. diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/it/BaseAnalyticsDMaaPIT.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/it/BaseAnalyticsDMaaPIT.java index 987b57b..d25fbad 100644 --- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/it/BaseAnalyticsDMaaPIT.java +++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/it/BaseAnalyticsDMaaPIT.java @@ -18,13 +18,13 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.dmaap.it; +package org.openecomp.dcae.apod.analytics.dmaap.it; -import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRPublisherConfig; -import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig; -import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRPublisherResponse; -import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisher; -import org.openecomp.dcae.analytics.test.BaseDCAEAnalyticsIT; +import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRPublisherConfig; +import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig; +import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRPublisherResponse; +import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisher; +import org.openecomp.dcae.apod.analytics.test.BaseDCAEAnalyticsIT; import java.util.List; diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/it/DMaaPMRPublisherImplIT.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/it/DMaaPMRPublisherImplIT.java index a7e1f8c..129e64c 100644 --- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/it/DMaaPMRPublisherImplIT.java +++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/it/DMaaPMRPublisherImplIT.java @@ -18,14 +18,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.dmaap.it; +package org.openecomp.dcae.apod.analytics.dmaap.it; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.openecomp.dcae.analytics.dmaap.DMaaPMRFactory; -import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRPublisherResponse; -import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisher; +import org.openecomp.dcae.apod.analytics.dmaap.DMaaPMRFactory; +import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRPublisherResponse; +import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisher; /** * @author Rajiv Singla. Creation Date: 10/13/2016. diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/it/DMaaPMRSubscriberImplIT.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/it/DMaaPMRSubscriberImplIT.java index 4b32e96..6553dc7 100644 --- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/it/DMaaPMRSubscriberImplIT.java +++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/it/DMaaPMRSubscriberImplIT.java @@ -18,16 +18,16 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.dmaap.it; +package org.openecomp.dcae.apod.analytics.dmaap.it; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.openecomp.dcae.analytics.dmaap.DMaaPMRFactory; -import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRPublisherResponse; -import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse; -import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisher; -import org.openecomp.dcae.analytics.dmaap.service.subscriber.DMaaPMRSubscriber; +import org.openecomp.dcae.apod.analytics.dmaap.DMaaPMRFactory; +import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRPublisherResponse; +import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse; +import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisher; +import org.openecomp.dcae.apod.analytics.dmaap.service.subscriber.DMaaPMRSubscriber; import java.util.LinkedList; import java.util.List; diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/module/AnalyticsDMaaPTestModule.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/module/AnalyticsDMaaPTestModule.java index 7ef44aa..00ac232 100644 --- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/module/AnalyticsDMaaPTestModule.java +++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/module/AnalyticsDMaaPTestModule.java @@ -18,21 +18,21 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.dmaap.module; +package org.openecomp.dcae.apod.analytics.dmaap.module; import com.google.inject.AbstractModule; import com.google.inject.assistedinject.FactoryModuleBuilder; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; -import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisher; -import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisherFactory; -import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisherMockImpl; -import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisherQueue; -import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisherQueueFactory; -import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisherQueueImpl; -import org.openecomp.dcae.analytics.dmaap.service.subscriber.DMaaPMRSubscriber; -import org.openecomp.dcae.analytics.dmaap.service.subscriber.DMaaPMRSubscriberFactory; -import org.openecomp.dcae.analytics.dmaap.service.subscriber.DMaaPMRSubscriberMockImpl; +import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisher; +import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisherFactory; +import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisherMockImpl; +import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisherQueue; +import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisherQueueFactory; +import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisherQueueImpl; +import org.openecomp.dcae.apod.analytics.dmaap.service.subscriber.DMaaPMRSubscriber; +import org.openecomp.dcae.apod.analytics.dmaap.service.subscriber.DMaaPMRSubscriberFactory; +import org.openecomp.dcae.apod.analytics.dmaap.service.subscriber.DMaaPMRSubscriberMockImpl; /** * DMaaP Guice Test Module diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/service/BaseDMaaPMRComponentTest.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/BaseDMaaPMRComponentTest.java index 4cc3f1e..4edf91b 100644 --- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/service/BaseDMaaPMRComponentTest.java +++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/BaseDMaaPMRComponentTest.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.dmaap.service; +package org.openecomp.dcae.apod.analytics.dmaap.service; import com.fasterxml.jackson.core.JsonProcessingException; import com.google.common.base.Optional; @@ -31,12 +31,12 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.Mockito; -import org.openecomp.dcae.analytics.common.exception.DCAEAnalyticsRuntimeException; -import org.openecomp.dcae.analytics.dmaap.BaseAnalyticsDMaaPUnitTest; -import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRPublisherConfig; -import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig; -import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse; -import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisherQueue; +import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException; +import org.openecomp.dcae.apod.analytics.dmaap.BaseAnalyticsDMaaPUnitTest; +import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRPublisherConfig; +import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig; +import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse; +import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisherQueue; import java.io.IOException; import java.net.URI; diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisherImplTest.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherImplTest.java index a24bb39..e037ceb 100644 --- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisherImplTest.java +++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherImplTest.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.dmaap.service.publisher; +package org.openecomp.dcae.apod.analytics.dmaap.service.publisher; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.http.client.ResponseHandler; @@ -34,10 +34,10 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; -import org.openecomp.dcae.analytics.common.exception.DCAEAnalyticsRuntimeException; -import org.openecomp.dcae.analytics.dmaap.BaseAnalyticsDMaaPUnitTest; -import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRPublisherConfig; -import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRPublisherResponse; +import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException; +import org.openecomp.dcae.apod.analytics.dmaap.BaseAnalyticsDMaaPUnitTest; +import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRPublisherConfig; +import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRPublisherResponse; import java.io.IOException; import java.util.ArrayList; diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisherMockImpl.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherMockImpl.java index 333b816..abd8618 100644 --- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisherMockImpl.java +++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherMockImpl.java @@ -18,11 +18,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.dmaap.service.publisher; +package org.openecomp.dcae.apod.analytics.dmaap.service.publisher; -import org.openecomp.dcae.analytics.common.exception.DCAEAnalyticsRuntimeException; -import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRPublisherResponse; -import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRPublisherResponseImpl; +import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException; +import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRPublisherResponse; +import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRPublisherResponseImpl; import java.util.Date; import java.util.List; diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueImplTest.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueImplTest.java index 07622df..7a24fa8 100644 --- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueImplTest.java +++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueImplTest.java @@ -18,10 +18,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.dmaap.service.publisher; +package org.openecomp.dcae.apod.analytics.dmaap.service.publisher; import org.junit.Test; -import org.openecomp.dcae.analytics.dmaap.BaseAnalyticsDMaaPUnitTest; +import org.openecomp.dcae.apod.analytics.dmaap.BaseAnalyticsDMaaPUnitTest; import java.util.List; diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueMockImpl.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueMockImpl.java index 585d0ba..84fea09 100644 --- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueMockImpl.java +++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueMockImpl.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.dmaap.service.publisher; +package org.openecomp.dcae.apod.analytics.dmaap.service.publisher; import java.util.List; diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/service/subscriber/DMaaPMRSubscriberImplTest.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/subscriber/DMaaPMRSubscriberImplTest.java index 6d8c79a..f206aa2 100644 --- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/service/subscriber/DMaaPMRSubscriberImplTest.java +++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/subscriber/DMaaPMRSubscriberImplTest.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.dmaap.service.subscriber; +package org.openecomp.dcae.apod.analytics.dmaap.service.subscriber; import com.jayway.jsonassert.impl.matcher.IsCollectionWithSize; import org.apache.commons.lang3.tuple.ImmutablePair; @@ -34,10 +34,10 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; -import org.openecomp.dcae.analytics.common.exception.DCAEAnalyticsRuntimeException; -import org.openecomp.dcae.analytics.dmaap.BaseAnalyticsDMaaPUnitTest; -import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig; -import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse; +import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException; +import org.openecomp.dcae.apod.analytics.dmaap.BaseAnalyticsDMaaPUnitTest; +import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig; +import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse; import java.io.IOException; import java.util.Random; diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/service/subscriber/DMaaPMRSubscriberMockImpl.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/subscriber/DMaaPMRSubscriberMockImpl.java index 87a76d0..92a795a 100644 --- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/analytics/dmaap/service/subscriber/DMaaPMRSubscriberMockImpl.java +++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/subscriber/DMaaPMRSubscriberMockImpl.java @@ -18,11 +18,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.dmaap.service.subscriber; +package org.openecomp.dcae.apod.analytics.dmaap.service.subscriber; -import org.openecomp.dcae.analytics.common.exception.DCAEAnalyticsRuntimeException; -import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse; -import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRSubscriberResponseImpl; +import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException; +import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse; +import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRSubscriberResponseImpl; import java.util.Date; diff --git a/dcae-analytics-model/pom.xml b/dcae-analytics-model/pom.xml index 58e1da8..5633267 100644 --- a/dcae-analytics-model/pom.xml +++ b/dcae-analytics-model/pom.xml @@ -28,7 +28,7 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.openecomp.dcae.analytics</groupId> + <groupId>org.openecomp.dcae.apod.analytics</groupId> <artifactId>dcae-analytics</artifactId> <version>1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> @@ -104,7 +104,7 @@ <!-- TEST DEPENDENCIES --> <dependency> - <groupId>org.openecomp.dcae.analytics</groupId> + <groupId>org.openecomp.dcae.apod.analytics</groupId> <artifactId>dcae-analytics-test</artifactId> <version>1.0-SNAPSHOT</version> <scope>test</scope> diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/DCAEAnalyticsModel.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/DCAEAnalyticsModel.java deleted file mode 100644 index 79650b5..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/DCAEAnalyticsModel.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.domain; - -import java.io.Serializable; - -/** - * <p> - * Marker Interface for all DCAE Analytics Model implementations - * </p> - * @author Rajiv Singla. Creation Date: 11/5/2016. - */ -public interface DCAEAnalyticsModel extends Serializable { -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/DynamicPropertiesProvider.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/DynamicPropertiesProvider.java deleted file mode 100644 index 55eef6b..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/DynamicPropertiesProvider.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.domain; - -import java.util.Map; - -/** - * <p> - * Problem: Many Entities have dynamic properties as well as known properties. - * Known properites can be binded explicitly with all dynamic properties need - * to be captured also ensuring that there must not be any loss in information - * during deserialization / serialization process. - * </p> - * <p> - * This contract allows the deserialization mechanism to catch those dynamic properties - * in a Map so that deserialization mechanism will not loose any information and - * can be serialized back with no loss in dynamic properties information - * </p> - * @author Rajiv Singla. Creation Date: 10/18/2016. - */ -public interface DynamicPropertiesProvider extends DCAEAnalyticsModel { - - - void addDynamicProperties(String propertyName, Object propertyValue); - - Map<String, Object> getDynamicProperties(); -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/AlertAction.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/AlertAction.java deleted file mode 100644 index a0e68f3..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/AlertAction.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.domain.cef; - -/** - * Common Event Format Alert Action - * - * @author Rajiv Singla. Creation Date: 11/3/2016. - */ -public enum AlertAction implements CEFModel { - - CLEAR, CONT, SET; - -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/AlertType.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/AlertType.java deleted file mode 100644 index 2dcce07..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/AlertType.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.domain.cef; - -/** - * - * @author Rajiv Singla. Creation Date: 11/3/2016. - */ -public enum AlertType implements CEFModel { - - CARD_ANOMALY("CARD-ANOMALY"), - ELEMENT_ANOMALY("ELEMENT-ANOMALY"), - INTERFACE_ANOMALY("INTERFACE-ANOMALY"), - SERVICE_ANOMALY("SERVICE-ANOMALY"), - UNKNOWN(null); - - private String name; - - AlertType(String name) { - this.name = name; - } - - public String getName() { - return name; - } - -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/BaseCEFModel.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/BaseCEFModel.java deleted file mode 100644 index dbf4e83..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/BaseCEFModel.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.domain.cef; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.openecomp.dcae.analytics.model.domain.BaseDynamicPropertiesProvider; - -/** - * <p> - * Base CEF Model should be extended by all CEF Model Entities. - * By extending CEF Model all the additional dynamic Properties - * can be accumalated in a map. - * </p> - * - * @author Rajiv Singla. Creation Date: 10/18/2016. - */ -@Data -@EqualsAndHashCode(callSuper = true) -public abstract class BaseCEFModel extends BaseDynamicPropertiesProvider implements CEFModel { - - -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/CEFModel.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/CEFModel.java deleted file mode 100644 index b7f1328..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/CEFModel.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.domain.cef; - -import org.openecomp.dcae.analytics.model.domain.DCAEAnalyticsModel; - -/** - * <p> - * Marker interface for all DCAE Analytics Common Event Format Model implementations - * </p> - * @author Rajiv Singla. Creation Date: 10/17/2016. - */ -public interface CEFModel extends DCAEAnalyticsModel { - - -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/Criticality.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/Criticality.java deleted file mode 100644 index 51b7bee..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/Criticality.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.domain.cef; - -/** - * Performance Criticality - * - * @author Rajiv Singla. Creation Date: 11/3/2016. - */ -public enum Criticality implements CEFModel { - - CRIT, MAJ; -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/EventListener.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/EventListener.java deleted file mode 100644 index ec9e64b..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/EventListener.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.domain.cef; - -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * Common Event Format - Base Event Listener - * <p> - * @author Rajiv Singla. Creation Date: 10/17/2016. - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class EventListener extends BaseCEFModel { - - - private static final long serialVersionUID = -2173233681841558721L; - /** - * Common Event Format - Event - * - * @param event New value for Event - * @return Common Event Format Event - */ - private Event event; - - -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/EventSeverity.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/EventSeverity.java deleted file mode 100644 index 178c49f..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/EventSeverity.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.domain.cef; - -/** - * CEF Event severity or priority - * - * @author Rajiv Singla. Creation Date: 11/3/2016. - */ -public enum EventSeverity implements CEFModel { - - //NOTE: enum order must not be changed. Events severity is ordered from high to low - CRITICAL, - MAJOR, - MINOR, - WARNING, - NORMAL; -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/MeasurementsForVfScalingFields.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/MeasurementsForVfScalingFields.java deleted file mode 100644 index d859f97..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/MeasurementsForVfScalingFields.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.domain.cef; - -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.List; - -/** - * Common Event Format - MeasurementsForVfScaling fields - * <p> - * @author Rajiv Singla. Creation Date: 10/17/2016. - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class MeasurementsForVfScalingFields extends BaseCEFModel { - - - private static final long serialVersionUID = 243977479034730554L; - - /** - * Interval over which measurements are being reported in seconds - * - * @param measurementInterval New value for measurement Interval - * @return Interval over which measurements are being reported in seconds - */ - private Long measurementInterval; - - /** - * Virtual Network Card Usage Array - * - * @param vNicUsageArray New value for Virtual Network Card Usage Array - * @return Virtual Network Card Usage Array - */ - private List<VNicUsageArray> vNicUsageArray; - - -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/Priority.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/Priority.java deleted file mode 100644 index d6d1a7b..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/Priority.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.domain.cef; - -/** - * Common Event Format - Event processing priority - * <p> - * @author Rajiv Singla. Creation Date: 10/17/2016. - */ -public enum Priority implements CEFModel { - - High, Medium, Normal, Low; - -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/PolicyModel.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/PolicyModel.java deleted file mode 100644 index 1825390..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/PolicyModel.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.domain.policy; - -import org.openecomp.dcae.analytics.model.domain.DCAEAnalyticsModel; - -/** - * <p> - * Marker Interface all DCAE Analytics Policy Model implementations - * </p> - * - * @author Rajiv Singla. Creation Date: 11/5/2016. - */ -public interface PolicyModel extends DCAEAnalyticsModel { -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/tca/BaseTCAPolicyModel.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/tca/BaseTCAPolicyModel.java deleted file mode 100644 index b2a9d21..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/tca/BaseTCAPolicyModel.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.domain.policy.tca; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.openecomp.dcae.analytics.model.domain.BaseDynamicPropertiesProvider; - -/** - * <p> - * A Base TCA Policy Model which accumulates all dynamic properties in a dynamicProperties Map - * </p> - * - * @author Rajiv Singla. Creation Date: 11/5/2016. - */ -@Data -@EqualsAndHashCode(callSuper = true) -public abstract class BaseTCAPolicyModel extends BaseDynamicPropertiesProvider implements TCAPolicyModel { -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/tca/Direction.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/tca/Direction.java deleted file mode 100644 index 8d3a8b0..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/tca/Direction.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.domain.policy.tca; - -import javax.annotation.Nonnull; - -/** - * <p> - * Enum for Threshold Direction - * </p> - * @author Rajiv Singla. Creation Date: 11/5/2016. - */ -public enum Direction implements TCAPolicyModel { - - LESS { - public Boolean operate(@Nonnull Long value1, @Nonnull Long value2) { - return value1 < value2; - } - }, - LESS_OR_EQUAL { - public Boolean operate(@Nonnull Long value1, @Nonnull Long value2) { - return value1 <= value2; - } - }, - GREATER { - public Boolean operate(@Nonnull Long value1, @Nonnull Long value2) { - return value1 > value2; - } - }, - GREATER_OR_EQUAL { - public Boolean operate(@Nonnull Long value1, @Nonnull Long value2) { - return value1 >= value2; - } - }; - - public abstract Boolean operate(@Nonnull Long value1, @Nonnull Long value2); - -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/tca/TCAPolicy.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/tca/TCAPolicy.java deleted file mode 100644 index 031ccb0..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/tca/TCAPolicy.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.domain.policy.tca; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.openecomp.dcae.analytics.model.domain.cef.CommonEventHeader; - -import java.util.List; - -/** - * <p> - * TCA (Threshold Crossing Alert) Root - * </p> - * - * @author Rajiv Singla. Creation Date: 11/5/2016. - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class TCAPolicy extends BaseTCAPolicyModel { - - private static final long serialVersionUID = 9186451218579196970L; - - /** - * TCA Policy domain which is associated with TCA incoming CEF message {@link CommonEventHeader#getDomain()} - * - * @param domain New value for domain - * @return Policy domain which is associated with incoming CEF message - */ - private String domain; - - /** - * Contains TCA Policy metrics that needs to be applied to each Functional Role - * - * @param metricsPerFunctionalRole New value for metrics that needs to be applied to each Functional Role - * @return Contains TCA Policy metrics that needs to be applied to each Functional Role - */ - private List<MetricsPerFunctionalRole> metricsPerFunctionalRole; - - -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/tca/TCAPolicyModel.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/tca/TCAPolicyModel.java deleted file mode 100644 index ceec46d..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/tca/TCAPolicyModel.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.domain.policy.tca; - -import org.openecomp.dcae.analytics.model.domain.policy.PolicyModel; - -/** - * <p> - * Marker interface for all TCA Policy Models - * </p> - * - * @author Rajiv Singla. Creation Date: 11/5/2016. - */ -public interface TCAPolicyModel extends PolicyModel { - - -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/facade/FacadeModel.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/facade/FacadeModel.java deleted file mode 100644 index abf6d36..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/facade/FacadeModel.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.facade; - -import java.io.Serializable; - -/** - * <p> - * Marker Interface for all Facade (outgoing) DCAE Analytics Model - * </p> - * - * @author Rajiv Singla. Creation Date: 11/9/2016. - */ -public interface FacadeModel extends Serializable { -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/facade/tca/AAI.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/facade/tca/AAI.java deleted file mode 100644 index fa08f07..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/facade/tca/AAI.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.facade.tca; - -import lombok.Data; - -/** - * - * @author Rajiv Singla. Creation Date: 11/9/2016. - */ -@Data -public class AAI implements TCAFacadeModel { - - private static final long serialVersionUID = 1255011931120081985L; - - private String genericVNFId; - - private String genericServerId; - -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/facade/tca/TCAFacadeModel.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/facade/tca/TCAFacadeModel.java deleted file mode 100644 index 78c4ae7..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/facade/tca/TCAFacadeModel.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.facade.tca; - -import org.openecomp.dcae.analytics.model.facade.FacadeModel; - -/** - * Marker Interface for all TCA Facade Models - * - * @author Rajiv Singla. Creation Date: 11/9/2016. - */ -public interface TCAFacadeModel extends FacadeModel { -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/facade/tca/TCAVESResponse.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/facade/tca/TCAVESResponse.java deleted file mode 100644 index f5a5b4e..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/facade/tca/TCAVESResponse.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.facade.tca; - -import lombok.Data; - -/** - * Response generated by TCA for VES Message - * - * @author Rajiv Singla. Creation Date: 11/9/2016. - */ -@Data -public class TCAVESResponse implements TCAFacadeModel { - - private static final long serialVersionUID = 8505119543756702710L; - - private String closedLoopControlName; - private String version; - private String requestID; - private Long closedLoopAlarmStart; - private String closedLoopEventClient; - private String targetType; - private AAI aai; - private String target; - private String from; - private String policyScope; - private String policyName; - private String policyVersion; - private String closedLoopEventStatus; - -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/CommonEventFormatModule.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/CommonEventFormatModule.java deleted file mode 100644 index 190289d..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/CommonEventFormatModule.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.util.json; - -import com.fasterxml.jackson.core.Version; -import com.fasterxml.jackson.databind.module.SimpleModule; -import org.openecomp.dcae.analytics.model.domain.cef.AlertAction; -import org.openecomp.dcae.analytics.model.domain.cef.AlertType; -import org.openecomp.dcae.analytics.model.domain.cef.BaseCEFModel; -import org.openecomp.dcae.analytics.model.domain.cef.CommonEventHeader; -import org.openecomp.dcae.analytics.model.domain.cef.Criticality; -import org.openecomp.dcae.analytics.model.domain.cef.Event; -import org.openecomp.dcae.analytics.model.domain.cef.EventListener; -import org.openecomp.dcae.analytics.model.domain.cef.EventSeverity; -import org.openecomp.dcae.analytics.model.domain.cef.MeasurementsForVfScalingFields; -import org.openecomp.dcae.analytics.model.domain.cef.PerformanceCounter; -import org.openecomp.dcae.analytics.model.domain.cef.Priority; -import org.openecomp.dcae.analytics.model.domain.cef.ThresholdCrossingAlertFields; -import org.openecomp.dcae.analytics.model.domain.cef.VNicUsageArray; -import org.openecomp.dcae.analytics.model.util.json.mixin.cef.AlertActionMixin; -import org.openecomp.dcae.analytics.model.util.json.mixin.cef.AlertTypeMixin; -import org.openecomp.dcae.analytics.model.util.json.mixin.cef.BaseCEFModelMixin; -import org.openecomp.dcae.analytics.model.util.json.mixin.cef.CommonEventHeaderMixin; -import org.openecomp.dcae.analytics.model.util.json.mixin.cef.CriticalityMixin; -import org.openecomp.dcae.analytics.model.util.json.mixin.cef.EventListenerMixin; -import org.openecomp.dcae.analytics.model.util.json.mixin.cef.EventMixin; -import org.openecomp.dcae.analytics.model.util.json.mixin.cef.EventSeverityMixin; -import org.openecomp.dcae.analytics.model.util.json.mixin.cef.MeasurementsForVfScalingFieldsMixin; -import org.openecomp.dcae.analytics.model.util.json.mixin.cef.PerformanceCounterMixin; -import org.openecomp.dcae.analytics.model.util.json.mixin.cef.PriorityMixin; -import org.openecomp.dcae.analytics.model.util.json.mixin.cef.ThresholdCrossingAlertFieldsMixin; -import org.openecomp.dcae.analytics.model.util.json.mixin.cef.VNicUsageArrayMixin; - -/** - * @author Rajiv Singla. Creation Date: 10/18/2016. - */ -public class CommonEventFormatModule extends SimpleModule { - - private static final long serialVersionUID = -6347258586478923257L; - - public CommonEventFormatModule() { - super("Common Event Format", - new Version(25, 0, 0, null, "org.openecomp.dcae.analytics.model", "dcae-analytics-model")); - } - - @Override - public void setupModule(final SetupContext setupContext) { - - setupContext.setMixInAnnotations(AlertAction.class, AlertActionMixin.class); - setupContext.setMixInAnnotations(AlertType.class, AlertTypeMixin.class); - setupContext.setMixInAnnotations(BaseCEFModel.class, BaseCEFModelMixin.class); - setupContext.setMixInAnnotations(CommonEventHeader.class, CommonEventHeaderMixin.class); - setupContext.setMixInAnnotations(Criticality.class, CriticalityMixin.class); - setupContext.setMixInAnnotations(EventListener.class, EventListenerMixin.class); - setupContext.setMixInAnnotations(Event.class, EventMixin.class); - setupContext.setMixInAnnotations(EventSeverity.class, EventSeverityMixin.class); - setupContext.setMixInAnnotations(MeasurementsForVfScalingFields.class, - MeasurementsForVfScalingFieldsMixin.class); - setupContext.setMixInAnnotations(PerformanceCounter.class, PerformanceCounterMixin.class); - setupContext.setMixInAnnotations(Priority.class, PriorityMixin.class); - setupContext.setMixInAnnotations(ThresholdCrossingAlertFields.class, ThresholdCrossingAlertFieldsMixin.class); - setupContext.setMixInAnnotations(VNicUsageArray.class, VNicUsageArrayMixin.class); - - } - -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/TCAFacadeModelModule.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/TCAFacadeModelModule.java deleted file mode 100644 index 09385f9..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/TCAFacadeModelModule.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.util.json; - -import com.fasterxml.jackson.core.Version; -import com.fasterxml.jackson.databind.module.SimpleModule; -import org.openecomp.dcae.analytics.model.facade.tca.AAI; -import org.openecomp.dcae.analytics.model.facade.tca.TCAVESResponse; -import org.openecomp.dcae.analytics.model.util.json.mixin.facade.tca.AAIMixin; -import org.openecomp.dcae.analytics.model.util.json.mixin.facade.tca.VESCEFMessageResponseMixin; - -/** - * - * @author Rajiv Singla. Creation Date: 11/9/2016. - */ -public class TCAFacadeModelModule extends SimpleModule { - - private static final long serialVersionUID = -5895573053812042524L; - - public TCAFacadeModelModule() { - super("Threshold Crossing Alert Facade", - new Version(1, 0, 0, null, "org.openecomp.dcae.analytics.model", "dcae-analytics-model")); - } - - @Override - public void setupModule(final SetupContext setupContext) { - setupContext.setMixInAnnotations(TCAVESResponse.class, VESCEFMessageResponseMixin.class); - setupContext.setMixInAnnotations(AAI.class, AAIMixin.class); - } - -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/TCAPolicyModule.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/TCAPolicyModule.java deleted file mode 100644 index 0f3bd7f..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/TCAPolicyModule.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.util.json; - -import com.fasterxml.jackson.core.Version; -import com.fasterxml.jackson.databind.module.SimpleModule; -import org.openecomp.dcae.analytics.model.domain.policy.tca.BaseTCAPolicyModel; -import org.openecomp.dcae.analytics.model.domain.policy.tca.Direction; -import org.openecomp.dcae.analytics.model.domain.policy.tca.MetricsPerFunctionalRole; -import org.openecomp.dcae.analytics.model.domain.policy.tca.TCAPolicy; -import org.openecomp.dcae.analytics.model.domain.policy.tca.Threshold; -import org.openecomp.dcae.analytics.model.util.json.mixin.policy.tca.BaseTCAPolicyModelMixin; -import org.openecomp.dcae.analytics.model.util.json.mixin.policy.tca.DirectionMixin; -import org.openecomp.dcae.analytics.model.util.json.mixin.policy.tca.MetricsPerFunctionalRoleMixin; -import org.openecomp.dcae.analytics.model.util.json.mixin.policy.tca.TCAPolicyMixin; -import org.openecomp.dcae.analytics.model.util.json.mixin.policy.tca.ThresholdMixin; - -/** - * - * @author Rajiv Singla. Creation Date: 11/5/2016. - */ -public class TCAPolicyModule extends SimpleModule { - - private static final long serialVersionUID = -5895573053812042524L; - - public TCAPolicyModule() { - super("Threshold Crossing Alert Policy", - new Version(1, 0, 0, null, "org.openecomp.dcae.analytics.model", "dcae-analytics-model")); - } - - @Override - public void setupModule(final SetupContext setupContext) { - - setupContext.setMixInAnnotations(BaseTCAPolicyModel.class, BaseTCAPolicyModelMixin.class); - setupContext.setMixInAnnotations(Direction.class, DirectionMixin.class); - setupContext.setMixInAnnotations(TCAPolicy.class, TCAPolicyMixin.class); - setupContext.setMixInAnnotations(MetricsPerFunctionalRole.class, MetricsPerFunctionalRoleMixin.class); - setupContext.setMixInAnnotations(Threshold.class, ThresholdMixin.class); - setupContext.setMixInAnnotations(TCAPolicy.class, TCAPolicyMixin.class); - - - } -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/BaseDynamicPropertiesProviderMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/BaseDynamicPropertiesProviderMixin.java deleted file mode 100644 index 1b4a5fe..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/BaseDynamicPropertiesProviderMixin.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.util.json.mixin; - -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import org.openecomp.dcae.analytics.model.domain.BaseDynamicPropertiesProvider; - -import java.util.Map; - -/** - * Json Mixin for {@link BaseDynamicPropertiesProvider} - * - * @author Rajiv Singla. Creation Date: 11/5/2016. - */ -public abstract class BaseDynamicPropertiesProviderMixin implements JsonMixin { - - @JsonAnySetter - public abstract void addDynamicProperties(String propertyName, Object propertyValue); - - @JsonAnyGetter - public abstract Map<String, Object> getDynamicProperties(); - - @JsonIgnore - public abstract boolean isDynamicPropertiesPresent(); -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/JsonMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/JsonMixin.java deleted file mode 100644 index fab85ba..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/JsonMixin.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.util.json.mixin; - -import java.io.Serializable; - -/** - * Marker Interface for all Json Mixin classes - * - * @author Rajiv Singla. Creation Date: 11/3/2016. - */ -public interface JsonMixin extends Serializable { -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/AlertActionMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/AlertActionMixin.java deleted file mode 100644 index a94d1f5..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/AlertActionMixin.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.util.json.mixin.cef; - -import org.openecomp.dcae.analytics.model.util.json.mixin.JsonMixin; - -/** - * - * @author Rajiv Singla. Creation Date: 11/5/2016. - */ -public abstract class AlertActionMixin implements JsonMixin { -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/AlertTypeMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/AlertTypeMixin.java deleted file mode 100644 index e7f83a6..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/AlertTypeMixin.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.util.json.mixin.cef; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; -import org.openecomp.dcae.analytics.model.domain.cef.AlertType; -import org.openecomp.dcae.analytics.model.util.json.mixin.JsonMixin; - -/** - * Mixin for Alert Type - * - * @author Rajiv Singla. Creation Date: 11/3/2016. - */ -public abstract class AlertTypeMixin implements JsonMixin { - - private String name; - - @JsonCreator - public static AlertType forValue(String name) { - - switch (name) { - case "CARD-ANOMALY": - return AlertType.CARD_ANOMALY; - case "ELEMENT-ANOMALY": - return AlertType.ELEMENT_ANOMALY; - case "INTERFACE-ANOMALY": - return AlertType.INTERFACE_ANOMALY; - case "SERVICE-ANOMALY": - return AlertType.SERVICE_ANOMALY; - default: - return AlertType.UNKNOWN; - } - - } - - @JsonValue - public String getName() { - return name; - } - - -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/BaseCEFModelMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/BaseCEFModelMixin.java deleted file mode 100644 index 77f4e8e..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/BaseCEFModelMixin.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.util.json.mixin.cef; - -import org.openecomp.dcae.analytics.model.util.json.mixin.BaseDynamicPropertiesProviderMixin; - -/** - * Abstract Mixin for all CEF Model Mixins - * - * @author Rajiv Singla. Creation Date: 10/18/2016. - */ -public abstract class BaseCEFModelMixin extends BaseDynamicPropertiesProviderMixin { - - -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/CommonEventHeaderMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/CommonEventHeaderMixin.java deleted file mode 100644 index 8bee579..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/CommonEventHeaderMixin.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.util.json.mixin.cef; - -/** - * @author Rajiv Singla. Creation Date: 10/18/2016. - */ -public abstract class CommonEventHeaderMixin extends BaseCEFModelMixin { -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/CriticalityMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/CriticalityMixin.java deleted file mode 100644 index 5a7e983..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/CriticalityMixin.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.util.json.mixin.cef; - -import org.openecomp.dcae.analytics.model.util.json.mixin.JsonMixin; - -/** - * - * @author Rajiv Singla. Creation Date: 11/5/2016. - */ -public abstract class CriticalityMixin implements JsonMixin { -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/EventListenerMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/EventListenerMixin.java deleted file mode 100644 index 9222909..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/EventListenerMixin.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.util.json.mixin.cef; - -/** - * Event Listener Json Mixin class - * <p> - * @author Rajiv Singla. Creation Date: 10/18/2016. - */ -public abstract class EventListenerMixin extends BaseCEFModelMixin { - - -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/EventMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/EventMixin.java deleted file mode 100644 index fa1090c..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/EventMixin.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.util.json.mixin.cef; - -/** - * Event Json Mixin class - * <p> - * @author Rajiv Singla. Creation Date: 10/18/2016. - */ -public abstract class EventMixin extends BaseCEFModelMixin { - - -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/EventSeverityMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/EventSeverityMixin.java deleted file mode 100644 index 6cc7616..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/EventSeverityMixin.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.util.json.mixin.cef; - -import org.openecomp.dcae.analytics.model.util.json.mixin.JsonMixin; - -/** - * - * @author Rajiv Singla. Creation Date: 11/5/2016. - */ -public abstract class EventSeverityMixin implements JsonMixin { -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/MeasurementsForVfScalingFieldsMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/MeasurementsForVfScalingFieldsMixin.java deleted file mode 100644 index f54c844..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/MeasurementsForVfScalingFieldsMixin.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.util.json.mixin.cef; - -import com.fasterxml.jackson.annotation.JsonGetter; -import com.fasterxml.jackson.annotation.JsonSetter; -import org.openecomp.dcae.analytics.model.domain.cef.VNicUsageArray; - -import java.util.List; - -/** - * @author Rajiv Singla. Creation Date: 10/18/2016. - */ -public abstract class MeasurementsForVfScalingFieldsMixin extends BaseCEFModelMixin { - - @JsonSetter("vNicUsageArray") - public abstract void setVNicUsageArray(List<VNicUsageArray> vNicUsageArrays); - - @JsonGetter("vNicUsageArray") - public abstract List<VNicUsageArray> getVNicUsageArray(); -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/PerformanceCounterMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/PerformanceCounterMixin.java deleted file mode 100644 index 808c6fd..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/PerformanceCounterMixin.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.util.json.mixin.cef; - -/** - * CEF Performance Counter Mixin - * - * @author Rajiv Singla. Creation Date: 11/3/2016. - */ -public abstract class PerformanceCounterMixin extends BaseCEFModelMixin { -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/PriorityMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/PriorityMixin.java deleted file mode 100644 index 94460d0..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/PriorityMixin.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.util.json.mixin.cef; - -import org.openecomp.dcae.analytics.model.util.json.mixin.JsonMixin; - -/** - * - * @author Rajiv Singla. Creation Date: 11/5/2016. - */ -public abstract class PriorityMixin implements JsonMixin { -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/ThresholdCrossingAlertFieldsMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/ThresholdCrossingAlertFieldsMixin.java deleted file mode 100644 index f81e3cb..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/ThresholdCrossingAlertFieldsMixin.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.util.json.mixin.cef; - -/** - * Mixin class for ThresholdCrossingAlertFields - * - * @author Rajiv Singla. Creation Date: 11/3/2016. - */ -public abstract class ThresholdCrossingAlertFieldsMixin extends BaseCEFModelMixin { -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/VNicUsageArrayMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/VNicUsageArrayMixin.java deleted file mode 100644 index 6e06f09..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/VNicUsageArrayMixin.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.util.json.mixin.cef; - -import com.fasterxml.jackson.annotation.JsonSetter; - -/** - * @author Rajiv Singla. Creation Date: 10/18/2016. - */ -public abstract class VNicUsageArrayMixin extends BaseCEFModelMixin { - - @JsonSetter("vNicIdentifier") - public abstract void setVNicIdentifier(String name); - - @JsonSetter("vNicIdentifier") - public abstract String setVNicIdentifier(); - -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/facade/tca/AAIMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/facade/tca/AAIMixin.java deleted file mode 100644 index a2d583b..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/facade/tca/AAIMixin.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.util.json.mixin.facade.tca; - -import com.fasterxml.jackson.annotation.JsonGetter; -import com.fasterxml.jackson.annotation.JsonSetter; -import org.openecomp.dcae.analytics.model.util.json.mixin.JsonMixin; - -/** - * - * @author Rajiv Singla. Creation Date: 11/9/2016. - */ -public abstract class AAIMixin implements JsonMixin { - - private String genericVNFId; - private String genericServerId; - - @JsonGetter("generic-vnf.vnf-id") - public String getGenericVNFId() { - return genericVNFId; - } - - @JsonSetter("generic-vnf.vnf-id") - public void setGenericVNFId(String genericVNFId) { - this.genericVNFId = genericVNFId; - } - - @JsonGetter("vserver.vserver-name") - public String getGenericServerId() { - return genericServerId; - } - @JsonSetter("vserver.vserver-name") - public void setGenericServerId(String genericServerId) { - this.genericServerId = genericServerId; - } -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/facade/tca/VESCEFMessageResponseMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/facade/tca/VESCEFMessageResponseMixin.java deleted file mode 100644 index 4852aad..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/facade/tca/VESCEFMessageResponseMixin.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.util.json.mixin.facade.tca; - -import com.fasterxml.jackson.annotation.JsonGetter; -import com.fasterxml.jackson.annotation.JsonSetter; -import org.openecomp.dcae.analytics.model.facade.tca.AAI; -import org.openecomp.dcae.analytics.model.util.json.mixin.JsonMixin; - -/** - * - * @author Rajiv Singla. Creation Date: 11/9/2016. - */ -public abstract class VESCEFMessageResponseMixin implements JsonMixin { - - private String targetType; - private AAI aai; - - @JsonGetter("target_type") - public String getTargetType() { - return targetType; - } - - @JsonSetter("target_type") - public void setTargetType(String targetType) { - this.targetType = targetType; - } - - @JsonGetter("AAI") - public AAI getAai() { - return aai; - } - - @JsonSetter("AAI") - public void setAai(AAI aai) { - this.aai = aai; - } -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/BaseTCAPolicyModelMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/BaseTCAPolicyModelMixin.java deleted file mode 100644 index af12f62..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/BaseTCAPolicyModelMixin.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.util.json.mixin.policy.tca; - -import org.openecomp.dcae.analytics.model.util.json.mixin.BaseDynamicPropertiesProviderMixin; - -/** - * - * @author Rajiv Singla. Creation Date: 11/5/2016. - */ -public abstract class BaseTCAPolicyModelMixin extends BaseDynamicPropertiesProviderMixin { -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/DirectionMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/DirectionMixin.java deleted file mode 100644 index 1c364c7..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/DirectionMixin.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.util.json.mixin.policy.tca; - -import org.openecomp.dcae.analytics.model.util.json.mixin.JsonMixin; - -/** - * - * @author Rajiv Singla. Creation Date: 11/5/2016. - */ -public abstract class DirectionMixin implements JsonMixin { -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/MetricsPerFunctionalRoleMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/MetricsPerFunctionalRoleMixin.java deleted file mode 100644 index fc8246b..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/MetricsPerFunctionalRoleMixin.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.util.json.mixin.policy.tca; - -/** - * - * @author Rajiv Singla. Creation Date: 11/5/2016. - */ -public abstract class MetricsPerFunctionalRoleMixin extends BaseTCAPolicyModelMixin { -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/TCAPolicyMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/TCAPolicyMixin.java deleted file mode 100644 index f27375a..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/TCAPolicyMixin.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.util.json.mixin.policy.tca; - -/** - * - * @author Rajiv Singla. Creation Date: 11/5/2016. - */ -public abstract class TCAPolicyMixin extends BaseTCAPolicyModelMixin { -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/ThresholdMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/ThresholdMixin.java deleted file mode 100644 index 046f336..0000000 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/ThresholdMixin.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.openecomp.dcae.analytics.model.util.json.mixin.policy.tca; - -/** - * - * @author Rajiv Singla. Creation Date: 11/5/2016. - */ -public abstract class ThresholdMixin extends BaseTCAPolicyModelMixin { -} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/BaseDynamicPropertiesProvider.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/BaseDynamicPropertiesProvider.java index 59c2a46..49ec872 100644 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/BaseDynamicPropertiesProvider.java +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/BaseDynamicPropertiesProvider.java @@ -1,20 +1,24 @@ /* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.model.domain; +package org.openecomp.dcae.apod.analytics.model.domain; import lombok.Data; diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/DCAEAnalyticsModel.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/DCAEAnalyticsModel.java new file mode 100644 index 0000000..f7486f5 --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/DCAEAnalyticsModel.java @@ -0,0 +1,32 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.domain; + +import java.io.Serializable; + +/** + * <p> + * Marker Interface for all DCAE Analytics Model implementations + * </p> + * @author Rajiv Singla. Creation Date: 11/5/2016. + */ +public interface DCAEAnalyticsModel extends Serializable { +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/DynamicPropertiesProvider.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/DynamicPropertiesProvider.java new file mode 100644 index 0000000..96842c5 --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/DynamicPropertiesProvider.java @@ -0,0 +1,45 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.domain; + +import java.util.Map; + +/** + * <p> + * Problem: Many Entities have dynamic properties as well as known properties. + * Known properites can be binded explicitly with all dynamic properties need + * to be captured also ensuring that there must not be any loss in information + * during deserialization / serialization process. + * </p> + * <p> + * This contract allows the deserialization mechanism to catch those dynamic properties + * in a Map so that deserialization mechanism will not loose any information and + * can be serialized back with no loss in dynamic properties information + * </p> + * @author Rajiv Singla. Creation Date: 10/18/2016. + */ +public interface DynamicPropertiesProvider extends DCAEAnalyticsModel { + + + void addDynamicProperties(String propertyName, Object propertyValue); + + Map<String, Object> getDynamicProperties(); +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/AlertAction.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/AlertAction.java new file mode 100644 index 0000000..1b4d49a --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/AlertAction.java @@ -0,0 +1,32 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.domain.cef; + +/** + * Common Event Format Alert Action + * + * @author Rajiv Singla. Creation Date: 11/3/2016. + */ +public enum AlertAction implements CEFModel { + + CLEAR, CONT, SET; + +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/AlertType.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/AlertType.java new file mode 100644 index 0000000..e50c393 --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/AlertType.java @@ -0,0 +1,45 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.domain.cef; + +/** + * + * @author Rajiv Singla. Creation Date: 11/3/2016. + */ +public enum AlertType implements CEFModel { + + CARD_ANOMALY("CARD-ANOMALY"), + ELEMENT_ANOMALY("ELEMENT-ANOMALY"), + INTERFACE_ANOMALY("INTERFACE-ANOMALY"), + SERVICE_ANOMALY("SERVICE-ANOMALY"), + UNKNOWN(null); + + private String name; + + AlertType(String name) { + this.name = name; + } + + public String getName() { + return name; + } + +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/BaseCEFModel.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/BaseCEFModel.java new file mode 100644 index 0000000..fd194bf --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/BaseCEFModel.java @@ -0,0 +1,41 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.domain.cef; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.openecomp.dcae.apod.analytics.model.domain.BaseDynamicPropertiesProvider; + +/** + * <p> + * Base CEF Model should be extended by all CEF Model Entities. + * By extending CEF Model all the additional dynamic Properties + * can be accumalated in a map. + * </p> + * + * @author Rajiv Singla. Creation Date: 10/18/2016. + */ +@Data +@EqualsAndHashCode(callSuper = true) +public abstract class BaseCEFModel extends BaseDynamicPropertiesProvider implements CEFModel { + + +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/CEFModel.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/CEFModel.java new file mode 100644 index 0000000..1f413b5 --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/CEFModel.java @@ -0,0 +1,34 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.domain.cef; + +import org.openecomp.dcae.apod.analytics.model.domain.DCAEAnalyticsModel; + +/** + * <p> + * Marker interface for all DCAE Analytics Common Event Format Model implementations + * </p> + * @author Rajiv Singla. Creation Date: 10/17/2016. + */ +public interface CEFModel extends DCAEAnalyticsModel { + + +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/CommonEventHeader.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/CommonEventHeader.java index 427e947..bdc9709 100644 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/CommonEventHeader.java +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/CommonEventHeader.java @@ -1,20 +1,24 @@ /* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.model.domain.cef; +package org.openecomp.dcae.apod.analytics.model.domain.cef; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/Criticality.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/Criticality.java new file mode 100644 index 0000000..a3dfad0 --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/Criticality.java @@ -0,0 +1,31 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.domain.cef; + +/** + * Performance Criticality + * + * @author Rajiv Singla. Creation Date: 11/3/2016. + */ +public enum Criticality implements CEFModel { + + CRIT, MAJ; +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/Event.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/Event.java index 9c5ff2e..afd6210 100644 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/Event.java +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/Event.java @@ -1,20 +1,24 @@ /* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.model.domain.cef; +package org.openecomp.dcae.apod.analytics.model.domain.cef; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/EventListener.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/EventListener.java new file mode 100644 index 0000000..1f68294 --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/EventListener.java @@ -0,0 +1,46 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.domain.cef; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * Common Event Format - Base Event Listener + * <p> + * @author Rajiv Singla. Creation Date: 10/17/2016. + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class EventListener extends BaseCEFModel { + + + private static final long serialVersionUID = -2173233681841558721L; + /** + * Common Event Format - Event + * + * @param event New value for Event + * @return Common Event Format Event + */ + private Event event; + + +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/EventSeverity.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/EventSeverity.java new file mode 100644 index 0000000..8b8f1a1 --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/EventSeverity.java @@ -0,0 +1,36 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.domain.cef; + +/** + * CEF Event severity or priority + * + * @author Rajiv Singla. Creation Date: 11/3/2016. + */ +public enum EventSeverity implements CEFModel { + + //NOTE: enum order must not be changed. Events severity is ordered from high to low + CRITICAL, + MAJOR, + MINOR, + WARNING, + NORMAL; +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/MeasurementsForVfScalingFields.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/MeasurementsForVfScalingFields.java new file mode 100644 index 0000000..5cfd710 --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/MeasurementsForVfScalingFields.java @@ -0,0 +1,57 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.domain.cef; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.List; + +/** + * Common Event Format - MeasurementsForVfScaling fields + * <p> + * @author Rajiv Singla. Creation Date: 10/17/2016. + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class MeasurementsForVfScalingFields extends BaseCEFModel { + + + private static final long serialVersionUID = 243977479034730554L; + + /** + * Interval over which measurements are being reported in seconds + * + * @param measurementInterval New value for measurement Interval + * @return Interval over which measurements are being reported in seconds + */ + private Long measurementInterval; + + /** + * Virtual Network Card Usage Array + * + * @param vNicUsageArray New value for Virtual Network Card Usage Array + * @return Virtual Network Card Usage Array + */ + private List<VNicUsageArray> vNicUsageArray; + + +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/PerformanceCounter.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/PerformanceCounter.java index 1c8367a..38001e6 100644 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/PerformanceCounter.java +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/PerformanceCounter.java @@ -1,20 +1,24 @@ /* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.model.domain.cef; +package org.openecomp.dcae.apod.analytics.model.domain.cef; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/Priority.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/Priority.java new file mode 100644 index 0000000..e8cc507 --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/Priority.java @@ -0,0 +1,32 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.domain.cef; + +/** + * Common Event Format - Event processing priority + * <p> + * @author Rajiv Singla. Creation Date: 10/17/2016. + */ +public enum Priority implements CEFModel { + + High, Medium, Normal, Low; + +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/ThresholdCrossingAlertFields.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/ThresholdCrossingAlertFields.java index 575d5c6..232890c 100644 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/ThresholdCrossingAlertFields.java +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/ThresholdCrossingAlertFields.java @@ -1,20 +1,24 @@ /* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.model.domain.cef; +package org.openecomp.dcae.apod.analytics.model.domain.cef; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/VNicUsageArray.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/VNicUsageArray.java index c4630ba..d1cdccb 100644 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/cef/VNicUsageArray.java +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/cef/VNicUsageArray.java @@ -1,20 +1,24 @@ /* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.model.domain.cef; +package org.openecomp.dcae.apod.analytics.model.domain.cef; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/PolicyModel.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/PolicyModel.java new file mode 100644 index 0000000..fe438cc --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/PolicyModel.java @@ -0,0 +1,33 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.domain.policy; + +import org.openecomp.dcae.apod.analytics.model.domain.DCAEAnalyticsModel; + +/** + * <p> + * Marker Interface all DCAE Analytics Policy Model implementations + * </p> + * + * @author Rajiv Singla. Creation Date: 11/5/2016. + */ +public interface PolicyModel extends DCAEAnalyticsModel { +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/BaseTCAPolicyModel.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/BaseTCAPolicyModel.java new file mode 100644 index 0000000..a706bc9 --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/BaseTCAPolicyModel.java @@ -0,0 +1,37 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.domain.policy.tca; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.openecomp.dcae.apod.analytics.model.domain.BaseDynamicPropertiesProvider; + +/** + * <p> + * A Base TCA Policy Model which accumulates all dynamic properties in a dynamicProperties Map + * </p> + * + * @author Rajiv Singla. Creation Date: 11/5/2016. + */ +@Data +@EqualsAndHashCode(callSuper = true) +public abstract class BaseTCAPolicyModel extends BaseDynamicPropertiesProvider implements TCAPolicyModel { +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/Direction.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/Direction.java new file mode 100644 index 0000000..b2e72dc --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/Direction.java @@ -0,0 +1,56 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.domain.policy.tca; + +import javax.annotation.Nonnull; + +/** + * <p> + * Enum for Threshold Direction + * </p> + * @author Rajiv Singla. Creation Date: 11/5/2016. + */ +public enum Direction implements TCAPolicyModel { + + LESS { + public Boolean operate(@Nonnull Long value1, @Nonnull Long value2) { + return value1 < value2; + } + }, + LESS_OR_EQUAL { + public Boolean operate(@Nonnull Long value1, @Nonnull Long value2) { + return value1 <= value2; + } + }, + GREATER { + public Boolean operate(@Nonnull Long value1, @Nonnull Long value2) { + return value1 > value2; + } + }, + GREATER_OR_EQUAL { + public Boolean operate(@Nonnull Long value1, @Nonnull Long value2) { + return value1 >= value2; + } + }; + + public abstract Boolean operate(@Nonnull Long value1, @Nonnull Long value2); + +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/tca/MetricsPerFunctionalRole.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/MetricsPerFunctionalRole.java index 4d35ed4..ca8249c 100644 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/tca/MetricsPerFunctionalRole.java +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/MetricsPerFunctionalRole.java @@ -1,20 +1,24 @@ /* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.model.domain.policy.tca; +package org.openecomp.dcae.apod.analytics.model.domain.policy.tca; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/TCAPolicy.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/TCAPolicy.java new file mode 100644 index 0000000..5f04b78 --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/TCAPolicy.java @@ -0,0 +1,59 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.domain.policy.tca; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.openecomp.dcae.apod.analytics.model.domain.cef.CommonEventHeader; + +import java.util.List; + +/** + * <p> + * TCA (Threshold Crossing Alert) Root + * </p> + * + * @author Rajiv Singla. Creation Date: 11/5/2016. + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class TCAPolicy extends BaseTCAPolicyModel { + + private static final long serialVersionUID = 9186451218579196970L; + + /** + * TCA Policy domain which is associated with TCA incoming CEF message {@link CommonEventHeader#getDomain()} + * + * @param domain New value for domain + * @return Policy domain which is associated with incoming CEF message + */ + private String domain; + + /** + * Contains TCA Policy metrics that needs to be applied to each Functional Role + * + * @param metricsPerFunctionalRole New value for metrics that needs to be applied to each Functional Role + * @return Contains TCA Policy metrics that needs to be applied to each Functional Role + */ + private List<MetricsPerFunctionalRole> metricsPerFunctionalRole; + + +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/TCAPolicyModel.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/TCAPolicyModel.java new file mode 100644 index 0000000..fa5cc83 --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/TCAPolicyModel.java @@ -0,0 +1,35 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.domain.policy.tca; + +import org.openecomp.dcae.apod.analytics.model.domain.policy.PolicyModel; + +/** + * <p> + * Marker interface for all TCA Policy Models + * </p> + * + * @author Rajiv Singla. Creation Date: 11/5/2016. + */ +public interface TCAPolicyModel extends PolicyModel { + + +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/tca/Threshold.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/Threshold.java index 0905730..97ee566 100644 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/domain/policy/tca/Threshold.java +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/domain/policy/tca/Threshold.java @@ -1,24 +1,28 @@ /* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.model.domain.policy.tca; +package org.openecomp.dcae.apod.analytics.model.domain.policy.tca; import lombok.Data; import lombok.EqualsAndHashCode; -import org.openecomp.dcae.analytics.model.domain.cef.EventSeverity; +import org.openecomp.dcae.apod.analytics.model.domain.cef.EventSeverity; /** * diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/FacadeModel.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/FacadeModel.java new file mode 100644 index 0000000..dd3c311 --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/FacadeModel.java @@ -0,0 +1,33 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.facade; + +import java.io.Serializable; + +/** + * <p> + * Marker Interface for all Facade (outgoing) DCAE Analytics Model + * </p> + * + * @author Rajiv Singla. Creation Date: 11/9/2016. + */ +public interface FacadeModel extends Serializable { +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/tca/AAI.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/tca/AAI.java new file mode 100644 index 0000000..8fb0f70 --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/tca/AAI.java @@ -0,0 +1,38 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.facade.tca; + +import lombok.Data; + +/** + * + * @author Rajiv Singla. Creation Date: 11/9/2016. + */ +@Data +public class AAI implements TCAFacadeModel { + + private static final long serialVersionUID = 1255011931120081985L; + + private String genericVNFId; + + private String genericServerId; + +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/tca/TCAFacadeModel.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/tca/TCAFacadeModel.java new file mode 100644 index 0000000..13ca650 --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/tca/TCAFacadeModel.java @@ -0,0 +1,31 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.facade.tca; + +import org.openecomp.dcae.apod.analytics.model.facade.FacadeModel; + +/** + * Marker Interface for all TCA Facade Models + * + * @author Rajiv Singla. Creation Date: 11/9/2016. + */ +public interface TCAFacadeModel extends FacadeModel { +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/tca/TCAVESResponse.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/tca/TCAVESResponse.java new file mode 100644 index 0000000..0b26e1c --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/tca/TCAVESResponse.java @@ -0,0 +1,49 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.facade.tca; + +import lombok.Data; + +/** + * Response generated by TCA for VES Message + * + * @author Rajiv Singla. Creation Date: 11/9/2016. + */ +@Data +public class TCAVESResponse implements TCAFacadeModel { + + private static final long serialVersionUID = 8505119543756702710L; + + private String closedLoopControlName; + private String version; + private String requestID; + private Long closedLoopAlarmStart; + private String closedLoopEventClient; + private String targetType; + private AAI aai; + private String target; + private String from; + private String policyScope; + private String policyName; + private String policyVersion; + private String closedLoopEventStatus; + +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/AnalyticsModelIOUtils.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/AnalyticsModelIOUtils.java index 0eddd20..9b97b26 100644 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/AnalyticsModelIOUtils.java +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/AnalyticsModelIOUtils.java @@ -1,20 +1,24 @@ /* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.model.util; +package org.openecomp.dcae.apod.analytics.model.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/AnalyticsModelJsonUtils.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/AnalyticsModelJsonUtils.java index 9e6b719..7bb0b55 100644 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/AnalyticsModelJsonUtils.java +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/AnalyticsModelJsonUtils.java @@ -1,26 +1,30 @@ /* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.model.util; +package org.openecomp.dcae.apod.analytics.model.util; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Suppliers; -import org.openecomp.dcae.analytics.model.util.json.AnalyticsModelObjectMapperSupplier; +import org.openecomp.dcae.apod.analytics.model.util.json.AnalyticsModelObjectMapperSupplier; import java.io.IOException; import java.io.InputStream; diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/AnalyticsModelObjectMapperSupplier.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/AnalyticsModelObjectMapperSupplier.java index 63857fc..b8dfae0 100644 --- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/analytics/model/util/json/AnalyticsModelObjectMapperSupplier.java +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/AnalyticsModelObjectMapperSupplier.java @@ -1,20 +1,24 @@ /* - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.model.util.json; +package org.openecomp.dcae.apod.analytics.model.util.json; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.DeserializationFeature; diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/CommonEventFormatModule.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/CommonEventFormatModule.java new file mode 100644 index 0000000..5f218cc --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/CommonEventFormatModule.java @@ -0,0 +1,84 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.util.json; + +import com.fasterxml.jackson.core.Version; +import com.fasterxml.jackson.databind.module.SimpleModule; +import org.openecomp.dcae.apod.analytics.model.domain.cef.AlertAction; +import org.openecomp.dcae.apod.analytics.model.domain.cef.AlertType; +import org.openecomp.dcae.apod.analytics.model.domain.cef.BaseCEFModel; +import org.openecomp.dcae.apod.analytics.model.domain.cef.CommonEventHeader; +import org.openecomp.dcae.apod.analytics.model.domain.cef.Criticality; +import org.openecomp.dcae.apod.analytics.model.domain.cef.Event; +import org.openecomp.dcae.apod.analytics.model.domain.cef.EventListener; +import org.openecomp.dcae.apod.analytics.model.domain.cef.EventSeverity; +import org.openecomp.dcae.apod.analytics.model.domain.cef.MeasurementsForVfScalingFields; +import org.openecomp.dcae.apod.analytics.model.domain.cef.PerformanceCounter; +import org.openecomp.dcae.apod.analytics.model.domain.cef.Priority; +import org.openecomp.dcae.apod.analytics.model.domain.cef.ThresholdCrossingAlertFields; +import org.openecomp.dcae.apod.analytics.model.domain.cef.VNicUsageArray; +import org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef.AlertActionMixin; +import org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef.AlertTypeMixin; +import org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef.BaseCEFModelMixin; +import org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef.CommonEventHeaderMixin; +import org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef.CriticalityMixin; +import org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef.EventListenerMixin; +import org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef.EventMixin; +import org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef.EventSeverityMixin; +import org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef.MeasurementsForVfScalingFieldsMixin; +import org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef.PerformanceCounterMixin; +import org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef.PriorityMixin; +import org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef.ThresholdCrossingAlertFieldsMixin; +import org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef.VNicUsageArrayMixin; + +/** + * @author Rajiv Singla. Creation Date: 10/18/2016. + */ +public class CommonEventFormatModule extends SimpleModule { + + private static final long serialVersionUID = -6347258586478923257L; + + public CommonEventFormatModule() { + super("Common Event Format", + new Version(25, 0, 0, null, "org.openecomp.dcae.analytics.model", "dcae-analytics-model")); + } + + @Override + public void setupModule(final SetupContext setupContext) { + + setupContext.setMixInAnnotations(AlertAction.class, AlertActionMixin.class); + setupContext.setMixInAnnotations(AlertType.class, AlertTypeMixin.class); + setupContext.setMixInAnnotations(BaseCEFModel.class, BaseCEFModelMixin.class); + setupContext.setMixInAnnotations(CommonEventHeader.class, CommonEventHeaderMixin.class); + setupContext.setMixInAnnotations(Criticality.class, CriticalityMixin.class); + setupContext.setMixInAnnotations(EventListener.class, EventListenerMixin.class); + setupContext.setMixInAnnotations(Event.class, EventMixin.class); + setupContext.setMixInAnnotations(EventSeverity.class, EventSeverityMixin.class); + setupContext.setMixInAnnotations(MeasurementsForVfScalingFields.class, + MeasurementsForVfScalingFieldsMixin.class); + setupContext.setMixInAnnotations(PerformanceCounter.class, PerformanceCounterMixin.class); + setupContext.setMixInAnnotations(Priority.class, PriorityMixin.class); + setupContext.setMixInAnnotations(ThresholdCrossingAlertFields.class, ThresholdCrossingAlertFieldsMixin.class); + setupContext.setMixInAnnotations(VNicUsageArray.class, VNicUsageArrayMixin.class); + + } + +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/TCAFacadeModelModule.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/TCAFacadeModelModule.java new file mode 100644 index 0000000..e17c617 --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/TCAFacadeModelModule.java @@ -0,0 +1,49 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.util.json; + +import com.fasterxml.jackson.core.Version; +import com.fasterxml.jackson.databind.module.SimpleModule; +import org.openecomp.dcae.apod.analytics.model.facade.tca.AAI; +import org.openecomp.dcae.apod.analytics.model.facade.tca.TCAVESResponse; +import org.openecomp.dcae.apod.analytics.model.util.json.mixin.facade.tca.AAIMixin; +import org.openecomp.dcae.apod.analytics.model.util.json.mixin.facade.tca.VESCEFMessageResponseMixin; + +/** + * + * @author Rajiv Singla. Creation Date: 11/9/2016. + */ +public class TCAFacadeModelModule extends SimpleModule { + + private static final long serialVersionUID = -5895573053812042524L; + + public TCAFacadeModelModule() { + super("Threshold Crossing Alert Facade", + new Version(1, 0, 0, null, "org.openecomp.dcae.analytics.model", "dcae-analytics-model")); + } + + @Override + public void setupModule(final SetupContext setupContext) { + setupContext.setMixInAnnotations(TCAVESResponse.class, VESCEFMessageResponseMixin.class); + setupContext.setMixInAnnotations(AAI.class, AAIMixin.class); + } + +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/TCAPolicyModule.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/TCAPolicyModule.java new file mode 100644 index 0000000..39cc005 --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/TCAPolicyModule.java @@ -0,0 +1,61 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.util.json; + +import com.fasterxml.jackson.core.Version; +import com.fasterxml.jackson.databind.module.SimpleModule; +import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.BaseTCAPolicyModel; +import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.Direction; +import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.MetricsPerFunctionalRole; +import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.TCAPolicy; +import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.Threshold; +import org.openecomp.dcae.apod.analytics.model.util.json.mixin.policy.tca.BaseTCAPolicyModelMixin; +import org.openecomp.dcae.apod.analytics.model.util.json.mixin.policy.tca.DirectionMixin; +import org.openecomp.dcae.apod.analytics.model.util.json.mixin.policy.tca.MetricsPerFunctionalRoleMixin; +import org.openecomp.dcae.apod.analytics.model.util.json.mixin.policy.tca.TCAPolicyMixin; +import org.openecomp.dcae.apod.analytics.model.util.json.mixin.policy.tca.ThresholdMixin; + +/** + * + * @author Rajiv Singla. Creation Date: 11/5/2016. + */ +public class TCAPolicyModule extends SimpleModule { + + private static final long serialVersionUID = -5895573053812042524L; + + public TCAPolicyModule() { + super("Threshold Crossing Alert Policy", + new Version(1, 0, 0, null, "org.openecomp.dcae.analytics.model", "dcae-analytics-model")); + } + + @Override + public void setupModule(final SetupContext setupContext) { + + setupContext.setMixInAnnotations(BaseTCAPolicyModel.class, BaseTCAPolicyModelMixin.class); + setupContext.setMixInAnnotations(Direction.class, DirectionMixin.class); + setupContext.setMixInAnnotations(TCAPolicy.class, TCAPolicyMixin.class); + setupContext.setMixInAnnotations(MetricsPerFunctionalRole.class, MetricsPerFunctionalRoleMixin.class); + setupContext.setMixInAnnotations(Threshold.class, ThresholdMixin.class); + setupContext.setMixInAnnotations(TCAPolicy.class, TCAPolicyMixin.class); + + + } +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/BaseDynamicPropertiesProviderMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/BaseDynamicPropertiesProviderMixin.java new file mode 100644 index 0000000..4d5ba40 --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/BaseDynamicPropertiesProviderMixin.java @@ -0,0 +1,45 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.util.json.mixin; + +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import org.openecomp.dcae.apod.analytics.model.domain.BaseDynamicPropertiesProvider; + +import java.util.Map; + +/** + * Json Mixin for {@link BaseDynamicPropertiesProvider} + * + * @author Rajiv Singla. Creation Date: 11/5/2016. + */ +public abstract class BaseDynamicPropertiesProviderMixin implements JsonMixin { + + @JsonAnySetter + public abstract void addDynamicProperties(String propertyName, Object propertyValue); + + @JsonAnyGetter + public abstract Map<String, Object> getDynamicProperties(); + + @JsonIgnore + public abstract boolean isDynamicPropertiesPresent(); +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/JsonMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/JsonMixin.java new file mode 100644 index 0000000..92e0b5a --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/JsonMixin.java @@ -0,0 +1,31 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.util.json.mixin; + +import java.io.Serializable; + +/** + * Marker Interface for all Json Mixin classes + * + * @author Rajiv Singla. Creation Date: 11/3/2016. + */ +public interface JsonMixin extends Serializable { +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/AlertActionMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/AlertActionMixin.java new file mode 100644 index 0000000..ea63dcf --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/AlertActionMixin.java @@ -0,0 +1,30 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef; + +import org.openecomp.dcae.apod.analytics.model.util.json.mixin.JsonMixin; + +/** + * + * @author Rajiv Singla. Creation Date: 11/5/2016. + */ +public abstract class AlertActionMixin implements JsonMixin { +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/AlertTypeMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/AlertTypeMixin.java new file mode 100644 index 0000000..181f4df --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/AlertTypeMixin.java @@ -0,0 +1,61 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import org.openecomp.dcae.apod.analytics.model.domain.cef.AlertType; +import org.openecomp.dcae.apod.analytics.model.util.json.mixin.JsonMixin; + +/** + * Mixin for Alert Type + * + * @author Rajiv Singla. Creation Date: 11/3/2016. + */ +public abstract class AlertTypeMixin implements JsonMixin { + + private String name; + + @JsonCreator + public static AlertType forValue(String name) { + + switch (name) { + case "CARD-ANOMALY": + return AlertType.CARD_ANOMALY; + case "ELEMENT-ANOMALY": + return AlertType.ELEMENT_ANOMALY; + case "INTERFACE-ANOMALY": + return AlertType.INTERFACE_ANOMALY; + case "SERVICE-ANOMALY": + return AlertType.SERVICE_ANOMALY; + default: + return AlertType.UNKNOWN; + } + + } + + @JsonValue + public String getName() { + return name; + } + + +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/BaseCEFModelMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/BaseCEFModelMixin.java new file mode 100644 index 0000000..1199de3 --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/BaseCEFModelMixin.java @@ -0,0 +1,33 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef; + +import org.openecomp.dcae.apod.analytics.model.util.json.mixin.BaseDynamicPropertiesProviderMixin; + +/** + * Abstract Mixin for all CEF Model Mixins + * + * @author Rajiv Singla. Creation Date: 10/18/2016. + */ +public abstract class BaseCEFModelMixin extends BaseDynamicPropertiesProviderMixin { + + +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/CommonEventHeaderMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/CommonEventHeaderMixin.java new file mode 100644 index 0000000..f4d4da3 --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/CommonEventHeaderMixin.java @@ -0,0 +1,27 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef; + +/** + * @author Rajiv Singla. Creation Date: 10/18/2016. + */ +public abstract class CommonEventHeaderMixin extends BaseCEFModelMixin { +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/CriticalityMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/CriticalityMixin.java new file mode 100644 index 0000000..be90733 --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/CriticalityMixin.java @@ -0,0 +1,30 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef; + +import org.openecomp.dcae.apod.analytics.model.util.json.mixin.JsonMixin; + +/** + * + * @author Rajiv Singla. Creation Date: 11/5/2016. + */ +public abstract class CriticalityMixin implements JsonMixin { +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/EventListenerMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/EventListenerMixin.java new file mode 100644 index 0000000..28014a3 --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/EventListenerMixin.java @@ -0,0 +1,31 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef; + +/** + * Event Listener Json Mixin class + * <p> + * @author Rajiv Singla. Creation Date: 10/18/2016. + */ +public abstract class EventListenerMixin extends BaseCEFModelMixin { + + +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/EventMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/EventMixin.java new file mode 100644 index 0000000..7ec077a --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/EventMixin.java @@ -0,0 +1,31 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef; + +/** + * Event Json Mixin class + * <p> + * @author Rajiv Singla. Creation Date: 10/18/2016. + */ +public abstract class EventMixin extends BaseCEFModelMixin { + + +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/EventSeverityMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/EventSeverityMixin.java new file mode 100644 index 0000000..b5d6a69 --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/EventSeverityMixin.java @@ -0,0 +1,30 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef; + +import org.openecomp.dcae.apod.analytics.model.util.json.mixin.JsonMixin; + +/** + * + * @author Rajiv Singla. Creation Date: 11/5/2016. + */ +public abstract class EventSeverityMixin implements JsonMixin { +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/MeasurementsForVfScalingFieldsMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/MeasurementsForVfScalingFieldsMixin.java new file mode 100644 index 0000000..c85249e --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/MeasurementsForVfScalingFieldsMixin.java @@ -0,0 +1,39 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef; + +import com.fasterxml.jackson.annotation.JsonGetter; +import com.fasterxml.jackson.annotation.JsonSetter; +import org.openecomp.dcae.apod.analytics.model.domain.cef.VNicUsageArray; + +import java.util.List; + +/** + * @author Rajiv Singla. Creation Date: 10/18/2016. + */ +public abstract class MeasurementsForVfScalingFieldsMixin extends BaseCEFModelMixin { + + @JsonSetter("vNicUsageArray") + public abstract void setVNicUsageArray(List<VNicUsageArray> vNicUsageArrays); + + @JsonGetter("vNicUsageArray") + public abstract List<VNicUsageArray> getVNicUsageArray(); +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/PerformanceCounterMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/PerformanceCounterMixin.java new file mode 100644 index 0000000..2e06403 --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/PerformanceCounterMixin.java @@ -0,0 +1,29 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef; + +/** + * CEF Performance Counter Mixin + * + * @author Rajiv Singla. Creation Date: 11/3/2016. + */ +public abstract class PerformanceCounterMixin extends BaseCEFModelMixin { +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/PriorityMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/PriorityMixin.java new file mode 100644 index 0000000..190db14 --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/PriorityMixin.java @@ -0,0 +1,30 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef; + +import org.openecomp.dcae.apod.analytics.model.util.json.mixin.JsonMixin; + +/** + * + * @author Rajiv Singla. Creation Date: 11/5/2016. + */ +public abstract class PriorityMixin implements JsonMixin { +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/ThresholdCrossingAlertFieldsMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/ThresholdCrossingAlertFieldsMixin.java new file mode 100644 index 0000000..48c4b2d --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/ThresholdCrossingAlertFieldsMixin.java @@ -0,0 +1,29 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef; + +/** + * Mixin class for ThresholdCrossingAlertFields + * + * @author Rajiv Singla. Creation Date: 11/3/2016. + */ +public abstract class ThresholdCrossingAlertFieldsMixin extends BaseCEFModelMixin { +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/VNicUsageArrayMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/VNicUsageArrayMixin.java new file mode 100644 index 0000000..cde4923 --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/VNicUsageArrayMixin.java @@ -0,0 +1,36 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef; + +import com.fasterxml.jackson.annotation.JsonSetter; + +/** + * @author Rajiv Singla. Creation Date: 10/18/2016. + */ +public abstract class VNicUsageArrayMixin extends BaseCEFModelMixin { + + @JsonSetter("vNicIdentifier") + public abstract void setVNicIdentifier(String name); + + @JsonSetter("vNicIdentifier") + public abstract String setVNicIdentifier(); + +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/AAIMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/AAIMixin.java new file mode 100644 index 0000000..ea6ffa5 --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/AAIMixin.java @@ -0,0 +1,54 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.util.json.mixin.facade.tca; + +import com.fasterxml.jackson.annotation.JsonGetter; +import com.fasterxml.jackson.annotation.JsonSetter; +import org.openecomp.dcae.apod.analytics.model.util.json.mixin.JsonMixin; + +/** + * + * @author Rajiv Singla. Creation Date: 11/9/2016. + */ +public abstract class AAIMixin implements JsonMixin { + + private String genericVNFId; + private String genericServerId; + + @JsonGetter("generic-vnf.vnf-id") + public String getGenericVNFId() { + return genericVNFId; + } + + @JsonSetter("generic-vnf.vnf-id") + public void setGenericVNFId(String genericVNFId) { + this.genericVNFId = genericVNFId; + } + + @JsonGetter("vserver.vserver-name") + public String getGenericServerId() { + return genericServerId; + } + @JsonSetter("vserver.vserver-name") + public void setGenericServerId(String genericServerId) { + this.genericServerId = genericServerId; + } +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/VESCEFMessageResponseMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/VESCEFMessageResponseMixin.java new file mode 100644 index 0000000..fcd6950 --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/VESCEFMessageResponseMixin.java @@ -0,0 +1,56 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.util.json.mixin.facade.tca; + +import com.fasterxml.jackson.annotation.JsonGetter; +import com.fasterxml.jackson.annotation.JsonSetter; +import org.openecomp.dcae.apod.analytics.model.facade.tca.AAI; +import org.openecomp.dcae.apod.analytics.model.util.json.mixin.JsonMixin; + +/** + * + * @author Rajiv Singla. Creation Date: 11/9/2016. + */ +public abstract class VESCEFMessageResponseMixin implements JsonMixin { + + private String targetType; + private AAI aai; + + @JsonGetter("target_type") + public String getTargetType() { + return targetType; + } + + @JsonSetter("target_type") + public void setTargetType(String targetType) { + this.targetType = targetType; + } + + @JsonGetter("AAI") + public AAI getAai() { + return aai; + } + + @JsonSetter("AAI") + public void setAai(AAI aai) { + this.aai = aai; + } +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/BaseTCAPolicyModelMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/BaseTCAPolicyModelMixin.java new file mode 100644 index 0000000..5a674cb --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/BaseTCAPolicyModelMixin.java @@ -0,0 +1,30 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.util.json.mixin.policy.tca; + +import org.openecomp.dcae.apod.analytics.model.util.json.mixin.BaseDynamicPropertiesProviderMixin; + +/** + * + * @author Rajiv Singla. Creation Date: 11/5/2016. + */ +public abstract class BaseTCAPolicyModelMixin extends BaseDynamicPropertiesProviderMixin { +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/DirectionMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/DirectionMixin.java new file mode 100644 index 0000000..66401ab --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/DirectionMixin.java @@ -0,0 +1,30 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.util.json.mixin.policy.tca; + +import org.openecomp.dcae.apod.analytics.model.util.json.mixin.JsonMixin; + +/** + * + * @author Rajiv Singla. Creation Date: 11/5/2016. + */ +public abstract class DirectionMixin implements JsonMixin { +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/MetricsPerFunctionalRoleMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/MetricsPerFunctionalRoleMixin.java new file mode 100644 index 0000000..146c957 --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/MetricsPerFunctionalRoleMixin.java @@ -0,0 +1,28 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.util.json.mixin.policy.tca; + +/** + * + * @author Rajiv Singla. Creation Date: 11/5/2016. + */ +public abstract class MetricsPerFunctionalRoleMixin extends BaseTCAPolicyModelMixin { +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/TCAPolicyMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/TCAPolicyMixin.java new file mode 100644 index 0000000..4bd04b3 --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/TCAPolicyMixin.java @@ -0,0 +1,28 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.util.json.mixin.policy.tca; + +/** + * + * @author Rajiv Singla. Creation Date: 11/5/2016. + */ +public abstract class TCAPolicyMixin extends BaseTCAPolicyModelMixin { +} diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/ThresholdMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/ThresholdMixin.java new file mode 100644 index 0000000..a4053e8 --- /dev/null +++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/ThresholdMixin.java @@ -0,0 +1,28 @@ +/* + * ============LICENSE_START========================================================= + * dcae-analytics + * ================================================================================ + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.dcae.apod.analytics.model.util.json.mixin.policy.tca; + +/** + * + * @author Rajiv Singla. Creation Date: 11/5/2016. + */ +public abstract class ThresholdMixin extends BaseTCAPolicyModelMixin { +} diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/BaseAnalyticsModelUnitTest.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/BaseAnalyticsModelUnitTest.java index 55e615a..e29136a 100644 --- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/BaseAnalyticsModelUnitTest.java +++ b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/BaseAnalyticsModelUnitTest.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.model; +package org.openecomp.dcae.apod.analytics.model; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -26,8 +26,8 @@ import com.google.common.base.Suppliers; import org.json.JSONException; import org.junit.Assert; import org.junit.BeforeClass; -import org.openecomp.dcae.analytics.model.util.json.AnalyticsModelObjectMapperSupplier; -import org.openecomp.dcae.analytics.test.BaseDCAEAnalyticsUnitTest; +import org.openecomp.dcae.apod.analytics.model.util.json.AnalyticsModelObjectMapperSupplier; +import org.openecomp.dcae.apod.analytics.test.BaseDCAEAnalyticsUnitTest; import java.io.IOException; import java.io.InputStream; diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/domain/cef/EventSeverityTest.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/domain/cef/EventSeverityTest.java index 5c8d870..492e8e1 100644 --- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/domain/cef/EventSeverityTest.java +++ b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/domain/cef/EventSeverityTest.java @@ -18,11 +18,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.model.domain.cef; +package org.openecomp.dcae.apod.analytics.model.domain.cef; import org.junit.Assert; import org.junit.Test; -import org.openecomp.dcae.analytics.test.BaseDCAEAnalyticsUnitTest; +import org.openecomp.dcae.apod.analytics.test.BaseDCAEAnalyticsUnitTest; import java.util.Collections; import java.util.Comparator; diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/util/AnalyticsModelIOUtilsTest.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/AnalyticsModelIOUtilsTest.java index ff929ba..39c5e9f 100644 --- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/util/AnalyticsModelIOUtilsTest.java +++ b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/AnalyticsModelIOUtilsTest.java @@ -18,11 +18,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.model.util; +package org.openecomp.dcae.apod.analytics.model.util; import org.junit.Test; -import org.openecomp.dcae.analytics.model.BaseAnalyticsModelUnitTest; +import org.openecomp.dcae.apod.analytics.model.BaseAnalyticsModelUnitTest; import java.util.Properties; diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/util/ConfigHolder.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/ConfigHolder.java index 35d6c80..6d9dc0c 100644 --- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/util/ConfigHolder.java +++ b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/ConfigHolder.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.model.util; +package org.openecomp.dcae.apod.analytics.model.util; /** * Created by Rajiv Singla on 10/5/2016. diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/util/TestAppConfig.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/TestAppConfig.java index d5a6a1e..bccc2b0 100644 --- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/util/TestAppConfig.java +++ b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/TestAppConfig.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.model.util; +package org.openecomp.dcae.apod.analytics.model.util; /** * Created by Rajiv Singla on 10/5/2016. diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/AlertTypeMixinTest.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/AlertTypeMixinTest.java index 078dae4..d25bbff 100644 --- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/AlertTypeMixinTest.java +++ b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/AlertTypeMixinTest.java @@ -18,12 +18,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.model.util.json.mixin.cef; +package org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef; import org.hamcrest.CoreMatchers; import org.junit.Test; -import org.openecomp.dcae.analytics.model.BaseAnalyticsModelUnitTest; -import org.openecomp.dcae.analytics.model.domain.cef.AlertType; +import org.openecomp.dcae.apod.analytics.model.BaseAnalyticsModelUnitTest; +import org.openecomp.dcae.apod.analytics.model.domain.cef.AlertType; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/EventListenerMixinTest.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/EventListenerMixinTest.java index 2bf4a6a..a8803d1 100644 --- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/util/json/mixin/cef/EventListenerMixinTest.java +++ b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/cef/EventListenerMixinTest.java @@ -18,14 +18,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.model.util.json.mixin.cef; +package org.openecomp.dcae.apod.analytics.model.util.json.mixin.cef; import com.fasterxml.jackson.core.type.TypeReference; import org.junit.Test; -import org.openecomp.dcae.analytics.model.BaseAnalyticsModelUnitTest; -import org.openecomp.dcae.analytics.model.domain.cef.EventListener; -import org.openecomp.dcae.analytics.model.domain.cef.MeasurementsForVfScalingFields; -import org.openecomp.dcae.analytics.model.domain.cef.VNicUsageArray; +import org.openecomp.dcae.apod.analytics.model.BaseAnalyticsModelUnitTest; +import org.openecomp.dcae.apod.analytics.model.domain.cef.EventListener; +import org.openecomp.dcae.apod.analytics.model.domain.cef.MeasurementsForVfScalingFields; +import org.openecomp.dcae.apod.analytics.model.domain.cef.VNicUsageArray; import java.util.List; import java.util.Map; diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/util/json/mixin/facade/tca/TCAVESResponseMixinTest.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/TCAVESResponseMixinTest.java index c853c57..932eb7d 100644 --- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/util/json/mixin/facade/tca/TCAVESResponseMixinTest.java +++ b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/TCAVESResponseMixinTest.java @@ -18,11 +18,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.model.util.json.mixin.facade.tca; +package org.openecomp.dcae.apod.analytics.model.util.json.mixin.facade.tca; import org.junit.Test; -import org.openecomp.dcae.analytics.model.BaseAnalyticsModelUnitTest; -import org.openecomp.dcae.analytics.model.facade.tca.TCAVESResponse; +import org.openecomp.dcae.apod.analytics.model.BaseAnalyticsModelUnitTest; +import org.openecomp.dcae.apod.analytics.model.facade.tca.TCAVESResponse; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/TCAPolicyMixinTest.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/TCAPolicyMixinTest.java index 1490563..a4da4c1 100644 --- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/analytics/model/util/json/mixin/policy/tca/TCAPolicyMixinTest.java +++ b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/TCAPolicyMixinTest.java @@ -18,11 +18,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.model.util.json.mixin.policy.tca; +package org.openecomp.dcae.apod.analytics.model.util.json.mixin.policy.tca; import org.junit.Test; -import org.openecomp.dcae.analytics.model.BaseAnalyticsModelUnitTest; -import org.openecomp.dcae.analytics.model.domain.policy.tca.TCAPolicy; +import org.openecomp.dcae.apod.analytics.model.BaseAnalyticsModelUnitTest; +import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.TCAPolicy; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; diff --git a/dcae-analytics-tca/pom.xml b/dcae-analytics-tca/pom.xml index 27475a1..945561f 100644 --- a/dcae-analytics-tca/pom.xml +++ b/dcae-analytics-tca/pom.xml @@ -28,7 +28,7 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.openecomp.dcae.analytics</groupId> + <groupId>org.openecomp.dcae.apod.analytics</groupId> <artifactId>dcae-analytics</artifactId> <version>1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> @@ -43,20 +43,20 @@ <properties> <main.basedir>${project.parent.basedir}</main.basedir> - <app.main.class>org.openecomp.dcae.analytics.tca.TCAAnalyticsApplication</app.main.class> + <app.main.class>org.openecomp.dcae.apod.analytics.tca.TCAAnalyticsApplication</app.main.class> </properties> <dependencies> <!-- DCAE DEPENDENCIES --> <dependency> - <groupId>org.openecomp.dcae.analytics</groupId> + <groupId>org.openecomp.dcae.apod.analytics</groupId> <artifactId>dcae-analytics-common</artifactId> <version>1.0-SNAPSHOT</version> </dependency> <dependency> - <groupId>org.openecomp.dcae.analytics</groupId> + <groupId>org.openecomp.dcae.apod.analytics</groupId> <artifactId>dcae-analytics-dmaap</artifactId> <version>1.0-SNAPSHOT</version> </dependency> @@ -99,7 +99,7 @@ <!-- TEST DEPENDENCIES --> <dependency> - <groupId>org.openecomp.dcae.analytics</groupId> + <groupId>org.openecomp.dcae.apod.analytics</groupId> <artifactId>dcae-analytics-test</artifactId> <version>1.0-SNAPSHOT</version> <scope>test</scope> diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/TCAAnalyticsApplication.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/TCAAnalyticsApplication.java index 655ddca..49e35b1 100644 --- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/TCAAnalyticsApplication.java +++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/TCAAnalyticsApplication.java @@ -18,25 +18,25 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca; +package org.openecomp.dcae.apod.analytics.tca; import co.cask.cdap.api.app.AbstractApplication; import co.cask.cdap.api.data.stream.Stream; import co.cask.cdap.api.dataset.DatasetProperties; import co.cask.cdap.api.dataset.lib.ObjectMappedTable; -import org.openecomp.dcae.analytics.common.utils.ValidationUtils; -import org.openecomp.dcae.analytics.tca.flow.TCAVESCollectorFlow; -import org.openecomp.dcae.analytics.tca.persistance.TCAMessageStatusPersister; -import org.openecomp.dcae.analytics.tca.persistance.TCAVESAlertsPersister; -import org.openecomp.dcae.analytics.tca.settings.TCAAppConfig; -import org.openecomp.dcae.analytics.tca.validator.TCAAppConfigValidator; -import org.openecomp.dcae.analytics.tca.worker.TCADMaaPMockSubscriberWorker; -import org.openecomp.dcae.analytics.tca.worker.TCADMaaPPublisherWorker; -import org.openecomp.dcae.analytics.tca.worker.TCADMaaPSubscriberWorker; +import org.openecomp.dcae.apod.analytics.common.utils.ValidationUtils; +import org.openecomp.dcae.apod.analytics.tca.flow.TCAVESCollectorFlow; +import org.openecomp.dcae.apod.analytics.tca.persistance.TCAMessageStatusPersister; +import org.openecomp.dcae.apod.analytics.tca.persistance.TCAVESAlertsPersister; +import org.openecomp.dcae.apod.analytics.tca.settings.TCAAppConfig; +import org.openecomp.dcae.apod.analytics.tca.validator.TCAAppConfigValidator; +import org.openecomp.dcae.apod.analytics.tca.worker.TCADMaaPMockSubscriberWorker; +import org.openecomp.dcae.apod.analytics.tca.worker.TCADMaaPPublisherWorker; +import org.openecomp.dcae.apod.analytics.tca.worker.TCADMaaPSubscriberWorker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.openecomp.dcae.analytics.common.CDAPComponentsConstants.TCA_FIXED_SUBSCRIBER_OUTPUT_DESCRIPTION_STREAM; +import static org.openecomp.dcae.apod.analytics.common.CDAPComponentsConstants.TCA_FIXED_SUBSCRIBER_OUTPUT_DESCRIPTION_STREAM; /** * @author Rajiv Singla. Creation Date: 10/21/2016. diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/flow/TCAVESCollectorFlow.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/flow/TCAVESCollectorFlow.java index 33db3c1..b62bc35 100644 --- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/flow/TCAVESCollectorFlow.java +++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/flow/TCAVESCollectorFlow.java @@ -18,14 +18,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.flow; +package org.openecomp.dcae.apod.analytics.tca.flow; import co.cask.cdap.api.flow.AbstractFlow; -import org.openecomp.dcae.analytics.common.CDAPComponentsConstants; -import org.openecomp.dcae.analytics.tca.flowlet.TCAVESAlertsSinkFlowlet; -import org.openecomp.dcae.analytics.tca.flowlet.TCAVESMessageRouterFlowlet; -import org.openecomp.dcae.analytics.tca.flowlet.TCAVESThresholdViolationCalculatorFlowlet; -import org.openecomp.dcae.analytics.tca.settings.TCAAppConfig; +import org.openecomp.dcae.apod.analytics.common.CDAPComponentsConstants; +import org.openecomp.dcae.apod.analytics.tca.flowlet.TCAVESAlertsSinkFlowlet; +import org.openecomp.dcae.apod.analytics.tca.flowlet.TCAVESMessageRouterFlowlet; +import org.openecomp.dcae.apod.analytics.tca.flowlet.TCAVESThresholdViolationCalculatorFlowlet; +import org.openecomp.dcae.apod.analytics.tca.settings.TCAAppConfig; /** * TCA Flow for VES (Virtual Event Streaming) Collector Flow diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/flowlet/TCAVESAlertsSinkFlowlet.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/flowlet/TCAVESAlertsSinkFlowlet.java index 597fcd0..0277635 100644 --- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/flowlet/TCAVESAlertsSinkFlowlet.java +++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/flowlet/TCAVESAlertsSinkFlowlet.java @@ -18,19 +18,19 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.flowlet; +package org.openecomp.dcae.apod.analytics.tca.flowlet; import co.cask.cdap.api.annotation.ProcessInput; import co.cask.cdap.api.annotation.Property; import co.cask.cdap.api.dataset.lib.ObjectMappedTable; import co.cask.cdap.api.flow.flowlet.AbstractFlowlet; import co.cask.cdap.api.flow.flowlet.FlowletContext; -import org.openecomp.dcae.analytics.tca.persistance.TCAVESAlertEntity; -import org.openecomp.dcae.analytics.tca.persistance.TCAVESAlertsPersister; +import org.openecomp.dcae.apod.analytics.tca.persistance.TCAVESAlertEntity; +import org.openecomp.dcae.apod.analytics.tca.persistance.TCAVESAlertsPersister; -import static org.openecomp.dcae.analytics.common.CDAPComponentsConstants.TCA_FIXED_VES_ALERTS_SINK_DESCRIPTION_FLOWLET; -import static org.openecomp.dcae.analytics.common.CDAPComponentsConstants.TCA_FIXED_VES_ALERTS_SINK_NAME_FLOWLET; -import static org.openecomp.dcae.analytics.common.CDAPComponentsConstants.TCA_FIXED_VES_TCA_CALCULATOR_NAME_OUTPUT; +import static org.openecomp.dcae.apod.analytics.common.CDAPComponentsConstants.TCA_FIXED_VES_ALERTS_SINK_DESCRIPTION_FLOWLET; +import static org.openecomp.dcae.apod.analytics.common.CDAPComponentsConstants.TCA_FIXED_VES_ALERTS_SINK_NAME_FLOWLET; +import static org.openecomp.dcae.apod.analytics.common.CDAPComponentsConstants.TCA_FIXED_VES_TCA_CALCULATOR_NAME_OUTPUT; /** * Saves TCA VES Alert Messages in a Time series Table diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/flowlet/TCAVESMessageRouterFlowlet.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/flowlet/TCAVESMessageRouterFlowlet.java index 7ecd917..102b116 100644 --- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/flowlet/TCAVESMessageRouterFlowlet.java +++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/flowlet/TCAVESMessageRouterFlowlet.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.flowlet; +package org.openecomp.dcae.apod.analytics.tca.flowlet; import co.cask.cdap.api.annotation.Output; import co.cask.cdap.api.annotation.ProcessInput; @@ -27,10 +27,10 @@ import co.cask.cdap.api.flow.flowlet.OutputEmitter; import co.cask.cdap.api.flow.flowlet.StreamEvent; import com.google.common.base.Charsets; -import static org.openecomp.dcae.analytics.common.AnalyticsConstants.TCA_VES_MESSAGE_ROUTER_PARTITION_KEY; -import static org.openecomp.dcae.analytics.common.CDAPComponentsConstants.TCA_FIXED_VES_MESSAGE_ROUTER_DESCRIPTION_FLOWLET; -import static org.openecomp.dcae.analytics.common.CDAPComponentsConstants.TCA_FIXED_VES_MESSAGE_ROUTER_NAME_FLOWLET; -import static org.openecomp.dcae.analytics.common.CDAPComponentsConstants.TCA_FIXED_VES_MESSAGE_ROUTER_OUTPUT; +import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.TCA_VES_MESSAGE_ROUTER_PARTITION_KEY; +import static org.openecomp.dcae.apod.analytics.common.CDAPComponentsConstants.TCA_FIXED_VES_MESSAGE_ROUTER_DESCRIPTION_FLOWLET; +import static org.openecomp.dcae.apod.analytics.common.CDAPComponentsConstants.TCA_FIXED_VES_MESSAGE_ROUTER_NAME_FLOWLET; +import static org.openecomp.dcae.apod.analytics.common.CDAPComponentsConstants.TCA_FIXED_VES_MESSAGE_ROUTER_OUTPUT; /** diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/flowlet/TCAVESThresholdViolationCalculatorFlowlet.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/flowlet/TCAVESThresholdViolationCalculatorFlowlet.java index d5ab109..3d03cf7 100644 --- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/flowlet/TCAVESThresholdViolationCalculatorFlowlet.java +++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/flowlet/TCAVESThresholdViolationCalculatorFlowlet.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.flowlet; +package org.openecomp.dcae.apod.analytics.tca.flowlet; import co.cask.cdap.api.annotation.Output; import co.cask.cdap.api.annotation.ProcessInput; @@ -30,20 +30,20 @@ import co.cask.cdap.api.flow.flowlet.FlowletContext; import co.cask.cdap.api.flow.flowlet.OutputEmitter; import co.cask.cdap.api.metrics.Metrics; import com.fasterxml.jackson.core.JsonProcessingException; -import org.openecomp.dcae.analytics.common.CDAPComponentsConstants; -import org.openecomp.dcae.analytics.common.CDAPMetricsConstants; -import org.openecomp.dcae.analytics.model.domain.policy.tca.TCAPolicy; -import org.openecomp.dcae.analytics.model.facade.tca.TCAVESResponse; -import org.openecomp.dcae.analytics.tca.persistance.TCACalculatorMessageType; -import org.openecomp.dcae.analytics.tca.persistance.TCAMessageStatusEntity; -import org.openecomp.dcae.analytics.tca.persistance.TCAMessageStatusPersister; -import org.openecomp.dcae.analytics.tca.processor.TCACEFProcessorContext; -import org.openecomp.dcae.analytics.tca.utils.TCAUtils; +import org.openecomp.dcae.apod.analytics.common.CDAPComponentsConstants; +import org.openecomp.dcae.apod.analytics.common.CDAPMetricsConstants; +import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.TCAPolicy; +import org.openecomp.dcae.apod.analytics.model.facade.tca.TCAVESResponse; +import org.openecomp.dcae.apod.analytics.tca.persistance.TCACalculatorMessageType; +import org.openecomp.dcae.apod.analytics.tca.persistance.TCAMessageStatusEntity; +import org.openecomp.dcae.apod.analytics.tca.persistance.TCAMessageStatusPersister; +import org.openecomp.dcae.apod.analytics.tca.processor.TCACEFProcessorContext; +import org.openecomp.dcae.apod.analytics.tca.utils.TCAUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.openecomp.dcae.analytics.common.CDAPComponentsConstants.TCA_FIXED_VES_THRESHOLD_VIOLATION_CALCULATOR_DESCRIPTION_FLOWLET; -import static org.openecomp.dcae.analytics.common.CDAPComponentsConstants.TCA_FIXED_VES_THRESHOLD_VIOLATION_CALCULATOR_NAME_FLOWLET; +import static org.openecomp.dcae.apod.analytics.common.CDAPComponentsConstants.TCA_FIXED_VES_THRESHOLD_VIOLATION_CALCULATOR_DESCRIPTION_FLOWLET; +import static org.openecomp.dcae.apod.analytics.common.CDAPComponentsConstants.TCA_FIXED_VES_THRESHOLD_VIOLATION_CALCULATOR_NAME_FLOWLET; /** * TCA VES Message Filter filters out messages which are not applicable for TCA as per TCA Policy diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/persistance/TCACalculatorMessageType.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/persistance/TCACalculatorMessageType.java index acef458..afb434e 100644 --- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/persistance/TCACalculatorMessageType.java +++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/persistance/TCACalculatorMessageType.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.persistance; +package org.openecomp.dcae.apod.analytics.tca.persistance; /** * TCA Calculator applies TCA Policy to incoming VES messages and classifies them as per this enum diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/persistance/TCAMessageStatusEntity.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/persistance/TCAMessageStatusEntity.java index 35aeac4..a2d84c3 100644 --- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/persistance/TCAMessageStatusEntity.java +++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/persistance/TCAMessageStatusEntity.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.persistance; +package org.openecomp.dcae.apod.analytics.tca.persistance; import org.apache.hadoop.io.Writable; import org.apache.hadoop.io.WritableUtils; diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/persistance/TCAMessageStatusPersister.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/persistance/TCAMessageStatusPersister.java index edd33dd..1ac8bfa 100644 --- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/persistance/TCAMessageStatusPersister.java +++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/persistance/TCAMessageStatusPersister.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.persistance; +package org.openecomp.dcae.apod.analytics.tca.persistance; import co.cask.cdap.api.data.schema.Schema; import co.cask.cdap.api.data.schema.UnsupportedTypeException; @@ -30,18 +30,18 @@ import co.cask.cdap.api.flow.flowlet.FlowletContext; import com.google.common.base.Joiner; import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.lang3.tuple.Pair; -import org.openecomp.dcae.analytics.common.exception.DCAEAnalyticsRuntimeException; -import org.openecomp.dcae.analytics.common.service.processor.MessageProcessor; -import org.openecomp.dcae.analytics.common.service.processor.ProcessorContext; -import org.openecomp.dcae.analytics.common.utils.PersistenceUtils; -import org.openecomp.dcae.analytics.model.domain.policy.tca.MetricsPerFunctionalRole; -import org.openecomp.dcae.analytics.model.domain.policy.tca.Threshold; -import org.openecomp.dcae.analytics.tca.processor.TCACEFJsonProcessor; -import org.openecomp.dcae.analytics.tca.processor.TCACEFPolicyDomainFilter; -import org.openecomp.dcae.analytics.tca.processor.TCACEFPolicyFunctionalRoleFilter; -import org.openecomp.dcae.analytics.tca.processor.TCACEFPolicyThresholdsProcessor; -import org.openecomp.dcae.analytics.tca.processor.TCACEFProcessorContext; -import org.openecomp.dcae.analytics.tca.utils.TCAUtils; +import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException; +import org.openecomp.dcae.apod.analytics.common.service.processor.MessageProcessor; +import org.openecomp.dcae.apod.analytics.common.service.processor.ProcessorContext; +import org.openecomp.dcae.apod.analytics.common.utils.PersistenceUtils; +import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.MetricsPerFunctionalRole; +import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.Threshold; +import org.openecomp.dcae.apod.analytics.tca.processor.TCACEFJsonProcessor; +import org.openecomp.dcae.apod.analytics.tca.processor.TCACEFPolicyDomainFilter; +import org.openecomp.dcae.apod.analytics.tca.processor.TCACEFPolicyFunctionalRoleFilter; +import org.openecomp.dcae.apod.analytics.tca.processor.TCACEFPolicyThresholdsProcessor; +import org.openecomp.dcae.apod.analytics.tca.processor.TCACEFProcessorContext; +import org.openecomp.dcae.apod.analytics.tca.utils.TCAUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -51,8 +51,8 @@ import java.util.List; import javax.annotation.Nullable; -import static org.openecomp.dcae.analytics.common.CDAPComponentsConstants.TCA_FIXED_VES_MESSAGE_STATUS_DESCRIPTION_TABLE; -import static org.openecomp.dcae.analytics.common.utils.PersistenceUtils.TABLE_ROW_KEY_COLUMN_NAME; +import static org.openecomp.dcae.apod.analytics.common.CDAPComponentsConstants.TCA_FIXED_VES_MESSAGE_STATUS_DESCRIPTION_TABLE; +import static org.openecomp.dcae.apod.analytics.common.utils.PersistenceUtils.TABLE_ROW_KEY_COLUMN_NAME; /** * diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/persistance/TCAVESAlertEntity.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/persistance/TCAVESAlertEntity.java index ff3906c..4f11f39 100644 --- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/persistance/TCAVESAlertEntity.java +++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/persistance/TCAVESAlertEntity.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.persistance; +package org.openecomp.dcae.apod.analytics.tca.persistance; import org.apache.hadoop.io.Writable; import org.apache.hadoop.io.WritableUtils; diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/persistance/TCAVESAlertsPersister.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/persistance/TCAVESAlertsPersister.java index bf94cde..83eaf7f 100644 --- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/persistance/TCAVESAlertsPersister.java +++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/persistance/TCAVESAlertsPersister.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.persistance; +package org.openecomp.dcae.apod.analytics.tca.persistance; import co.cask.cdap.api.data.schema.Schema; import co.cask.cdap.api.data.schema.UnsupportedTypeException; @@ -27,14 +27,14 @@ import co.cask.cdap.api.dataset.lib.IndexedTable; import co.cask.cdap.api.dataset.lib.ObjectMappedTable; import co.cask.cdap.api.dataset.lib.ObjectMappedTableProperties; import org.apache.commons.lang3.StringEscapeUtils; -import org.openecomp.dcae.analytics.common.exception.DCAEAnalyticsRuntimeException; +import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.Date; -import static org.openecomp.dcae.analytics.common.CDAPComponentsConstants.TCA_DEFAULT_VES_ALERTS_DESCRIPTION_TABLE; -import static org.openecomp.dcae.analytics.common.utils.PersistenceUtils.TABLE_ROW_KEY_COLUMN_NAME; +import static org.openecomp.dcae.apod.analytics.common.CDAPComponentsConstants.TCA_DEFAULT_VES_ALERTS_DESCRIPTION_TABLE; +import static org.openecomp.dcae.apod.analytics.common.utils.PersistenceUtils.TABLE_ROW_KEY_COLUMN_NAME; /** * diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/processor/AbstractTCAECEFPolicyProcessor.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/processor/AbstractTCAECEFPolicyProcessor.java index 56ea38f..3e599c4 100644 --- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/processor/AbstractTCAECEFPolicyProcessor.java +++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/processor/AbstractTCAECEFPolicyProcessor.java @@ -18,11 +18,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.processor; +package org.openecomp.dcae.apod.analytics.tca.processor; -import org.openecomp.dcae.analytics.common.exception.MessageProcessingException; -import org.openecomp.dcae.analytics.common.service.processor.AbstractMessageProcessor; -import org.openecomp.dcae.analytics.model.domain.cef.EventListener; +import org.openecomp.dcae.apod.analytics.common.exception.MessageProcessingException; +import org.openecomp.dcae.apod.analytics.common.service.processor.AbstractMessageProcessor; +import org.openecomp.dcae.apod.analytics.model.domain.cef.EventListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/processor/TCACEFJsonProcessor.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFJsonProcessor.java index ab33fe2..7f45adb 100644 --- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/processor/TCACEFJsonProcessor.java +++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFJsonProcessor.java @@ -18,13 +18,13 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.processor; +package org.openecomp.dcae.apod.analytics.tca.processor; import org.apache.commons.lang3.StringUtils; -import org.openecomp.dcae.analytics.common.exception.MessageProcessingException; -import org.openecomp.dcae.analytics.common.service.processor.AbstractMessageProcessor; -import org.openecomp.dcae.analytics.model.domain.cef.EventListener; -import org.openecomp.dcae.analytics.tca.utils.TCAUtils; +import org.openecomp.dcae.apod.analytics.common.exception.MessageProcessingException; +import org.openecomp.dcae.apod.analytics.common.service.processor.AbstractMessageProcessor; +import org.openecomp.dcae.apod.analytics.model.domain.cef.EventListener; +import org.openecomp.dcae.apod.analytics.tca.utils.TCAUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/processor/TCACEFPolicyDomainFilter.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyDomainFilter.java index 639c6bc..d283e35 100644 --- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/processor/TCACEFPolicyDomainFilter.java +++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyDomainFilter.java @@ -18,9 +18,9 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.processor; +package org.openecomp.dcae.apod.analytics.tca.processor; -import org.openecomp.dcae.analytics.model.domain.cef.EventListener; +import org.openecomp.dcae.apod.analytics.model.domain.cef.EventListener; /** * <p> diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/processor/TCACEFPolicyFunctionalRoleFilter.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyFunctionalRoleFilter.java index 0f7e9b6..82aa1d6 100644 --- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/processor/TCACEFPolicyFunctionalRoleFilter.java +++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyFunctionalRoleFilter.java @@ -18,12 +18,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.processor; +package org.openecomp.dcae.apod.analytics.tca.processor; import com.google.common.base.Joiner; -import org.openecomp.dcae.analytics.model.domain.cef.EventListener; -import org.openecomp.dcae.analytics.model.domain.policy.tca.TCAPolicy; -import org.openecomp.dcae.analytics.tca.utils.TCAUtils; +import org.openecomp.dcae.apod.analytics.model.domain.cef.EventListener; +import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.TCAPolicy; +import org.openecomp.dcae.apod.analytics.tca.utils.TCAUtils; import java.util.List; diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/processor/TCACEFPolicyThresholdsProcessor.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyThresholdsProcessor.java index 6dd334f..89e4941 100644 --- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/processor/TCACEFPolicyThresholdsProcessor.java +++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyThresholdsProcessor.java @@ -18,16 +18,16 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.processor; +package org.openecomp.dcae.apod.analytics.tca.processor; import com.google.common.base.Optional; import com.google.common.collect.Table; -import org.openecomp.dcae.analytics.common.exception.MessageProcessingException; -import org.openecomp.dcae.analytics.model.domain.cef.EventListener; -import org.openecomp.dcae.analytics.model.domain.policy.tca.MetricsPerFunctionalRole; -import org.openecomp.dcae.analytics.model.domain.policy.tca.TCAPolicy; -import org.openecomp.dcae.analytics.model.domain.policy.tca.Threshold; -import org.openecomp.dcae.analytics.tca.utils.TCAUtils; +import org.openecomp.dcae.apod.analytics.common.exception.MessageProcessingException; +import org.openecomp.dcae.apod.analytics.model.domain.cef.EventListener; +import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.MetricsPerFunctionalRole; +import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.TCAPolicy; +import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.Threshold; +import org.openecomp.dcae.apod.analytics.tca.utils.TCAUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/processor/TCACEFProcessorContext.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFProcessorContext.java index 30ebe9d..b8c31c9 100644 --- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/processor/TCACEFProcessorContext.java +++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFProcessorContext.java @@ -18,12 +18,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.processor; +package org.openecomp.dcae.apod.analytics.tca.processor; -import org.openecomp.dcae.analytics.common.service.processor.AbstractProcessorContext; -import org.openecomp.dcae.analytics.model.domain.cef.EventListener; -import org.openecomp.dcae.analytics.model.domain.policy.tca.MetricsPerFunctionalRole; -import org.openecomp.dcae.analytics.model.domain.policy.tca.TCAPolicy; +import org.openecomp.dcae.apod.analytics.common.service.processor.AbstractProcessorContext; +import org.openecomp.dcae.apod.analytics.model.domain.cef.EventListener; +import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.MetricsPerFunctionalRole; +import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.TCAPolicy; /** * TCA CEF Policy Processor Context diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/settings/TCAAppConfig.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/settings/TCAAppConfig.java index 1f7c32d..0e4cbe9 100644 --- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/settings/TCAAppConfig.java +++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/settings/TCAAppConfig.java @@ -18,12 +18,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.settings; +package org.openecomp.dcae.apod.analytics.tca.settings; import com.google.common.base.Objects; -import org.openecomp.dcae.analytics.common.AnalyticsConstants; -import org.openecomp.dcae.analytics.common.CDAPComponentsConstants; -import org.openecomp.dcae.analytics.common.cdap.settings.CDAPBaseAppConfig; +import org.openecomp.dcae.apod.analytics.common.AnalyticsConstants; +import org.openecomp.dcae.apod.analytics.common.CDAPComponentsConstants; +import org.openecomp.dcae.apod.analytics.common.cdap.settings.CDAPBaseAppConfig; /** diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/settings/TCAAppPreferences.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/settings/TCAAppPreferences.java index 8eddb3c..30c7aaf 100644 --- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/settings/TCAAppPreferences.java +++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/settings/TCAAppPreferences.java @@ -18,15 +18,15 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.settings; +package org.openecomp.dcae.apod.analytics.tca.settings; import com.google.common.base.Objects; -import org.openecomp.dcae.analytics.common.cdap.settings.CDAPAppPreferences; +import org.openecomp.dcae.apod.analytics.common.cdap.settings.CDAPAppPreferences; -import static org.openecomp.dcae.analytics.common.AnalyticsConstants.TCA_DEFAULT_PUBLISHER_MAX_BATCH_QUEUE_SIZE; -import static org.openecomp.dcae.analytics.common.AnalyticsConstants.TCA_DEFAULT_PUBLISHER_MAX_RECOVERY_QUEUE_SIZE; -import static org.openecomp.dcae.analytics.common.AnalyticsConstants.TCA_DEFAULT_PUBLISHER_POLLING_INTERVAL_MS; -import static org.openecomp.dcae.analytics.common.AnalyticsConstants.TCA_DEFAULT_SUBSCRIBER_POLLING_INTERVAL_MS; +import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.TCA_DEFAULT_PUBLISHER_MAX_BATCH_QUEUE_SIZE; +import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.TCA_DEFAULT_PUBLISHER_MAX_RECOVERY_QUEUE_SIZE; +import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.TCA_DEFAULT_PUBLISHER_POLLING_INTERVAL_MS; +import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.TCA_DEFAULT_SUBSCRIBER_POLLING_INTERVAL_MS; /** * <p> diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/settings/TCAPolicyPreferences.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/settings/TCAPolicyPreferences.java index cbbf550..5ee4e7a 100644 --- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/settings/TCAPolicyPreferences.java +++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/settings/TCAPolicyPreferences.java @@ -18,10 +18,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.settings; +package org.openecomp.dcae.apod.analytics.tca.settings; -import org.openecomp.dcae.analytics.common.cdap.settings.CDAPAppPreferences; -import org.openecomp.dcae.analytics.model.domain.policy.tca.TCAPolicy; +import org.openecomp.dcae.apod.analytics.common.cdap.settings.CDAPAppPreferences; +import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.TCAPolicy; /** * A wrapper over {@link TCAPolicy} to act as app Preferences as TCA Policy is passed diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/utils/AppPreferencesToPublisherConfigMapper.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/utils/AppPreferencesToPublisherConfigMapper.java index f332681..7c6de64 100644 --- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/utils/AppPreferencesToPublisherConfigMapper.java +++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/utils/AppPreferencesToPublisherConfigMapper.java @@ -18,15 +18,15 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.utils; +package org.openecomp.dcae.apod.analytics.tca.utils; import com.google.common.base.Function; -import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRPublisherConfig; -import org.openecomp.dcae.analytics.tca.settings.TCAAppPreferences; +import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRPublisherConfig; +import org.openecomp.dcae.apod.analytics.tca.settings.TCAAppPreferences; import javax.annotation.Nonnull; -import static org.openecomp.dcae.analytics.common.utils.ValidationUtils.isEmpty; +import static org.openecomp.dcae.apod.analytics.common.utils.ValidationUtils.isEmpty; /** * Function which translates {@link TCAAppPreferences} to {@link DMaaPMRPublisherConfig} diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/utils/AppPreferencesToSubscriberConfigMapper.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/utils/AppPreferencesToSubscriberConfigMapper.java index d0e7f1f..5188916 100644 --- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/utils/AppPreferencesToSubscriberConfigMapper.java +++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/utils/AppPreferencesToSubscriberConfigMapper.java @@ -18,15 +18,15 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.utils; +package org.openecomp.dcae.apod.analytics.tca.utils; import com.google.common.base.Function; -import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig; -import org.openecomp.dcae.analytics.tca.settings.TCAAppPreferences; +import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig; +import org.openecomp.dcae.apod.analytics.tca.settings.TCAAppPreferences; import javax.annotation.Nonnull; -import static org.openecomp.dcae.analytics.common.utils.ValidationUtils.isEmpty; +import static org.openecomp.dcae.apod.analytics.common.utils.ValidationUtils.isEmpty; /** * Function which translates {@link TCAAppPreferences} to {@link DMaaPMRSubscriberConfig} diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/utils/TCAUtils.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/utils/TCAUtils.java index 27df27f..d0a17dd 100644 --- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/utils/TCAUtils.java +++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/utils/TCAUtils.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.utils; +package org.openecomp.dcae.apod.analytics.tca.utils; import co.cask.cdap.api.RuntimeContext; import com.google.common.base.Function; @@ -39,31 +39,31 @@ import com.jayway.jsonpath.TypeRef; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; -import org.openecomp.dcae.analytics.common.AnalyticsConstants; -import org.openecomp.dcae.analytics.common.exception.DCAEAnalyticsRuntimeException; -import org.openecomp.dcae.analytics.common.exception.MessageProcessingException; -import org.openecomp.dcae.analytics.common.service.processor.AbstractMessageProcessor; -import org.openecomp.dcae.analytics.common.service.processor.GenericMessageChainProcessor; -import org.openecomp.dcae.analytics.model.domain.cef.CommonEventHeader; -import org.openecomp.dcae.analytics.model.domain.cef.EventListener; -import org.openecomp.dcae.analytics.model.domain.cef.EventSeverity; -import org.openecomp.dcae.analytics.model.domain.policy.tca.Direction; -import org.openecomp.dcae.analytics.model.domain.policy.tca.MetricsPerFunctionalRole; -import org.openecomp.dcae.analytics.model.domain.policy.tca.TCAPolicy; -import org.openecomp.dcae.analytics.model.domain.policy.tca.Threshold; -import org.openecomp.dcae.analytics.model.facade.tca.AAI; -import org.openecomp.dcae.analytics.model.facade.tca.TCAVESResponse; -import org.openecomp.dcae.analytics.model.util.AnalyticsModelJsonUtils; -import org.openecomp.dcae.analytics.tca.persistance.TCAVESAlertEntity; -import org.openecomp.dcae.analytics.tca.processor.TCACEFJsonProcessor; -import org.openecomp.dcae.analytics.tca.processor.TCACEFPolicyDomainFilter; -import org.openecomp.dcae.analytics.tca.processor.TCACEFPolicyFunctionalRoleFilter; -import org.openecomp.dcae.analytics.tca.processor.TCACEFPolicyThresholdsProcessor; -import org.openecomp.dcae.analytics.tca.processor.TCACEFProcessorContext; -import org.openecomp.dcae.analytics.tca.settings.TCAAppPreferences; -import org.openecomp.dcae.analytics.tca.settings.TCAPolicyPreferences; -import org.openecomp.dcae.analytics.tca.validator.TCAPolicyPreferencesValidator; -import org.openecomp.dcae.analytics.tca.validator.TCAPreferencesValidator; +import org.openecomp.dcae.apod.analytics.common.AnalyticsConstants; +import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException; +import org.openecomp.dcae.apod.analytics.common.exception.MessageProcessingException; +import org.openecomp.dcae.apod.analytics.common.service.processor.AbstractMessageProcessor; +import org.openecomp.dcae.apod.analytics.common.service.processor.GenericMessageChainProcessor; +import org.openecomp.dcae.apod.analytics.model.domain.cef.CommonEventHeader; +import org.openecomp.dcae.apod.analytics.model.domain.cef.EventListener; +import org.openecomp.dcae.apod.analytics.model.domain.cef.EventSeverity; +import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.Direction; +import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.MetricsPerFunctionalRole; +import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.TCAPolicy; +import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.Threshold; +import org.openecomp.dcae.apod.analytics.model.facade.tca.AAI; +import org.openecomp.dcae.apod.analytics.model.facade.tca.TCAVESResponse; +import org.openecomp.dcae.apod.analytics.model.util.AnalyticsModelJsonUtils; +import org.openecomp.dcae.apod.analytics.tca.persistance.TCAVESAlertEntity; +import org.openecomp.dcae.apod.analytics.tca.processor.TCACEFJsonProcessor; +import org.openecomp.dcae.apod.analytics.tca.processor.TCACEFPolicyDomainFilter; +import org.openecomp.dcae.apod.analytics.tca.processor.TCACEFPolicyFunctionalRoleFilter; +import org.openecomp.dcae.apod.analytics.tca.processor.TCACEFPolicyThresholdsProcessor; +import org.openecomp.dcae.apod.analytics.tca.processor.TCACEFProcessorContext; +import org.openecomp.dcae.apod.analytics.tca.settings.TCAAppPreferences; +import org.openecomp.dcae.apod.analytics.tca.settings.TCAPolicyPreferences; +import org.openecomp.dcae.apod.analytics.tca.validator.TCAPolicyPreferencesValidator; +import org.openecomp.dcae.apod.analytics.tca.validator.TCAPreferencesValidator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -87,8 +87,8 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import static com.google.common.collect.Lists.newArrayList; -import static org.openecomp.dcae.analytics.common.AnalyticsConstants.TCA_POLICY_METRICS_PER_FUNCTIONAL_ROLE_PATH; -import static org.openecomp.dcae.analytics.common.utils.ValidationUtils.validateSettings; +import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.TCA_POLICY_METRICS_PER_FUNCTIONAL_ROLE_PATH; +import static org.openecomp.dcae.apod.analytics.common.utils.ValidationUtils.validateSettings; /** * Utility Helper methods for TCA sub module only. Extends {@link AnalyticsModelJsonUtils} to get diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/validator/TCAAppConfigValidator.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/validator/TCAAppConfigValidator.java index 05b0331..de6d38e 100644 --- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/validator/TCAAppConfigValidator.java +++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/validator/TCAAppConfigValidator.java @@ -18,13 +18,13 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.validator; +package org.openecomp.dcae.apod.analytics.tca.validator; -import org.openecomp.dcae.analytics.common.cdap.validation.CDAPAppSettingsValidator; -import org.openecomp.dcae.analytics.common.validation.GenericValidationResponse; -import org.openecomp.dcae.analytics.tca.settings.TCAAppConfig; +import org.openecomp.dcae.apod.analytics.common.cdap.validation.CDAPAppSettingsValidator; +import org.openecomp.dcae.apod.analytics.common.validation.GenericValidationResponse; +import org.openecomp.dcae.apod.analytics.tca.settings.TCAAppConfig; -import static org.openecomp.dcae.analytics.common.utils.ValidationUtils.isEmpty; +import static org.openecomp.dcae.apod.analytics.common.utils.ValidationUtils.isEmpty; /** * <p> diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/validator/TCAPolicyPreferencesValidator.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/validator/TCAPolicyPreferencesValidator.java index 0ff0eb6..5984bac 100644 --- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/validator/TCAPolicyPreferencesValidator.java +++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/validator/TCAPolicyPreferencesValidator.java @@ -18,20 +18,20 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.validator; +package org.openecomp.dcae.apod.analytics.tca.validator; -import org.openecomp.dcae.analytics.common.cdap.validation.CDAPAppSettingsValidator; -import org.openecomp.dcae.analytics.common.validation.GenericValidationResponse; -import org.openecomp.dcae.analytics.model.domain.cef.EventSeverity; -import org.openecomp.dcae.analytics.model.domain.policy.tca.Direction; -import org.openecomp.dcae.analytics.model.domain.policy.tca.MetricsPerFunctionalRole; -import org.openecomp.dcae.analytics.model.domain.policy.tca.Threshold; -import org.openecomp.dcae.analytics.tca.settings.TCAPolicyPreferences; -import org.openecomp.dcae.analytics.tca.utils.TCAUtils; +import org.openecomp.dcae.apod.analytics.common.cdap.validation.CDAPAppSettingsValidator; +import org.openecomp.dcae.apod.analytics.common.validation.GenericValidationResponse; +import org.openecomp.dcae.apod.analytics.model.domain.cef.EventSeverity; +import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.Direction; +import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.MetricsPerFunctionalRole; +import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.Threshold; +import org.openecomp.dcae.apod.analytics.tca.settings.TCAPolicyPreferences; +import org.openecomp.dcae.apod.analytics.tca.utils.TCAUtils; import java.util.List; -import static org.openecomp.dcae.analytics.common.utils.ValidationUtils.isEmpty; +import static org.openecomp.dcae.apod.analytics.common.utils.ValidationUtils.isEmpty; /** * Validates TCA Policy Preferences diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/validator/TCAPreferencesValidator.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/validator/TCAPreferencesValidator.java index a7cbbf5..78da6f9 100644 --- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/validator/TCAPreferencesValidator.java +++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/validator/TCAPreferencesValidator.java @@ -18,13 +18,13 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.validator; +package org.openecomp.dcae.apod.analytics.tca.validator; -import org.openecomp.dcae.analytics.common.cdap.validation.CDAPAppSettingsValidator; -import org.openecomp.dcae.analytics.common.validation.GenericValidationResponse; -import org.openecomp.dcae.analytics.tca.settings.TCAAppPreferences; +import org.openecomp.dcae.apod.analytics.common.cdap.validation.CDAPAppSettingsValidator; +import org.openecomp.dcae.apod.analytics.common.validation.GenericValidationResponse; +import org.openecomp.dcae.apod.analytics.tca.settings.TCAAppPreferences; -import static org.openecomp.dcae.analytics.common.utils.ValidationUtils.isEmpty; +import static org.openecomp.dcae.apod.analytics.common.utils.ValidationUtils.isEmpty; /** * diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/worker/TCADMaaPMRPublisherJob.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/worker/TCADMaaPMRPublisherJob.java index 4a9a7ab..cba3d86 100644 --- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/worker/TCADMaaPMRPublisherJob.java +++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/worker/TCADMaaPMRPublisherJob.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.worker; +package org.openecomp.dcae.apod.analytics.tca.worker; import co.cask.cdap.api.TxRunnable; import co.cask.cdap.api.common.Bytes; @@ -30,14 +30,14 @@ import co.cask.cdap.api.metrics.Metrics; import co.cask.cdap.api.worker.WorkerContext; import com.google.common.base.Joiner; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import org.openecomp.dcae.analytics.common.CDAPMetricsConstants; -import org.openecomp.dcae.analytics.common.exception.DCAEAnalyticsRuntimeException; -import org.openecomp.dcae.analytics.common.utils.HTTPUtils; -import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRPublisherResponse; -import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisher; -import org.openecomp.dcae.analytics.tca.persistance.TCAVESAlertEntity; -import org.openecomp.dcae.analytics.tca.persistance.TCAVESAlertsPersister; -import org.openecomp.dcae.analytics.tca.utils.TCAUtils; +import org.openecomp.dcae.apod.analytics.common.CDAPMetricsConstants; +import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException; +import org.openecomp.dcae.apod.analytics.common.utils.HTTPUtils; +import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRPublisherResponse; +import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisher; +import org.openecomp.dcae.apod.analytics.tca.persistance.TCAVESAlertEntity; +import org.openecomp.dcae.apod.analytics.tca.persistance.TCAVESAlertsPersister; +import org.openecomp.dcae.apod.analytics.tca.utils.TCAUtils; import org.quartz.DisallowConcurrentExecution; import org.quartz.Job; import org.quartz.JobDataMap; @@ -53,10 +53,10 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static org.openecomp.dcae.analytics.common.AnalyticsConstants.CDAP_ALERTS_TABLE_VARIABLE_NAME; -import static org.openecomp.dcae.analytics.common.AnalyticsConstants.DMAAP_METRICS_VARIABLE_NAME; -import static org.openecomp.dcae.analytics.common.AnalyticsConstants.DMAAP_PUBLISHER_VARIABLE_NAME; -import static org.openecomp.dcae.analytics.common.AnalyticsConstants.WORKER_CONTEXT_VARIABLE_NAME; +import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.CDAP_ALERTS_TABLE_VARIABLE_NAME; +import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.DMAAP_METRICS_VARIABLE_NAME; +import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.DMAAP_PUBLISHER_VARIABLE_NAME; +import static org.openecomp.dcae.apod.analytics.common.AnalyticsConstants.WORKER_CONTEXT_VARIABLE_NAME; /** * Quartz Job that will monitor any new alert messages in given TCA Alerts table and if any found publish them to diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/worker/TCADMaaPMRSubscriberJob.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/worker/TCADMaaPMRSubscriberJob.java index 7212527..d5c9c41 100644 --- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/worker/TCADMaaPMRSubscriberJob.java +++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/worker/TCADMaaPMRSubscriberJob.java @@ -18,18 +18,18 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.worker; +package org.openecomp.dcae.apod.analytics.tca.worker; import co.cask.cdap.api.metrics.Metrics; import co.cask.cdap.api.worker.WorkerContext; import com.google.common.base.Optional; import com.google.common.base.Stopwatch; -import org.openecomp.dcae.analytics.common.AnalyticsConstants; -import org.openecomp.dcae.analytics.common.CDAPMetricsConstants; -import org.openecomp.dcae.analytics.common.exception.DCAEAnalyticsRuntimeException; -import org.openecomp.dcae.analytics.common.utils.HTTPUtils; -import org.openecomp.dcae.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse; -import org.openecomp.dcae.analytics.dmaap.service.subscriber.DMaaPMRSubscriber; +import org.openecomp.dcae.apod.analytics.common.AnalyticsConstants; +import org.openecomp.dcae.apod.analytics.common.CDAPMetricsConstants; +import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException; +import org.openecomp.dcae.apod.analytics.common.utils.HTTPUtils; +import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse; +import org.openecomp.dcae.apod.analytics.dmaap.service.subscriber.DMaaPMRSubscriber; import org.quartz.DisallowConcurrentExecution; import org.quartz.Job; import org.quartz.JobDataMap; diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/worker/TCADMaaPMockSubscriberWorker.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/worker/TCADMaaPMockSubscriberWorker.java index d8d1968..0e3da5e 100644 --- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/worker/TCADMaaPMockSubscriberWorker.java +++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/worker/TCADMaaPMockSubscriberWorker.java @@ -18,15 +18,15 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.worker; +package org.openecomp.dcae.apod.analytics.tca.worker; import co.cask.cdap.api.annotation.Property; import co.cask.cdap.api.worker.AbstractWorker; import co.cask.cdap.api.worker.WorkerContext; import com.fasterxml.jackson.core.type.TypeReference; -import org.openecomp.dcae.analytics.common.exception.DCAEAnalyticsRuntimeException; -import org.openecomp.dcae.analytics.model.domain.cef.EventListener; -import org.openecomp.dcae.analytics.tca.settings.TCAAppPreferences; +import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException; +import org.openecomp.dcae.apod.analytics.model.domain.cef.EventListener; +import org.openecomp.dcae.apod.analytics.tca.settings.TCAAppPreferences; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,9 +35,9 @@ import java.io.IOException; import java.io.InputStream; import java.util.List; -import static org.openecomp.dcae.analytics.tca.utils.TCAUtils.getValidatedTCAAppPreferences; -import static org.openecomp.dcae.analytics.tca.utils.TCAUtils.readValue; -import static org.openecomp.dcae.analytics.tca.utils.TCAUtils.writeValueAsString; +import static org.openecomp.dcae.apod.analytics.tca.utils.TCAUtils.getValidatedTCAAppPreferences; +import static org.openecomp.dcae.apod.analytics.tca.utils.TCAUtils.readValue; +import static org.openecomp.dcae.apod.analytics.tca.utils.TCAUtils.writeValueAsString; /** * CDAP Worker which mocks fetching VES Messages from DMaaP MR topic. diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/worker/TCADMaaPPublisherWorker.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/worker/TCADMaaPPublisherWorker.java index 49f98fc..0286d43 100644 --- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/worker/TCADMaaPPublisherWorker.java +++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/worker/TCADMaaPPublisherWorker.java @@ -18,22 +18,22 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.worker; +package org.openecomp.dcae.apod.analytics.tca.worker; import co.cask.cdap.api.annotation.Property; import co.cask.cdap.api.metrics.Metrics; import co.cask.cdap.api.worker.AbstractWorker; import co.cask.cdap.api.worker.WorkerContext; -import org.openecomp.dcae.analytics.common.AnalyticsConstants; -import org.openecomp.dcae.analytics.common.CDAPComponentsConstants; -import org.openecomp.dcae.analytics.common.exception.DCAEAnalyticsRuntimeException; -import org.openecomp.dcae.analytics.dmaap.DMaaPMRFactory; -import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRPublisherConfig; -import org.openecomp.dcae.analytics.dmaap.service.publisher.DMaaPMRPublisher; -import org.openecomp.dcae.analytics.model.util.AnalyticsModelIOUtils; -import org.openecomp.dcae.analytics.tca.settings.TCAAppPreferences; -import org.openecomp.dcae.analytics.tca.utils.AppPreferencesToPublisherConfigMapper; -import org.openecomp.dcae.analytics.tca.utils.TCAUtils; +import org.openecomp.dcae.apod.analytics.common.AnalyticsConstants; +import org.openecomp.dcae.apod.analytics.common.CDAPComponentsConstants; +import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException; +import org.openecomp.dcae.apod.analytics.dmaap.DMaaPMRFactory; +import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRPublisherConfig; +import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisher; +import org.openecomp.dcae.apod.analytics.model.util.AnalyticsModelIOUtils; +import org.openecomp.dcae.apod.analytics.tca.settings.TCAAppPreferences; +import org.openecomp.dcae.apod.analytics.tca.utils.AppPreferencesToPublisherConfigMapper; +import org.openecomp.dcae.apod.analytics.tca.utils.TCAUtils; import org.quartz.JobBuilder; import org.quartz.JobDataMap; import org.quartz.JobDetail; diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/worker/TCADMaaPSubscriberWorker.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/worker/TCADMaaPSubscriberWorker.java index 8d773e4..7b58dbc 100644 --- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/analytics/tca/worker/TCADMaaPSubscriberWorker.java +++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/worker/TCADMaaPSubscriberWorker.java @@ -18,22 +18,22 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.worker; +package org.openecomp.dcae.apod.analytics.tca.worker; import co.cask.cdap.api.annotation.Property; import co.cask.cdap.api.metrics.Metrics; import co.cask.cdap.api.worker.AbstractWorker; import co.cask.cdap.api.worker.WorkerContext; -import org.openecomp.dcae.analytics.common.AnalyticsConstants; -import org.openecomp.dcae.analytics.common.CDAPComponentsConstants; -import org.openecomp.dcae.analytics.common.exception.DCAEAnalyticsRuntimeException; -import org.openecomp.dcae.analytics.dmaap.DMaaPMRFactory; -import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig; -import org.openecomp.dcae.analytics.dmaap.service.subscriber.DMaaPMRSubscriber; -import org.openecomp.dcae.analytics.model.util.AnalyticsModelIOUtils; -import org.openecomp.dcae.analytics.tca.settings.TCAAppPreferences; -import org.openecomp.dcae.analytics.tca.utils.AppPreferencesToSubscriberConfigMapper; -import org.openecomp.dcae.analytics.tca.utils.TCAUtils; +import org.openecomp.dcae.apod.analytics.common.AnalyticsConstants; +import org.openecomp.dcae.apod.analytics.common.CDAPComponentsConstants; +import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException; +import org.openecomp.dcae.apod.analytics.dmaap.DMaaPMRFactory; +import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig; +import org.openecomp.dcae.apod.analytics.dmaap.service.subscriber.DMaaPMRSubscriber; +import org.openecomp.dcae.apod.analytics.model.util.AnalyticsModelIOUtils; +import org.openecomp.dcae.apod.analytics.tca.settings.TCAAppPreferences; +import org.openecomp.dcae.apod.analytics.tca.utils.AppPreferencesToSubscriberConfigMapper; +import org.openecomp.dcae.apod.analytics.tca.utils.TCAUtils; import org.quartz.JobBuilder; import org.quartz.JobDataMap; import org.quartz.JobDetail; diff --git a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/BaseAnalyticsTCAIT.java b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/BaseAnalyticsTCAIT.java index 4dedf98..e7fa380 100644 --- a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/BaseAnalyticsTCAIT.java +++ b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/BaseAnalyticsTCAIT.java @@ -18,19 +18,19 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca; +package org.openecomp.dcae.apod.analytics.tca; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; import com.google.common.base.Suppliers; import org.junit.BeforeClass; -import org.openecomp.dcae.analytics.common.AnalyticsConstants; -import org.openecomp.dcae.analytics.model.util.AnalyticsModelIOUtils; -import org.openecomp.dcae.analytics.model.util.json.AnalyticsModelObjectMapperSupplier; -import org.openecomp.dcae.analytics.tca.settings.TCATestAppConfig; -import org.openecomp.dcae.analytics.tca.settings.TCATestAppPreferences; -import org.openecomp.dcae.analytics.test.BaseDCAEAnalyticsIT; +import org.openecomp.dcae.apod.analytics.common.AnalyticsConstants; +import org.openecomp.dcae.apod.analytics.model.util.AnalyticsModelIOUtils; +import org.openecomp.dcae.apod.analytics.model.util.json.AnalyticsModelObjectMapperSupplier; +import org.openecomp.dcae.apod.analytics.tca.settings.TCATestAppConfig; +import org.openecomp.dcae.apod.analytics.tca.settings.TCATestAppPreferences; +import org.openecomp.dcae.apod.analytics.test.BaseDCAEAnalyticsIT; import java.util.LinkedHashMap; import java.util.Map; diff --git a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/BaseAnalyticsTCAUnitTest.java b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/BaseAnalyticsTCAUnitTest.java index 38e4ce1..002c427 100644 --- a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/BaseAnalyticsTCAUnitTest.java +++ b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/BaseAnalyticsTCAUnitTest.java @@ -18,19 +18,19 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca; +package org.openecomp.dcae.apod.analytics.tca; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Suppliers; import org.junit.Assert; -import org.openecomp.dcae.analytics.model.domain.cef.EventListener; -import org.openecomp.dcae.analytics.model.domain.policy.tca.Direction; -import org.openecomp.dcae.analytics.model.domain.policy.tca.TCAPolicy; -import org.openecomp.dcae.analytics.model.domain.policy.tca.Threshold; -import org.openecomp.dcae.analytics.model.util.json.AnalyticsModelObjectMapperSupplier; -import org.openecomp.dcae.analytics.tca.settings.TCATestAppPreferences; -import org.openecomp.dcae.analytics.test.BaseDCAEAnalyticsUnitTest; +import org.openecomp.dcae.apod.analytics.model.domain.cef.EventListener; +import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.Direction; +import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.TCAPolicy; +import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.Threshold; +import org.openecomp.dcae.apod.analytics.model.util.json.AnalyticsModelObjectMapperSupplier; +import org.openecomp.dcae.apod.analytics.tca.settings.TCATestAppPreferences; +import org.openecomp.dcae.apod.analytics.test.BaseDCAEAnalyticsUnitTest; import java.io.IOException; import java.io.InputStream; diff --git a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/it/TCAnalyticsAppConfigIT.java b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/it/TCAnalyticsAppConfigIT.java index 2ed5252..59795fd 100644 --- a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/it/TCAnalyticsAppConfigIT.java +++ b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/it/TCAnalyticsAppConfigIT.java @@ -18,13 +18,13 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.it; +package org.openecomp.dcae.apod.analytics.tca.it; import org.junit.Test; -import org.openecomp.dcae.analytics.tca.BaseAnalyticsTCAIT; -import org.openecomp.dcae.analytics.tca.settings.TCATestAppConfig; -import org.openecomp.dcae.analytics.tca.settings.TCATestAppConfigHolder; -import org.openecomp.dcae.analytics.tca.settings.TCATestAppPreferences; +import org.openecomp.dcae.apod.analytics.tca.BaseAnalyticsTCAIT; +import org.openecomp.dcae.apod.analytics.tca.settings.TCATestAppConfig; +import org.openecomp.dcae.apod.analytics.tca.settings.TCATestAppConfigHolder; +import org.openecomp.dcae.apod.analytics.tca.settings.TCATestAppPreferences; /** * diff --git a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/processor/TCACEFJsonProcessorTest.java b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFJsonProcessorTest.java index 05efcd6..dfb640c 100644 --- a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/processor/TCACEFJsonProcessorTest.java +++ b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFJsonProcessorTest.java @@ -18,12 +18,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.processor; +package org.openecomp.dcae.apod.analytics.tca.processor; import org.junit.Test; -import org.openecomp.dcae.analytics.common.exception.MessageProcessingException; -import org.openecomp.dcae.analytics.model.domain.cef.EventListener; -import org.openecomp.dcae.analytics.tca.BaseAnalyticsTCAUnitTest; +import org.openecomp.dcae.apod.analytics.common.exception.MessageProcessingException; +import org.openecomp.dcae.apod.analytics.model.domain.cef.EventListener; +import org.openecomp.dcae.apod.analytics.tca.BaseAnalyticsTCAUnitTest; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/processor/TCACEFPolicyThresholdsProcessorTest.java b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyThresholdsProcessorTest.java index 8d83307..e03d81b 100644 --- a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/processor/TCACEFPolicyThresholdsProcessorTest.java +++ b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyThresholdsProcessorTest.java @@ -18,12 +18,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.processor; +package org.openecomp.dcae.apod.analytics.tca.processor; import org.junit.Test; -import org.openecomp.dcae.analytics.common.service.processor.ProcessingState; -import org.openecomp.dcae.analytics.model.domain.cef.EventListener; -import org.openecomp.dcae.analytics.tca.BaseAnalyticsTCAUnitTest; +import org.openecomp.dcae.apod.analytics.common.service.processor.ProcessingState; +import org.openecomp.dcae.apod.analytics.model.domain.cef.EventListener; +import org.openecomp.dcae.apod.analytics.tca.BaseAnalyticsTCAUnitTest; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertFalse; diff --git a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/processor/TCACEFProcessorContextTest.java b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFProcessorContextTest.java index d955d81..ff044bc 100644 --- a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/processor/TCACEFProcessorContextTest.java +++ b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFProcessorContextTest.java @@ -18,10 +18,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.processor; +package org.openecomp.dcae.apod.analytics.tca.processor; import org.junit.Test; -import org.openecomp.dcae.analytics.tca.BaseAnalyticsTCAUnitTest; +import org.openecomp.dcae.apod.analytics.tca.BaseAnalyticsTCAUnitTest; /** * diff --git a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/settings/TCATestAppConfig.java b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/settings/TCATestAppConfig.java index 4e057cc..b8718c3 100644 --- a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/settings/TCATestAppConfig.java +++ b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/settings/TCATestAppConfig.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.settings; +package org.openecomp.dcae.apod.analytics.tca.settings; /** * TCA Test App Config is used for testing purposes only diff --git a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/settings/TCATestAppConfigHolder.java b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/settings/TCATestAppConfigHolder.java index e854cac..4007a7c 100644 --- a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/settings/TCATestAppConfigHolder.java +++ b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/settings/TCATestAppConfigHolder.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.settings; +package org.openecomp.dcae.apod.analytics.tca.settings; /** * Holder for TCA Test App Config diff --git a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/settings/TCATestAppPreferences.java b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/settings/TCATestAppPreferences.java index f8a0474..2218d63 100644 --- a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/settings/TCATestAppPreferences.java +++ b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/settings/TCATestAppPreferences.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.settings; +package org.openecomp.dcae.apod.analytics.tca.settings; import com.fasterxml.jackson.annotation.JsonAnyGetter; diff --git a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/utils/AppPreferencesToPublisherConfigMapperTest.java b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/utils/AppPreferencesToPublisherConfigMapperTest.java index d66ef52..7ae3cf8 100644 --- a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/utils/AppPreferencesToPublisherConfigMapperTest.java +++ b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/utils/AppPreferencesToPublisherConfigMapperTest.java @@ -18,14 +18,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.utils; +package org.openecomp.dcae.apod.analytics.tca.utils; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.runners.MockitoJUnitRunner; -import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRPublisherConfig; -import org.openecomp.dcae.analytics.tca.BaseAnalyticsTCAUnitTest; -import org.openecomp.dcae.analytics.tca.settings.TCATestAppPreferences; +import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRPublisherConfig; +import org.openecomp.dcae.apod.analytics.tca.BaseAnalyticsTCAUnitTest; +import org.openecomp.dcae.apod.analytics.tca.settings.TCATestAppPreferences; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/utils/AppPreferencesToSubscriberConfigMapperTest.java b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/utils/AppPreferencesToSubscriberConfigMapperTest.java index 6963201..7ff8d60 100644 --- a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/utils/AppPreferencesToSubscriberConfigMapperTest.java +++ b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/utils/AppPreferencesToSubscriberConfigMapperTest.java @@ -18,14 +18,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.utils; +package org.openecomp.dcae.apod.analytics.tca.utils; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.runners.MockitoJUnitRunner; -import org.openecomp.dcae.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig; -import org.openecomp.dcae.analytics.tca.BaseAnalyticsTCAUnitTest; -import org.openecomp.dcae.analytics.tca.settings.TCATestAppPreferences; +import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig; +import org.openecomp.dcae.apod.analytics.tca.BaseAnalyticsTCAUnitTest; +import org.openecomp.dcae.apod.analytics.tca.settings.TCATestAppPreferences; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/utils/TCAUtilsTest.java b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/utils/TCAUtilsTest.java index 19c80d2..7fa961e 100644 --- a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/utils/TCAUtilsTest.java +++ b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/utils/TCAUtilsTest.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.utils; +package org.openecomp.dcae.apod.analytics.tca.utils; import co.cask.cdap.api.RuntimeContext; import com.google.common.base.Supplier; @@ -31,19 +31,19 @@ import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; -import org.openecomp.dcae.analytics.common.exception.MessageProcessingException; -import org.openecomp.dcae.analytics.model.domain.cef.CommonEventHeader; -import org.openecomp.dcae.analytics.model.domain.cef.Event; -import org.openecomp.dcae.analytics.model.domain.cef.EventListener; -import org.openecomp.dcae.analytics.model.domain.cef.EventSeverity; -import org.openecomp.dcae.analytics.model.domain.policy.tca.MetricsPerFunctionalRole; -import org.openecomp.dcae.analytics.model.domain.policy.tca.TCAPolicy; -import org.openecomp.dcae.analytics.model.domain.policy.tca.Threshold; -import org.openecomp.dcae.analytics.model.facade.tca.TCAVESResponse; -import org.openecomp.dcae.analytics.model.util.AnalyticsModelIOUtils; -import org.openecomp.dcae.analytics.tca.BaseAnalyticsTCAUnitTest; -import org.openecomp.dcae.analytics.tca.processor.TCACEFProcessorContext; -import org.openecomp.dcae.analytics.tca.settings.TCAAppPreferences; +import org.openecomp.dcae.apod.analytics.common.exception.MessageProcessingException; +import org.openecomp.dcae.apod.analytics.model.domain.cef.CommonEventHeader; +import org.openecomp.dcae.apod.analytics.model.domain.cef.Event; +import org.openecomp.dcae.apod.analytics.model.domain.cef.EventListener; +import org.openecomp.dcae.apod.analytics.model.domain.cef.EventSeverity; +import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.MetricsPerFunctionalRole; +import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.TCAPolicy; +import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.Threshold; +import org.openecomp.dcae.apod.analytics.model.facade.tca.TCAVESResponse; +import org.openecomp.dcae.apod.analytics.model.util.AnalyticsModelIOUtils; +import org.openecomp.dcae.apod.analytics.tca.BaseAnalyticsTCAUnitTest; +import org.openecomp.dcae.apod.analytics.tca.processor.TCACEFProcessorContext; +import org.openecomp.dcae.apod.analytics.tca.settings.TCAAppPreferences; import java.util.HashMap; import java.util.LinkedHashMap; diff --git a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/worker/TCADMaaPMRSubscriberJobTest.java b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/worker/TCADMaaPMRSubscriberJobTest.java index bc8a6f0..453f195 100644 --- a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/analytics/tca/worker/TCADMaaPMRSubscriberJobTest.java +++ b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/worker/TCADMaaPMRSubscriberJobTest.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.tca.worker; +package org.openecomp.dcae.apod.analytics.tca.worker; import co.cask.cdap.api.metrics.Metrics; import co.cask.cdap.api.worker.WorkerConfigurer; @@ -27,9 +27,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; -import org.openecomp.dcae.analytics.common.AnalyticsConstants; -import org.openecomp.dcae.analytics.dmaap.service.subscriber.DMaaPMRSubscriber; -import org.openecomp.dcae.analytics.tca.BaseAnalyticsTCAUnitTest; +import org.openecomp.dcae.apod.analytics.common.AnalyticsConstants; +import org.openecomp.dcae.apod.analytics.dmaap.service.subscriber.DMaaPMRSubscriber; +import org.openecomp.dcae.apod.analytics.tca.BaseAnalyticsTCAUnitTest; import org.quartz.JobDataMap; import org.quartz.JobExecutionContext; diff --git a/dcae-analytics-test/pom.xml b/dcae-analytics-test/pom.xml index 2654a1d..0847793 100644 --- a/dcae-analytics-test/pom.xml +++ b/dcae-analytics-test/pom.xml @@ -27,7 +27,7 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.openecomp.dcae.analytics</groupId> + <groupId>org.openecomp.dcae.apod.analytics</groupId> <artifactId>dcae-analytics</artifactId> <version>1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> diff --git a/dcae-analytics-test/src/main/java/org/openecomp/dcae/analytics/test/BaseDCAEAnalyticsCommonTest.java b/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/BaseDCAEAnalyticsCommonTest.java index c40bd94..a7f2e04 100644 --- a/dcae-analytics-test/src/main/java/org/openecomp/dcae/analytics/test/BaseDCAEAnalyticsCommonTest.java +++ b/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/BaseDCAEAnalyticsCommonTest.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.test; +package org.openecomp.dcae.apod.analytics.test; import org.json.JSONException; import org.junit.Assert; diff --git a/dcae-analytics-test/src/main/java/org/openecomp/dcae/analytics/test/BaseDCAEAnalyticsIT.java b/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/BaseDCAEAnalyticsIT.java index 789f7ec..067a95a 100644 --- a/dcae-analytics-test/src/main/java/org/openecomp/dcae/analytics/test/BaseDCAEAnalyticsIT.java +++ b/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/BaseDCAEAnalyticsIT.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.test; +package org.openecomp.dcae.apod.analytics.test; /** * Base class for all DCAE Analytics Integration Tests diff --git a/dcae-analytics-test/src/main/java/org/openecomp/dcae/analytics/test/BaseDCAEAnalyticsUnitTest.java b/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/BaseDCAEAnalyticsUnitTest.java index 7c5526f..87d40b3 100644 --- a/dcae-analytics-test/src/main/java/org/openecomp/dcae/analytics/test/BaseDCAEAnalyticsUnitTest.java +++ b/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/BaseDCAEAnalyticsUnitTest.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.test; +package org.openecomp.dcae.apod.analytics.test; /** * Base class for all DCAE Analytics Unit Tests diff --git a/dcae-analytics-test/src/main/java/org/openecomp/dcae/analytics/test/annotation/GuiceModules.java b/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/annotation/GuiceModules.java index 3ee8163..585b399 100644 --- a/dcae-analytics-test/src/main/java/org/openecomp/dcae/analytics/test/annotation/GuiceModules.java +++ b/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/annotation/GuiceModules.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.test.annotation; +package org.openecomp.dcae.apod.analytics.test.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; diff --git a/dcae-analytics-test/src/main/java/org/openecomp/dcae/analytics/test/runner/GuiceJUnitRunner.java b/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/runner/GuiceJUnitRunner.java index 21a89a9..67b346f 100644 --- a/dcae-analytics-test/src/main/java/org/openecomp/dcae/analytics/test/runner/GuiceJUnitRunner.java +++ b/dcae-analytics-test/src/main/java/org/openecomp/dcae/apod/analytics/test/runner/GuiceJUnitRunner.java @@ -18,14 +18,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.analytics.test.runner; +package org.openecomp.dcae.apod.analytics.test.runner; import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Module; import org.junit.runners.BlockJUnit4ClassRunner; import org.junit.runners.model.InitializationError; -import org.openecomp.dcae.analytics.test.annotation.GuiceModules; +import org.openecomp.dcae.apod.analytics.test.annotation.GuiceModules; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/findbugs-exclude.xml b/findbugs-exclude.xml index 4033614..9344c19 100644 --- a/findbugs-exclude.xml +++ b/findbugs-exclude.xml @@ -20,14 +20,10 @@ --> <FindBugsFilter> - <Match> - <!-- Ignore warnings for DACE Models project --> - <Class name="org.openecomp.dcae.analytics.model.domain.cef.MeasurementsForVfScaling"/> - </Match> <Match> <!-- TCA Application has unconfirmed cast which is provided by CDAP --> - <Class name="org.openecomp.dcae.analytics.tca.TCAAnalyticsApplication"/> + <Class name="org.openecomp.dcae.apod.analytics.tca.TCAAnalyticsApplication"/> <Bug pattern="BC_UNCONFIRMED_CAST_OF_RETURN_VALUE"/> </Match> @@ -27,7 +27,7 @@ <modelVersion>4.0.0</modelVersion> - <groupId>org.openecomp.dcae.analytics</groupId> + <groupId>org.openecomp.dcae.apod.analytics</groupId> <artifactId>dcae-analytics</artifactId> <version>1.0-SNAPSHOT</version> <packaging>pom</packaging> @@ -51,14 +51,14 @@ <distributionManagement> <repository> - <id>ecomp-releases</id> - <name>OpenECOMP Release Repository</name> - <url>${openecomp.nexus.releases}</url> + <id>osecomp-nexus-releases</id> + <name>OSECOMP Release Repository</name> + <url>https://ecomp-nexus:8443/repository/maven-releases</url> </repository> <snapshotRepository> - <id>ecomp-snapshots</id> - <name>OpenECOMP Snapshot Repository</name> - <url>${openecomp.nexus.snapshots}</url> + <id>osecomp-nexus-snapshots</id> + <name>OSECOMP Snapshot Repository</name> + <url>https://ecomp-nexus:8443/repository/maven-snapshots</url> </snapshotRepository> <site> <id>dcae-javadoc</id> @@ -148,9 +148,6 @@ </jacoco.ut.execution.data.file> <dependency.locations.enabled>false</dependency.locations.enabled> - <!--NEXUS SETTINGS --> - <openecomp.nexus.releases>https://nexus.openecomp.org/content/repositories/releases/</openecomp.nexus.releases> - <openecomp.nexus.snapshots>https://nexus.openecomp.org/content/repositories/snapshots/</openecomp.nexus.snapshots> </properties> @@ -863,7 +860,7 @@ <!-- BLACK DUCK LICENSE SCANNER --> - <!-- + <!-- <plugin> <groupId>com.blackducksoftware.integration</groupId> <artifactId>hub-maven-plugin</artifactId> @@ -872,6 +869,7 @@ <configuration> <hubProjectName>${project.name}</hubProjectName> <outputDirectory>${project.basedir}</outputDirectory> + <hubIgnoreFailure>true</hubIgnoreFailure> </configuration> <executions> <execution> |