Skip to content

Commit da6e967

Browse files
z-sztromz-sztrom
authored
Update to Orizaba Edition of Protocol (#163)
Both implementation and tests adjusted to be compatible with Orizaba.
1 parent 20a597a commit da6e967

File tree

171 files changed

+550
-191
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

171 files changed

+550
-191
lines changed

‎CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
## 2.4.0
2+
- Switched to Orizaba
3+
14
## 2.3.1
25
- Switched to Arica.
36
A new property ``.meta.schemaUri`` has been added to meta-object.

‎pom.xml

+4-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<version>2.0.12</version>
88
</parent>
99
<artifactId>eiffel-remrem-semantics</artifactId>
10-
<version>2.3.0</version>
10+
<version>2.4.0</version>
1111
<packaging>jar</packaging>
1212
<properties>
1313
<eclipse.jgit.version>5.0.1.201806211838-r</eclipse.jgit.version>
@@ -130,7 +130,7 @@
130130
<plugin>
131131
<groupId>org.codehaus.mojo</groupId>
132132
<artifactId>exec-maven-plugin</artifactId>
133-
<version>1.5.0</version>
133+
<version>3.1.0</version>
134134
<executions>
135135
<execution>
136136
<phase>compile</phase>
@@ -145,7 +145,7 @@
145145
<mainClass>com.ericsson.eiffel.remrem.semantics.clone.PrepareLocalEiffelSchemas</mainClass>
146146
<arguments>
147147
<argument>https://github.com/eiffel-community/eiffel.git</argument>
148-
<argument>tags/edition-paris</argument>
148+
<argument>tags/edition-orizaba</argument>
149149
<argument>https://github.com/Ericsson/eiffel-operations-extension.git</argument>
150150
<argument>tags/edition-agen</argument>
151151
</arguments>
@@ -163,12 +163,11 @@
163163
<plugin>
164164
<groupId>org.jsonschema2pojo</groupId>
165165
<artifactId>jsonschema2pojo-maven-plugin</artifactId>
166-
<version>0.5.1</version>
166+
<version>1.2.1</version>
167167
<configuration>
168168
<sourceDirectory>${basedir}/src/main/resources/schemas/input</sourceDirectory>
169169
<outputDirectory>${basedir}/src/main/java</outputDirectory>
170170
<targetPackage>com.ericsson.eiffel.semantics.events</targetPackage>
171-
<useCommonsLang3>ture</useCommonsLang3>
172171
<includeHashcodeAndEquals>false</includeHashcodeAndEquals>
173172
<includeToString>false</includeToString>
174173
<annotationStyle>gson</annotationStyle>

‎src/main/java/com/ericsson/eiffel/remrem/semantics/validator/EiffelValidator.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public JsonObject validate(JsonObject jsonObjectInput, Boolean lenientValidation
105105
ProcessingReport report2 = validationSchema.validate(JsonLoader.fromString(revalidatedJson), true);
106106
handleErrorReport(jsonObjectInput, report2);
107107
log.debug("VALIDATED. Schema used: {}", schemaResourceName);
108-
return addRemremGenerateFailuresToCustomData(new JsonParser().parse(revalidatedJson).getAsJsonObject(), remremGenerateFailures);
108+
return addRemremGenerateFailuresToCustomData(JsonParser.parseString(revalidatedJson).getAsJsonObject(), remremGenerateFailures);
109109
} else {
110110
handleErrorReport(jsonObjectInput, report);
111111
}
@@ -196,7 +196,7 @@ private JsonObject addRemremGenerateFailuresToCustomData(JsonObject inputJson, J
196196

197197
/**
198198
* Gets the customData array from an Eiffel message
199-
* @param Eiffel message
199+
* @param JsonObject json
200200
* @return customData array
201201
*/
202202
public JsonArray getCustomData(JsonObject json) {

‎src/main/java/com/ericsson/eiffel/semantics/events/Author.java

+2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@
1515

1616
package com.ericsson.eiffel.semantics.events;
1717

18+
import javax.annotation.processing.Generated;
1819
import com.google.gson.annotations.Expose;
1920
import com.google.gson.annotations.SerializedName;
2021

22+
@Generated("jsonschema2pojo")
2123
public class Author {
2224

2325
@SerializedName("name")

‎src/main/java/com/ericsson/eiffel/semantics/events/Batch.java

+2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@
1717

1818
import java.util.ArrayList;
1919
import java.util.List;
20+
import javax.annotation.processing.Generated;
2021
import com.google.gson.annotations.Expose;
2122
import com.google.gson.annotations.SerializedName;
2223

24+
@Generated("jsonschema2pojo")
2325
public class Batch {
2426

2527
@SerializedName("name")

‎src/main/java/com/ericsson/eiffel/semantics/events/CcCompositeIdentifier.java

+2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@
1717

1818
import java.util.ArrayList;
1919
import java.util.List;
20+
import javax.annotation.processing.Generated;
2021
import com.google.gson.annotations.Expose;
2122
import com.google.gson.annotations.SerializedName;
2223

24+
@Generated("jsonschema2pojo")
2325
public class CcCompositeIdentifier {
2426

2527
/**

‎src/main/java/com/ericsson/eiffel/semantics/events/Change.java

+2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@
1515

1616
package com.ericsson.eiffel.semantics.events;
1717

18+
import javax.annotation.processing.Generated;
1819
import com.google.gson.annotations.Expose;
1920
import com.google.gson.annotations.SerializedName;
2021

22+
@Generated("jsonschema2pojo")
2123
public class Change {
2224

2325
@SerializedName("insertions")

‎src/main/java/com/ericsson/eiffel/semantics/events/Constraint.java

+2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@
1515

1616
package com.ericsson.eiffel.semantics.events;
1717

18+
import javax.annotation.processing.Generated;
1819
import com.google.gson.annotations.Expose;
1920
import com.google.gson.annotations.SerializedName;
2021

22+
@Generated("jsonschema2pojo")
2123
public class Constraint {
2224

2325
/**

‎src/main/java/com/ericsson/eiffel/semantics/events/CustomData.java

+2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@
1515

1616
package com.ericsson.eiffel.semantics.events;
1717

18+
import javax.annotation.processing.Generated;
1819
import com.google.gson.annotations.Expose;
1920
import com.google.gson.annotations.SerializedName;
2021

22+
@Generated("jsonschema2pojo")
2123
public class CustomData {
2224

2325
/**

‎src/main/java/com/ericsson/eiffel/semantics/events/Dependency.java

+2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@
1515

1616
package com.ericsson.eiffel.semantics.events;
1717

18+
import javax.annotation.processing.Generated;
1819
import com.google.gson.annotations.Expose;
1920
import com.google.gson.annotations.SerializedName;
2021

22+
@Generated("jsonschema2pojo")
2123
public class Dependency {
2224

2325
/**

‎src/main/java/com/ericsson/eiffel/semantics/events/EiffelActivityCanceledEvent.java

+2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@
1717

1818
import java.util.ArrayList;
1919
import java.util.List;
20+
import javax.annotation.processing.Generated;
2021
import com.google.gson.annotations.Expose;
2122
import com.google.gson.annotations.SerializedName;
2223

24+
@Generated("jsonschema2pojo")
2325
public class EiffelActivityCanceledEvent
2426
extends Event
2527
{

‎src/main/java/com/ericsson/eiffel/semantics/events/EiffelActivityCanceledEventData.java

+2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@
1717

1818
import java.util.ArrayList;
1919
import java.util.List;
20+
import javax.annotation.processing.Generated;
2021
import com.google.gson.annotations.Expose;
2122
import com.google.gson.annotations.SerializedName;
2223

24+
@Generated("jsonschema2pojo")
2325
public class EiffelActivityCanceledEventData {
2426

2527
@SerializedName("reason")

‎src/main/java/com/ericsson/eiffel/semantics/events/EiffelActivityCanceledEventMeta.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@
1919
import java.util.HashMap;
2020
import java.util.List;
2121
import java.util.Map;
22+
import javax.annotation.processing.Generated;
2223
import com.google.gson.annotations.Expose;
2324
import com.google.gson.annotations.SerializedName;
2425

26+
@Generated("jsonschema2pojo")
2527
public class EiffelActivityCanceledEventMeta implements Meta
2628
{
2729

@@ -174,6 +176,7 @@ public void setSchemaUri(String schemaUri) {
174176
this.schemaUri = schemaUri;
175177
}
176178

179+
@Generated("jsonschema2pojo")
177180
public enum Type {
178181

179182
@SerializedName("EiffelActivityCanceledEvent")
@@ -187,7 +190,7 @@ public enum Type {
187190
}
188191
}
189192

190-
private Type(String value) {
193+
Type(String value) {
191194
this.value = value;
192195
}
193196

@@ -211,6 +214,7 @@ public static EiffelActivityCanceledEventMeta.Type fromValue(String value) {
211214

212215
}
213216

217+
@Generated("jsonschema2pojo")
214218
public enum Version {
215219

216220
@SerializedName("3.2.0")
@@ -224,7 +228,7 @@ public enum Version {
224228
}
225229
}
226230

227-
private Version(String value) {
231+
Version(String value) {
228232
this.value = value;
229233
}
230234

‎src/main/java/com/ericsson/eiffel/semantics/events/EiffelActivityFinishedEvent.java

+2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@
1717

1818
import java.util.ArrayList;
1919
import java.util.List;
20+
import javax.annotation.processing.Generated;
2021
import com.google.gson.annotations.Expose;
2122
import com.google.gson.annotations.SerializedName;
2223

24+
@Generated("jsonschema2pojo")
2325
public class EiffelActivityFinishedEvent
2426
extends Event
2527
{

‎src/main/java/com/ericsson/eiffel/semantics/events/EiffelActivityFinishedEventData.java

+2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@
1717

1818
import java.util.ArrayList;
1919
import java.util.List;
20+
import javax.annotation.processing.Generated;
2021
import com.google.gson.annotations.Expose;
2122
import com.google.gson.annotations.SerializedName;
2223

24+
@Generated("jsonschema2pojo")
2325
public class EiffelActivityFinishedEventData {
2426

2527
/**

‎src/main/java/com/ericsson/eiffel/semantics/events/EiffelActivityFinishedEventMeta.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@
1919
import java.util.HashMap;
2020
import java.util.List;
2121
import java.util.Map;
22+
import javax.annotation.processing.Generated;
2223
import com.google.gson.annotations.Expose;
2324
import com.google.gson.annotations.SerializedName;
2425

26+
@Generated("jsonschema2pojo")
2527
public class EiffelActivityFinishedEventMeta implements Meta
2628
{
2729

@@ -174,6 +176,7 @@ public void setSchemaUri(String schemaUri) {
174176
this.schemaUri = schemaUri;
175177
}
176178

179+
@Generated("jsonschema2pojo")
177180
public enum Type {
178181

179182
@SerializedName("EiffelActivityFinishedEvent")
@@ -187,7 +190,7 @@ public enum Type {
187190
}
188191
}
189192

190-
private Type(String value) {
193+
Type(String value) {
191194
this.value = value;
192195
}
193196

@@ -211,6 +214,7 @@ public static EiffelActivityFinishedEventMeta.Type fromValue(String value) {
211214

212215
}
213216

217+
@Generated("jsonschema2pojo")
214218
public enum Version {
215219

216220
@SerializedName("3.3.0")
@@ -224,7 +228,7 @@ public enum Version {
224228
}
225229
}
226230

227-
private Version(String value) {
231+
Version(String value) {
228232
this.value = value;
229233
}
230234

‎src/main/java/com/ericsson/eiffel/semantics/events/EiffelActivityFinishedEventOutcome.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@
1717

1818
import java.util.HashMap;
1919
import java.util.Map;
20+
import javax.annotation.processing.Generated;
2021
import com.google.gson.annotations.Expose;
2122
import com.google.gson.annotations.SerializedName;
2223

24+
@Generated("jsonschema2pojo")
2325
public class EiffelActivityFinishedEventOutcome {
2426

2527
/**
@@ -60,6 +62,7 @@ public void setDescription(String description) {
6062
this.description = description;
6163
}
6264

65+
@Generated("jsonschema2pojo")
6366
public enum Conclusion {
6467

6568
@SerializedName("SUCCESSFUL")
@@ -83,7 +86,7 @@ public enum Conclusion {
8386
}
8487
}
8588

86-
private Conclusion(String value) {
89+
Conclusion(String value) {
8790
this.value = value;
8891
}
8992

‎src/main/java/com/ericsson/eiffel/semantics/events/EiffelActivityStartedEvent.java

+2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@
1717

1818
import java.util.ArrayList;
1919
import java.util.List;
20+
import javax.annotation.processing.Generated;
2021
import com.google.gson.annotations.Expose;
2122
import com.google.gson.annotations.SerializedName;
2223

24+
@Generated("jsonschema2pojo")
2325
public class EiffelActivityStartedEvent
2426
extends Event
2527
{

‎src/main/java/com/ericsson/eiffel/semantics/events/EiffelActivityStartedEventData.java

+2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@
1717

1818
import java.util.ArrayList;
1919
import java.util.List;
20+
import javax.annotation.processing.Generated;
2021
import com.google.gson.annotations.Expose;
2122
import com.google.gson.annotations.SerializedName;
2223

24+
@Generated("jsonschema2pojo")
2325
public class EiffelActivityStartedEventData {
2426

2527
@SerializedName("executionUri")

‎src/main/java/com/ericsson/eiffel/semantics/events/EiffelActivityStartedEventMeta.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@
1919
import java.util.HashMap;
2020
import java.util.List;
2121
import java.util.Map;
22+
import javax.annotation.processing.Generated;
2223
import com.google.gson.annotations.Expose;
2324
import com.google.gson.annotations.SerializedName;
2425

26+
@Generated("jsonschema2pojo")
2527
public class EiffelActivityStartedEventMeta implements Meta
2628
{
2729

@@ -174,6 +176,7 @@ public void setSchemaUri(String schemaUri) {
174176
this.schemaUri = schemaUri;
175177
}
176178

179+
@Generated("jsonschema2pojo")
177180
public enum Type {
178181

179182
@SerializedName("EiffelActivityStartedEvent")
@@ -187,7 +190,7 @@ public enum Type {
187190
}
188191
}
189192

190-
private Type(String value) {
193+
Type(String value) {
191194
this.value = value;
192195
}
193196

@@ -211,6 +214,7 @@ public static EiffelActivityStartedEventMeta.Type fromValue(String value) {
211214

212215
}
213216

217+
@Generated("jsonschema2pojo")
214218
public enum Version {
215219

216220
@SerializedName("4.3.0")
@@ -224,7 +228,7 @@ public enum Version {
224228
}
225229
}
226230

227-
private Version(String value) {
231+
Version(String value) {
228232
this.value = value;
229233
}
230234

0 commit comments

Comments
 (0)