Skip to content

Commit

Permalink
matchables calcs and clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
@alx652
alx652 committed Mar 13, 2024
1 parent b9cc1ef commit 4a86126
Show file tree
Hide file tree
Showing 5 changed files with 99 additions and 92 deletions.
17 changes: 5 additions & 12 deletions ...cheduled-tasks/src/main/java/gsrs/scheduler/GsrsSchedulerTaskPropertiesConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,27 +56,20 @@ public void unknownSetter(String key, Object value){
}

private CachedSupplier<List<SchedulerPlugin.ScheduledTask>> tasks = CachedSupplier.of(()->{
String reportTag = "ScheduledTaskConfig";
List<SchedulerPlugin.ScheduledTask> l = new ArrayList<>(list.size());

ObjectMapper mapper = new ObjectMapper();

// For quality control and maybe an accessor
for (String k: list.keySet()) {
ScheduledTaskConfig config = list.get(k);
config.setKey(k);
}

List<ScheduledTaskConfig> configs = list.values().stream().collect(Collectors.toList());

System.out.println("Scheduled task configurations found before filtering: " + configs.size());

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("Scheduled task configurations active after filtering: " + configs.size());

System.out.println(String.format("%s|%s|%s|%s", "ScheduledTaskConfig", "class", "key", "order", "isDisabled"));
System.out.println(reportTag + " active after filtering: " + configs.size());
System.out.println(String.format("%s|%s|%s|%s", reportTag, "class", "key", "order", "isDisabled"));
for (ScheduledTaskConfig config : configs) {
System.out.println(String.format("%s|%s|%s|%s", "ScheduledTaskConfig", config.getScheduledTaskClass(), config.getKey(), config.getOrder(), config.isDisabled()));
System.out.println(String.format("%s|%s|%s|%s", reportTag, config.getScheduledTaskClass(), config.getKey(), config.getOrder(), config.isDisabled()));
}

for(ScheduledTaskConfig config : configs){
Expand Down
109 changes: 45 additions & 64 deletions gsrs-spring-boot-autoconfigure/src/main/java/gsrs/GsrsFactoryConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public class GsrsFactoryConfiguration {

private Map<String, Map<String, Map<String, Object>>> importAdapterFactories;

private Map<String, List<Map<String, Object>>> matchableCalculators;
private Map<String, Map<String, Map<String, Object>>> matchableCalculators;

private Map<String, Map<String, Object>> search;

Expand All @@ -55,81 +55,53 @@ public Optional<Map<String, Object>> getSearchSettingsFor(String context) {
}

public List<EntityProcessorConfig> getEntityProcessors() {
String reportTag = "EntityProcessorConfig";
if (entityProcessors == null) {
//nothing set
return Collections.emptyList();
}
Map<String,EntityProcessorConfig> map = entityProcessors;

if (map == null || map.isEmpty()) {
return Collections.emptyList();
}

// 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).setKey(k);
}

// By the time we are here all conf files have been processed

List<EntityProcessorConfig> configs = map.values().stream().collect(Collectors.toList());

// Can this be omitted for processors?
// https://fasterxml.github.io/jackson-core/javadoc/2.2.0/com/fasterxml/jackson/core/type/TypeReference.html
// List<? extends ValidatorConfig> configs = mapper.convertValue(list, new TypeReference<List<? extends ValidatorConfig>>() {
// });

System.out.println("Entity processor configurations found before filtering: " + configs.size());

configs = configs.stream().filter(p->!p.isDisabled()).sorted(Comparator.comparing(v->v.getOrder(),nullsFirst(naturalOrder()))).collect(Collectors.toList());

configs = configs.stream().filter(c->!c.isDisabled()).sorted(Comparator.comparing(c->c.getOrder(),nullsFirst(naturalOrder()))).collect(Collectors.toList());
System.out.println("Entity processor configurations active after filtering: " + configs.size());

System.out.println(String.format("%s|%s|%s|%s", "EntityProcessor", "class", "key", "order", "isDisabled"));
for (EntityProcessorConfig config : configs) {
System.out.println(String.format("%s|%s|%s|%s", "EntityProcessor", config.getProcessor(), config.getKey(), config.getOrder(), config.isDisabled()));
}

return configs;
}

public List<? extends ValidatorConfig> getValidatorConfigByContext(String context) {
String reportTag = "ValidatorConfig";
if (validators == null) {
//nothing set
return Collections.emptyList();
}
ObjectMapper mapper = new ObjectMapper();
try {

Map<String,Map<String, Object>> map = (Map<String, Map<String, Object>>) validators.get(context);

if (map == null || map.isEmpty()) {
return Collections.emptyList();
}

// 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);
}

// By the time we are here all conf files have been processed

List<Object> list = map.values().stream().collect(Collectors.toList());

List<? extends ValidatorConfig> configs = mapper.convertValue(list, new TypeReference<List<? extends ValidatorConfig>>() {
});

System.out.println("Validator configurations found before filtering: " + configs.size());

configs = configs.stream().filter(v->!v.isDisabled()).sorted(Comparator.comparing(v->v.getOrder(),nullsFirst(naturalOrder()))).collect(Collectors.toList());

System.out.println("Validator configurations active after filtering: " + configs.size());

System.out.println(String.format("%s|%s|%s|%s", "Validator", "class", "key", "order", "isDisabled"));
List<? extends ValidatorConfig> configs = mapper.convertValue(list, new TypeReference<List<? extends ValidatorConfig>>() { });
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"));
for (ValidatorConfig config : configs) {
System.out.println(String.format("%s|%s|%s|%s", "Validator", config.getValidatorClass(), config.getKey(), config.getOrder(), config.isDisabled()));
System.out.println(String.format("%s|%s|%s|%s", reportTag, config.getValidatorClass(), config.getKey(), config.getOrder(), config.isDisabled()));
}

return configs;
} catch (Throwable t) {
throw t;
Expand All @@ -141,6 +113,7 @@ public List<? extends ValidatorConfig> getValidatorConfigByContext(String contex
context -- the name of a type of entity that the Adapters will create.
*/
public List<? extends ImportAdapterFactoryConfig> getImportAdapterFactories(String context) {
String reportTag = "ImportAdapterFactoryConfig";
log.trace("starting in getImportAdapterFactories");
if (importAdapterFactories == null) {
return Collections.emptyList();
Expand All @@ -152,32 +125,25 @@ public List<? extends ImportAdapterFactoryConfig> getImportAdapterFactories(Stri
// fix this later
// list.forEach(i -> i.keySet().forEach(k -> log.trace("key: {}; value: {}", k, i.get(k))));

// map.keySet().forEach(k1->{
// map.get(k1).keySet().forEach(k2-> log.trace("key: {}; value: {}", k2, map.get(k1).get(k2)));
// });

if (map == null || map.isEmpty()) {
log.warn("no import adapter factory configuration info found!");
return Collections.emptyList();
}

// 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);
}

// By the time we are here all conf files have been processed

List<Object> list = map.values().stream().collect(Collectors.toList());

List<? extends ImportAdapterFactoryConfig> configs = EntityUtils.convertClean(list, new TypeReference<List<? extends ImportAdapterFactoryConfig>>() {
});

System.out.println("Import adapter factory configurations found before filtering: " + configs.size());

configs = configs.stream().filter(a->!a.isDisabled()).sorted(Comparator.comparing(a->a.getOrder(),nullsFirst(naturalOrder()))).collect(Collectors.toList());

System.out.println("Import adapter factory configurations active after filtering: " + configs.size());

System.out.println(String.format("%s|%s|%s|%s", "ImportAdapterFactoryConfig", "class", "key", "order", "isDisabled"));
List<? extends ImportAdapterFactoryConfig> configs = EntityUtils.convertClean(list, new TypeReference<List<? extends ImportAdapterFactoryConfig>>() { });
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"));
for (ImportAdapterFactoryConfig config : configs) {
System.out.println(String.format("%s|%s|%s|%s", "ImportAdapterFactoryConfig", config.getImportAdapterFactoryClass(), config.getKey(), config.getOrder(), config.isDisabled()));
System.out.println(String.format("%s|%s|%s|%s", reportTag, config.getImportAdapterFactoryClass(), config.getKey(), config.getOrder(), config.isDisabled()));
}

//log.trace("list (after):");
Expand All @@ -191,19 +157,34 @@ public List<? extends ImportAdapterFactoryConfig> getImportAdapterFactories(Stri

public List<? extends MatchableCalculationConfig> getMatchableCalculationConfig(String context) {
log.trace("in ");
String reportTag = "MatchableCalculationConfig";
if(matchableCalculators==null){
return Collections.emptyList();
}
List<Map<String, Object>> list = matchableCalculators.get(context);
if (list == null || list.isEmpty()) {
log.warn("no matchable calculation configuration info found!");
return Collections.emptyList();
try {
Map<String, Map<String, Object>> map = matchableCalculators.get(context);
if (map == null || map.isEmpty()) {
log.warn("no matchable calculation configuration info found!");
return Collections.emptyList();
}
// 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);
}
List<Object> list = map.values().stream().collect(Collectors.toList());
List<? extends MatchableCalculationConfig> configs = EntityUtils.convertClean(list, new TypeReference<List<? extends MatchableCalculationConfig>>() { });
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"));
for (MatchableCalculationConfig config : configs) {
System.out.println(String.format("%s|%s|%s|%s", reportTag, config.getMatchableCalculationClass(), config.getKey(), config.getOrder(), config.isDisabled()));
}
return configs;
} catch (Throwable t) {
throw t;
}
List<? extends MatchableCalculationConfig> configs = EntityUtils.convertClean(list, new TypeReference<List<? extends MatchableCalculationConfig>>() {
});
//log.trace("list (after):");
//configs.forEach(c-> log.trace("name: {}; desc: {}; ext: {}", c.getAdapterName(), c.getDescription(), c.getSupportedFileExtensions()));
return configs;
}

}

34 changes: 34 additions & 0 deletions ...ring-boot-autoconfigure/src/main/java/gsrs/imports/DefaultMatchableCalculationConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,47 @@ public class DefaultMatchableCalculationConfig<T> implements MatchableCalculatio

private Class extractorClass;

private String key;
private Double order;
private boolean disabled = false;

private JsonNode extractorConfig;

@Override
public Class getMatchableCalculationClass() {
return extractorClass;
}

@Override
public String getKey() {
return key;
}

@Override
public void setKey(String key) {
this.key = key;
}

@Override
public Double getOrder() {
return order;
}

@Override
public void setOrder(Double order) {
this.order = order;
}

@Override
public boolean isDisabled() {
return disabled;
}

@Override
public void setDisabled(boolean disabled) {
this.disabled = disabled;
}


@Override
public void setMatchableCalculationClass(Class calculatorClass) {
Expand Down
9 changes: 9 additions & 0 deletions gsrs-spring-boot-autoconfigure/src/main/java/gsrs/imports/MatchableCalculationConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,15 @@ public interface MatchableCalculationConfig<T> {

Class<? extends MatchableKeyValueTupleExtractor> getMatchableCalculationClass();

String getKey();
void setKey(String key);

Double getOrder();
void setOrder(Double order);

boolean isDisabled();
void setDisabled(boolean disabled);

void setMatchableCalculationClass(Class<? extends MatchableKeyValueTupleExtractor> calculatorClass);

void setConfig(JsonNode config);
Expand Down
22 changes: 6 additions & 16 deletions ...ng-legacy-indexer/src/main/java/gsrs/indexer/ConfigBasedIndexValueMakerConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,31 +40,21 @@ public static class IndexValueMakerConf{
@ConditionalOnMissingBean
@Order
public IndexValueMakerFactory indexValueMakerFactory(){

Map<String, IndexValueMakerConf> map = list;

String reportTag = "IndexValueMakerConf";
Map<String, IndexValueMakerConf> map = list;
if(map==null){
return new ConfigBasedIndexValueMakerFactory(Collections.emptyList());
}

// 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).setKey(k);
}

// By the time we are here all conf files have been processed

List<IndexValueMakerConf> configs = map.values().stream().collect(Collectors.toList());

System.out.println("Indexer configurations 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("Indexer configurations active after filtering: " + configs.size());

System.out.println(String.format("%s|%s|%s|%s", "Indexer", "class", "key", "order", "isDisabled"));
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"));
for (IndexValueMakerConf config : configs) {
System.out.println(String.format("%s|%s|%s|%s", "Indexer", config.getIndexer(), config.getKey(), config.getOrder(), config.isDisabled()));
System.out.println(String.format("%s|%s|%s|%s", reportTag, config.getIndexer(), config.getKey(), config.getOrder(), config.isDisabled()));
}
return new ConfigBasedIndexValueMakerFactory(configs);
}
Expand Down

0 comments on commit 4a86126

Please sign in to comment.