Fix cds error regex and add logging

Change-Id: I38a567fd9c1d844a36665af59eee80b2d9d17e62
Signed-off-by: Serban Jora <sj2381@att.com>
Issue-ID: MODELING-276

diff --git a/gateway/src/main/java/org/acumos/federation/gateway/adapter/PeerGateway.java b/gateway/src/main/java/org/acumos/federation/gateway/adapter/PeerGateway.java
index 44f123c..99d8466 100644 (file)
--- a/gateway/src/main/java/org/acumos/federation/gateway/adapter/PeerGateway.java
+++ b/gateway/src/main/java/org/acumos/federation/gateway/adapter/PeerGateway.java
@@ -170,6 +170,8 @@ public class PeerGateway {
                                                localSolution = createMLPSolution(peerSolution, cdsClient);
                                        }
                                        else {
+                                               log.info(EELFLoggerDelegate.debugLogger, "Solution Id : " + peerSolution.getSolutionId()
+                                                               + " exists locally, updating local catalog ");
                                                localSolution = updateMLPSolution(peerSolution, localSolution, cdsClient);
                                        }
 

diff --git a/gateway/src/main/java/org/acumos/federation/gateway/common/JsonResponse.java b/gateway/src/main/java/org/acumos/federation/gateway/common/JsonResponse.java
index 8caf452..908f297 100644 (file)
--- a/gateway/src/main/java/org/acumos/federation/gateway/common/JsonResponse.java
+++ b/gateway/src/main/java/org/acumos/federation/gateway/common/JsonResponse.java
@@ -39,7 +39,6 @@ public class JsonResponse<T> implements Serializable {
         * Was there an error ?
         */
        @JsonProperty(value = JSONTags.TAG_RESPONSE_ERROR)
-       //private Boolean error;
        private String error;
 
        /**
@@ -53,15 +52,7 @@ public class JsonResponse<T> implements Serializable {
         */
        @JsonProperty(value = JSONTags.TAG_RESPONSE_CONTENT)
        private T content;
-/*
-       public Boolean isError() {
-               return this.error;
-       }
-
-       public void setError(Boolean isError) {
-               this.error = isError;
-       }
-*/
+       
        public String getError() {
                return this.error;
        }
@@ -106,7 +97,7 @@ public class JsonResponse<T> implements Serializable {
                private JsonResponse<T> response = new JsonResponse();
 
                public JsonResponseBuilder() {
-                       this.response.setError(Boolean.FALSE.toString());
+                       this.response.setError(null);
                }
 
                public JsonResponseBuilder<T>   withMessage(String theMessage) {
@@ -146,7 +137,7 @@ public class JsonResponse<T> implements Serializable {
                }
                
                public JsonErrorResponseBuilder<T>      withError(Throwable theError) {
-                       this.response.setMessage(theError.toString());
+                       this.response.setError(theError.toString());
                        return this;
                }
 

diff --git a/gateway/src/main/java/org/acumos/federation/gateway/task/PeerSubscriptionTaskScheduler.java b/gateway/src/main/java/org/acumos/federation/gateway/task/PeerSubscriptionTaskScheduler.java
index ab131b4..7ed4b3c 100644 (file)
--- a/gateway/src/main/java/org/acumos/federation/gateway/task/PeerSubscriptionTaskScheduler.java
+++ b/gateway/src/main/java/org/acumos/federation/gateway/task/PeerSubscriptionTaskScheduler.java
@@ -138,6 +138,9 @@ public class PeerSubscriptionTaskScheduler {
                for (MLPPeer mlpPeer : mlpPeers) {
                        log.info(EELFLoggerDelegate.debugLogger, "checkPeer : " + mlpPeer);
 
+                       if (mlpPeer.isSelf())
+                               continue;
+
                        // cancel peer tasks for inactive peers
                        if (PeerStatus.Active != PeerStatus.forCode(mlpPeer.getStatusCode())) {
                                // cancel all peer sub tasks for this peer

diff --git a/gateway/src/main/java/org/acumos/federation/gateway/util/Errors.java b/gateway/src/main/java/org/acumos/federation/gateway/util/Errors.java
index ab3b5fa..92efa4b 100644 (file)
--- a/gateway/src/main/java/org/acumos/federation/gateway/util/Errors.java
+++ b/gateway/src/main/java/org/acumos/federation/gateway/util/Errors.java
@@ -35,7 +35,7 @@ public class Errors {
        private static Pattern cdsNotFoundPattern = null;
        {
                try {
-                       cdsNotFoundPattern = Pattern.compile("No (.*) for ID (.*)");
+                       cdsNotFoundPattern = Pattern.compile("No (.*) with ID (.*)");
                }
                catch (PatternSyntaxException psx) {
                        throw new RuntimeException("Invalid error pattern", psx);