From ab80e33bb4c1ca928d7c6ff531bc7cabd5706551 Mon Sep 17 00:00:00 2001 From: alx652 Date: Mon, 18 Mar 2024 17:01:10 -0400 Subject: [PATCH] change to parentKey, add extensonConfig interface --- .../main/java/gsrs/util/ExtensionConfig.java | 17 +++++++++++ .../gsrs/util/RegisteredFunctionConfig.java | 4 +-- .../util/pojopointer/LambdaParseRegistry.java | 6 ++-- ...sSchedulerTaskPropertiesConfiguration.java | 13 ++++----- .../java/gsrs/GsrsFactoryConfiguration.java | 25 ++++++++-------- .../autoconfigure/ExporterFactoryConfig.java | 5 ++-- .../GsrsExportConfiguration.java | 6 ++-- .../ExtensionConfigurationController.java | 29 +++++++++++++++++++ .../EntityProcessorConfig.java | 8 ++--- .../DefaultImportAdapterFactoryConfig.java | 10 +++---- .../DefaultMatchableCalculationConfig.java | 10 +++---- .../imports/ImportAdapterFactoryConfig.java | 13 ++------- .../imports/MatchableCalculationConfig.java | 12 ++------ .../validator/DefaultValidatorConfig.java | 2 +- .../java/gsrs/validator/ValidatorConfig.java | 17 ++--------- ...TestDefaultImportAdapterFactoryConfig.java | 4 +-- ...nfigBasedIndexValueMakerConfiguration.java | 11 +++---- 17 files changed, 103 insertions(+), 89 deletions(-) create mode 100644 gsrs-core/src/main/java/gsrs/util/ExtensionConfig.java create mode 100644 gsrs-spring-boot-autoconfigure/src/main/java/gsrs/controller/ExtensionConfigurationController.java diff --git a/gsrs-core/src/main/java/gsrs/util/ExtensionConfig.java b/gsrs-core/src/main/java/gsrs/util/ExtensionConfig.java new file mode 100644 index 00000000..5c0e657a --- /dev/null +++ b/gsrs-core/src/main/java/gsrs/util/ExtensionConfig.java @@ -0,0 +1,17 @@ +package gsrs.util; + +public interface ExtensionConfig { + + String getParentKey(); + + Double getOrder(); + + boolean isDisabled(); + + void setParentKey(String parentKey); + + void setOrder(Double order); + + void setDisabled(boolean disabled); + +} diff --git a/gsrs-core/src/main/java/gsrs/util/RegisteredFunctionConfig.java b/gsrs-core/src/main/java/gsrs/util/RegisteredFunctionConfig.java index 5ec1b711..51660b1e 100644 --- a/gsrs-core/src/main/java/gsrs/util/RegisteredFunctionConfig.java +++ b/gsrs-core/src/main/java/gsrs/util/RegisteredFunctionConfig.java @@ -5,9 +5,9 @@ import java.util.Map; @Data -public class RegisteredFunctionConfig { +public class RegisteredFunctionConfig implements ExtensionConfig { private Class registeredFunctionClass; - private String key; + private String parentKey; private Double order; private boolean disabled = false; private Map parameters; diff --git a/gsrs-core/src/main/java/ix/core/util/pojopointer/LambdaParseRegistry.java b/gsrs-core/src/main/java/ix/core/util/pojopointer/LambdaParseRegistry.java index 8ab0f333..ebf37791 100644 --- a/gsrs-core/src/main/java/ix/core/util/pojopointer/LambdaParseRegistry.java +++ b/gsrs-core/src/main/java/ix/core/util/pojopointer/LambdaParseRegistry.java @@ -128,16 +128,16 @@ private List loadRegisteredFunctionsFromCon return Collections.emptyList(); } for (String k: map.keySet()) { - map.get(k).put("key", k); + map.get(k).put("parentKey", k); } List list = map.values().stream().collect(Collectors.toList()); List configs = mapper.convertValue(list, new TypeReference>() { }); System.out.println( reportTag + "found before filtering: " + configs.size()); configs = configs.stream().filter(c->!c.isDisabled()).sorted(Comparator.comparing(c->c.getOrder(),nullsFirst(naturalOrder()))).collect(Collectors.toList()); System.out.println(reportTag + " active after filtering: " + configs.size()); - System.out.println(String.format("%s|%s|%s|%s", reportTag, "class", "key", "order", "isDisabled")); + System.out.println(String.format("%s|%s|%s|%s", reportTag, "class", "parentKey", "order", "isDisabled")); for (RegisteredFunctionConfig config : configs) { - System.out.println(String.format("%s|%s|%s|%s", reportTag, config.getRegisteredFunctionClass(), config.getKey(), config.getOrder(), config.isDisabled())); + System.out.println(String.format("%s|%s|%s|%s", reportTag, config.getRegisteredFunctionClass(), config.getParentKey(), config.getOrder(), config.isDisabled())); } return configs; } catch (Throwable t) { diff --git a/gsrs-scheduled-tasks/src/main/java/gsrs/scheduler/GsrsSchedulerTaskPropertiesConfiguration.java b/gsrs-scheduled-tasks/src/main/java/gsrs/scheduler/GsrsSchedulerTaskPropertiesConfiguration.java index 9a92095e..fa0e66bd 100644 --- a/gsrs-scheduled-tasks/src/main/java/gsrs/scheduler/GsrsSchedulerTaskPropertiesConfiguration.java +++ b/gsrs-scheduled-tasks/src/main/java/gsrs/scheduler/GsrsSchedulerTaskPropertiesConfiguration.java @@ -9,6 +9,7 @@ import gsrs.scheduledTasks.SchedulerPlugin; import gsrs.scheduledTasks.SchedulerPlugin.ScheduledTask; import gsrs.springUtils.AutowireHelper; +import gsrs.util.ExtensionConfig; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; @@ -24,8 +25,6 @@ @ConfigurationProperties("gsrs.scheduled-tasks") public class GsrsSchedulerTaskPropertiesConfiguration { - // private List _list = new ArrayList<>(); - private Map list = new HashMap(); public Map getList() { @@ -39,9 +38,9 @@ public void setList(Map list) { // public void setList(List list) { this.list = list; } @Data - public static class ScheduledTaskConfig{ + public static class ScheduledTaskConfig implements ExtensionConfig { private String scheduledTaskClass; - private String key; + private String parentKey; private Double order; private boolean disabled = false; private Map parameters; @@ -61,15 +60,15 @@ public void unknownSetter(String key, Object value){ ObjectMapper mapper = new ObjectMapper(); for (String k: list.keySet()) { ScheduledTaskConfig config = list.get(k); - config.setKey(k); + config.setParentKey(k); } List configs = list.values().stream().collect(Collectors.toList()); System.out.println(reportTag + " found before filtering: " + configs.size()); configs = configs.stream().filter(p->!p.isDisabled()).sorted(Comparator.comparing(i->i.getOrder(),nullsFirst(naturalOrder()))).collect(Collectors.toList()); System.out.println(reportTag + " active after filtering: " + configs.size()); - System.out.println(String.format("%s|%s|%s|%s", reportTag, "class", "key", "order", "isDisabled")); + System.out.println(String.format("%s|%s|%s|%s", reportTag, "class", "parentKey", "order", "isDisabled")); for (ScheduledTaskConfig config : configs) { - System.out.println(String.format("%s|%s|%s|%s", reportTag, config.getScheduledTaskClass(), config.getKey(), config.getOrder(), config.isDisabled())); + System.out.println(String.format("%s|%s|%s|%s", reportTag, config.getScheduledTaskClass(), config.getParentKey(), config.getOrder(), config.isDisabled())); } for(ScheduledTaskConfig config : configs){ diff --git a/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/GsrsFactoryConfiguration.java b/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/GsrsFactoryConfiguration.java index be693f4e..54d314b7 100644 --- a/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/GsrsFactoryConfiguration.java +++ b/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/GsrsFactoryConfiguration.java @@ -65,15 +65,15 @@ public List getEntityProcessors() { return Collections.emptyList(); } for (String k: map.keySet()) { - map.get(k).setKey(k); + map.get(k).setParentKey(k); } List configs = map.values().stream().collect(Collectors.toList()); System.out.println(reportTag + " found before filtering: " + configs.size()); configs = configs.stream().filter(c->!c.isDisabled()).sorted(Comparator.comparing(c->c.getOrder(),nullsFirst(naturalOrder()))).collect(Collectors.toList()); System.out.println(reportTag + " active after filtering: " + configs.size()); - System.out.println(String.format("%s|%s|%s|%s", reportTag, "class", "key", "order", "isDisabled")); + System.out.println(String.format("%s|%s|%s|%s", reportTag, "class", "parentKey", "order", "isDisabled")); for (EntityProcessorConfig config : configs) { - System.out.println(String.format("%s|%s|%s|%s", reportTag, config.getProcessor(), config.getKey(), config.getOrder(), config.isDisabled())); + System.out.println(String.format("%s|%s|%s|%s", reportTag, config.getProcessor(), config.getParentKey(), config.getOrder(), config.isDisabled())); } return configs; } @@ -81,7 +81,6 @@ public List getEntityProcessors() { public List getValidatorConfigByContext(String context) { String reportTag = "ValidatorConfig"; if (validators == null) { - //nothing set return Collections.emptyList(); } ObjectMapper mapper = new ObjectMapper(); @@ -91,16 +90,16 @@ public List getValidatorConfigByContext(String contex return Collections.emptyList(); } for (String k: map.keySet()) { - map.get(k).put("key", k); + map.get(k).put("parentKey", k); } List list = map.values().stream().collect(Collectors.toList()); List configs = mapper.convertValue(list, new TypeReference>() { }); System.out.println( reportTag + "found before filtering: " + configs.size()); configs = configs.stream().filter(c->!c.isDisabled()).sorted(Comparator.comparing(c->c.getOrder(),nullsFirst(naturalOrder()))).collect(Collectors.toList()); System.out.println(reportTag + " active after filtering: " + configs.size()); - System.out.println(String.format("%s|%s|%s|%s", reportTag, "class", "key", "order", "isDisabled")); + System.out.println(String.format("%s|%s|%s|%s", reportTag, "class", "parentKey", "order", "isDisabled")); for (ValidatorConfig config : configs) { - System.out.println(String.format("%s|%s|%s|%s", reportTag, config.getValidatorClass(), config.getKey(), config.getOrder(), config.isDisabled())); + System.out.println(String.format("%s|%s|%s|%s", reportTag, config.getValidatorClass(), config.getParentKey(), config.getOrder(), config.isDisabled())); } return configs; } catch (Throwable t) { @@ -134,16 +133,16 @@ public List getImportAdapterFactories(Stri return Collections.emptyList(); } for (String k: map.keySet()) { - map.get(k).put("key", k); + map.get(k).put("parentKey", k); } List list = map.values().stream().collect(Collectors.toList()); List configs = EntityUtils.convertClean(list, new TypeReference>() { }); System.out.println(reportTag + " found before filtering: " + configs.size()); configs = configs.stream().filter(c->!c.isDisabled()).sorted(Comparator.comparing(c->c.getOrder(),nullsFirst(naturalOrder()))).collect(Collectors.toList()); System.out.println(reportTag + " active after filtering: " + configs.size()); - System.out.println(String.format("%s|%s|%s|%s", reportTag, "class", "key", "order", "isDisabled")); + System.out.println(String.format("%s|%s|%s|%s", reportTag, "class", "parentKey", "order", "isDisabled")); for (ImportAdapterFactoryConfig config : configs) { - System.out.println(String.format("%s|%s|%s|%s", reportTag, config.getImportAdapterFactoryClass(), config.getKey(), config.getOrder(), config.isDisabled())); + System.out.println(String.format("%s|%s|%s|%s", reportTag, config.getImportAdapterFactoryClass(), config.getParentKey(), config.getOrder(), config.isDisabled())); } //log.trace("list (after):"); @@ -169,16 +168,16 @@ public List getMatchableCalculationConfig( } // Copy the key into the Object for quality control and maybe as a way to access by key from the list for (String k: map.keySet()) { - map.get(k).put("key", k); + map.get(k).put("parentKey", k); } List list = map.values().stream().collect(Collectors.toList()); List configs = EntityUtils.convertClean(list, new TypeReference>() { }); System.out.println(reportTag + " found before filtering: " + configs.size()); configs = configs.stream().filter(c->!c.isDisabled()).sorted(Comparator.comparing(c->c.getOrder(),nullsFirst(naturalOrder()))).collect(Collectors.toList()); System.out.println(reportTag + " active after filtering: " + configs.size()); - System.out.println(String.format("%s|%s|%s|%s", "MatchableCalculator", "class", "key", "order", "isDisabled")); + System.out.println(String.format("%s|%s|%s|%s", "MatchableCalculator", "class", "parentKey", "order", "isDisabled")); for (MatchableCalculationConfig config : configs) { - System.out.println(String.format("%s|%s|%s|%s", reportTag, config.getMatchableCalculationClass(), config.getKey(), config.getOrder(), config.isDisabled())); + System.out.println(String.format("%s|%s|%s|%s", reportTag, config.getMatchableCalculationClass(), config.getParentKey(), config.getOrder(), config.isDisabled())); } return configs; } catch (Throwable t) { diff --git a/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/autoconfigure/ExporterFactoryConfig.java b/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/autoconfigure/ExporterFactoryConfig.java index ccae3479..913ceea2 100644 --- a/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/autoconfigure/ExporterFactoryConfig.java +++ b/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/autoconfigure/ExporterFactoryConfig.java @@ -1,13 +1,14 @@ package gsrs.autoconfigure; +import gsrs.util.ExtensionConfig; import lombok.Data; import java.util.Map; @Data -public class ExporterFactoryConfig { +public class ExporterFactoryConfig implements ExtensionConfig { private Class exporterFactoryClass; - private String key; + private String parentKey; private Double order; private boolean disabled = false; private Map parameters; diff --git a/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/autoconfigure/GsrsExportConfiguration.java b/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/autoconfigure/GsrsExportConfiguration.java index 65576c1a..1fbeb7b9 100644 --- a/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/autoconfigure/GsrsExportConfiguration.java +++ b/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/autoconfigure/GsrsExportConfiguration.java @@ -69,7 +69,7 @@ public class GsrsExportConfiguration { for (Map.Entry> entry1 : exporterFactories.entrySet()) { Map m = entry1.getValue(); for (Map.Entry entry2 : m.entrySet()) { - entry2.getValue().setKey(entry2.getKey()); + entry2.getValue().setParentKey(entry2.getKey()); } } for (Map.Entry> entry1 : exporterFactories.entrySet()) { @@ -80,9 +80,9 @@ public class GsrsExportConfiguration { configs = configs.stream().filter(p -> !p.isDisabled()).sorted(Comparator.comparing(i -> i.getOrder(), nullsFirst(naturalOrder()))).collect(Collectors.toList()); System.out.println(reportTag + " for [" + mapKey + "] found after filtering: " + configs.size()); exporterFactoriesMapList.put(mapKey, configs); - System.out.println(String.format("%s|%s|%s|%s", reportTag, "context", "class", "key", "order", "isDisabled")); + System.out.println(String.format("%s|%s|%s|%s", reportTag, "context", "class", "parentKey", "order", "isDisabled")); for (ExporterFactoryConfig config : configs) { - System.out.println(String.format("%s|%s|%s|%s", "reportTag", mapKey, config.getExporterFactoryClass(), config.getKey(), config.getOrder(), config.isDisabled())); + System.out.println(String.format("%s|%s|%s|%s", "reportTag", mapKey, config.getExporterFactoryClass(), config.getParentKey(), config.getOrder(), config.isDisabled())); } } } diff --git a/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/controller/ExtensionConfigurationController.java b/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/controller/ExtensionConfigurationController.java new file mode 100644 index 00000000..d1ad3099 --- /dev/null +++ b/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/controller/ExtensionConfigurationController.java @@ -0,0 +1,29 @@ +package gsrs.controller; + +import gsrs.GsrsFactoryConfiguration; +import gsrs.validator.ValidatorConfig; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +public class ExtensionConfigurationController { + + @Autowired + GsrsFactoryConfiguration gsrsFactoryConfiguration; + + @GetMapping("/api/v1/validatorsConfiguration") + public ResponseEntity > getValidators() { + List validatorConfigs = gsrsFactoryConfiguration.getValidatorConfigByContext("substances"); + System.out.println(validatorConfigs.toString()); + return (ResponseEntity>) validatorConfigs; + } + @GetMapping("/api/v1/someText") + public String getSomeText() { + return "Hi there"; + } + +} diff --git a/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/entityProcessor/EntityProcessorConfig.java b/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/entityProcessor/EntityProcessorConfig.java index 103f436d..9459d667 100644 --- a/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/entityProcessor/EntityProcessorConfig.java +++ b/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/entityProcessor/EntityProcessorConfig.java @@ -1,19 +1,17 @@ package gsrs.entityProcessor; -import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.ObjectMapper; +import gsrs.util.ExtensionConfig; import ix.core.EntityProcessor; -import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; import java.lang.reflect.Constructor; import java.util.Map; @Data -public class EntityProcessorConfig { - private String key; +public class EntityProcessorConfig implements ExtensionConfig { private Class entityClassName; private Class processor; + private String parentKey; private Double order; private boolean disabled = false; diff --git a/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/imports/DefaultImportAdapterFactoryConfig.java b/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/imports/DefaultImportAdapterFactoryConfig.java index 433e4783..3f927cb9 100644 --- a/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/imports/DefaultImportAdapterFactoryConfig.java +++ b/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/imports/DefaultImportAdapterFactoryConfig.java @@ -27,7 +27,7 @@ public class DefaultImportAdapterFactoryConfig implements ImportAdapterFactoryCo private List extensions; private String adapterName; - private String key; + private String parentKey; private Double order; private boolean disabled = false; @@ -84,13 +84,13 @@ public void setImportAdapterFactoryClass(Class importAdapterFactoryClass) { } @Override - public String getKey() { - return this.key; + public String getParentKey() { + return this.parentKey; } @Override - public void setKey(String key) { - this.key = key; + public void setParentKey(String key) { + this.parentKey = parentKey; } @Override diff --git a/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/imports/DefaultMatchableCalculationConfig.java b/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/imports/DefaultMatchableCalculationConfig.java index 6560c45c..445ad5da 100644 --- a/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/imports/DefaultMatchableCalculationConfig.java +++ b/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/imports/DefaultMatchableCalculationConfig.java @@ -8,7 +8,7 @@ public class DefaultMatchableCalculationConfig implements MatchableCalculatio private Class extractorClass; - private String key; + private String parentKey; private Double order; private boolean disabled = false; @@ -20,13 +20,13 @@ public Class getMatchableCalculationClass() { } @Override - public String getKey() { - return key; + public String getParentKey() { + return parentKey; } @Override - public void setKey(String key) { - this.key = key; + public void setParentKey(String parentKey) { + this.parentKey = parentKey; } @Override diff --git a/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/imports/ImportAdapterFactoryConfig.java b/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/imports/ImportAdapterFactoryConfig.java index 0f712b51..84e01ffc 100644 --- a/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/imports/ImportAdapterFactoryConfig.java +++ b/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/imports/ImportAdapterFactoryConfig.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.annotation.JsonTypeIdResolver; +import gsrs.util.ExtensionConfig; import ix.core.util.InheritanceTypeIdResolver; import java.util.List; @@ -14,22 +15,12 @@ */ @JsonTypeInfo(use = JsonTypeInfo.Id.CUSTOM, include = JsonTypeInfo.As.PROPERTY, property = "configClass", defaultImpl = DefaultImportAdapterFactoryConfig.class) @JsonTypeIdResolver(InheritanceTypeIdResolver.class) -public interface ImportAdapterFactoryConfig { +public interface ImportAdapterFactoryConfig extends ExtensionConfig { Class getImportAdapterFactoryClass(); void setImportAdapterFactoryClass(Class importAdapterFactoryClass); - String getKey(); - void setKey(String key); - - - Double getOrder(); - void setOrder(Double order); - - boolean isDisabled(); - void setDisabled(boolean disabled); - Map getParameters(); void setParameters(Map params); diff --git a/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/imports/MatchableCalculationConfig.java b/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/imports/MatchableCalculationConfig.java index f5e3de36..1b13d4a0 100644 --- a/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/imports/MatchableCalculationConfig.java +++ b/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/imports/MatchableCalculationConfig.java @@ -3,6 +3,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.annotation.JsonTypeIdResolver; +import gsrs.util.ExtensionConfig; import gsrs.stagingarea.model.MatchableKeyValueTupleExtractor; import ix.core.util.InheritanceTypeIdResolver; @@ -11,19 +12,10 @@ */ @JsonTypeInfo(use = JsonTypeInfo.Id.CUSTOM, include = JsonTypeInfo.As.PROPERTY, property = "configClass", defaultImpl = DefaultMatchableCalculationConfig.class) @JsonTypeIdResolver(InheritanceTypeIdResolver.class) -public interface MatchableCalculationConfig { +public interface MatchableCalculationConfig extends ExtensionConfig { Class getMatchableCalculationClass(); - String getKey(); - void setKey(String key); - - Double getOrder(); - void setOrder(Double order); - - boolean isDisabled(); - void setDisabled(boolean disabled); - void setMatchableCalculationClass(Class calculatorClass); void setConfig(JsonNode config); diff --git a/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/validator/DefaultValidatorConfig.java b/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/validator/DefaultValidatorConfig.java index 3afcc4e1..a5bad14b 100644 --- a/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/validator/DefaultValidatorConfig.java +++ b/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/validator/DefaultValidatorConfig.java @@ -37,7 +37,7 @@ public class DefaultValidatorConfig implements ValidatorConfig { private Map unknownParameters = new ConcurrentHashMap<>(); private Class newObjClass; - private String key; + private String parentKey; private Double order; private boolean disabled = false; diff --git a/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/validator/ValidatorConfig.java b/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/validator/ValidatorConfig.java index a24eb0e2..fca4f6d7 100644 --- a/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/validator/ValidatorConfig.java +++ b/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/validator/ValidatorConfig.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.annotation.JsonTypeIdResolver; +import gsrs.util.ExtensionConfig; import ix.core.util.InheritanceTypeIdResolver; import ix.ginas.utils.validation.ValidatorPlugin; @@ -12,7 +13,7 @@ @JsonTypeIdResolver(InheritanceTypeIdResolver.class) -public interface ValidatorConfig { // extend ExtensionConfig that has general structure +public interface ValidatorConfig extends ExtensionConfig { Map getParameters(); void setParameters(Map parameters); @@ -25,29 +26,15 @@ public interface ValidatorConfig { // extend ExtensionConfig that has general st Class getNewObjClass(); - String getKey(); - - Double getOrder(); - - boolean isDisabled(); - METHOD_TYPE getMethodType(); void setValidatorClass(Class validatorClass); void setNewObjClass(Class newObjClass); - void setKey(String key); - - void setOrder(Double order); - - void setDisabled(boolean disabled); - void setMethodType(METHOD_TYPE methodType); - - enum METHOD_TYPE{ CREATE, diff --git a/gsrs-spring-boot-autoconfigure/src/test/java/gsrs/imports/TestDefaultImportAdapterFactoryConfig.java b/gsrs-spring-boot-autoconfigure/src/test/java/gsrs/imports/TestDefaultImportAdapterFactoryConfig.java index d12c935e..69419986 100644 --- a/gsrs-spring-boot-autoconfigure/src/test/java/gsrs/imports/TestDefaultImportAdapterFactoryConfig.java +++ b/gsrs-spring-boot-autoconfigure/src/test/java/gsrs/imports/TestDefaultImportAdapterFactoryConfig.java @@ -31,14 +31,14 @@ public void testSetup() throws ClassNotFoundException, IllegalAccessException, N Map>> adapterConfig = new HashMap<>(); Map oneAdapter = new HashMap<>(); - oneAdapter.put("key", "SDFImportAdaptorFactory"); + oneAdapter.put("parentKey", "SDFImportAdaptorFactory"); oneAdapter.put("importAdapterFactoryClass", "gsrs.module.substance.importers.SDFImportAdaptorFactory"); oneAdapter.put("adapterName", "NSRS SDF Adapter"); oneAdapter.put("extensions", new String[] {"sdf", "sd"}); oneAdapter.put("parameters", buildConfigParameters()); oneAdapter.put("description", "general description"); Map> adapters = new HashMap<>(); - adapters.put((String)oneAdapter.get("key"), oneAdapter); + adapters.put((String)oneAdapter.get("parentKey"), oneAdapter); adapterConfig.put(substanceContext, adapters); config.setImportAdapterFactories(adapterConfig); diff --git a/gsrs-spring-legacy-indexer/src/main/java/gsrs/indexer/ConfigBasedIndexValueMakerConfiguration.java b/gsrs-spring-legacy-indexer/src/main/java/gsrs/indexer/ConfigBasedIndexValueMakerConfiguration.java index f60e538a..51ecde72 100644 --- a/gsrs-spring-legacy-indexer/src/main/java/gsrs/indexer/ConfigBasedIndexValueMakerConfiguration.java +++ b/gsrs-spring-legacy-indexer/src/main/java/gsrs/indexer/ConfigBasedIndexValueMakerConfiguration.java @@ -1,6 +1,7 @@ package gsrs.indexer; import com.fasterxml.jackson.annotation.JsonProperty; +import gsrs.util.ExtensionConfig; import lombok.Data; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -24,11 +25,11 @@ public class ConfigBasedIndexValueMakerConfiguration { private Map list; @Data - public static class IndexValueMakerConf{ + public static class IndexValueMakerConf implements ExtensionConfig { @JsonProperty("class") private Class entityClass; private Class indexer; - private String key; + private String parentKey; private Double order; private boolean disabled; @@ -46,15 +47,15 @@ public IndexValueMakerFactory indexValueMakerFactory(){ return new ConfigBasedIndexValueMakerFactory(Collections.emptyList()); } for (String k: map.keySet()) { - map.get(k).setKey(k); + map.get(k).setParentKey(k); } List configs = map.values().stream().collect(Collectors.toList()); System.out.println("Indexer configurations found before filtering: " + configs.size()); configs = configs.stream().filter(c->!c.isDisabled()).sorted(Comparator.comparing(c->c.getOrder(),nullsFirst(naturalOrder()))).collect(Collectors.toList()); System.out.println(reportTag + " active after filtering: " + configs.size()); - System.out.println(String.format("%s|%s|%s|%s", reportTag, "class", "key", "order", "isDisabled")); + System.out.println(String.format("%s|%s|%s|%s", reportTag, "class", "parentKey", "order", "isDisabled")); for (IndexValueMakerConf config : configs) { - System.out.println(String.format("%s|%s|%s|%s", reportTag, config.getIndexer(), config.getKey(), config.getOrder(), config.isDisabled())); + System.out.println(String.format("%s|%s|%s|%s", reportTag, config.getIndexer(), config.getParentKey(), config.getOrder(), config.isDisabled())); } return new ConfigBasedIndexValueMakerFactory(configs); }