From 8fc1dbd5956a1e20b8b576cee791271bc3e7c283 Mon Sep 17 00:00:00 2001 From: Carsten Lund Date: Tue, 2 May 2017 02:14:33 +0000 Subject: [DCAE-15] Changes related to version 1.1 (2) Change-Id: I52fefc397f789b56095f037acc517b364516b2cb Signed-off-by: Carsten Lund --- .../controller/service/cdap/CdapDeployAppStep.java | 22 +++++------ .../service/cdap/CdapLoadArtifactStep.java | 22 +++++------ .../dcae/controller/service/cdap/CdapPackage.java | 36 ++++++++--------- .../service/cdap/impl/CdapDeployAppStepImpl.java | 46 +++++++++++----------- .../cdap/impl/CdapLoadArtifactStepImpl.java | 46 +++++++++++----------- .../service/cdap/impl/CdapPackageImpl.java | 12 +++--- .../src/main/xcore/manager.xcore | 2 +- .../src/main/xcore/service.xcore | 4 +- 8 files changed, 95 insertions(+), 95 deletions(-) (limited to 'dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main') diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapDeployAppStep.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapDeployAppStep.java index e4a884e..f0a4705 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapDeployAppStep.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapDeployAppStep.java @@ -12,7 +12,7 @@ package org.openecomp.dcae.controller.service.cdap; * The following features are supported: *

* * * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapDeployAppStep() @@ -21,29 +21,29 @@ package org.openecomp.dcae.controller.service.cdap; */ public interface CdapDeployAppStep extends CdapStep { /** - * Returns the value of the 'Jarfile' attribute. + * Returns the value of the 'Jar File' attribute. * *

- * If the meaning of the 'Jarfile' attribute isn't clear, + * If the meaning of the 'Jar File' attribute isn't clear, * there really should be more of a description here... *

* - * @return the value of the 'Jarfile' attribute. - * @see #setJarfile(String) - * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapDeployAppStep_Jarfile() + * @return the value of the 'Jar File' attribute. + * @see #setJarFile(String) + * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapDeployAppStep_JarFile() * @model unique="false" * @generated */ - String getJarfile(); + String getJarFile(); /** - * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapDeployAppStep#getJarfile Jarfile}' attribute. + * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapDeployAppStep#getJarFile Jar File}' attribute. * * - * @param value the new value of the 'Jarfile' attribute. - * @see #getJarfile() + * @param value the new value of the 'Jar File' attribute. + * @see #getJarFile() * @generated */ - void setJarfile(String value); + void setJarFile(String value); } // CdapDeployAppStep diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapLoadArtifactStep.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapLoadArtifactStep.java index 9826779..3c8ebf6 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapLoadArtifactStep.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapLoadArtifactStep.java @@ -13,7 +13,7 @@ package org.openecomp.dcae.controller.service.cdap; *

