QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-18 05:01:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Property Var name per review

Browse Source
This commit is contained in:
james.maes
2025-06-17 13:05:14 -05:00
parent 54f40fbc83
commit 7575a57ae9
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/middleware/javalin/routeproviders/SimpleFileSystemDirectoryRouter.java
View File

@ -55,7 +55,7 @@ public class SimpleFileSystemDirectoryRouter implements QJavalinRouteProviderInt
private static final QLogger LOG = QLogger.getLogger(SimpleFileSystemDirectoryRouter.class); 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; public static boolean loadStaticFilesFromJar = false;
/******************************************************************************* /*******************************************************************************
@ -73,7 +73,7 @@ public class SimpleFileSystemDirectoryRouter implements QJavalinRouteProviderInt
/////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////
try try
{ {
String propertyValue = System.getProperty(SimpleFileSystemDirectoryRouter.loadStaticFilesFromJarProperty, ""); String propertyValue = System.getProperty(SimpleFileSystemDirectoryRouter.LOAD_STATIC_FILES_FROM_JAR_PROPERTY, "");
if(propertyValue.equals("true")) if(propertyValue.equals("true"))
{ {
loadStaticFilesFromJar = true; loadStaticFilesFromJar = true;
@ -82,7 +82,7 @@ public class SimpleFileSystemDirectoryRouter implements QJavalinRouteProviderInt
catch(Exception e) catch(Exception e)
{ {
loadStaticFilesFromJar = false; 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));
} }
} }

7
qqq-middleware-javalin/src/test/java/com/kingsrook/qqq/middleware/javalin/QApplicationJavalinServerTest.java
View File

@ -37,6 +37,7 @@ import kong.unirest.Unirest;
import org.json.JSONObject; import org.json.JSONObject;
import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test; 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.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
@ -71,7 +72,7 @@ class QApplicationJavalinServerTest
{ {
javalinServer.stop(); javalinServer.stop();
TestApplication.callCount = 0; TestApplication.callCount = 0;
System.clearProperty(SimpleFileSystemDirectoryRouter.loadStaticFilesFromJarProperty); System.clearProperty(LOAD_STATIC_FILES_FROM_JAR_PROPERTY);
} }
@ -214,7 +215,7 @@ class QApplicationJavalinServerTest
@Test @Test
void testStaticRouterFilesFromExternal() throws Exception void testStaticRouterFilesFromExternal() throws Exception
{ {
System.setProperty(SimpleFileSystemDirectoryRouter.loadStaticFilesFromJarProperty, "false"); System.setProperty(LOAD_STATIC_FILES_FROM_JAR_PROPERTY, "false");
javalinServer = new QApplicationJavalinServer(getQqqApplication()) javalinServer = new QApplicationJavalinServer(getQqqApplication())
.withServeFrontendMaterialDashboard(false) .withServeFrontendMaterialDashboard(false)
@ -274,7 +275,7 @@ class QApplicationJavalinServerTest
@Test @Test
void testStaticRouterFilesFromClasspath() throws Exception void testStaticRouterFilesFromClasspath() throws Exception
{ {
System.setProperty(SimpleFileSystemDirectoryRouter.loadStaticFilesFromJarProperty, "true"); System.setProperty(LOAD_STATIC_FILES_FROM_JAR_PROPERTY, "true");
javalinServer = new QApplicationJavalinServer(new QApplicationJavalinServerTest.TestApplication()) javalinServer = new QApplicationJavalinServer(new QApplicationJavalinServerTest.TestApplication())
.withServeFrontendMaterialDashboard(false) .withServeFrontendMaterialDashboard(false)