diff --git a/wizard-client/src/main/java/org/cobbzilla/wizard/client/script/ApiScriptIncludeHandler.java b/wizard-client/src/main/java/org/cobbzilla/wizard/client/script/ApiScriptIncludeHandler.java index 984edca..348ea9f 100644 --- a/wizard-client/src/main/java/org/cobbzilla/wizard/client/script/ApiScriptIncludeHandler.java +++ b/wizard-client/src/main/java/org/cobbzilla/wizard/client/script/ApiScriptIncludeHandler.java @@ -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)+")"); } } } diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/PgRestServerConfiguration.java b/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/PgRestServerConfiguration.java index 51c7ebd..8e716b0 100644 --- a/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/PgRestServerConfiguration.java +++ b/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/PgRestServerConfiguration.java @@ -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 getSortedEntityClassNames() { + return getEntityClasses().stream().map(Class::getName).sorted().collect(Collectors.toList()); + } + @Getter(lazy=true) private final List tableNames = initTableNames(); private List initTableNames() { return getEntityClasses().stream()