Merge pull request #82 from zkolsur/master

Removed the Issue_.java generated class in remrem semantics

Author: Surya-Kolli

CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.4.5
+- Implemented code changes which avoids the generation of duplicate class names.
+
+## 0.4.4
+- Minor changes in mockito dependency availablity.
+
+## 0.4.3
+- Updated dependencies versions
+
 ## 0.4.2
 - Removed serializer information from few event templates which are missed in the previous release
 

build.gradle

@@ -48,7 +48,7 @@ allprojects {
 
 jar {
     baseName = 'eiffel-remrem-semantics'
-    version =  '0.4.4'
+    version =  '0.4.5'
     manifest {
         attributes('remremVersionKey': 'semanticsVersion')
         attributes('semanticsVersion': version)
@@ -66,7 +66,7 @@ jar {
 
 shadowJar {
     baseName = 'eiffel-remrem-semantics'
-    version =  '0.4.4'
+    version =  '0.4.5'
     classifier = ''
 }
 

src/main/java/com/ericsson/eiffel/remrem/semantics/schemas/EiffelConstants.java

@@ -32,6 +32,7 @@ public final class EiffelConstants {
     public static String OUTCOME = "outcome";
     public static String DATA = "data";
     public static String META = "meta";
+    public static String ISSUE = "issue";
     public static String EXTENDS_JAVA_CLASS = "extendsJavaClass";
     public static String COM_ERICSSON_EIFFEL_SEMANTICS_EVENTS_EVENT = "com.ericsson.eiffel.semantics.events.Event";
     public static String JAVA_TYPE = "javaType";

src/main/java/com/ericsson/eiffel/remrem/semantics/schemas/SchemaFile.java

@@ -131,6 +131,10 @@ private void addAttributesToJsonSchema(JsonObject jsonContent, String jsonElemen
                                 jsonObject.add(EiffelConstants.JAVA_TYPE,
                                         parser.parse(EiffelConstants.COM_ERICSSON_EIFFEL_SEMANTICS_EVENTS
                                                 .concat(this.eventName + "" + newClassName)));
+                            }else if (jsonElementName.equals(EiffelConstants.ISSUE)) {
+                                jsonObject.add(EiffelConstants.JAVA_TYPE,
+                                        parser.parse(EiffelConstants.COM_ERICSSON_EIFFEL_SEMANTICS_EVENTS
+                                                .concat(this.eventName + "" + newClassName)));
                             } else {
                                 jsonObject.add(EiffelConstants.JAVA_TYPE, parser.parse(
                                         EiffelConstants.COM_ERICSSON_EIFFEL_SEMANTICS_EVENTS.concat(newClassName)));

src/main/java/com/ericsson/eiffel/semantics/events/EiffelIssueVerifiedEventData.java

@@ -28,7 +28,7 @@ public class EiffelIssueVerifiedEventData {
      */
     @SerializedName("issues")
     @Expose
-    private List<Issue> issues = new ArrayList<Issue>();
+    private List<EiffelIssueVerifiedEventIssue> issues = new ArrayList<EiffelIssueVerifiedEventIssue>();
     @SerializedName("customData")
     @Expose
     private List<CustomData> customData = new ArrayList<CustomData>();
@@ -38,7 +38,7 @@ public class EiffelIssueVerifiedEventData {
      * (Required)
      * 
      */
-    public List<Issue> getIssues() {
+    public List<EiffelIssueVerifiedEventIssue> getIssues() {
         return issues;
     }
 
@@ -47,7 +47,7 @@ public List<Issue> getIssues() {
      * (Required)
      * 
      */
-    public void setIssues(List<Issue> issues) {
+    public void setIssues(List<EiffelIssueVerifiedEventIssue> issues) {
         this.issues = issues;
     }