Event names in Eiffel2.0 should adhere to documentation of eiffel in Github. (#48)

Author: tcskoab

build.gradle

@@ -48,7 +48,7 @@ allprojects {
 
 jar {
     baseName = 'eiffel-remrem-semantics'
-    version =  '0.2.6'
+    version =  '0.2.7'
     manifest {
         attributes('remremVersionKey': 'semanticsVersion')
         attributes('semanticsVersion': version)
@@ -64,7 +64,7 @@ jar {
 
 shadowJar {
     baseName = 'eiffel-remrem-semantics'
-    version =  '0.2.6'
+    version =  '0.2.7'
     classifier = ''
 }
 
@@ -139,8 +139,11 @@ task runJava(type:JavaExec){
 //please set 'runJava.enabled= true' to execute the :runJava task if needed only.
 runJava.enabled=false;
 
-//To execute the task compileSourceCode first in gradle build.
-compileSourceCode.execute()
+/*To execute the task compileSourceCode first in gradle build when runJava.enabled=true
+
+please uncomment this compileSourceCode.execute() when runJava method enabled(runJava.enabled=true)*/
+
+//compileSourceCode.execute();
 
 //To execute the runJava task before jsonSchema2pojo plugin execution .
 generateJsonSchema2Pojo.dependsOn runJava

src/main/java/com/ericsson/eiffel/remrem/semantics/EiffelEventType.java

@@ -18,28 +18,28 @@
 
 
 public enum EiffelEventType {
-    ARTIFACT_PUBLISHED("eiffelartifactpublished"),
-    ACTIVITY_FINISHED("eiffelactivityfinished"),
-    ACTIVITY_CANCELED("eiffelactivitycanceled"),
-    ARTIFACT_CREATED("eiffelartifactcreated"),
-    ACTIVITY_TRIGGERED("eiffelactivitytriggered"),
-    CONFIDENCELEVEL_MODIFIED("eiffelconfidencelevelmodified"),
-    ACTIVITY_STARTED("eiffelactivitystarted"),
-    ANNOUNCEMENT_PUBLISHED("eiffelannouncementpublished"),
-    COMPOSITION_DEFINED("eiffelcompositiondefined"),
-    TESTCASE_CANCELED("eiffeltestcasecanceled"),
-    TESTCASE_TRIGGERED("eiffeltestcasetriggered"),
-    EXECUTION_RECIPE_COLLECTION_CREATED("eiffeltestexecutionrecipecollectioncreated"),
-    ENVIRONMENT_DEFINED("eiffelenvironmentdefined"),
-    FLOWCONTEXT_DEFINED("eiffelflowcontextdefined"),
-    SOURCECHANGE_CREATED("eiffelsourcechangecreated"),
-    SOURCECHANGE_SUBMITTED("eiffelsourcechangesubmitted"),
-    TESTCASE_FINISHED("eiffeltestcasefinished"),
-    TESTCASE_STARTED("eiffeltestcasestarted"),
-    TESTSUITE_FINISHED("eiffeltestsuitefinished"),
-    TESTSUITE_STARTED("eiffeltestsuitestarted"),
-    ISSUE_VERIFIED("eiffelissueverified"),
-    ARTIFACT_REUSED("eiffelartifactreused");
+    ARTIFACT_PUBLISHED("EiffelArtifactPublishedEvent"),
+    ACTIVITY_FINISHED("EiffelActivityFinishedEvent"),
+    ACTIVITY_CANCELED("EiffelActivityCanceledEvent"),
+    ARTIFACT_CREATED("EiffelArtifactCreatedEvent"),
+    ACTIVITY_TRIGGERED("EiffelActivityTriggeredEvent"),
+    CONFIDENCELEVEL_MODIFIED("EiffelConfidenceLevelModifiedEvent"),
+    ACTIVITY_STARTED("EiffelActivityStartedEvent"),
+    ANNOUNCEMENT_PUBLISHED("EiffelAnnouncementPublishedEvent"),
+    COMPOSITION_DEFINED("EiffelCompositionDefinedEvent"),
+    TESTCASE_CANCELED("EiffelTestCaseCanceledEvent"),
+    TESTCASE_TRIGGERED("EiffelTestCaseTriggeredEvent"),
+    EXECUTION_RECIPE_COLLECTION_CREATED("EiffelTestExecutionRecipeCollectionCreatedEvent"),
+    ENVIRONMENT_DEFINED("EiffelEnvironmentDefinedEvent"),
+    FLOWCONTEXT_DEFINED("EiffelFlowContextDefinedEvent"),
+    SOURCECHANGE_CREATED("EiffelSourceChangeCreatedEvent"),
+    SOURCECHANGE_SUBMITTED("EiffelSourceChangeSubmittedEvent"),
+    TESTCASE_FINISHED("EiffelTestCaseFinishedEvent"),
+    TESTCASE_STARTED("EiffelTestCaseStartedEvent"),
+    TESTSUITE_FINISHED("EiffelTestSuiteFinishedEvent"),
+    TESTSUITE_STARTED("EiffelTestSuiteStartedEvent"),
+    ISSUE_VERIFIED("EiffelIssueVerifiedEvent"),
+    ARTIFACT_REUSED("EiffelArtifactReusedEvent");
 
     private String eventType;
 
@@ -51,15 +51,16 @@ public enum EiffelEventType {
 
     /**
      * This method used to get EiffelEventType Enum constant based on event type
+     * Supports eventType, if we passed as lower case from cli and service and also check eventType is valid or not
      * @param eventType of an eiffel event
      * @return Enum constant of EiffelEventType
      */
     public static EiffelEventType fromString(String eventType) {
         if (eventTypeMap.size() == 0) {
             for (EiffelEventType type : values())
-                eventTypeMap.put(type.eventType, type);
+                eventTypeMap.put(type.eventType.toLowerCase(), type);
         }
-        return eventTypeMap.get(eventType);
+        return eventTypeMap.get(eventType.toLowerCase().replace("event", "") + "event");
     }
 
     /**

src/main/java/com/ericsson/eiffel/remrem/semantics/RoutingKeyTypes.java

@@ -18,27 +18,26 @@
 
 public enum RoutingKeyTypes {    
 
-    eiffelactivitycanceled(EiffelConstants.ACTIVITY, "canceled"),
-    eiffelactivityfinished(EiffelConstants.ACTIVITY,"finished"),
-    eiffelactivitystarted(EiffelConstants.ACTIVITY,"started"),
-    eiffelactivitytriggered(EiffelConstants.ACTIVITY,"triggered"),
-    eiffelannouncementpublished(EiffelConstants.INFO,"announcement"),
-    eiffelartifactcreated(EiffelConstants.ARTIFACT,"created"),
-    eiffelartifactpublished(EiffelConstants.ARTIFACT,"published"),
-    eiffelartifactreused(EiffelConstants.ARTIFACT,"reused"),
-    eiffelcompositiondefined(EiffelConstants.CM,"composition"),
-    eiffelconfidencelevelmodified(EiffelConstants.ARTIFACT,"modified"),
-    eiffelconfigurationapplied(EiffelConstants.CONFIGURATION,"applied"),
-    eiffelenvironmentdefined(EiffelConstants.CM,"environment"),
-    eiffelflowcontextdefined(EiffelConstants.FLOWCONTEXT,"defined"),
-    eiffelissueverified(EiffelConstants.TEST,"issueverified"),
-    eiffelsourcechangecreated(EiffelConstants.CM,"scmchange"),
-    eiffelsourcechangesubmitted(EiffelConstants.CM,"scmproposedchange"),
-    eiffeltestcasefinished(EiffelConstants.TEST,"casefinished"),
-    eiffeltestcasestarted(EiffelConstants.TEST,"casestarted"),
-    eiffeltestsuitefinished(EiffelConstants.TEST,"suitefinished"),
-    eiffeltestsuitestarted(EiffelConstants.TEST,"suitestarted"),
-    eiffeltestexecutionrecipecollectioncreated(EiffelConstants.TEST,"execution");
+	EiffelActivityCanceledEvent(EiffelConstants.ACTIVITY, "canceled"),
+    EiffelActivityFinishedEvent(EiffelConstants.ACTIVITY,"finished"),
+    EiffelActivityStartedEvent(EiffelConstants.ACTIVITY,"started"),
+    EiffelActivityTriggeredEvent(EiffelConstants.ACTIVITY,"triggered"),
+    EiffelAnnouncementPublishedEvent(EiffelConstants.INFO,"announcement"),
+    EiffelArtifactCreatedEvent(EiffelConstants.ARTIFACT,"created"),
+    EiffelArtifactPublishedEvent(EiffelConstants.ARTIFACT,"published"),
+    EiffelArtifactReusedEvent(EiffelConstants.ARTIFACT,"reused"),
+    EiffelCompositionDefinedEvent(EiffelConstants.CM,"composition"),
+    EiffelConfidenceLevelModifiedEvent(EiffelConstants.ARTIFACT,"modified"),
+    EiffelEnvironmentDefinedEvent(EiffelConstants.CM,"environment"),
+    EiffelFlowContextDefinedEvent(EiffelConstants.FLOWCONTEXT,"defined"),
+    EiffelIssueVerifiedEvent(EiffelConstants.TEST,"issueverified"),
+    EiffelSourceChangeCreatedEvent(EiffelConstants.CM,"scmchange"),
+    EiffelSourceChangeSubmittedEvent(EiffelConstants.CM,"scmproposedchange"),
+    EiffelTestCaseFinishedEvent(EiffelConstants.TEST,"casefinished"),
+    EiffelTestCaseStartedEvent(EiffelConstants.TEST,"casestarted"),
+    EiffelTestSuiteFinishedEvent(EiffelConstants.TEST,"suitefinished"),
+    EiffelTestSuiteStartedEvent(EiffelConstants.TEST,"suitestarted"),
+    EiffelTestExecutionRecipeCollectionCreatedEvent(EiffelConstants.TEST,"execution");
 
     private final String family;   // family
      private final String type; // type

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

@@ -43,7 +43,6 @@ public class SchemaFile {
     private JsonParser parser = new JsonParser();
     private boolean isEvent;
     private boolean isMeta = false;
-    private boolean isEnumType = false;
     private String eventName = null;
 
     /**
@@ -100,7 +99,6 @@ private void addAttributesToJsonSchema(JsonObject jsonContent, String jsonElemen
                     isMeta = true;
                 }
                 if (name.equals(EiffelConstants.TYPE) && isMeta) {
-                    isEnumType = true;
                     isMeta = false;
                 }
                 addingItemsProperties(name, valueSet.getValue(), jsonObject, previousObjectName);
@@ -146,14 +144,6 @@ private void addAttributesToJsonSchema(JsonObject jsonContent, String jsonElemen
                     }
                 } else {
                     jsonObject.add(valueSet.getKey(), valueSet.getValue());
-                    if (valueSet.getKey().equals(EiffelConstants.ENUM)) {
-                        if (isEnumType) {
-                            // To change the eventType in meta
-                            jsonObject.add(valueSet.getKey(),
-                                    parser.parse(valueSet.getValue().toString().toLowerCase().replace("event", "")));
-                            isEnumType = false;
-                        }
-                    }
                 }
             }
         }

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

@@ -4,7 +4,7 @@
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
-
+ 
     http://www.apache.org/licenses/LICENSE-2.0
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
@@ -164,8 +164,8 @@ public void setSecurity(Security security) {
 
     public enum Type {
 
-        @SerializedName("eiffelactivitycanceled")
-        EIFFELACTIVITYCANCELED("eiffelactivitycanceled");
+        @SerializedName("EiffelActivityCanceledEvent")
+        EIFFEL_ACTIVITY_CANCELED_EVENT("EiffelActivityCanceledEvent");
         private final String value;
         private final static Map<String, EiffelActivityCanceledEventMeta.Type> CONSTANTS = new HashMap<String, EiffelActivityCanceledEventMeta.Type>();
 

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

@@ -4,7 +4,7 @@
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
-
+ 
     http://www.apache.org/licenses/LICENSE-2.0
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
@@ -164,8 +164,8 @@ public void setSecurity(Security security) {
 
     public enum Type {
 
-        @SerializedName("eiffelactivityfinished")
-        EIFFELACTIVITYFINISHED("eiffelactivityfinished");
+        @SerializedName("EiffelActivityFinishedEvent")
+        EIFFEL_ACTIVITY_FINISHED_EVENT("EiffelActivityFinishedEvent");
         private final String value;
         private final static Map<String, EiffelActivityFinishedEventMeta.Type> CONSTANTS = new HashMap<String, EiffelActivityFinishedEventMeta.Type>();
 

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

@@ -4,7 +4,7 @@
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
-
+ 
     http://www.apache.org/licenses/LICENSE-2.0
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
@@ -164,8 +164,8 @@ public void setSecurity(Security security) {
 
     public enum Type {
 
-        @SerializedName("eiffelactivitystarted")
-        EIFFELACTIVITYSTARTED("eiffelactivitystarted");
+        @SerializedName("EiffelActivityStartedEvent")
+        EIFFEL_ACTIVITY_STARTED_EVENT("EiffelActivityStartedEvent");
         private final String value;
         private final static Map<String, EiffelActivityStartedEventMeta.Type> CONSTANTS = new HashMap<String, EiffelActivityStartedEventMeta.Type>();
 

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

@@ -4,7 +4,7 @@
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
-
+ 
     http://www.apache.org/licenses/LICENSE-2.0
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
@@ -164,8 +164,8 @@ public void setSecurity(Security security) {
 
     public enum Type {
 
-        @SerializedName("eiffelactivitytriggered")
-        EIFFELACTIVITYTRIGGERED("eiffelactivitytriggered");
+        @SerializedName("EiffelActivityTriggeredEvent")
+        EIFFEL_ACTIVITY_TRIGGERED_EVENT("EiffelActivityTriggeredEvent");
         private final String value;
         private final static Map<String, EiffelActivityTriggeredEventMeta.Type> CONSTANTS = new HashMap<String, EiffelActivityTriggeredEventMeta.Type>();
 

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

@@ -4,7 +4,7 @@
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
-
+ 
     http://www.apache.org/licenses/LICENSE-2.0
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
@@ -164,8 +164,8 @@ public void setSecurity(Security security) {
 
     public enum Type {
 
-        @SerializedName("eiffelannouncementpublished")
-        EIFFELANNOUNCEMENTPUBLISHED("eiffelannouncementpublished");
+        @SerializedName("EiffelAnnouncementPublishedEvent")
+        EIFFEL_ANNOUNCEMENT_PUBLISHED_EVENT("EiffelAnnouncementPublishedEvent");
         private final String value;
         private final static Map<String, EiffelAnnouncementPublishedEventMeta.Type> CONSTANTS = new HashMap<String, EiffelAnnouncementPublishedEventMeta.Type>();
 

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

@@ -4,7 +4,7 @@
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
-
+ 
     http://www.apache.org/licenses/LICENSE-2.0
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
@@ -164,8 +164,8 @@ public void setSecurity(Security security) {
 
     public enum Type {
 
-        @SerializedName("eiffelartifactcreated")
-        EIFFELARTIFACTCREATED("eiffelartifactcreated");
+        @SerializedName("EiffelArtifactCreatedEvent")
+        EIFFEL_ARTIFACT_CREATED_EVENT("EiffelArtifactCreatedEvent");
         private final String value;
         private final static Map<String, EiffelArtifactCreatedEventMeta.Type> CONSTANTS = new HashMap<String, EiffelArtifactCreatedEventMeta.Type>();