Tidying up some odds-n-ends.

neo4j · Nov 22, 2016 · 83d2aca · 83d2aca
1 parent 2546639
commit 83d2aca
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/...rise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseNeoServer.java b/...rise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseNeoServer.java
@@ -120,7 +120,7 @@ protected static Database.Factory createDbFactory( Config config )
             return lifecycleManagingDatabase( CORE_FACTORY );
         case READ_REPLICA:
             return lifecycleManagingDatabase( READ_REPLICA_FACTORY );
-        default: // Anything else gives community, including Mode.SINGLE
+        default:
             return lifecycleManagingDatabase( ENTERPRISE_FACTORY );
         }
     }

diff --git a/...erver-enterprise/src/main/java/org/neo4j/server/rest/CoreDatabaseAvailabilityService.java b/...erver-enterprise/src/main/java/org/neo4j/server/rest/CoreDatabaseAvailabilityService.java
@@ -40,9 +40,9 @@
 @Path(CoreDatabaseAvailabilityService.BASE_PATH)
 public class CoreDatabaseAvailabilityService implements AdvertisableService
 {
-    public static final String BASE_PATH = "server/core";
-    public static final String IS_WRITABLE_PATH = "/writable";
-    public static final String IS_AVAILABLE_PATH = "/available";
+    static final String BASE_PATH = "server/core";
+    private static final String IS_WRITABLE_PATH = "/writable";
+    private static final String IS_AVAILABLE_PATH = "/available";
 
     private final OutputFormat output;
     private final CoreGraphDatabase coreDatabase;
@@ -68,9 +68,7 @@ public Response discover() throws BadInputException
             return status( FORBIDDEN ).build();
         }
 
-        String isSlaveUri = IS_WRITABLE_PATH;
-
-        return output.ok( new CoreDatabaseAvailabilityDiscoveryRepresentation( BASE_PATH, isSlaveUri ) );
+        return output.ok( new CoreDatabaseAvailabilityDiscoveryRepresentation( BASE_PATH, IS_WRITABLE_PATH ) );
     }
 
     @GET

diff --git a/...nterprise/src/main/java/org/neo4j/server/rest/ReadReplicaDatabaseAvailabilityService.java b/...nterprise/src/main/java/org/neo4j/server/rest/ReadReplicaDatabaseAvailabilityService.java
@@ -31,14 +31,15 @@
 
 import static javax.ws.rs.core.MediaType.TEXT_PLAIN_TYPE;
 import static javax.ws.rs.core.Response.Status.FORBIDDEN;
+import static javax.ws.rs.core.Response.Status.NOT_FOUND;
 import static javax.ws.rs.core.Response.Status.OK;
 import static javax.ws.rs.core.Response.status;
 
 @Path( ReadReplicaDatabaseAvailabilityService.BASE_PATH)
 public class ReadReplicaDatabaseAvailabilityService implements AdvertisableService
 {
-    public static final String BASE_PATH = "server/read-replica";
-    public static final String IS_AVAILABLE_PATH = "/available";
+    static final String BASE_PATH = "server/read-replica";
+    private static final String IS_AVAILABLE_PATH = "/available";
 
     private final ReadReplicaGraphDatabase readReplica;