Move exception into top-level class, make make package private

neo4j · Oct 2, 2015 · 98c36d0 · 98c36d0
1 parent e22a7be
commit 98c36d0
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 13 deletions.
diff --git a/enterprise/backup/src/main/java/org/neo4j/backup/BackupService.java b/enterprise/backup/src/main/java/org/neo4j/backup/BackupService.java
@@ -165,10 +165,9 @@ public void done()
             try
             {
                 consistent = consistencyCheck.runFull( targetDirectory, tuningConfiguration,
-                        ProgressMonitorFactory.textual( System.err ),
-                        logProvider, fileSystem, pageCache, false );
+                        ProgressMonitorFactory.textual( System.err ), logProvider, fileSystem, pageCache, false );
             }
-            catch ( ConsistencyCheck.ConsistencyCheckFailedException e )
+            catch ( ConsistencyCheckFailedException e )
             {
                 log.error( "Consistency check incomplete", e );
             }

diff --git a/enterprise/backup/src/main/java/org/neo4j/backup/ConsistencyCheck.java b/enterprise/backup/src/main/java/org/neo4j/backup/ConsistencyCheck.java
@@ -28,7 +28,7 @@
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.logging.LogProvider;
 
-public enum ConsistencyCheck
+enum ConsistencyCheck
 {
     NONE
             {
@@ -108,14 +108,6 @@ public static ConsistencyCheck fromString( String name )
             }
         }
         throw new IllegalArgumentException( "Unknown consistency check name: " + name +
-                                            ". Supported values: " + Arrays.toString( values() ) );
-    }
-
-    public static class ConsistencyCheckFailedException extends Exception
-    {
-        public ConsistencyCheckFailedException( Throwable cause )
-        {
-            super( cause );
-        }
+                ". Supported values: " + Arrays.toString( values() ) );
     }
 }
diff --git a/enterprise/backup/src/main/java/org/neo4j/backup/ConsistencyCheckFailedException.java b/enterprise/backup/src/main/java/org/neo4j/backup/ConsistencyCheckFailedException.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2002-2015 "Neo Technology,"
+ * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Neo4j is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.neo4j.backup;
+
+class ConsistencyCheckFailedException extends Exception
+{
+    public ConsistencyCheckFailedException( Throwable cause )
+    {
+        super( cause );
+    }
+}