Merge branch 'CURATOR-304' of github.com:nirdothan/curator into CURAT…

…OR-304
epollan · Mar 28, 2016 · 3d1fca2 · 3d1fca2
2 parents 8499680 + 0b088ff
commit 3d1fca2
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/...ry-server/src/main/java/org/apache/curator/x/discovery/server/rest/DiscoveryResource.java b/...ry-server/src/main/java/org/apache/curator/x/discovery/server/rest/DiscoveryResource.java
@@ -90,7 +90,7 @@ public Response     putService(ServiceInstance<T> instance, @PathParam("name") S
             return Response.status(Response.Status.BAD_REQUEST).build();
         }
 
-        if ( instance.getServiceType() == ServiceType.DYNAMIC )
+        if ( instance.getServiceType().isDynamic() )
         {
             log.info("Service type cannot be dynamic");
             return Response.status(Response.Status.BAD_REQUEST).build();

diff --git a/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/ServiceType.java b/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/ServiceType.java
@@ -22,5 +22,10 @@ public enum ServiceType
 {
     DYNAMIC,
     STATIC,
-    PERMANENT
+    PERMANENT, 
+    DYNAMIC_SEQUENTIAL;
+
+	public boolean isDynamic() {
+		return this == DYNAMIC || this == DYNAMIC_SEQUENTIAL;
+	}
 }
diff --git a/...-discovery/src/main/java/org/apache/curator/x/discovery/details/ServiceDiscoveryImpl.java b/...-discovery/src/main/java/org/apache/curator/x/discovery/details/ServiceDiscoveryImpl.java
@@ -220,7 +220,18 @@ protected void internalRegisterService(ServiceInstance<T> service) throws Except
         {
             try
             {
-                CreateMode mode = (service.getServiceType() == ServiceType.DYNAMIC) ? CreateMode.EPHEMERAL : CreateMode.PERSISTENT;
+				CreateMode mode;
+				switch (service.getServiceType()) {
+				case DYNAMIC:
+					mode = CreateMode.EPHEMERAL;
+					break;
+				case DYNAMIC_SEQUENTIAL:
+					mode = CreateMode.EPHEMERAL_SEQUENTIAL;
+					break;
+				default:
+					mode = CreateMode.PERSISTENT;
+					break;
+				}
                 client.create().creatingParentContainersIfNeeded().withMode(mode).forPath(path, bytes);
                 isDone = true;
             }