add method to get available eiffel event types as string collection (#59)

Add method to get available Eiffel event types as string collection

Author: Christoffer-Cortes

build.gradle

@@ -48,7 +48,7 @@ allprojects {
 
 jar {
     baseName = 'eiffel-remrem-semantics'
-    version =  '0.3.2'
+    version =  '0.3.3'
     manifest {
         attributes('remremVersionKey': 'semanticsVersion')
         attributes('semanticsVersion': version)
@@ -95,7 +95,7 @@ repositories {
 install.dependsOn shadowJar
 
 dependencies {
-    compile 'com.github.Ericsson:eiffel-remrem-protocol-interface:0.0.5'
+    compile 'com.github.Ericsson:eiffel-remrem-protocol-interface:0.0.6'
     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

@@ -46,7 +46,9 @@
 import static com.ericsson.eiffel.remrem.semantics.EiffelEventType.ARTIFACT_REUSED;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import javax.annotation.PostConstruct;
@@ -283,6 +285,11 @@ public String getEventType(JsonObject json) {
         }
         return null;
     }
+    
+    @Override
+    public Collection<String> getSupportedEventTypes() {
+    	return supportedEventTypes;
+    }
 
     /**
      * Returns Family Routing Key Word from the messaging library based on the

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

@@ -24,6 +24,9 @@
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
 
@@ -37,6 +40,8 @@
 import com.ericsson.eiffel.remrem.protocol.ValidationResult;
 import com.ericsson.eiffel.remrem.semantics.util.ManifestHandler;
 import com.ericsson.eiffel.semantics.events.Gav;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
 import com.google.gson.JsonIOException;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
@@ -65,8 +70,6 @@ public static void readManifestGav() {
             manifestGav.setGroupId(attributes1.getValue("groupId"));
             manifestGav.setArtifactId(attributes1.getValue("artifactId"));
             manifestGav.setVersion(attributes1.getValue("semanticsVersion"));
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -148,11 +151,7 @@ public void validateMessage() {
         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) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
         Assert.assertNotNull(msg);
@@ -169,11 +168,7 @@ public void testGetEventType() {
         try {
             input = parser.parse(new FileReader(file)).getAsJsonObject();
             eventType = service.getEventType(input);
-        } catch (JsonIOException e) {
-            e.printStackTrace();
-        } catch (JsonSyntaxException e) {
-            e.printStackTrace();
-        } catch (FileNotFoundException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
         assertEquals("EiffelActivityFinishedEvent", eventType);
@@ -189,11 +184,7 @@ public void testGenerateRoutingKey() {
         try {
             input = parser.parse(new FileReader(file)).getAsJsonObject();
             routingKey = service.generateRoutingKey(input, null, null, null);
-        } catch (JsonIOException e) {
-            e.printStackTrace();
-        } catch (JsonSyntaxException e) {
-            e.printStackTrace();
-        } catch (FileNotFoundException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
         assertEquals("eiffel.activity.finished.notag.domainID", routingKey);
@@ -219,4 +210,28 @@ public void testInvalidPathRemremSemanticsGav() throws Exception {
         manifestGav.setVersion(attributes1.getValue("semanticsVersion"));
 
     }
+    
+    @Test
+    public void testGetSupportedEventTypes() {
+    	URL url = getClass().getClassLoader().getResource("EventTypes.json");
+        String path = url.getPath().replace("%20", " ");
+        File file = new File(path);
+        JsonObject input = null;
+        boolean checkValue = false;        
+        try {
+            Collection<String> types = service.getSupportedEventTypes();
+            input = parser.parse(new FileReader(file)).getAsJsonObject();
+            JsonArray eventTypes = input.getAsJsonArray("eventTypes");            
+            List<String> matchingCollection = new ArrayList<>();
+            if (eventTypes != null) {
+            	for (JsonElement event : eventTypes) {
+            		matchingCollection.add(event.getAsString());
+            	}
+            }
+            checkValue = types.containsAll(matchingCollection);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }     
+        assertEquals(true,checkValue);
+    }
 }

src/test/resources/EventTypes.json

@@ -0,0 +1 @@
+{"eventTypes":["EiffelCompositionDefinedEvent","EiffelTestSuiteStartedEvent","EiffelActivityCanceledEvent","EiffelActivityTriggeredEvent","EiffelAnnouncementPublishedEvent","EiffelTestCaseFinishedEvent","EiffelIssueVerifiedEvent","EiffelActivityFinishedEvent","EiffelFlowContextDefinedEvent","EiffelConfidenceLevelModifiedEvent","EiffelSourceChangeSubmittedEvent","EiffelTestCaseCanceledEvent","EiffelTestExecutionRecipeCollectionCreatedEvent","EiffelEnvironmentDefinedEvent","EiffelActivityStartedEvent","EiffelTestCaseTriggeredEvent","EiffelArtifactReusedEvent","EiffelSourceChangeCreatedEvent","EiffelTestSuiteFinishedEvent","EiffelArtifactPublishedEvent","EiffelArtifactCreatedEvent","EiffelTestCaseStartedEvent"]}