diff --git a/qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/middleware/javalin/routeproviders/SimpleFileSystemDirectoryRouter.java b/qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/middleware/javalin/routeproviders/SimpleFileSystemDirectoryRouter.java index 1becf9fa..959e4fb2 100644 --- a/qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/middleware/javalin/routeproviders/SimpleFileSystemDirectoryRouter.java +++ b/qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/middleware/javalin/routeproviders/SimpleFileSystemDirectoryRouter.java @@ -55,7 +55,7 @@ public class SimpleFileSystemDirectoryRouter implements QJavalinRouteProviderInt private static final QLogger LOG = QLogger.getLogger(SimpleFileSystemDirectoryRouter.class); - public static final String loadStaticFilesFromJarProperty = "qqq.javalin.enableStaticFilesFromJar"; + public static final String LOAD_STATIC_FILES_FROM_JAR_PROPERTY = "qqq.javalin.enableStaticFilesFromJar"; public static boolean loadStaticFilesFromJar = false; /******************************************************************************* @@ -73,7 +73,7 @@ public class SimpleFileSystemDirectoryRouter implements QJavalinRouteProviderInt /////////////////////////////////////////////////////////////////////////////////////////////////////// try { - String propertyValue = System.getProperty(SimpleFileSystemDirectoryRouter.loadStaticFilesFromJarProperty, ""); + String propertyValue = System.getProperty(SimpleFileSystemDirectoryRouter.LOAD_STATIC_FILES_FROM_JAR_PROPERTY, ""); if(propertyValue.equals("true")) { loadStaticFilesFromJar = true; @@ -82,7 +82,7 @@ public class SimpleFileSystemDirectoryRouter implements QJavalinRouteProviderInt catch(Exception e) { loadStaticFilesFromJar = false; - LOG.warn("Exception attempting to read system property, defaulting to false. ", e, logPair("system property", SimpleFileSystemDirectoryRouter.loadStaticFilesFromJarProperty)); + LOG.warn("Exception attempting to read system property, defaulting to false. ", e, logPair("system property", SimpleFileSystemDirectoryRouter.LOAD_STATIC_FILES_FROM_JAR_PROPERTY)); } } diff --git a/qqq-middleware-javalin/src/test/java/com/kingsrook/qqq/middleware/javalin/QApplicationJavalinServerTest.java b/qqq-middleware-javalin/src/test/java/com/kingsrook/qqq/middleware/javalin/QApplicationJavalinServerTest.java index 00815322..bbcb8cab 100644 --- a/qqq-middleware-javalin/src/test/java/com/kingsrook/qqq/middleware/javalin/QApplicationJavalinServerTest.java +++ b/qqq-middleware-javalin/src/test/java/com/kingsrook/qqq/middleware/javalin/QApplicationJavalinServerTest.java @@ -37,6 +37,7 @@ import kong.unirest.Unirest; import org.json.JSONObject; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; +import static com.kingsrook.qqq.middleware.javalin.routeproviders.SimpleFileSystemDirectoryRouter.LOAD_STATIC_FILES_FROM_JAR_PROPERTY; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -71,7 +72,7 @@ class QApplicationJavalinServerTest { javalinServer.stop(); TestApplication.callCount = 0; - System.clearProperty(SimpleFileSystemDirectoryRouter.loadStaticFilesFromJarProperty); + System.clearProperty(LOAD_STATIC_FILES_FROM_JAR_PROPERTY); } @@ -214,7 +215,7 @@ class QApplicationJavalinServerTest @Test void testStaticRouterFilesFromExternal() throws Exception { - System.setProperty(SimpleFileSystemDirectoryRouter.loadStaticFilesFromJarProperty, "false"); + System.setProperty(LOAD_STATIC_FILES_FROM_JAR_PROPERTY, "false"); javalinServer = new QApplicationJavalinServer(getQqqApplication()) .withServeFrontendMaterialDashboard(false) @@ -274,7 +275,7 @@ class QApplicationJavalinServerTest @Test void testStaticRouterFilesFromClasspath() throws Exception { - System.setProperty(SimpleFileSystemDirectoryRouter.loadStaticFilesFromJarProperty, "true"); + System.setProperty(LOAD_STATIC_FILES_FROM_JAR_PROPERTY, "true"); javalinServer = new QApplicationJavalinServer(new QApplicationJavalinServerTest.TestApplication()) .withServeFrontendMaterialDashboard(false)