Event names in Eiffel2.0 check and update the eventtype if we haven't passed (#51)

e113834ed47bea3b5b1e7e2305b11a53aa6c4af8

Author: tcskoab

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.8
+- Event names in Eiffel2.0 check and update the eventtype if we haven't passed
+
+## 0.2.7
+- Event names in Eiffel2.0 should adhere to documentation of eiffel in Github
+
 ## 0.2.6
 - Added links validation to events based on the Bordeaux edition of protocol
 

build.gradle

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

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

@@ -132,6 +132,7 @@ public static Map<EiffelEventType, Class<? extends Event>> eventType()
         eventTypes.put(ARTIFACT_REUSED, EiffelArtifactReusedEvent.class);
        return eventTypes; 
     }
+
     @Override
     public String generateMsg(String msgType, JsonObject bodyJson){
         EiffelEventType eiffelType = EiffelEventType.fromString(msgType);
@@ -144,6 +145,16 @@ public String generateMsg(String msgType, JsonObject bodyJson){
         JsonObject msgNodes = bodyJson.get(MSG_PARAMS).getAsJsonObject();
         JsonObject eventNodes = bodyJson.get(EVENT_PARAMS).getAsJsonObject();
 
+        //Compare the input JSON EventType with query parameter(-t) and also check type exist or not,
+        //if input JSON EventType is missing adding query parameter as Type. 
+        String inputEventType = getInputEventType(bodyJson);
+        if(inputEventType ==  null || inputEventType.isEmpty()){
+            bodyJson.get(MSG_PARAMS).getAsJsonObject().get(META).getAsJsonObject().addProperty(TYPE, msgType);
+        }else if(!(inputEventType.equals(msgType))){
+            log.error("check the input json message type : " + inputEventType);
+            return createErrorResponse(msgType,supportedEventTypes);
+        }
+
         Event event = eventCreation(msgType, eventType, msgNodes, eventNodes);
 
        String result = gson.toJson(event);
@@ -198,6 +209,17 @@ public String getEventId(JsonObject json) {
         return null;
     }
 
+    /*
+     * json Input json which we have passed from CLI or Service
+     * return eventType will return from inputJson file
+     */
+    public String getInputEventType(JsonObject json) {
+        if (json.isJsonObject() && json.get(MSG_PARAMS).getAsJsonObject().has(META) && json.get(MSG_PARAMS).getAsJsonObject().getAsJsonObject(META).has(TYPE)){
+            return json.get(MSG_PARAMS).getAsJsonObject().getAsJsonObject(META).get(TYPE).getAsString();
+        }
+        return null;
+    }
+
     @Override
     public String getFamily(JsonObject eiffelMessage) {
         if (eiffelMessage.isJsonObject() && eiffelMessage.getAsJsonObject().has(META)

src/test/java/com/ericsson/eiffel/remrem/semantics/ServiceTest.java

@@ -59,6 +59,7 @@
 import com.google.gson.JsonParser;
 import com.google.gson.JsonSyntaxException;
 
+
 public class ServiceTest {
 
     private String ACTIVITY_FINISHED = "EiffelActivityFinishedEvent";
@@ -268,7 +269,8 @@ private void testGenerateMsg(String msgType, String fileName) {
         }
     }
 
-    @Test public void testInvalidMessage() {
+    @Test
+    public void testInvalidMessage() {
         try {
         	URL url = getClass().getClassLoader().getResource("input/ActivityFinishedInvalid.json");
             String path = url.getPath().replace("%20"," ");
@@ -278,7 +280,7 @@ private void testGenerateMsg(String msgType, String fileName) {
             Assert.assertTrue(msg.contains("message"));
             Assert.assertTrue(msg.contains("Cannot validate given JSON string"));
             Assert.assertTrue(msg.contains("cause"));
-            Assert.assertTrue(msg.contains("missing required properties ([\\\"type"));
+            Assert.assertTrue(msg.contains("missing required properties ([\\\"groupId"));
         } catch(FileNotFoundException e) {
             Assert.assertFalse(false);
         }

src/test/resources/input/ActivityFinishedInvalid.json

@@ -10,7 +10,6 @@
         "name": "name",
         "uri": "http:\/\/java.sun.com\/j2se\/1.3\/",
         "serializer": {
-          "groupId": "G",
           "artifactId": "A",
           "version": "V"
         }