aboutsummaryrefslogtreecommitdiffstats
path: root/dcae-analytics-cdap-common-model
diff options
context:
space:
mode:
authorCarsten Lund <lund@research.att.com>2017-04-16 14:22:00 +0000
committerCarsten Lund <lund@research.att.com>2017-04-16 14:22:34 +0000
commit2f0975136c52c1e3f2a836a37de567a3d1b99268 (patch)
treeaaade7a50aa755edfa3fd585358d58073d1e278a /dcae-analytics-cdap-common-model
parenta8290730acfa358654d7fb5a515377185d939728 (diff)
[DCAE-15] Changes related to version 1.1
See Jira for details Change-Id: I9ad1f99d849ba637c3b95938327eee0e07ed2e75 Signed-off-by: Carsten Lund <lund@research.att.com>
Diffstat (limited to 'dcae-analytics-cdap-common-model')
-rw-r--r--dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/CommonPackage.java18
-rw-r--r--dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/TcaConfiguration.java2
-rw-r--r--dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/TcaMetrics.java2
-rw-r--r--dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/TcaThreshold.java2
-rw-r--r--dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/impl/CommonPackageImpl.java170
-rw-r--r--dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/impl/TcaConfigurationImpl.java2
-rw-r--r--dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/impl/TcaMetricsImpl.java2
-rw-r--r--dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/impl/TcaThresholdImpl.java2
-rw-r--r--dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/util/CommonSwitch.java2
-rw-r--r--dcae-analytics-cdap-common-model/src/main/xcore/common.xcore4
10 files changed, 112 insertions, 94 deletions
diff --git a/dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/CommonPackage.java b/dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/CommonPackage.java
index 334bb03..c517df5 100644
--- a/dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/CommonPackage.java
+++ b/dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/CommonPackage.java
@@ -44,6 +44,24 @@ import org.eclipse.emf.ecore.EReference;
* <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * -
+ * ============LICENSE_START==========================================
+ * OPENECOMP - DCAE
+ * ===================================================================
+ * Copyright (c) 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============================================
+ * <!-- end-model-doc -->
* @see org.openecomp.dcae.analytics.cdap.common.CommonFactory
* @model kind="package"
* annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/dcae-analytics-cdap-common-model/src/main/xcore-gen' basePackage='org.openecomp.dcae.analytics.cdap'"
diff --git a/dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/TcaConfiguration.java b/dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/TcaConfiguration.java
index b86fe62..abfa479 100644
--- a/dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/TcaConfiguration.java
+++ b/dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/TcaConfiguration.java
@@ -34,6 +34,7 @@ import org.eclipse.emf.common.util.EList;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.dcae.analytics.cdap.common.TcaConfiguration#getDomain <em>Domain</em>}</li>
* <li>{@link org.openecomp.dcae.analytics.cdap.common.TcaConfiguration#getSubscriberHostName <em>Subscriber Host Name</em>}</li>
@@ -60,7 +61,6 @@ import org.eclipse.emf.common.util.EList;
* <li>{@link org.openecomp.dcae.analytics.cdap.common.TcaConfiguration#getPublisherPollingInterval <em>Publisher Polling Interval</em>}</li>
* <li>{@link org.openecomp.dcae.analytics.cdap.common.TcaConfiguration#getMetricsPerFunctionalRole <em>Metrics Per Functional Role</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.dcae.analytics.cdap.common.CommonPackage#getTcaConfiguration()
* @model
diff --git a/dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/TcaMetrics.java b/dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/TcaMetrics.java
index 280103f..43716ff 100644
--- a/dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/TcaMetrics.java
+++ b/dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/TcaMetrics.java
@@ -35,11 +35,11 @@ import org.eclipse.emf.common.util.EList;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.dcae.analytics.cdap.common.TcaMetrics#getFunctionalRole <em>Functional Role</em>}</li>
* <li>{@link org.openecomp.dcae.analytics.cdap.common.TcaMetrics#getThresholds <em>Thresholds</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.dcae.analytics.cdap.common.CommonPackage#getTcaMetrics()
* @model annotation="http://openecomp.org/policy policyTemplate='dcae-microservice' dcaeService='tca'"
diff --git a/dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/TcaThreshold.java b/dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/TcaThreshold.java
index 49b249e..9cc0718 100644
--- a/dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/TcaThreshold.java
+++ b/dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/TcaThreshold.java
@@ -32,6 +32,7 @@ import org.openecomp.ncomp.core.NamedEntity;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.dcae.analytics.cdap.common.TcaThreshold#getClosedLoopControlName <em>Closed Loop Control Name</em>}</li>
* <li>{@link org.openecomp.dcae.analytics.cdap.common.TcaThreshold#getVersion <em>Version</em>}</li>
@@ -40,7 +41,6 @@ import org.openecomp.ncomp.core.NamedEntity;
* <li>{@link org.openecomp.dcae.analytics.cdap.common.TcaThreshold#getDirection <em>Direction</em>}</li>
* <li>{@link org.openecomp.dcae.analytics.cdap.common.TcaThreshold#getSeverity <em>Severity</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.dcae.analytics.cdap.common.CommonPackage#getTcaThreshold()
* @model annotation="http://openecomp.org type='configuration'"
diff --git a/dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/impl/CommonPackageImpl.java b/dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/impl/CommonPackageImpl.java
index 3f1e9fd..70bc43d 100644
--- a/dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/impl/CommonPackageImpl.java
+++ b/dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/impl/CommonPackageImpl.java
@@ -597,7 +597,7 @@ public class CommonPackageImpl extends EPackageImpl implements CommonPackage {
// http://www.eclipse.org/emf/2011/Xcore
createXcoreAnnotations();
// http://openecomp.org
- createEcompAnnotations();
+ createOpenecompAnnotations();
// http://openecomp.org/cdap
createCdapAnnotations();
// http://openecomp.org/policy
@@ -623,400 +623,400 @@ public class CommonPackageImpl extends EPackageImpl implements CommonPackage {
}
/**
- * Initializes the annotations for <b>http://openecomp.org/cdap</b>.
+ * Initializes the annotations for <b>http://openecomp.org</b>.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- protected void createCdapAnnotations() {
- String source = "http://openecomp.org/cdap";
+ protected void createOpenecompAnnotations() {
+ String source = "http://openecomp.org";
addAnnotation
(getTcaConfiguration_Domain(),
source,
new String[] {
- "destination", "namespace-prefs:cdap-tca:domain"
+ "type", "configuration"
});
addAnnotation
(getTcaConfiguration_SubscriberHostName(),
source,
new String[] {
- "destination", "namespace-prefs:cdap-tca:subscriberHostName"
+ "type", "configuration"
});
addAnnotation
(getTcaConfiguration_SubscriberHostPort(),
source,
new String[] {
- "destination", "namespace-prefs:cdap-tca:subscriberHostPort"
+ "type", "configuration"
});
addAnnotation
(getTcaConfiguration_SubscriberTopicName(),
source,
new String[] {
- "destination", "namespace-prefs:cdap-tca:subscriberTopicName"
+ "type", "configuration"
});
addAnnotation
(getTcaConfiguration_SubscriberProtocol(),
source,
new String[] {
- "destination", "namespace-prefs:cdap-tca:subscriberProtocol"
+ "type", "configuration"
});
addAnnotation
(getTcaConfiguration_SubscriberUserName(),
source,
new String[] {
- "destination", "namespace-prefs:cdap-tca:subscriberUserName"
+ "type", "configuration"
});
addAnnotation
(getTcaConfiguration_SubscriberUserPassword(),
source,
new String[] {
- "destination", "namespace-prefs:cdap-tca:subscriberUserPassword"
+ "type", "configuration"
});
addAnnotation
(getTcaConfiguration_SubscriberContentType(),
source,
new String[] {
- "destination", "namespace-prefs:cdap-tca:subscriberContentType"
+ "type", "configuration"
});
addAnnotation
(getTcaConfiguration_SubscriberConsumerId(),
source,
new String[] {
- "destination", "namespace-prefs:cdap-tca:subscriberConsumerId"
+ "type", "configuration"
});
addAnnotation
(getTcaConfiguration_SubscriberConsumerGroup(),
source,
new String[] {
- "destination", "namespace-prefs:cdap-tca:subscriberConsumerGroup"
+ "type", "configuration"
});
addAnnotation
(getTcaConfiguration_SubscriberTimeoutMS(),
source,
new String[] {
- "destination", "namespace-prefs:cdap-tca:subscriberTimeoutMS"
+ "type", "configuration"
});
addAnnotation
(getTcaConfiguration_SubscriberMessageLimit(),
source,
new String[] {
- "destination", "namespace-prefs:cdap-tca:subscriberMessageLimit"
+ "type", "configuration"
});
addAnnotation
(getTcaConfiguration_SubscriberPollingInterval(),
source,
new String[] {
- "destination", "namespace-prefs:cdap-tca:subscriberPollingInterval"
+ "type", "configuration"
});
addAnnotation
(getTcaConfiguration_PublisherHostName(),
source,
new String[] {
- "destination", "namespace-prefs:cdap-tca:publisherHostName"
+ "type", "configuration"
});
addAnnotation
(getTcaConfiguration_PublisherHostPort(),
source,
new String[] {
- "destination", "namespace-prefs:cdap-tca:publisherHostPort"
+ "type", "configuration"
});
addAnnotation
(getTcaConfiguration_PublisherTopicName(),
source,
new String[] {
- "destination", "namespace-prefs:cdap-tca:publisherTopicName"
+ "type", "configuration"
});
addAnnotation
(getTcaConfiguration_PublisherProtocol(),
source,
new String[] {
- "destination", "namespace-prefs:cdap-tca:publisherProtocol"
+ "type", "configuration"
});
addAnnotation
(getTcaConfiguration_PublisherUserName(),
source,
new String[] {
- "destination", "namespace-prefs:cdap-tca:publisherUserName"
+ "type", "configuration"
});
addAnnotation
(getTcaConfiguration_PublisherUserPassword(),
source,
new String[] {
- "destination", "namespace-prefs:cdap-tca:publisherUserPassword"
+ "type", "configuration"
});
addAnnotation
(getTcaConfiguration_PublisherContentType(),
source,
new String[] {
- "destination", "namespace-prefs:cdap-tca:publisherContentType"
+ "type", "configuration"
});
addAnnotation
(getTcaConfiguration_PublisherMaxBatchSize(),
source,
new String[] {
- "destination", "namespace-prefs:cdap-tca:publisherMaxBatchSize"
+ "type", "configuration"
});
addAnnotation
(getTcaConfiguration_PublisherMaxRecoveryQueueSize(),
source,
new String[] {
- "destination", "namespace-prefs:cdap-tca:publisherMaxRecoveryQueueSize"
+ "type", "configuration"
});
addAnnotation
(getTcaConfiguration_PublisherPollingInterval(),
source,
new String[] {
- "destination", "namespace-prefs:cdap-tca:publisherPollingInterval"
+ "type", "configuration"
+ });
+ addAnnotation
+ (tcaMetricsEClass,
+ source,
+ new String[] {
+ "type", "configuration"
});
addAnnotation
(getTcaMetrics_FunctionalRole(),
source,
new String[] {
- "destination", "namespace-prefs:cdap-tca:${path}.policy.functionalRole"
+ "type", "configuration"
+ });
+ addAnnotation
+ (getTcaMetrics_Thresholds(),
+ source,
+ new String[] {
+ "type", "configuration"
+ });
+ addAnnotation
+ (tcaThresholdEClass,
+ source,
+ new String[] {
+ "type", "configuration"
});
addAnnotation
(getTcaThreshold_ClosedLoopControlName(),
source,
new String[] {
- "destination", "namespace-prefs:cdap-tca:${path}.policy.closedLoopControlName"
+ "type", "configuration"
});
addAnnotation
(getTcaThreshold_Version(),
source,
new String[] {
- "destination", "namespace-prefs:cdap-tca:${path}.policy.version"
+ "type", "configuration"
});
addAnnotation
(getTcaThreshold_FieldPath(),
source,
new String[] {
- "destination", "namespace-prefs:cdap-tca:${path}.policy.fieldPath"
+ "type", "configuration"
});
addAnnotation
(getTcaThreshold_ThresholdValue(),
source,
new String[] {
- "destination", "namespace-prefs:cdap-tca:${path}.policy.thresholdValue"
+ "type", "configuration"
});
addAnnotation
(getTcaThreshold_Direction(),
source,
new String[] {
- "destination", "namespace-prefs:cdap-tca:${path}.policy.direction"
+ "type", "configuration"
});
addAnnotation
(getTcaThreshold_Severity(),
source,
new String[] {
- "destination", "namespace-prefs:cdap-tca:${path}.policy.severity"
+ "type", "configuration"
});
}
/**
- * Initializes the annotations for <b>http://openecomp.org</b>.
+ * Initializes the annotations for <b>http://openecomp.org/cdap</b>.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- protected void createEcompAnnotations() {
- String source = "http://openecomp.org";
+ protected void createCdapAnnotations() {
+ String source = "http://openecomp.org/cdap";
addAnnotation
(getTcaConfiguration_Domain(),
source,
new String[] {
- "type", "configuration"
+ "destination", "namespace-prefs:cdap-tca:domain"
});
addAnnotation
(getTcaConfiguration_SubscriberHostName(),
source,
new String[] {
- "type", "configuration"
+ "destination", "namespace-prefs:cdap-tca:subscriberHostName"
});
addAnnotation
(getTcaConfiguration_SubscriberHostPort(),
source,
new String[] {
- "type", "configuration"
+ "destination", "namespace-prefs:cdap-tca:subscriberHostPort"
});
addAnnotation
(getTcaConfiguration_SubscriberTopicName(),
source,
new String[] {
- "type", "configuration"
+ "destination", "namespace-prefs:cdap-tca:subscriberTopicName"
});
addAnnotation
(getTcaConfiguration_SubscriberProtocol(),
source,
new String[] {
- "type", "configuration"
+ "destination", "namespace-prefs:cdap-tca:subscriberProtocol"
});
addAnnotation
(getTcaConfiguration_SubscriberUserName(),
source,
new String[] {
- "type", "configuration"
+ "destination", "namespace-prefs:cdap-tca:subscriberUserName"
});
addAnnotation
(getTcaConfiguration_SubscriberUserPassword(),
source,
new String[] {
- "type", "configuration"
+ "destination", "namespace-prefs:cdap-tca:subscriberUserPassword"
});
addAnnotation
(getTcaConfiguration_SubscriberContentType(),
source,
new String[] {
- "type", "configuration"
+ "destination", "namespace-prefs:cdap-tca:subscriberContentType"
});
addAnnotation
(getTcaConfiguration_SubscriberConsumerId(),
source,
new String[] {
- "type", "configuration"
+ "destination", "namespace-prefs:cdap-tca:subscriberConsumerId"
});
addAnnotation
(getTcaConfiguration_SubscriberConsumerGroup(),
source,
new String[] {
- "type", "configuration"
+ "destination", "namespace-prefs:cdap-tca:subscriberConsumerGroup"
});
addAnnotation
(getTcaConfiguration_SubscriberTimeoutMS(),
source,
new String[] {
- "type", "configuration"
+ "destination", "namespace-prefs:cdap-tca:subscriberTimeoutMS"
});
addAnnotation
(getTcaConfiguration_SubscriberMessageLimit(),
source,
new String[] {
- "type", "configuration"
+ "destination", "namespace-prefs:cdap-tca:subscriberMessageLimit"
});
addAnnotation
(getTcaConfiguration_SubscriberPollingInterval(),
source,
new String[] {
- "type", "configuration"
+ "destination", "namespace-prefs:cdap-tca:subscriberPollingInterval"
});
addAnnotation
(getTcaConfiguration_PublisherHostName(),
source,
new String[] {
- "type", "configuration"
+ "destination", "namespace-prefs:cdap-tca:publisherHostName"
});
addAnnotation
(getTcaConfiguration_PublisherHostPort(),
source,
new String[] {
- "type", "configuration"
+ "destination", "namespace-prefs:cdap-tca:publisherHostPort"
});
addAnnotation
(getTcaConfiguration_PublisherTopicName(),
source,
new String[] {
- "type", "configuration"
+ "destination", "namespace-prefs:cdap-tca:publisherTopicName"
});
addAnnotation
(getTcaConfiguration_PublisherProtocol(),
source,
new String[] {
- "type", "configuration"
+ "destination", "namespace-prefs:cdap-tca:publisherProtocol"
});
addAnnotation
(getTcaConfiguration_PublisherUserName(),
source,
new String[] {
- "type", "configuration"
+ "destination", "namespace-prefs:cdap-tca:publisherUserName"
});
addAnnotation
(getTcaConfiguration_PublisherUserPassword(),
source,
new String[] {
- "type", "configuration"
+ "destination", "namespace-prefs:cdap-tca:publisherUserPassword"
});
addAnnotation
(getTcaConfiguration_PublisherContentType(),
source,
new String[] {
- "type", "configuration"
+ "destination", "namespace-prefs:cdap-tca:publisherContentType"
});
addAnnotation
(getTcaConfiguration_PublisherMaxBatchSize(),
source,
new String[] {
- "type", "configuration"
+ "destination", "namespace-prefs:cdap-tca:publisherMaxBatchSize"
});
addAnnotation
(getTcaConfiguration_PublisherMaxRecoveryQueueSize(),
source,
new String[] {
- "type", "configuration"
+ "destination", "namespace-prefs:cdap-tca:publisherMaxRecoveryQueueSize"
});
addAnnotation
(getTcaConfiguration_PublisherPollingInterval(),
source,
new String[] {
- "type", "configuration"
- });
- addAnnotation
- (tcaMetricsEClass,
- source,
- new String[] {
- "type", "configuration"
+ "destination", "namespace-prefs:cdap-tca:publisherPollingInterval"
});
addAnnotation
(getTcaMetrics_FunctionalRole(),
source,
new String[] {
- "type", "configuration"
- });
- addAnnotation
- (getTcaMetrics_Thresholds(),
- source,
- new String[] {
- "type", "configuration"
- });
- addAnnotation
- (tcaThresholdEClass,
- source,
- new String[] {
- "type", "configuration"
+ "destination", "namespace-prefs:cdap-tca:${path}.policy.functionalRole"
});
addAnnotation
(getTcaThreshold_ClosedLoopControlName(),
source,
new String[] {
- "type", "configuration"
+ "destination", "namespace-prefs:cdap-tca:${path}.policy.closedLoopControlName"
});
addAnnotation
(getTcaThreshold_Version(),
source,
new String[] {
- "type", "configuration"
+ "destination", "namespace-prefs:cdap-tca:${path}.policy.version"
});
addAnnotation
(getTcaThreshold_FieldPath(),
source,
new String[] {
- "type", "configuration"
+ "destination", "namespace-prefs:cdap-tca:${path}.policy.fieldPath"
});
addAnnotation
(getTcaThreshold_ThresholdValue(),
source,
new String[] {
- "type", "configuration"
+ "destination", "namespace-prefs:cdap-tca:${path}.policy.thresholdValue"
});
addAnnotation
(getTcaThreshold_Direction(),
source,
new String[] {
- "type", "configuration"
+ "destination", "namespace-prefs:cdap-tca:${path}.policy.direction"
});
addAnnotation
(getTcaThreshold_Severity(),
source,
new String[] {
- "type", "configuration"
+ "destination", "namespace-prefs:cdap-tca:${path}.policy.severity"
});
}
diff --git a/dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/impl/TcaConfigurationImpl.java b/dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/impl/TcaConfigurationImpl.java
index 208f0f9..8a3e3b6 100644
--- a/dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/impl/TcaConfigurationImpl.java
+++ b/dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/impl/TcaConfigurationImpl.java
@@ -50,6 +50,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.dcae.analytics.cdap.common.impl.TcaConfigurationImpl#getDomain <em>Domain</em>}</li>
* <li>{@link org.openecomp.dcae.analytics.cdap.common.impl.TcaConfigurationImpl#getSubscriberHostName <em>Subscriber Host Name</em>}</li>
@@ -76,7 +77,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <li>{@link org.openecomp.dcae.analytics.cdap.common.impl.TcaConfigurationImpl#getPublisherPollingInterval <em>Publisher Polling Interval</em>}</li>
* <li>{@link org.openecomp.dcae.analytics.cdap.common.impl.TcaConfigurationImpl#getMetricsPerFunctionalRole <em>Metrics Per Functional Role</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/impl/TcaMetricsImpl.java b/dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/impl/TcaMetricsImpl.java
index 5ad8173..619eb45 100644
--- a/dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/impl/TcaMetricsImpl.java
+++ b/dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/impl/TcaMetricsImpl.java
@@ -45,6 +45,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.dcae.analytics.cdap.common.impl.TcaMetricsImpl#getPolicyName <em>Policy Name</em>}</li>
* <li>{@link org.openecomp.dcae.analytics.cdap.common.impl.TcaMetricsImpl#getPolicyDescription <em>Policy Description</em>}</li>
@@ -56,7 +57,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <li>{@link org.openecomp.dcae.analytics.cdap.common.impl.TcaMetricsImpl#getFunctionalRole <em>Functional Role</em>}</li>
* <li>{@link org.openecomp.dcae.analytics.cdap.common.impl.TcaMetricsImpl#getThresholds <em>Thresholds</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/impl/TcaThresholdImpl.java b/dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/impl/TcaThresholdImpl.java
index 7004af4..e433633 100644
--- a/dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/impl/TcaThresholdImpl.java
+++ b/dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/impl/TcaThresholdImpl.java
@@ -36,6 +36,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.dcae.analytics.cdap.common.impl.TcaThresholdImpl#getClosedLoopControlName <em>Closed Loop Control Name</em>}</li>
* <li>{@link org.openecomp.dcae.analytics.cdap.common.impl.TcaThresholdImpl#getVersion <em>Version</em>}</li>
@@ -44,7 +45,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
* <li>{@link org.openecomp.dcae.analytics.cdap.common.impl.TcaThresholdImpl#getDirection <em>Direction</em>}</li>
* <li>{@link org.openecomp.dcae.analytics.cdap.common.impl.TcaThresholdImpl#getSeverity <em>Severity</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/util/CommonSwitch.java b/dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/util/CommonSwitch.java
index 0c52242..e474ae8 100644
--- a/dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/util/CommonSwitch.java
+++ b/dcae-analytics-cdap-common-model/src/main/xcore-gen/org/openecomp/dcae/analytics/cdap/common/util/CommonSwitch.java
@@ -69,7 +69,7 @@ public class CommonSwitch<T> extends Switch<T> {
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/dcae-analytics-cdap-common-model/src/main/xcore/common.xcore b/dcae-analytics-cdap-common-model/src/main/xcore/common.xcore
index c6cc0bb..71333ce 100644
--- a/dcae-analytics-cdap-common-model/src/main/xcore/common.xcore
+++ b/dcae-analytics-cdap-common-model/src/main/xcore/common.xcore
@@ -19,8 +19,8 @@
* ============LICENSE_END============================================
*/
-@GenModel(modelDirectory="/dcae-analytics-cdap-common-model/src/main/xcore-gen")
-package org.openecomp.dcae.analytics.cdap.common
+@GenModel(modelDirectory="/dcae-analytics-cdap-common-model/src/main/xcore-gen")
+package org.openecomp.dcae.analytics.cdap.common
import org.openecomp.dcae.controller.service.cdap.CdapServiceInstanceConfiguration
import org.openecomp.ncomp.core.NamedEntity