Bladeren bron

Merge branch 'master' into kris/pg_dump_table

pull/5/head
jonathan 4 jaren geleden
bovenliggende
commit
14479c000f
1 gewijzigde bestanden met toevoegingen van 7 en 1 verwijderingen
  1. +7
    -1
      wizard-common/src/main/java/org/cobbzilla/wizard/client/script/ApiRunner.java

+ 7
- 1
wizard-common/src/main/java/org/cobbzilla/wizard/client/script/ApiRunner.java Bestand weergeven

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.github.jknack.handlebars.Handlebars;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.NonNull;
import lombok.Setter;
import lombok.experimental.Accessors;
import lombok.extern.slf4j.Slf4j;
@@ -155,6 +156,7 @@ public class ApiRunner {
if (empty(defaults.getParams())) {
log.warn(logPrefix+"no default parameters set");
} else {
@NonNull final var defaultParamsLog = new StringBuilder();
for (Map.Entry<String, Object> param : defaults.getParams().entrySet()) {
final String pName = param.getKey();
final Object pValue = param.getValue();
@@ -166,11 +168,15 @@ public class ApiRunner {
if ((pValue instanceof Boolean) && !((Boolean) pValue)) {
continue; // boolean values already default to false, no need to change script
}
log.info(logPrefix+"parameter '"+pName+"' undefined, using default value ("+pValue+")");
defaultParamsLog.append("\n\t").append(pName).append('=').append(pValue);
script.setParam(pName, pValue);
paramsChanged = true;
}
}
if (defaultParamsLog.length() > 0) {
log.info(logPrefix + "Following parameter(s) are undefined, using shown default value(s):"
+ defaultParamsLog.toString());
}
}
}
if (paramsChanged) include = include(script); // re-include because params have changed


Laden…
Annuleren
Opslaan