feat: add intermediate superclass for ContractNegotiation Events hierarchy

janpmeyer · janpmeyer · commit 728f1953f476 · 2022-09-02T09:14:44.000+02:00
diff --git a/spi/common/core-spi/src/main/java/org/eclipse/dataspaceconnector/spi/event/contractnegotiation/ContractNegotiationApproved.java b/spi/common/core-spi/src/main/java/org/eclipse/dataspaceconnector/spi/event/contractnegotiation/ContractNegotiationApproved.java
@@ -9,13 +9,13 @@
  *
  *  Contributors:
  *       Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - initial API and implementation
+ *       Fraunhofer Institute for Software and Systems Engineering - expending Event classes
  *
  */
 
 package org.eclipse.dataspaceconnector.spi.event.contractnegotiation;
 
 import org.eclipse.dataspaceconnector.spi.event.Event;
-import org.eclipse.dataspaceconnector.spi.event.EventPayload;
 
 import java.util.Objects;
 
@@ -48,11 +48,6 @@ protected void validate() {
         }
     }
 
-    public static class Payload extends EventPayload {
-        private String contractNegotiationId;
-
-        public String getContractNegotiationId() {
-            return contractNegotiationId;
-        }
+    public static class Payload extends ContractNegotiationEventPayload {
     }
 }
diff --git a/spi/common/core-spi/src/main/java/org/eclipse/dataspaceconnector/spi/event/contractnegotiation/ContractNegotiationConfirmed.java b/spi/common/core-spi/src/main/java/org/eclipse/dataspaceconnector/spi/event/contractnegotiation/ContractNegotiationConfirmed.java
@@ -9,13 +9,13 @@
  *
  *  Contributors:
  *       Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - initial API and implementation
+ *       Fraunhofer Institute for Software and Systems Engineering - expending Event classes
  *
  */
 
 package org.eclipse.dataspaceconnector.spi.event.contractnegotiation;
 
 import org.eclipse.dataspaceconnector.spi.event.Event;
-import org.eclipse.dataspaceconnector.spi.event.EventPayload;
 
 import java.util.Objects;
 
@@ -48,11 +48,6 @@ protected void validate() {
         }
     }
 
-    public static class Payload extends EventPayload {
-        private String contractNegotiationId;
-
-        public String getContractNegotiationId() {
-            return contractNegotiationId;
-        }
+    public static class Payload extends ContractNegotiationEventPayload {
     }
 }
diff --git a/spi/common/core-spi/src/main/java/org/eclipse/dataspaceconnector/spi/event/contractnegotiation/ContractNegotiationDeclined.java b/spi/common/core-spi/src/main/java/org/eclipse/dataspaceconnector/spi/event/contractnegotiation/ContractNegotiationDeclined.java
@@ -9,13 +9,13 @@
  *
  *  Contributors:
  *       Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - initial API and implementation
+ *       Fraunhofer Institute for Software and Systems Engineering - expending Event classes
  *
  */
 
 package org.eclipse.dataspaceconnector.spi.event.contractnegotiation;
 
 import org.eclipse.dataspaceconnector.spi.event.Event;
-import org.eclipse.dataspaceconnector.spi.event.EventPayload;
 
 import java.util.Objects;
 
@@ -48,11 +48,6 @@ protected void validate() {
         }
     }
 
-    public static class Payload extends EventPayload {
-        private String contractNegotiationId;
-
-        public String getContractNegotiationId() {
-            return contractNegotiationId;
-        }
+    public static class Payload extends ContractNegotiationEventPayload {
     }
 }
diff --git a/spi/common/core-spi/src/main/java/org/eclipse/dataspaceconnector/spi/event/contractnegotiation/ContractNegotiationEventPayload.java b/spi/common/core-spi/src/main/java/org/eclipse/dataspaceconnector/spi/event/contractnegotiation/ContractNegotiationEventPayload.java
@@ -0,0 +1,26 @@
+/*
+ *  Copyright (c) 2022 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+ *
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Apache License, Version 2.0 which is available at
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Contributors:
+ *       Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - initial API and implementation
+ *       Fraunhofer Institute for Software and Systems Engineering - expending Event classes
+ *
+ */
+
+package org.eclipse.dataspaceconnector.spi.event.contractnegotiation;
+
+import org.eclipse.dataspaceconnector.spi.event.EventPayload;
+
+public class ContractNegotiationEventPayload extends EventPayload {
+    protected String contractNegotiationId;
+
+    public String getContractNegotiationId() {
+        return contractNegotiationId;
+    }
+}
diff --git a/spi/common/core-spi/src/main/java/org/eclipse/dataspaceconnector/spi/event/contractnegotiation/ContractNegotiationFailed.java b/spi/common/core-spi/src/main/java/org/eclipse/dataspaceconnector/spi/event/contractnegotiation/ContractNegotiationFailed.java
@@ -9,13 +9,13 @@
  *
  *  Contributors:
  *       Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - initial API and implementation
+ *       Fraunhofer Institute for Software and Systems Engineering - expending Event classes
  *
  */
 
 package org.eclipse.dataspaceconnector.spi.event.contractnegotiation;
 
 import org.eclipse.dataspaceconnector.spi.event.Event;
