Merge branch 'p-backman-ericsson-master'

Author: Vali (Vasile Baluta)

CHANGELOG.md

@@ -0,0 +1,3 @@
+## 0.1.6
+- removed lombok dependecy
+- improved logging and error messages to caller

build.gradle

@@ -24,7 +24,7 @@ jar {
     baseName = 'eiffel-remrem-semantics'
     // If this version is updated please update it in Event.java 
     // com.ericsson.eiffel.remrem.semantics.events
-    version =  '0.1.5'
+    version =  '0.1.6'
     manifest {
         attributes('Semantics-Version': version)
     }
@@ -33,7 +33,7 @@ jar {
 
 shadowJar {
     baseName = 'eiffel-remrem-semantics'
-    version =  '0.1.5'
+    version =  '0.1.6'
     classifier = ''
 }
 
@@ -68,6 +68,5 @@ dependencies {
     compile 'javax.inject:javax.inject:1'
     compile 'org.slf4j:slf4j-api:1.7.18'
     compile group: 'com.google.code.gson', name: 'gson', version: '1.7.2'
-    compile group: 'org.projectlombok', name: 'lombok', version: '1.16.8'
     testCompile 'junit:junit:4.12'
 }

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

@@ -12,19 +12,22 @@
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import lombok.extern.slf4j.Slf4j;
 
 import java.util.HashMap;
 import java.util.Map;
-
 import javax.inject.Named;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.ACTIVITY_FINISHED;
 import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.ARTIFACT_PUBLISHED;
 
-@Named("eiffel-semantics") @Slf4j
+
+@Named("eiffel-semantics")
 public class SemanticsService implements MsgService{
 
+    public static final Logger log = LoggerFactory.getLogger(SemanticsService.class);
+
     private Gson gson = new Gson();
     private Map<EiffelEventType, Class<? extends Event>> eventTypes;
 
@@ -38,7 +41,8 @@ public SemanticsService() {
     public String generateMsg(String msgType, JsonObject bodyJson){
         EiffelEventType eiffelType = EiffelEventType.fromString(msgType);
         if (eiffelType == null) {
-            throw new IllegalArgumentException("Unknown message type requested: " + msgType);
+            log.error("Unknown message type requested: " + msgType);
+            return createErrorResponse("Unknown message type requested", "'" + msgType + "' is not in the vocabulary of this service");
         }
         Class<? extends Event> eventType = eventTypes.get(eiffelType);
 
@@ -51,12 +55,9 @@ public String generateMsg(String msgType, JsonObject bodyJson){
         String result = gson.toJson(event);
         try {
             outputValidate(eiffelType, result);
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            JsonObject errorResponse = new JsonObject();
-            errorResponse.addProperty("message", e.getMessage());
-            errorResponse.addProperty("cause", e.getCause().toString().replace("\n", ""));
-            return errorResponse.toString();
+        } catch (EiffelValidationException e) {
+            log.error("Could not validate message. Reason:" +  e.getMessage() +"\nCause: " + e.getCause().toString());
+            return createErrorResponse(e.getMessage(), e.getCause().toString());
         }
         return result;
     }
@@ -65,6 +66,13 @@ private Event createEvent(JsonObject eventNodes, Class<? extends Event> eventTyp
     	return gson.fromJson(eventNodes, eventType);
     }
 
+    private String createErrorResponse(final String message, final String cause){
+        JsonObject errorResponse = new JsonObject();
+        errorResponse.addProperty("message", message);
+        errorResponse.addProperty("cause", cause.replace("\n", ""));
+        return errorResponse.toString();
+    }
+    
     private void outputValidate(EiffelEventType eiffelType, String jsonStringInput) throws EiffelValidationException {
         EiffelValidator validator = EiffelOutputValidatorFactory.getEiffelValidator(eiffelType);
         JsonObject jsonObject = new JsonParser().parse(jsonStringInput).getAsJsonObject();

src/main/java/com/ericsson/eiffel/remrem/semantics/events/Event.java

@@ -12,7 +12,7 @@
 
 public abstract class Event {
     public Meta meta;
-    public static String  version = "0.1.5";
+    public static String  version = "0.1.6";
 
     @Inject
     private Attributes attributes;

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

@@ -6,11 +6,14 @@
 import com.github.fge.jsonschema.main.JsonSchema;
 import com.github.fge.jsonschema.main.JsonSchemaFactory;
 import com.google.gson.JsonObject;
-import lombok.extern.slf4j.Slf4j;
 
-@Slf4j
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 //todo optional fields links.causes and links.context should be mutual exclusive
 public class EiffelValidator {
+    public static final Logger log = LoggerFactory.getLogger(EiffelValidator.class);
+
     private JsonSchema validationSchema;
     private String schemaResourceName;
 
@@ -45,7 +48,7 @@ public void validate(JsonObject jsonObjectInput) throws EiffelValidationExceptio
             log.debug("VALIDATED. Schema used: {}", schemaResourceName);
         } catch (Exception e) {
             String message = "Cannot validate given JSON string";
-            log.error(message, e);
+            log.debug(message, e);
             throw new EiffelValidationException(message, e);
         }
     }

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

@@ -2,30 +2,28 @@
 
 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.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.InjectMocks;
-import org.mockito.Mockito;
 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;
 
-
 public class ServiceTest {
 
     private String ACTIVITY_FINISHED = "eiffelactivityfinished";
     private String ARTIFACT_PUBLISHED = "eiffelartifactpublished";
 
     JsonParser parser = new JsonParser();
-    
+
     @InjectMocks
     SemanticsService service = new SemanticsService();	
 
@@ -66,4 +64,37 @@ private void testGenerateMsg(String msgType, String fileName) {
     @Test public void testArtifactPublished() {
         testGenerateMsg(ARTIFACT_PUBLISHED, "input/ArtifactPublished.json");
     }
+
+    @Test public void testUnknownMessage() {
+        try {
+            File file = new File(getClass().getClassLoader().getResource("input/ArtifactPublished.json").getFile());
+            JsonObject input = parser.parse(new FileReader(file)).getAsJsonObject();
+
+            String msg = service.generateMsg("unknownmessage",input);
+            System.out.println(msg);
+
+            Assert.assertTrue(msg.contains("message"));
+            Assert.assertTrue(msg.contains("Unknown message type requested"));
+            Assert.assertTrue(msg.contains("cause"));
+        } catch(FileNotFoundException e) {
+            Assert.assertFalse(false);
+        }
+    }
+    
+    @Test public void testInvalidMessage() {
+        try {
+            File file = new File(getClass().getClassLoader().getResource("input/ActivityFinishedInvalid.json").getFile());
+            JsonObject input = parser.parse(new FileReader(file)).getAsJsonObject();
+
+            String msg = service.generateMsg(ACTIVITY_FINISHED, input);
+            System.out.println(msg);
+
+            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 ([\\\"activityExecution"));
+        } catch(FileNotFoundException e) {
+            Assert.assertFalse(false);
+        }
+    }
 }

src/test/resources/input/ActivityFinishedInvalid.json

@@ -0,0 +1,41 @@
+{"msgParams": {
+  "meta": {
+    "type": "EiffelActivityFinishedEvent",
+    "domainId": "example.domain",
+    "tags": ["tag1", "tag2"],
+    "source": {
+      "host": "host",
+      "name": "name",
+      "uri": "http://java.sun.com/j2se/1.3/",
+      "serializer": {
+        "groupId": "G",
+        "artifactId": "A",
+        "version": "V"
+      }
+    }
+  }
+},
+  "eventParams": {
+    "data": {
+      "outcome": {
+        "conclusion": "TIMED_OUT",
+        "description": "Compilation timed out."
+      },
+      "persistentLogs": [
+        {
+          "name": "firstLog",
+          "uri": "http://myHost.com/firstLog"
+        },
+        {
+          "name": "otherLog",
+          "uri": "isbn:0-486-27557-4"
+        }
+      ]
+    },
+    "links": {
+      "activityExecutionMisspelled": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee1",
+      "causes": ["cause1", "cause2"],
+      "flowContext": "flowContext"
+    }
+  }
+}