Get service name and Validate message methods implementation (#34)

* Added getServiceName and validateMsg methods

* removed try and catch outPutValidate method

* changed getServiceName return eiffel-semantics to eiffelsemantics

* Created constants for all hard coded strings.

Author: Raja Maragani

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.1.9
+- Implemented getServiceName and added remrem-protocol-interface
+
 ## 0.1.8
 - added getEventId functionality for get the event id from the json Object
 

build.gradle

@@ -35,7 +35,7 @@ jar {
 
 shadowJar {
     baseName = 'eiffel-remrem-semantics'
-    version =  '0.1.8'
+    version =  '0.1.9'
     classifier = ''
 }
 
@@ -64,7 +64,8 @@ repositories {
 install.dependsOn shadowJar
 
 dependencies {
-    compile 'com.github.Ericsson:eiffel-remrem-shared:0.1.5'    
+    compile 'com.github.Ericsson:eiffel-remrem-shared:0.2.0' 
+    compile 'com.github.Ericsson:eiffel-remrem-protocol-interface:0.0.1'    
     compile('com.github.fge:json-schema-validator:2.2.6')
     {
     // we need to exclude jackson-databind here and add a

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

@@ -12,13 +12,14 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.ericsson.eiffel.remrem.protocol.MsgService;
+import com.ericsson.eiffel.remrem.protocol.ValidationResult;
 import com.ericsson.eiffel.remrem.semantics.events.EiffelActivityFinishedEvent;
 import com.ericsson.eiffel.remrem.semantics.events.EiffelArtifactPublishedEvent;
 import com.ericsson.eiffel.remrem.semantics.events.Event;
 import com.ericsson.eiffel.remrem.semantics.factory.EiffelOutputValidatorFactory;
 import com.ericsson.eiffel.remrem.semantics.validator.EiffelValidationException;
 import com.ericsson.eiffel.remrem.semantics.validator.EiffelValidator;
-import com.ericsson.eiffel.remrem.shared.MsgService;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
@@ -27,6 +28,11 @@
 @Named("eiffel-semantics")
 public class SemanticsService implements MsgService{
 
+    private static final String EVENT_PARAMS = "eventParams";
+    private static final String MSG_PARAMS = "msgParams";
+    private static final String MESSAGE = "message";
+    private static final String CAUSE = "cause";
+    private static final String EIFFELSEMANTICS = "eiffelsemantics";
     private static final String ID = "id";
     private static final String META = "meta";
 
@@ -50,8 +56,8 @@ public String generateMsg(String msgType, JsonObject bodyJson){
         }
         Class<? extends Event> eventType = eventTypes.get(eiffelType);
 
-        JsonObject msgNodes = bodyJson.get("msgParams").getAsJsonObject();
-        JsonObject eventNodes = bodyJson.get("eventParams").getAsJsonObject();
+        JsonObject msgNodes = bodyJson.get(MSG_PARAMS).getAsJsonObject();
+        JsonObject eventNodes = bodyJson.get(EVENT_PARAMS).getAsJsonObject();
 
         Event event = createEvent(eventNodes, eventType);
         event.generateMeta(msgType, msgNodes);
@@ -72,8 +78,8 @@ private Event createEvent(JsonObject eventNodes, Class<? extends Event> eventTyp
 
     private String createErrorResponse(final String message, final String cause){
         JsonObject errorResponse = new JsonObject();
-        errorResponse.addProperty("message", message);
-        errorResponse.addProperty("cause", cause.replace("\n", ""));
+        errorResponse.addProperty(MESSAGE, message);
+        errorResponse.addProperty(CAUSE, cause.replace("\n", ""));
         return errorResponse.toString();
     }
 
@@ -92,4 +98,32 @@ public String getEventId(JsonObject json) {
         }
         return null;
     }
+
+    @Override
+    public String getFamily(JsonObject eiffelMessage) {
+        return null;
+    }
+    
+    @Override
+    public String getType(JsonObject eiffelMessage) {
+        return null;
+    }
+    @Override
+    public String getServiceName() {
+        return EIFFELSEMANTICS;
+    }
+
+    @Override
+    public ValidationResult validateMsg(String msgType, JsonObject jsonvalidateMessage) {
+        ValidationResult validationResult = null;
+        EiffelEventType eiffelType = EiffelEventType.fromString(msgType);
+        String result = gson.toJson(jsonvalidateMessage);
+        try {
+            outputValidate(eiffelType, result);
+            validationResult = new ValidationResult(true, "");
+        } catch (EiffelValidationException e) {
+            validationResult = new ValidationResult(false, e.getLocalizedMessage());
+        }
+        return validationResult;
+    }
 }

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

@@ -1,21 +1,27 @@
 package com.ericsson.eiffel.remrem.semantics;
 
-import com.ericsson.eiffel.remrem.semantics.events.EiffelActivityFinishedEvent;
-import com.ericsson.eiffel.remrem.semantics.events.EiffelArtifactPublishedEvent;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.util.jar.Attributes;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.InjectMocks;
-import static org.mockito.Mockito.*;
-
 import org.mockito.MockitoAnnotations;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.util.jar.Attributes;
+import com.ericsson.eiffel.remrem.protocol.ValidationResult;
+import com.ericsson.eiffel.remrem.semantics.events.EiffelActivityFinishedEvent;
+import com.ericsson.eiffel.remrem.semantics.events.EiffelArtifactPublishedEvent;
+import com.google.gson.JsonIOException;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.google.gson.JsonSyntaxException;
 
 public class ServiceTest {
 
@@ -97,4 +103,23 @@ private void testGenerateMsg(String msgType, String fileName) {
             Assert.assertFalse(false);
         }
     }
+
+    @Test
+    public void validateMessage() {
+        File file = new File(getClass().getClassLoader().getResource("output/ActivityFinished.json").getFile());
+        JsonObject input;
+        ValidationResult msg = null;
+        try {
+            input = parser.parse(new FileReader(file)).getAsJsonObject();
+            msg = service.validateMsg(ACTIVITY_FINISHED, input);
+        } catch (JsonIOException e) {
+            e.printStackTrace();
+        } catch (JsonSyntaxException e) {
+            e.printStackTrace();
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        }
+        Assert.assertNotNull(msg);
+        Assert.assertTrue(msg.isValid());
+    }
 }