-import org.eclipse.dataspaceconnector.spi.event.EventPayload;
 
 import java.util.Objects;
 
@@ -48,11 +48,6 @@ protected void validate() {
         }
     }
 
-    public static class Payload extends EventPayload {
-        private String contractNegotiationId;
-
-        public String getContractNegotiationId() {
-            return contractNegotiationId;
-        }
+    public static class Payload extends ContractNegotiationEventPayload {
     }
 }
diff --git a/spi/common/core-spi/src/main/java/org/eclipse/dataspaceconnector/spi/event/contractnegotiation/ContractNegotiationInitiated.java b/spi/common/core-spi/src/main/java/org/eclipse/dataspaceconnector/spi/event/contractnegotiation/ContractNegotiationInitiated.java
@@ -9,13 +9,13 @@
  *
  *  Contributors:
  *       Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - initial API and implementation
+ *       Fraunhofer Institute for Software and Systems Engineering - expending Event classes
  *
  */
 
 package org.eclipse.dataspaceconnector.spi.event.contractnegotiation;
 
 import org.eclipse.dataspaceconnector.spi.event.Event;
-import org.eclipse.dataspaceconnector.spi.event.EventPayload;
 
 import java.util.Objects;
 
@@ -48,11 +48,6 @@ protected void validate() {
         }
     }
 
-    public static class Payload extends EventPayload {
-        private String contractNegotiationId;
-
-        public String getContractNegotiationId() {
-            return contractNegotiationId;
-        }
+    public static class Payload extends ContractNegotiationEventPayload {
     }
 }
diff --git a/spi/common/core-spi/src/main/java/org/eclipse/dataspaceconnector/spi/event/contractnegotiation/ContractNegotiationOffered.java b/spi/common/core-spi/src/main/java/org/eclipse/dataspaceconnector/spi/event/contractnegotiation/ContractNegotiationOffered.java
@@ -9,13 +9,13 @@
  *
  *  Contributors:
  *       Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - initial API and implementation
+ *       Fraunhofer Institute for Software and Systems Engineering - expending Event classes
  *
  */
 
 package org.eclipse.dataspaceconnector.spi.event.contractnegotiation;
 
 import org.eclipse.dataspaceconnector.spi.event.Event;
-import org.eclipse.dataspaceconnector.spi.event.EventPayload;
 
 import java.util.Objects;
 
@@ -48,11 +48,6 @@ protected void validate() {
         }
     }
 
-    public static class Payload extends EventPayload {
-        private String contractNegotiationId;
-
-        public String getContractNegotiationId() {
-            return contractNegotiationId;
-        }
+    public static class Payload extends ContractNegotiationEventPayload {
     }
 }
diff --git a/spi/common/core-spi/src/main/java/org/eclipse/dataspaceconnector/spi/event/contractnegotiation/ContractNegotiationRequested.java b/spi/common/core-spi/src/main/java/org/eclipse/dataspaceconnector/spi/event/contractnegotiation/ContractNegotiationRequested.java
@@ -9,13 +9,13 @@
  *
  *  Contributors:
  *       Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - initial API and implementation
+ *       Fraunhofer Institute for Software and Systems Engineering - expending Event classes
  *
  */
 
 package org.eclipse.dataspaceconnector.spi.event.contractnegotiation;
 
 import org.eclipse.dataspaceconnector.spi.event.Event;
-import org.eclipse.dataspaceconnector.spi.event.EventPayload;
 
 import java.util.Objects;
 
@@ -48,11 +48,6 @@ protected void validate() {
         }
     }
 
-    public static class Payload extends EventPayload {
-        private String contractNegotiationId;
-
-        public String getContractNegotiationId() {
-            return contractNegotiationId;
-        }
+    public static class Payload extends ContractNegotiationEventPayload {
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -9,13 +9,13 @@`
`9`	`9`	`*`
`10`	`10`	`* Contributors:`
`11`	`11`	`* Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - initial API and implementation`
	`12`	`+ * Fraunhofer Institute for Software and Systems Engineering - expending Event classes`
`12`	`13`	`*`
`13`	`14`	`*/`
`14`	`15`
`15`	`16`	`package org.eclipse.dataspaceconnector.spi.event.contractnegotiation;`
`16`	`17`
`17`	`18`	`import org.eclipse.dataspaceconnector.spi.event.Event;`
`18`		`-import org.eclipse.dataspaceconnector.spi.event.EventPayload;`
`19`	`19`
`20`	`20`	`import java.util.Objects;`
`21`	`21`
`@@ -48,11 +48,6 @@ protected void validate() {`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
`51`		`- public static class Payload extends EventPayload {`
`52`		`- private String contractNegotiationId;`
`53`		`-`
`54`		`- public String getContractNegotiationId() {`
`55`		`- return contractNegotiationId;`
`56`		`- }`
	`51`	`+ public static class Payload extends ContractNegotiationEventPayload {`
`57`	`52`	`}`
`58`	`53`	`}`