extract SystemExit class

jbake-org · May 17, 2020 · 54b8786 · 54b8786
1 parent 8140f87
commit 54b8786
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 24 deletions.
diff --git a/jbake-core/src/main/java/org/jbake/app/ContentStore.java b/jbake-core/src/main/java/org/jbake/app/ContentStore.java
@@ -36,7 +36,7 @@
 import com.orientechnologies.orient.core.sql.OCommandSQL;
 import com.orientechnologies.orient.core.sql.executor.OResultSet;
 import com.orientechnologies.orient.core.sql.query.OSQLSynchQuery;
-import org.jbake.app.JBakeException.SystemExit;
+import org.jbake.launcher.SystemExit;
 import org.jbake.model.DocumentAttributes;
 import org.jbake.model.DocumentTypes;
 import org.slf4j.Logger;

diff --git a/jbake-core/src/main/java/org/jbake/app/JBakeException.java b/jbake-core/src/main/java/org/jbake/app/JBakeException.java
@@ -1,5 +1,7 @@
 package org.jbake.app;
 
+import org.jbake.launcher.SystemExit;
+
 /**
  * This runtime exception is thrown by JBake API to indicate an processing
  * error.
@@ -9,23 +11,6 @@
 public class JBakeException extends RuntimeException {
     private static final long serialVersionUID = 1L;
 
-    public enum SystemExit {
-        ERROR(1),
-        CONFIGURATION_ERROR(2),
-        INIT_ERROR(3),
-        SERVER_ERROR(4);
-
-        private final int status;
-
-        SystemExit(int status) {
-            this.status = status;
-        }
-
-        public int getStatus() {
-            return status;
-        }
-
-    }
     final private SystemExit exit;
 
     /**

diff --git a/jbake-core/src/main/java/org/jbake/app/configuration/ConfigUtil.java b/jbake-core/src/main/java/org/jbake/app/configuration/ConfigUtil.java
@@ -5,7 +5,7 @@
 import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.commons.configuration.SystemConfiguration;
 import org.jbake.app.JBakeException;
-import org.jbake.app.JBakeException.SystemExit;
+import org.jbake.launcher.SystemExit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfigurationInspector.java b/jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfigurationInspector.java
@@ -2,7 +2,7 @@
 
 import org.jbake.app.FileUtil;
 import org.jbake.app.JBakeException;
-import org.jbake.app.JBakeException.SystemExit;
+import org.jbake.launcher.SystemExit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/jbake-core/src/main/java/org/jbake/launcher/Baker.java b/jbake-core/src/main/java/org/jbake/launcher/Baker.java
@@ -2,7 +2,6 @@
 
 import org.apache.commons.configuration.CompositeConfiguration;
 import org.jbake.app.JBakeException;
-import org.jbake.app.JBakeException.SystemExit;
 import org.jbake.app.Oven;
 import org.jbake.app.configuration.JBakeConfiguration;
 import org.jbake.app.configuration.JBakeConfigurationFactory;

diff --git a/jbake-core/src/main/java/org/jbake/launcher/JettyServer.java b/jbake-core/src/main/java/org/jbake/launcher/JettyServer.java
@@ -7,7 +7,6 @@
 import org.eclipse.jetty.server.handler.HandlerList;
 import org.eclipse.jetty.server.handler.ResourceHandler;
 import org.jbake.app.JBakeException;
-import org.jbake.app.JBakeException.SystemExit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/jbake-core/src/main/java/org/jbake/launcher/Main.java b/jbake-core/src/main/java/org/jbake/launcher/Main.java
@@ -3,7 +3,6 @@
 import org.apache.commons.configuration.ConfigurationException;
 import org.jbake.app.FileUtil;
 import org.jbake.app.JBakeException;
-import org.jbake.app.JBakeException.SystemExit;
 import org.jbake.app.configuration.JBakeConfiguration;
 import org.jbake.app.configuration.JBakeConfigurationFactory;
 import org.slf4j.Logger;

diff --git a/jbake-core/src/main/java/org/jbake/launcher/SystemExit.java b/jbake-core/src/main/java/org/jbake/launcher/SystemExit.java
@@ -0,0 +1,13 @@
+package org.jbake.launcher;
+
+public enum SystemExit {
+    SUCCESS,
+    ERROR,
+    CONFIGURATION_ERROR,
+    INIT_ERROR,
+    SERVER_ERROR;
+
+    public int getStatus() {
+        return this.ordinal();
+    }
+}
diff --git a/jbake-core/src/test/java/org/jbake/launcher/MainTest.java b/jbake-core/src/test/java/org/jbake/launcher/MainTest.java
@@ -5,7 +5,6 @@
 import org.itsallcode.junit.sysextensions.ExitGuard;
 import org.jbake.TestUtils;
 import org.jbake.app.JBakeException;
-import org.jbake.app.JBakeException.SystemExit;
 import org.jbake.app.LoggingTest;
 import org.jbake.app.configuration.ConfigUtil;
 import org.jbake.app.configuration.DefaultJBakeConfiguration;