* * @@ -50,30 +50,30 @@ public interface CdapLoadArtifactStep extends CdapStep { void setArtifactName(String value); /** - * Returns the value of the 'Jarfile' attribute. + * Returns the value of the 'Jar File' attribute. * *

- * If the meaning of the 'Jarfile' attribute isn't clear, + * If the meaning of the 'Jar File' attribute isn't clear, * there really should be more of a description here... *

* - * @return the value of the 'Jarfile' attribute. - * @see #setJarfile(String) - * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapLoadArtifactStep_Jarfile() + * @return the value of the 'Jar File' attribute. + * @see #setJarFile(String) + * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapLoadArtifactStep_JarFile() * @model unique="false" * @generated */ - String getJarfile(); + String getJarFile(); /** - * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep#getJarfile Jarfile}' attribute. + * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep#getJarFile Jar File}' attribute. * * - * @param value the new value of the 'Jarfile' attribute. - * @see #getJarfile() + * @param value the new value of the 'Jar File' attribute. + * @see #getJarFile() * @generated */ - void setJarfile(String value); + void setJarFile(String value); /** * Returns the value of the 'Version' attribute. diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapPackage.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapPackage.java index d0f18c1..7582421 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapPackage.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapPackage.java @@ -1122,13 +1122,13 @@ public interface CdapPackage extends EPackage { int CDAP_LOAD_ARTIFACT_STEP__ARTIFACT_NAME = CDAP_STEP_FEATURE_COUNT + 0; /** - * The feature id for the 'Jarfile' attribute. + * The feature id for the 'Jar File' attribute. * * * @generated * @ordered */ - int CDAP_LOAD_ARTIFACT_STEP__JARFILE = CDAP_STEP_FEATURE_COUNT + 1; + int CDAP_LOAD_ARTIFACT_STEP__JAR_FILE = CDAP_STEP_FEATURE_COUNT + 1; /** * The feature id for the 'Version' attribute. @@ -1213,13 +1213,13 @@ public interface CdapPackage extends EPackage { int CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP__ARTIFACT_NAME = CDAP_LOAD_ARTIFACT_STEP__ARTIFACT_NAME; /** - * The feature id for the 'Jarfile' attribute. + * The feature id for the 'Jar File' attribute. * * * @generated * @ordered */ - int CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP__JARFILE = CDAP_LOAD_ARTIFACT_STEP__JARFILE; + int CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP__JAR_FILE = CDAP_LOAD_ARTIFACT_STEP__JAR_FILE; /** * The feature id for the 'Version' attribute. @@ -1513,13 +1513,13 @@ public interface CdapPackage extends EPackage { int CDAP_DEPLOY_APP_STEP__CREATED = CDAP_STEP__CREATED; /** - * The feature id for the 'Jarfile' attribute. + * The feature id for the 'Jar File' attribute. * * * @generated * @ordered */ - int CDAP_DEPLOY_APP_STEP__JARFILE = CDAP_STEP_FEATURE_COUNT + 0; + int CDAP_DEPLOY_APP_STEP__JAR_FILE = CDAP_STEP_FEATURE_COUNT + 0; /** * The number of structural features of the 'Deploy App Step' class. @@ -3031,15 +3031,15 @@ public interface CdapPackage extends EPackage { EAttribute getCdapLoadArtifactStep_ArtifactName(); /** - * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep#getJarfile Jarfile}'. + * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep#getJarFile Jar File}'. * * - * @return the meta object for the attribute 'Jarfile'. - * @see org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep#getJarfile() + * @return the meta object for the attribute 'Jar File'. + * @see org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep#getJarFile() * @see #getCdapLoadArtifactStep() * @generated */ - EAttribute getCdapLoadArtifactStep_Jarfile(); + EAttribute getCdapLoadArtifactStep_JarFile(); /** * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep#getVersion Version}'. @@ -3159,15 +3159,15 @@ public interface CdapPackage extends EPackage { EClass getCdapDeployAppStep(); /** - * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapDeployAppStep#getJarfile Jarfile}'. + * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapDeployAppStep#getJarFile Jar File}'. * * - * @return the meta object for the attribute 'Jarfile'. - * @see org.openecomp.dcae.controller.service.cdap.CdapDeployAppStep#getJarfile() + * @return the meta object for the attribute 'Jar File'. + * @see org.openecomp.dcae.controller.service.cdap.CdapDeployAppStep#getJarFile() * @see #getCdapDeployAppStep() * @generated */ - EAttribute getCdapDeployAppStep_Jarfile(); + EAttribute getCdapDeployAppStep_JarFile(); /** * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapStopFlowStep Stop Flow Step}'. @@ -3924,12 +3924,12 @@ public interface CdapPackage extends EPackage { */ EAttribute CDAP_LOAD_ARTIFACT_STEP__ARTIFACT_NAME = eINSTANCE.getCdapLoadArtifactStep_ArtifactName(); /** - * The meta object literal for the 'Jarfile' attribute feature. + * The meta object literal for the 'Jar File' attribute feature. * * * @generated */ - EAttribute CDAP_LOAD_ARTIFACT_STEP__JARFILE = eINSTANCE.getCdapLoadArtifactStep_Jarfile(); + EAttribute CDAP_LOAD_ARTIFACT_STEP__JAR_FILE = eINSTANCE.getCdapLoadArtifactStep_JarFile(); /** * The meta object literal for the 'Version' attribute feature. * @@ -4016,12 +4016,12 @@ public interface CdapPackage extends EPackage { */ EClass CDAP_DEPLOY_APP_STEP = eINSTANCE.getCdapDeployAppStep(); /** - * The meta object literal for the 'Jarfile' attribute feature. + * The meta object literal for the 'Jar File' attribute feature. * * * @generated */ - EAttribute CDAP_DEPLOY_APP_STEP__JARFILE = eINSTANCE.getCdapDeployAppStep_Jarfile(); + EAttribute CDAP_DEPLOY_APP_STEP__JAR_FILE = eINSTANCE.getCdapDeployAppStep_JarFile(); /** * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStopFlowStepImpl Stop Flow Step}' class. * diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapDeployAppStepImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapDeployAppStepImpl.java index 507a60e..40350c5 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapDeployAppStepImpl.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapDeployAppStepImpl.java @@ -19,31 +19,31 @@ import org.openecomp.dcae.controller.service.cdap.CdapPackage; * The following features are implemented: *

* * * @generated */ public class CdapDeployAppStepImpl extends CdapStepImpl implements CdapDeployAppStep { /** - * The default value of the '{@link #getJarfile() Jarfile}' attribute. + * The default value of the '{@link #getJarFile() Jar File}' attribute. * * - * @see #getJarfile() + * @see #getJarFile() * @generated * @ordered */ - protected static final String JARFILE_EDEFAULT = null; + protected static final String JAR_FILE_EDEFAULT = null; /** - * The cached value of the '{@link #getJarfile() Jarfile}' attribute. + * The cached value of the '{@link #getJarFile() Jar File}' attribute. * * - * @see #getJarfile() + * @see #getJarFile() * @generated * @ordered */ - protected String jarfile = JARFILE_EDEFAULT; + protected String jarFile = JAR_FILE_EDEFAULT; /** * @@ -69,8 +69,8 @@ public class CdapDeployAppStepImpl extends CdapStepImpl implements CdapDeployApp * * @generated */ - public String getJarfile() { - return jarfile; + public String getJarFile() { + return jarFile; } /** @@ -78,11 +78,11 @@ public class CdapDeployAppStepImpl extends CdapStepImpl implements CdapDeployApp * * @generated */ - public void setJarfile(String newJarfile) { - String oldJarfile = jarfile; - jarfile = newJarfile; + public void setJarFile(String newJarFile) { + String oldJarFile = jarFile; + jarFile = newJarFile; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_DEPLOY_APP_STEP__JARFILE, oldJarfile, jarfile)); + eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_DEPLOY_APP_STEP__JAR_FILE, oldJarFile, jarFile)); } /** @@ -93,8 +93,8 @@ public class CdapDeployAppStepImpl extends CdapStepImpl implements CdapDeployApp @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case CdapPackage.CDAP_DEPLOY_APP_STEP__JARFILE: - return getJarfile(); + case CdapPackage.CDAP_DEPLOY_APP_STEP__JAR_FILE: + return getJarFile(); } return super.eGet(featureID, resolve, coreType); } @@ -107,8 +107,8 @@ public class CdapDeployAppStepImpl extends CdapStepImpl implements CdapDeployApp @Override public void eSet(int featureID, Object newValue) { switch (featureID) { - case CdapPackage.CDAP_DEPLOY_APP_STEP__JARFILE: - setJarfile((String)newValue); + case CdapPackage.CDAP_DEPLOY_APP_STEP__JAR_FILE: + setJarFile((String)newValue); return; } super.eSet(featureID, newValue); @@ -122,8 +122,8 @@ public class CdapDeployAppStepImpl extends CdapStepImpl implements CdapDeployApp @Override public void eUnset(int featureID) { switch (featureID) { - case CdapPackage.CDAP_DEPLOY_APP_STEP__JARFILE: - setJarfile(JARFILE_EDEFAULT); + case CdapPackage.CDAP_DEPLOY_APP_STEP__JAR_FILE: + setJarFile(JAR_FILE_EDEFAULT); return; } super.eUnset(featureID); @@ -137,8 +137,8 @@ public class CdapDeployAppStepImpl extends CdapStepImpl implements CdapDeployApp @Override public boolean eIsSet(int featureID) { switch (featureID) { - case CdapPackage.CDAP_DEPLOY_APP_STEP__JARFILE: - return JARFILE_EDEFAULT == null ? jarfile != null : !JARFILE_EDEFAULT.equals(jarfile); + case CdapPackage.CDAP_DEPLOY_APP_STEP__JAR_FILE: + return JAR_FILE_EDEFAULT == null ? jarFile != null : !JAR_FILE_EDEFAULT.equals(jarFile); } return super.eIsSet(featureID); } @@ -153,8 +153,8 @@ public class CdapDeployAppStepImpl extends CdapStepImpl implements CdapDeployApp if (eIsProxy()) return super.toString(); StringBuffer result = new StringBuffer(super.toString()); - result.append(" (jarfile: "); - result.append(jarfile); + result.append(" (jarFile: "); + result.append(jarFile); result.append(')'); return result.toString(); } diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapLoadArtifactStepImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapLoadArtifactStepImpl.java index c9c3ccc..19168c1 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapLoadArtifactStepImpl.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapLoadArtifactStepImpl.java @@ -18,7 +18,7 @@ import org.openecomp.dcae.controller.service.cdap.CdapPackage; *

* * @@ -44,23 +44,23 @@ public class CdapLoadArtifactStepImpl extends CdapStepImpl implements CdapLoadAr */ protected String artifactName = ARTIFACT_NAME_EDEFAULT; /** - * The default value of the '{@link #getJarfile() Jarfile}' attribute. + * The default value of the '{@link #getJarFile() Jar File}' attribute. * * - * @see #getJarfile() + * @see #getJarFile() * @generated * @ordered */ - protected static final String JARFILE_EDEFAULT = null; + protected static final String JAR_FILE_EDEFAULT = null; /** - * The cached value of the '{@link #getJarfile() Jarfile}' attribute. + * The cached value of the '{@link #getJarFile() Jar File}' attribute. * * - * @see #getJarfile() + * @see #getJarFile() * @generated * @ordered */ - protected String jarfile = JARFILE_EDEFAULT; + protected String jarFile = JAR_FILE_EDEFAULT; /** * The default value of the '{@link #getVersion() Version}' attribute. * @@ -125,8 +125,8 @@ public class CdapLoadArtifactStepImpl extends CdapStepImpl implements CdapLoadAr * * @generated */ - public String getJarfile() { - return jarfile; + public String getJarFile() { + return jarFile; } /** @@ -134,11 +134,11 @@ public class CdapLoadArtifactStepImpl extends CdapStepImpl implements CdapLoadAr * * @generated */ - public void setJarfile(String newJarfile) { - String oldJarfile = jarfile; - jarfile = newJarfile; + public void setJarFile(String newJarFile) { + String oldJarFile = jarFile; + jarFile = newJarFile; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_LOAD_ARTIFACT_STEP__JARFILE, oldJarfile, jarfile)); + eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_LOAD_ARTIFACT_STEP__JAR_FILE, oldJarFile, jarFile)); } /** @@ -172,8 +172,8 @@ public class CdapLoadArtifactStepImpl extends CdapStepImpl implements CdapLoadAr switch (featureID) { case CdapPackage.CDAP_LOAD_ARTIFACT_STEP__ARTIFACT_NAME: return getArtifactName(); - case CdapPackage.CDAP_LOAD_ARTIFACT_STEP__JARFILE: - return getJarfile(); + case CdapPackage.CDAP_LOAD_ARTIFACT_STEP__JAR_FILE: + return getJarFile(); case CdapPackage.CDAP_LOAD_ARTIFACT_STEP__VERSION: return getVersion(); } @@ -191,8 +191,8 @@ public class CdapLoadArtifactStepImpl extends CdapStepImpl implements CdapLoadAr case CdapPackage.CDAP_LOAD_ARTIFACT_STEP__ARTIFACT_NAME: setArtifactName((String)newValue); return; - case CdapPackage.CDAP_LOAD_ARTIFACT_STEP__JARFILE: - setJarfile((String)newValue); + case CdapPackage.CDAP_LOAD_ARTIFACT_STEP__JAR_FILE: + setJarFile((String)newValue); return; case CdapPackage.CDAP_LOAD_ARTIFACT_STEP__VERSION: setVersion((String)newValue); @@ -212,8 +212,8 @@ public class CdapLoadArtifactStepImpl extends CdapStepImpl implements CdapLoadAr case CdapPackage.CDAP_LOAD_ARTIFACT_STEP__ARTIFACT_NAME: setArtifactName(ARTIFACT_NAME_EDEFAULT); return; - case CdapPackage.CDAP_LOAD_ARTIFACT_STEP__JARFILE: - setJarfile(JARFILE_EDEFAULT); + case CdapPackage.CDAP_LOAD_ARTIFACT_STEP__JAR_FILE: + setJarFile(JAR_FILE_EDEFAULT); return; case CdapPackage.CDAP_LOAD_ARTIFACT_STEP__VERSION: setVersion(VERSION_EDEFAULT); @@ -232,8 +232,8 @@ public class CdapLoadArtifactStepImpl extends CdapStepImpl implements CdapLoadAr switch (featureID) { case CdapPackage.CDAP_LOAD_ARTIFACT_STEP__ARTIFACT_NAME: return ARTIFACT_NAME_EDEFAULT == null ? artifactName != null : !ARTIFACT_NAME_EDEFAULT.equals(artifactName); - case CdapPackage.CDAP_LOAD_ARTIFACT_STEP__JARFILE: - return JARFILE_EDEFAULT == null ? jarfile != null : !JARFILE_EDEFAULT.equals(jarfile); + case CdapPackage.CDAP_LOAD_ARTIFACT_STEP__JAR_FILE: + return JAR_FILE_EDEFAULT == null ? jarFile != null : !JAR_FILE_EDEFAULT.equals(jarFile); case CdapPackage.CDAP_LOAD_ARTIFACT_STEP__VERSION: return VERSION_EDEFAULT == null ? version != null : !VERSION_EDEFAULT.equals(version); } @@ -252,8 +252,8 @@ public class CdapLoadArtifactStepImpl extends CdapStepImpl implements CdapLoadAr StringBuffer result = new StringBuffer(super.toString()); result.append(" (artifactName: "); result.append(artifactName); - result.append(", jarfile: "); - result.append(jarfile); + result.append(", jarFile: "); + result.append(jarFile); result.append(", version: "); result.append(version); result.append(')'); diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapPackageImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapPackageImpl.java index 1f60df4..d2df369 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapPackageImpl.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapPackageImpl.java @@ -734,7 +734,7 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage { * * @generated */ - public EAttribute getCdapLoadArtifactStep_Jarfile() { + public EAttribute getCdapLoadArtifactStep_JarFile() { return (EAttribute)cdapLoadArtifactStepEClass.getEStructuralFeatures().get(1); } @@ -842,7 +842,7 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage { * * @generated */ - public EAttribute getCdapDeployAppStep_Jarfile() { + public EAttribute getCdapDeployAppStep_JarFile() { return (EAttribute)cdapDeployAppStepEClass.getEStructuralFeatures().get(0); } @@ -1253,7 +1253,7 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage { cdapLoadArtifactStepEClass = createEClass(CDAP_LOAD_ARTIFACT_STEP); createEAttribute(cdapLoadArtifactStepEClass, CDAP_LOAD_ARTIFACT_STEP__ARTIFACT_NAME); - createEAttribute(cdapLoadArtifactStepEClass, CDAP_LOAD_ARTIFACT_STEP__JARFILE); + createEAttribute(cdapLoadArtifactStepEClass, CDAP_LOAD_ARTIFACT_STEP__JAR_FILE); createEAttribute(cdapLoadArtifactStepEClass, CDAP_LOAD_ARTIFACT_STEP__VERSION); cdapLoadArtifactWithConfigStepEClass = createEClass(CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP); @@ -1269,7 +1269,7 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage { createEAttribute(cdapCreateAppWithConfigStepEClass, CDAP_CREATE_APP_WITH_CONFIG_STEP__APP_CONFIG); cdapDeployAppStepEClass = createEClass(CDAP_DEPLOY_APP_STEP); - createEAttribute(cdapDeployAppStepEClass, CDAP_DEPLOY_APP_STEP__JARFILE); + createEAttribute(cdapDeployAppStepEClass, CDAP_DEPLOY_APP_STEP__JAR_FILE); cdapStopFlowStepEClass = createEClass(CDAP_STOP_FLOW_STEP); createEAttribute(cdapStopFlowStepEClass, CDAP_STOP_FLOW_STEP__APP_ID); @@ -1437,7 +1437,7 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage { initEClass(cdapLoadArtifactStepEClass, CdapLoadArtifactStep.class, "CdapLoadArtifactStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getCdapLoadArtifactStep_ArtifactName(), theEcorePackage.getEString(), "artifactName", null, 0, 1, CdapLoadArtifactStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getCdapLoadArtifactStep_Jarfile(), theEcorePackage.getEString(), "jarfile", null, 0, 1, CdapLoadArtifactStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getCdapLoadArtifactStep_JarFile(), theEcorePackage.getEString(), "jarFile", null, 0, 1, CdapLoadArtifactStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getCdapLoadArtifactStep_Version(), theEcorePackage.getEString(), "version", null, 0, 1, CdapLoadArtifactStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(cdapLoadArtifactWithConfigStepEClass, CdapLoadArtifactWithConfigStep.class, "CdapLoadArtifactWithConfigStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -1453,7 +1453,7 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage { initEAttribute(getCdapCreateAppWithConfigStep_AppConfig(), theEcorePackage.getEString(), "appConfig", null, 0, 1, CdapCreateAppWithConfigStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(cdapDeployAppStepEClass, CdapDeployAppStep.class, "CdapDeployAppStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getCdapDeployAppStep_Jarfile(), theEcorePackage.getEString(), "jarfile", null, 0, 1, CdapDeployAppStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getCdapDeployAppStep_JarFile(), theEcorePackage.getEString(), "jarFile", null, 0, 1, CdapDeployAppStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(cdapStopFlowStepEClass, CdapStopFlowStep.class, "CdapStopFlowStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getCdapStopFlowStep_AppId(), theEcorePackage.getEString(), "appId", null, 0, 1, CdapStopFlowStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore/manager.xcore b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore/manager.xcore index eed0293..aa057a3 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore/manager.xcore +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore/manager.xcore @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END============================================ - */ + */ @GenModel(modelDirectory="/dcae-controller-service-cdap-model/src/main/xcore-gen") diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore/service.xcore b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore/service.xcore index 71dceb7..4dd1bb3 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore/service.xcore +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore/service.xcore @@ -109,7 +109,7 @@ abstract class CdapStep extends NamedEntity { class CdapLoadArtifactStep extends CdapStep { String artifactName - String jarfile + String jarFile String version } @@ -129,7 +129,7 @@ class CdapCreateAppWithConfigStep extends CdapCreateAppStep { } class CdapDeployAppStep extends CdapStep { - String jarfile + String jarFile } class CdapStopFlowStep extends CdapStep { -- cgit 1.2.3-korg