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

Add guard around serving of material-dashboard-overlay, to allow server to start up without that path existing

Browse Source
This commit is contained in:
darin.kelkhoff
2025-01-06 08:36:23 -06:00
parent 5ecae928ac
commit 719be86e94
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/middleware/javalin/QApplicationJavalinServer.java
View File

@ -38,6 +38,7 @@ import com.kingsrook.qqq.middleware.javalin.specs.v1.MiddlewareVersionV1;
import io.javalin.Javalin; import io.javalin.Javalin;
import io.javalin.http.Context; import io.javalin.http.Context;
import org.apache.commons.lang.BooleanUtils; import org.apache.commons.lang.BooleanUtils;
import org.eclipse.jetty.util.resource.Resource;
/******************************************************************************* /*******************************************************************************
@ -102,17 +103,23 @@ public class QApplicationJavalinServer
{ {
//////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////
// If you have any assets to add to the web server (e.g., logos, icons) place them at // // If you have any assets to add to the web server (e.g., logos, icons) place them at //
// src/main/resources/material-dashboard-overlay (or a directory of your choice // // src/main/resources/material-dashboard-overlay //
// under src/main/resources) and use this line of code to tell javalin about it. // // we'll use the same check that javalin (jetty?) internally uses to see if this //
// Make sure to add your app-specific directory to the javalin config before the core // // directory exists - because if it doesn't, then it'll fail to start the server... //
// material-dashboard directory, so in case the same file exists in both (e.g., // // note that that Resource object is auto-closable, hence the try-with-resources //
// favicon.png), the app-specific one will be used. //
//////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////
config.staticFiles.add("/material-dashboard-overlay"); try(Resource resource = Resource.newClassPathResource("/material-dashboard-overlay"))
{
if(resource !=null)
{
config.staticFiles.add("/material-dashboard-overlay");
}
}
///////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////
// tell javalin where to find material-dashboard static web assets // // tell javalin where to find material-dashboard static web assets //
///////////////////////////////////////////////////////////////////// // in this case, this path is coming from the qqq-frontend-material-dashboard jar //
////////////////////////////////////////////////////////////////////////////////////
config.staticFiles.add("/material-dashboard"); config.staticFiles.add("/material-dashboard");
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////