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

Updated to decide which javalinMetaData to use (either from this object or the QInstance)

Browse Source
This commit is contained in:
darin.kelkhoff
2025-05-12 09:16:52 -05:00
parent 595190fd8f
commit af4dd2a771
1 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,10 +106,10 @@ public class QApplicationJavalinServer
{ {
QInstance qInstance = application.defineValidatedQInstance(); QInstance qInstance = application.defineValidatedQInstance();
QJavalinMetaData qJavalinMetaData = QJavalinMetaData.of(qInstance); QJavalinMetaData javalinMetaData = getJavalinMetaDataToUse(qInstance);
if(qJavalinMetaData != null) if(javalinMetaData != null)
{ {
addRouteProvidersFromMetaData(qJavalinMetaData); addRouteProvidersFromMetaData(javalinMetaData);
} }
service = Javalin.create(config -> service = Javalin.create(config ->
@ -234,6 +234,28 @@ public class QApplicationJavalinServer
/***************************************************************************
**
***************************************************************************/
private QJavalinMetaData getJavalinMetaDataToUse(QInstance qInstance)
{
if(this.javalinMetaData != null && QJavalinMetaData.of(qInstance) != null)
{
LOG.warn("JavalinMetaData is defined both in the QInstance and the QApplicationJavalinServer. The one from the QInstance will be ignored - the one from the QJavalinApplicationServer will be used.");
return (this.javalinMetaData);
}
else if (this.javalinMetaData != null)
{
return (this.javalinMetaData);
}
else
{
return QJavalinMetaData.of(qInstance);
}
}
/*************************************************************************** /***************************************************************************
** initial tests with the SimpleFileSystemDirectoryRouter would sometimes ** initial tests with the SimpleFileSystemDirectoryRouter would sometimes
** have a Content-Type:text/html;charset=null ! ** have a Content-Type:text/html;charset=null !