Renamed StoreVersion#string() to #versionString()

Because this is a more descriptive name.
neo4j · Jun 2, 2016 · 5a9ecb7 · 5a9ecb7
1 parent 6ebfba1
commit 5a9ecb7
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 21 deletions.
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/format/StoreVersion.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/format/StoreVersion.java
@@ -36,18 +36,18 @@ public enum StoreVersion
 
     private static final StoreVersion[] ALL_STORE_VERSIONS = values();
 
-    private final String string;
+    private final String versionString;
     private final boolean isCommunity;
 
-    StoreVersion( String string, boolean isCommunity )
+    StoreVersion( String versionString, boolean isCommunity )
     {
-        this.string = string;
+        this.versionString = versionString;
         this.isCommunity = isCommunity;
     }
 
-    public String string()
+    public String versionString()
     {
-        return string;
+        return versionString;
     }
 
     /**
@@ -58,7 +58,7 @@ public static boolean isCommunityStoreVersion( @Nonnull String version )
     {
         for ( StoreVersion storeVersion : ALL_STORE_VERSIONS )
         {
-            if ( storeVersion.string.equals( version ) && storeVersion.isCommunity )
+            if ( storeVersion.versionString.equals( version ) && storeVersion.isCommunity )
             {
                 return true;
             }
@@ -74,7 +74,7 @@ public static boolean isEnterpriseStoreVersion( @Nonnull String version )
     {
         for ( StoreVersion storeVersion : ALL_STORE_VERSIONS )
         {
-            if ( storeVersion.string.equals( version ) && !storeVersion.isCommunity )
+            if ( storeVersion.versionString.equals( version ) && !storeVersion.isCommunity )
             {
                 return true;
             }

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/format/standard/StandardV2_0.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/format/standard/StandardV2_0.java
@@ -35,7 +35,7 @@
 
 public class StandardV2_0 extends BaseRecordFormats
 {
-    public static final String STORE_VERSION = StoreVersion.STANDARD_V2_0.string();
+    public static final String STORE_VERSION = StoreVersion.STANDARD_V2_0.versionString();
     public static final RecordFormats RECORD_FORMATS = new StandardV2_0();
 
     public StandardV2_0()

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/format/standard/StandardV2_1.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/format/standard/StandardV2_1.java
@@ -35,7 +35,7 @@
 
 public class StandardV2_1 extends BaseRecordFormats
 {
-    public static final String STORE_VERSION = StoreVersion.STANDARD_V2_1.string();
+    public static final String STORE_VERSION = StoreVersion.STANDARD_V2_1.versionString();
     public static final RecordFormats RECORD_FORMATS = new StandardV2_1();
 
     public StandardV2_1()

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/format/standard/StandardV2_2.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/format/standard/StandardV2_2.java
@@ -35,7 +35,7 @@
 
 public class StandardV2_2 extends BaseRecordFormats
 {
-    public static final String STORE_VERSION = StoreVersion.STANDARD_V2_2.string();
+    public static final String STORE_VERSION = StoreVersion.STANDARD_V2_2.versionString();
     public static final RecordFormats RECORD_FORMATS = new StandardV2_2();
 
     public StandardV2_2()

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/format/standard/StandardV2_3.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/format/standard/StandardV2_3.java
@@ -35,7 +35,7 @@
 
 public class StandardV2_3 extends BaseRecordFormats
 {
-    public static final String STORE_VERSION = StoreVersion.STANDARD_V2_3.string();
+    public static final String STORE_VERSION = StoreVersion.STANDARD_V2_3.versionString();
     public static final RecordFormats RECORD_FORMATS = new StandardV2_3();
 
     public StandardV2_3()

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/format/standard/StandardV3_0.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/format/standard/StandardV3_0.java
@@ -35,7 +35,7 @@
 
 public class StandardV3_0 extends BaseRecordFormats
 {
-    public static final String STORE_VERSION = StoreVersion.STANDARD_V3_0.string();
+    public static final String STORE_VERSION = StoreVersion.STANDARD_V3_0.versionString();
     public static final RecordFormats RECORD_FORMATS = new StandardV3_0();
     public static final String NAME = "standard";
 

diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/format/StoreVersionTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/format/StoreVersionTest.java
@@ -39,11 +39,11 @@ public class StoreVersionTest
     public static Collection<String> versions()
     {
         return Arrays.asList(
-                StoreVersion.STANDARD_V2_0.string(),
-                StoreVersion.STANDARD_V2_1.string(),
-                StoreVersion.STANDARD_V2_2.string(),
-                StoreVersion.STANDARD_V2_3.string(),
-                StoreVersion.STANDARD_V3_0.string() );
+                StoreVersion.STANDARD_V2_0.versionString(),
+                StoreVersion.STANDARD_V2_1.versionString(),
+                StoreVersion.STANDARD_V2_2.versionString(),
+                StoreVersion.STANDARD_V2_3.versionString(),
+                StoreVersion.STANDARD_V3_0.versionString() );
     }
 
     @Test
@@ -67,7 +67,7 @@ public static class EnterpriseVersions
         @Parameterized.Parameters( name = "{0}" )
         public static Collection<String> versions()
         {
-            return Arrays.asList( StoreVersion.HIGH_LIMIT_V3_0.string() );
+            return Arrays.asList( StoreVersion.HIGH_LIMIT_V3_0.versionString() );
         }
 
         @Test

diff --git a/...ity/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/UpgradableDatabaseTest.java b/...ity/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/UpgradableDatabaseTest.java
@@ -211,7 +211,7 @@ public static class UnsupportedVersions
         @Parameterized.Parameters( name = "{0}" )
         public static Collection<String> versions()
         {
-            return Arrays.asList( "v0.9.5", "v0.A.4", StoreVersion.HIGH_LIMIT_V3_0.string() );
+            return Arrays.asList( "v0.9.5", "v0.A.4", StoreVersion.HIGH_LIMIT_V3_0.versionString() );
         }
 
         @Rule

diff --git a/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/store/format/highlimit/HighLimit.java b/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/store/format/highlimit/HighLimit.java
@@ -48,7 +48,7 @@ public class HighLimit extends BaseRecordFormats
      */
     static final int DEFAULT_MAXIMUM_BITS_PER_ID = 50;
 
-    public static final String STORE_VERSION = StoreVersion.HIGH_LIMIT_V3_0.string();
+    public static final String STORE_VERSION = StoreVersion.HIGH_LIMIT_V3_0.versionString();
     public static final RecordFormats RECORD_FORMATS = new HighLimit();
     public static final String NAME = "high_limit";
 

diff --git a/enterprise/neo4j-enterprise/src/test/java/org/neo4j/RecordFormatsGenerationTest.java b/enterprise/neo4j-enterprise/src/test/java/org/neo4j/RecordFormatsGenerationTest.java
@@ -63,7 +63,7 @@ public void uniqueGenerations()
     private static List<Integer> allGenerations()
     {
         return Arrays.stream( StoreVersion.values() )
-                .map( StoreVersion::string )
+                .map( StoreVersion::versionString )
                 .map( RecordFormatSelector::selectForVersion )
                 .map( RecordFormats::generation )
                 .sorted()