Bläddra i källkod

add getSortedEntityClassNames, simplify shortError

tags/2.0.1
Jonathan Cobb 4 år sedan
förälder
incheckning
72db68516f
2 ändrade filer med 7 tillägg och 3 borttagningar
  1. +2
    -2
      wizard-client/src/main/java/org/cobbzilla/wizard/client/script/ApiScriptIncludeHandler.java
  2. +5
    -1
      wizard-server/src/main/java/org/cobbzilla/wizard/server/config/PgRestServerConfiguration.java

+ 2
- 2
wizard-client/src/main/java/org/cobbzilla/wizard/client/script/ApiScriptIncludeHandler.java Visa fil

@@ -9,7 +9,7 @@ import java.util.Arrays;
import java.util.List;

import static org.cobbzilla.util.daemon.ZillaRuntime.die;
import static org.cobbzilla.util.daemon.ZillaRuntime.shortErrorString;
import static org.cobbzilla.util.daemon.ZillaRuntime.shortError;
import static org.cobbzilla.util.io.StreamUtil.loadResourceAsString;
import static org.cobbzilla.util.io.StreamUtil.stream2string;

@@ -29,7 +29,7 @@ public interface ApiScriptIncludeHandler {
try {
return loadResourceAsString(inc + "/" + fileName);
} catch (Exception e2) {
log.debug("include(" + path + "): not found in " + inc+": (e="+shortErrorString(e)+", e2="+shortErrorString(e2)+")");
log.debug("include(" + path + "): not found in " + inc+": (e="+ shortError(e)+", e2="+ shortError(e2)+")");
}
}
}


+ 5
- 1
wizard-server/src/main/java/org/cobbzilla/wizard/server/config/PgRestServerConfiguration.java Visa fil

@@ -161,7 +161,7 @@ public class PgRestServerConfiguration extends RestServerConfiguration implement
execSql("select 1");
return true;
} catch (Exception e) {
log.warn("dbExists: "+shortErrorString(e));
log.warn("dbExists: "+ shortError(e));
return false;
}
}
@@ -314,6 +314,10 @@ public class PgRestServerConfiguration extends RestServerConfiguration implement
return reversed;
}

public List<String> getSortedEntityClassNames() {
return getEntityClasses().stream().map(Class::getName).sorted().collect(Collectors.toList());
}

@Getter(lazy=true) private final List<String> tableNames = initTableNames();
private List<String> initTableNames() {
return getEntityClasses().stream()


Laddar…
Avbryt
Spara