Merge pull request #877 from eclipse-passage/575166-1

Bug 575166 License Agreement management: license issuing
eclipse-passage · Aug 16, 2021 · ca7c629 · ca7c629
2 parents 9dc44c4 + 9264e9f
commit ca7c629
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/bundles/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore b/bundles/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore
@@ -138,7 +138,7 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="file" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="hashAlgo" lowerBound="1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hash" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hash" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EByteArray"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="content" ordered="false"
         unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EByteArray"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="contentType" lowerBound="1"

diff --git a/....lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/api/AgreementData.java b/....lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/api/AgreementData.java
@@ -140,13 +140,13 @@ public interface AgreementData extends EObject, AgreementDataDescriptor {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Hash</em>' attribute.
-	 * @see #setHash(String)
+	 * @see #setHash(byte[])
 	 * @see org.eclipse.passage.lic.licenses.model.meta.LicensesPackage#getAgreementData_Hash()
 	 * @model required="true"
 	 * @generated
 	 */
 	@Override
-	String getHash();
+	byte[] getHash();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.passage.lic.licenses.model.api.AgreementData#getHash <em>Hash</em>}' attribute.
@@ -156,7 +156,7 @@ public interface AgreementData extends EObject, AgreementDataDescriptor {
 	 * @see #getHash()
 	 * @generated
 	 */
-	void setHash(String value);
+	void setHash(byte[] value);
 
 	/**
 	 * Returns the value of the '<em><b>Content</b></em>' attribute.

diff --git a/...licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/impl/AgreementDataImpl.java b/...licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/impl/AgreementDataImpl.java
@@ -134,7 +134,7 @@ public class AgreementDataImpl extends MinimalEObjectImpl.Container implements A
 	 * @generated
 	 * @ordered
 	 */
-	protected static final String HASH_EDEFAULT = null;
+	protected static final byte[] HASH_EDEFAULT = null;
 
 	/**
 	 * The cached value of the '{@link #getHash() <em>Hash</em>}' attribute.
@@ -144,7 +144,7 @@ public class AgreementDataImpl extends MinimalEObjectImpl.Container implements A
 	 * @generated
 	 * @ordered
 	 */
-	private String hash = HASH_EDEFAULT;
+	private byte[] hash = HASH_EDEFAULT;
 
 	/**
 	 * The default value of the '{@link #getContent() <em>Content</em>}' attribute.
@@ -309,7 +309,7 @@ public void setHashAlgo(String newHashAlgo) {
 	 * @generated
 	 */
 	@Override
-	public String getHash() {
+	public byte[] getHash() {
 		return hash;
 	}
 
@@ -319,8 +319,8 @@ public String getHash() {
 	 * @generated
 	 */
 	@Override
-	public void setHash(String newHash) {
-		String oldHash = hash;
+	public void setHash(byte[] newHash) {
+		byte[] oldHash = hash;
 		hash = newHash;
 		if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, LicensesPackage.AGREEMENT_DATA__HASH, oldHash, hash));
@@ -425,7 +425,7 @@ public void eSet(int featureID, Object newValue) {
 			setHashAlgo((String) newValue);
 			return;
 		case LicensesPackage.AGREEMENT_DATA__HASH:
-			setHash((String) newValue);
+			setHash((byte[]) newValue);
 			return;
 		case LicensesPackage.AGREEMENT_DATA__CONTENT:
 			setContent((byte[]) newValue);

diff --git a/...censes.model/src-gen/org/eclipse/passage/lic/licenses/model/impl/LicensesPackageImpl.java b/...censes.model/src-gen/org/eclipse/passage/lic/licenses/model/impl/LicensesPackageImpl.java
@@ -2257,7 +2257,7 @@ public void initializePackageContents() {
 		initEAttribute(getAgreementData_HashAlgo(), ecorePackage.getEString(), "hashAlgo", null, 1, 1, //$NON-NLS-1$
 				AgreementData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
 				!IS_DERIVED, IS_ORDERED);
-		initEAttribute(getAgreementData_Hash(), ecorePackage.getEString(), "hash", null, 1, 1, AgreementData.class, //$NON-NLS-1$
+		initEAttribute(getAgreementData_Hash(), ecorePackage.getEByteArray(), "hash", null, 1, 1, AgreementData.class, //$NON-NLS-1$
 				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getAgreementData_Content(), ecorePackage.getEByteArray(), "content", null, 1, 1, //$NON-NLS-1$
 				AgreementData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE,

diff --git a/...se.passage.lic.licenses/src/org/eclipse/passage/lic/licenses/AgreementDataDescriptor.java b/...se.passage.lic.licenses/src/org/eclipse/passage/lic/licenses/AgreementDataDescriptor.java
@@ -25,7 +25,7 @@ public interface AgreementDataDescriptor {
 
 	String getHashAlgo();
 
-	String getHash();
+	byte[] getHash();
 
 	byte[] getContent();