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

Change sort tie-breaker to be done with map rather than if/else-ifs; adding Widget after Joins (for child lists built of a join)

Browse Source
This commit is contained in:
darin.kelkhoff
2024-04-18 18:30:00 -05:00
parent 5d8cfa5935
commit 9f142a4909
1 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/MetaDataProducerHelper.java
View File

@ -27,11 +27,15 @@ import java.lang.reflect.Constructor;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Comparator; import java.util.Comparator;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import com.google.common.reflect.ClassPath; import com.google.common.reflect.ClassPath;
import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.exceptions.QException;
import com.kingsrook.qqq.backend.core.logging.QLogger; import com.kingsrook.qqq.backend.core.logging.QLogger;
import com.kingsrook.qqq.backend.core.model.MetaDataProducerInterface; import com.kingsrook.qqq.backend.core.model.MetaDataProducerInterface;
import com.kingsrook.qqq.backend.core.model.metadata.dashboard.QWidgetMetaData;
import com.kingsrook.qqq.backend.core.model.metadata.joins.QJoinMetaData;
import com.kingsrook.qqq.backend.core.model.metadata.layout.QAppMetaData; import com.kingsrook.qqq.backend.core.model.metadata.layout.QAppMetaData;
import static com.kingsrook.qqq.backend.core.logging.LogUtils.logPair; import static com.kingsrook.qqq.backend.core.logging.LogUtils.logPair;
@ -43,6 +47,29 @@ public class MetaDataProducerHelper
{ {
private static final QLogger LOG = QLogger.getLogger(MetaDataProducerHelper.class); private static final QLogger LOG = QLogger.getLogger(MetaDataProducerHelper.class);
private static Map<Class<?>, Integer> comparatorValuesByType = new HashMap<>();
private static Integer defaultComparatorValue;
static
{
////////////////////////////////////////////////////////////////////////////////////////
// define how we break ties in sort-order based on the meta-dta type. e.g., do apps //
// after all other types (as apps often try to get other types from the instance) //
// also - do backends earlier than others (e.g., tables may expect backends to exist) //
// any types not in the map get the default value. //
////////////////////////////////////////////////////////////////////////////////////////
comparatorValuesByType.put(QBackendMetaData.class, 1);
/////////////////////////////////////
// unspecified ones will come here //
/////////////////////////////////////
defaultComparatorValue = 10;
comparatorValuesByType.put(QJoinMetaData.class, 21);
comparatorValuesByType.put(QWidgetMetaData.class, 22);
comparatorValuesByType.put(QAppMetaData.class, 23);
}
/******************************************************************************* /*******************************************************************************
@ -102,11 +129,9 @@ public class MetaDataProducerHelper
} }
} }
//////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////
// sort them by sort order, then by the type that they return - specifically - doing apps // // sort them by sort order, then by the type that they return, as set up in the static map //
// after all other types (as apps often try to get other types from the instance) // /////////////////////////////////////////////////////////////////////////////////////////////
// also - do backends earlier than others (e.g., tables may expect backends to exist) //
////////////////////////////////////////////////////////////////////////////////////////////
producers.sort(Comparator producers.sort(Comparator
.comparing((MetaDataProducerInterface<?> p) -> p.getSortOrder()) .comparing((MetaDataProducerInterface<?> p) -> p.getSortOrder())
.thenComparing((MetaDataProducerInterface<?> p) -> .thenComparing((MetaDataProducerInterface<?> p) ->
@ -114,18 +139,7 @@ public class MetaDataProducerHelper
try try
{ {
Class<?> outputType = p.getClass().getMethod("produce", QInstance.class).getReturnType(); Class<?> outputType = p.getClass().getMethod("produce", QInstance.class).getReturnType();
if(outputType.equals(QAppMetaData.class)) return comparatorValuesByType.getOrDefault(outputType, defaultComparatorValue);
{
return (2);
}
else if(outputType.equals(QBackendMetaData.class))
{
return (0);
}
else
{
return (1);
}
} }
catch(Exception e) catch(Exception e)
{ {