Eiffel2.0 events links validation based on the Bordeaux edition of protocol #47

Umadevi-Kapu · 2017-07-31T11:43:32Z

No description provided.

…otocol

…tarted.json

coveralls · 2017-07-31T11:56:19Z

Coverage increased (+1.3%) to 44.943% when pulling 8788ebe on xumakap:links into eca019d on Ericsson:master.

coveralls · 2017-08-07T06:32:58Z

Coverage increased (+1.3%) to 44.932% when pulling 194c969 on xumakap:links into eca019d on Ericsson:master.

raja-maragani · 2017-08-08T05:26:05Z

src/main/java/com/ericsson/eiffel/remrem/semantics/config/LinksConfiguration.java

+/**
+ * This class is used to read required and optional links from linksValidation.properties file
+ * 
+ * @author xumakap


remove author

raja-maragani · 2017-08-08T05:27:49Z

src/main/java/com/ericsson/eiffel/remrem/semantics/config/LinksConfiguration.java

+    public static List<String> getRequiredLinks(String eventType) {
+
+        if (requiredLinksMap.size() == 0 || optionalLinksMap.size() == 0) {
+            while (keys.hasMoreElements()) {


Why iterating map, Use directly get from Map

raja-maragani · 2017-08-08T05:33:21Z

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

+
+            if(requiredLinks == null && optionalLinks == null) {
+                throw new EiffelValidationException(eiffelType.getEventName()+"event links not configured in property file "+CONFIG_FILE);
+            }


if may be some of event does not have optional parameters then?

raja-maragani · 2017-08-08T05:36:17Z

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

            throw new EiffelValidationException(message, e);
        }
    }



Write method doc comments
http://www.oracle.com/technetwork/articles/java/index-137868.html

raja-maragani · 2017-08-08T05:37:33Z

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

        }
    }

+    public void linksValidation(EiffelEventType eiffelType, JsonObject jsonObject) throws EiffelValidationException {


We are validating only Links Object, So do not pass entire event object.

…uration file

coveralls · 2017-08-08T06:57:48Z

Coverage increased (+1.3%) to 44.947% when pulling 8a75435 on xumakap:links into eca019d on Ericsson:master.

…nal links based on event

coveralls · 2017-08-08T12:23:11Z

Coverage increased (+2.5%) to 46.201% when pulling ab67952 on xumakap:links into eca019d on Ericsson:master.

xvinosi-github · 2017-08-08T12:48:35Z

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


-    String getEventName() {
+    public String getEventName() {
        return id;


variable name from id to eventName

xvinosi-github · 2017-08-08T12:49:51Z

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

+
+import com.ericsson.eiffel.remrem.semantics.schemas.EiffelConstants;
+
+public enum LinkTypes {


LinkTypes to LinkType

xvinosi-github · 2017-08-08T12:52:03Z

src/main/java/com/ericsson/eiffel/remrem/semantics/config/LinksConfiguration.java

+    private final String OPTIONAL_LINKS = "optionalLinks";
+    private final String DOT = ".";
+
+    public LinksConfiguration() {


Javadoc for the constructor

xvinosi-github · 2017-08-08T12:52:35Z

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

        }
        return idMap.get(id);
    }



javadoc for the method

xvinosi-github · 2017-08-08T12:52:41Z

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

+package com.ericsson.eiffel.remrem.semantics;
+
+import com.ericsson.eiffel.remrem.semantics.schemas.EiffelConstants;
+


Javadoc for the Enum

xvinosi-github · 2017-08-08T12:56:14Z

src/main/java/com/ericsson/eiffel/remrem/semantics/config/LinksConfiguration.java

+     * This method is used to get all link types from LinkTypes Enum
+     * @return link types list
+     */
+    public List<String> getLinkTypes() {


getAllLinkTypes

xvinosi-github · 2017-08-08T12:56:30Z

src/main/java/com/ericsson/eiffel/remrem/semantics/factory/EiffelOutputValidatorFactory.java


 public class EiffelOutputValidatorFactory {

+    private static LinksConfiguration linksConfiguration = new LinksConfiguration();


final keyword

xvinosi-github · 2017-08-08T12:58:32Z

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

+    private List<String> linkTypes;

-    public EiffelValidator(String schemaResourceName) {
+    public EiffelValidator(String schemaResourceName, String eventType, List<String> requiredLinks, List<String> optionalLinks, List<String> linkTypes) {


requiredLinkTypes, optionalLinkTypes, allLinkTypes

xvinosi-github · 2017-08-08T12:59:32Z

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

-}
+    /**
+     * This method is used to validate links in an event
+     * @param eiffelType is an event type


remove javadoc

xvinosi-github · 2017-08-08T15:12:05Z

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

-    public OutputValidator(String schemaResourceName) {
-        super(schemaResourceName);
+    public OutputValidator(String schemaResourceName,String eventType, List<String> requiredLinks, List<String> optionalLinks, List<String> linkTypes) {
+        super(schemaResourceName, eventType, requiredLinks, optionalLinks, linkTypes);


allLinkTypes

raja-maragani · 2017-08-09T09:44:57Z

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

+        for (String requiredLink : requiredLinks) {
+            Integer count = linksCountMapForEvent.get(requiredLink);
+            if (count == null) {
+                throw new EiffelValidationException("Mandatory links missing");


Add Link type to EiffelValidationException

…the links in all events

coveralls · 2017-08-09T12:09:25Z

Coverage increased (+2.4%) to 46.111% when pulling f56a832 on xumakap:links into eca019d on Ericsson:master.

xvinosi-github · 2017-08-09T12:12:44Z

src/main/java/com/ericsson/eiffel/remrem/semantics/config/LinksConfiguration.java

+        } catch (MissingResourceException e) {
+            return linkTypeList;
+        }
+    }*/


remove not needed code

xvinosi-github · 2017-08-09T12:14:18Z

src/main/java/com/ericsson/eiffel/remrem/semantics/config/LinksConfiguration.java

+        return getLinkTypesFromConfiguration(key);
+    }
+
+    /*private List<String> getLinkTypesFromConfiguration(String key) {


remove commented code

xvinosi-github · 2017-08-09T12:14:39Z

src/main/java/com/ericsson/eiffel/remrem/semantics/config/LinksConfiguration.java

+        return getLinkTypesFromConfiguration(key);
+    }
+
+    private List<String> getLinkTypesFromConfiguration(String key) {


add java doc

…ed unused code

coveralls · 2017-08-09T12:41:43Z

Coverage increased (+2.4%) to 46.111% when pulling 9b7a371 on xumakap:links into eca019d on Ericsson:master.

xvinosi-github · 2017-08-09T12:55:54Z

+1

raja-maragani · 2017-08-10T01:37:51Z

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

+            }
+            Set<String> linksSet = new HashSet<>(linksCountMapForEvent.keySet());
+
+            for (String requiredLinkType : requiredLinkTypes) {


use java8 Lambda Expression

raja-maragani · 2017-08-10T01:41:49Z

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

+        String CONTEXT_LINK = "CONTEXT";
+        try {
+            JsonArray links = jsonObjectInput.get("links").getAsJsonArray();
+            for (JsonElement link : links) {


please use java 8 Lambda Expression, we can reduce this logic.

I guess we can implement then in upcoming stories related to this.

raja-maragani · 2017-08-10T01:43:48Z

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

+                throw new EiffelValidationException(
+                        "Link types " + CAUSE_LINK + " and " + CONTEXT_LINK + " should not be in one event");
+            }
+            for (String optionalLinkType : optionalLinkTypes) {


use java 8 Lambda Expression

SantoshNC68

please implement the lambda expressions in coming tasks.

Umadevi-Kapu added 2 commits July 31, 2017 17:07

Eiffel2.0 events links validation based on the Bordeaux edition of pr…

594328d

…otocol

Added mandatory link type "TEST_CASE_EXECUTION" in links in TestCaseS…

8788ebe

…tarted.json

Umadevi-Kapu requested review from raja-maragani and xvinosi-github July 31, 2017 12:06

Added custom link type validation

194c969

raja-maragani suggested changes Aug 8, 2017

View reviewed changes

Modified getRequiredLinks and getOptionalLinks methods in LinksConfig…

8a75435

…uration file

Modified EiffelOutputValidatorFactory class to get required and optio…

ab67952

…nal links based on event

xdurvak requested a review from SantoshNC68 August 8, 2017 13:41

xvinosi-github reviewed Aug 8, 2017

View reviewed changes

raja-maragani reviewed Aug 9, 2017

View reviewed changes

Added java doc for methods and classes and modified target values in …

f56a832

…the links in all events

xvinosi-github reviewed Aug 9, 2017

View reviewed changes

Added java doc for the method getLinkTypesFromConfiguration and remov…

9b7a371

…ed unused code

raja-maragani reviewed Aug 10, 2017

View reviewed changes

SantoshNC68 approved these changes Aug 11, 2017

View reviewed changes

Umadevi-Kapu merged commit 329494c into eiffel-community:master Aug 11, 2017

Umadevi-Kapu deleted the links branch August 29, 2017 09:17


		import com.ericsson.eiffel.remrem.semantics.schemas.EiffelConstants;

		public enum LinkTypes {

		package com.ericsson.eiffel.remrem.semantics;

		import com.ericsson.eiffel.remrem.semantics.schemas.EiffelConstants;


		public class EiffelOutputValidatorFactory {

		private static LinksConfiguration linksConfiguration = new LinksConfiguration();

Eiffel2.0 events links validation based on the Bordeaux edition of protocol #47

Eiffel2.0 events links validation based on the Bordeaux edition of protocol #47

Uh oh!

Conversation

Umadevi-Kapu commented Jul 31, 2017

Uh oh!

coveralls commented Jul 31, 2017

Uh oh!

coveralls commented Aug 7, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

coveralls commented Aug 8, 2017

Uh oh!

coveralls commented Aug 8, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

coveralls commented Aug 9, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

coveralls commented Aug 9, 2017

Uh oh!

xvinosi-github commented Aug 9, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

SantoshNC68 left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants