From 54b878654b9ebbf6017c12d403bf270dc1d2d455 Mon Sep 17 00:00:00 2001 From: Frank Becker Date: Sun, 17 May 2020 11:12:24 +0200 Subject: [PATCH] extract SystemExit class --- .../main/java/org/jbake/app/ContentStore.java | 2 +- .../java/org/jbake/app/JBakeException.java | 19 ++----------------- .../jbake/app/configuration/ConfigUtil.java | 2 +- .../JBakeConfigurationInspector.java | 2 +- .../main/java/org/jbake/launcher/Baker.java | 1 - .../java/org/jbake/launcher/JettyServer.java | 1 - .../main/java/org/jbake/launcher/Main.java | 1 - .../java/org/jbake/launcher/SystemExit.java | 13 +++++++++++++ .../java/org/jbake/launcher/MainTest.java | 1 - 9 files changed, 18 insertions(+), 24 deletions(-) create mode 100644 jbake-core/src/main/java/org/jbake/launcher/SystemExit.java diff --git a/jbake-core/src/main/java/org/jbake/app/ContentStore.java b/jbake-core/src/main/java/org/jbake/app/ContentStore.java index 70ec82672..0c54658f8 100644 --- 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 index 917d1e583..f3e858a4a 100644 --- 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 index 4e30655c9..a27e83d8d 100644 --- 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 index bc949347c..fda8a3974 100644 --- 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 index f90c65919..17d17f8f4 100644 --- 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 index aee33d436..650bbcb43 100644 --- 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 index af4b4899d..d26505ee1 100644 --- 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 new file mode 100644 index 000000000..0e7b3002f --- /dev/null +++ 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 index bfa346d51..4ab81a684 100644 --- 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;