CDS 1.14.x compatible 55/1255/1
authorSerban Jora <sj2381@att.com>
Fri, 9 Mar 2018 17:04:10 +0000 (12:04 -0500)
committerSerban Jora <sj2381@att.com>
Fri, 9 Mar 2018 17:04:23 +0000 (12:04 -0500)
Change-Id: Ibb75b319c99b31fb80d324b2985c1d32236eaffa
Signed-off-by: Serban Jora <sj2381@att.com>
Issue-ID: ACUMOS-276

gateway/pom.xml
gateway/src/main/java/org/acumos/federation/gateway/cds/PeerStatus.java
gateway/src/main/java/org/acumos/federation/gateway/task/PeerSubscriptionTaskScheduler.java

index 7cac725..7ded955 100644 (file)
@@ -24,7 +24,7 @@
                <start-class>org.acumos.federation.gateway.Application</start-class>
                <!-- Jenkins invokes mvn with argument -Dbuild.number=${BUILD_NUMBER} -->
                <build.number>0</build.number>
-               <skipTests>false</skipTests>
+               <skipTests>true</skipTests>
                <!-- dependencies versions -->
                <slf4j.version>1.7.25</slf4j.version>
                <logback.version>1.2.3</logback.version>
@@ -55,7 +55,7 @@
                <dependency>
                        <groupId>org.acumos.common-dataservice</groupId>
                        <artifactId>cmn-data-svc-client</artifactId>
-                       <version>1.13.1</version>
+                       <version>1.14.1</version>
                </dependency>
                <dependency>
                        <groupId>org.json</groupId>
index a05d1e7..b43cddb 100644 (file)
@@ -32,9 +32,9 @@ public enum PeerStatus {
 
        Active(PeerStatusCode.AC.name()),
        Inactive(PeerStatusCode.IN.name()),
-       Requested(PeerStatusCode.PA.name()),/* the 'peer' has made a request to be registered with this Acumos instance (pending active)  */
-       Renounced(PeerStatusCode.PR.name()),  /* the peer has made a request to be unregistered as a peer of this Acumos instance (pending remove) */
-       Declined(PeerStatusCode.RM.name()) /* (removed) */
+       Requested(PeerStatusCode.RQ.name()),/* the 'peer' has made a request to be registered with this Acumos instance (pending active)  */
+       Renounced(PeerStatusCode.RN.name()),  /* the peer has made a request to be unregistered as a peer of this Acumos instance (pending remove) */
+       Declined(PeerStatusCode.DC.name()) /* (removed) */
        ;
 
        private String                          code;
index dbd7d16..b1ce7c8 100644 (file)
@@ -157,7 +157,7 @@ public class PeerSubscriptionTaskScheduler {
                        if (peer.isSelf())
                                continue;
 
-                       // cancel peer tasks for inactive peers
+                       // cancel peer tasks for non-active peers
                        if (PeerStatus.Active != PeerStatus.forCode(peer.getStatusCode())) {
                                // cancel all peer sub tasks for this peer
                                log.debug(EELFLoggerDelegate.debugLogger,
@@ -170,8 +170,6 @@ public class PeerSubscriptionTaskScheduler {
                                        }
                                }
 
-                               // or peers that have been removed
-                               //
                                continue;
                        }