From bb074e9a7cdf386eae070c2773c6b7176cf519f8 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sat, 26 Dec 2020 12:23:28 +0100 Subject: [PATCH 1/9] export all org.utplsql.sqldev packages --- sqldev/pom.xml | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/sqldev/pom.xml b/sqldev/pom.xml index f43e4ed..2291d0d 100644 --- a/sqldev/pom.xml +++ b/sqldev/pom.xml @@ -430,11 +430,25 @@ META-INF/extension.xml=target/classes/META-INF/extension.xml - org.utplsql.sqldev, + org.utplsql.sqldev.coverage, + org.utplsql.sqldev.dal, + org.utplsql.sqldev.exception, org.utplsql.sqldev.menu, + org.utplsql.sqldev.model, + org.utplsql.sqldev.model.oddgen, + org.utplsql.sqldev.model.parser, org.utplsql.sqldev.model.preference, - org.utplsql.sqldev.actions, - org.utplsql.sqldev.resources + org.utplsql.sqldev.model.runner, + org.utplsql.sqldev.model.ut, + org.utplsql.sqldev.oddgen, + org.utplsql.sqldev.parser, + org.utplsql.sqldev.resources, + org.utplsql.sqldev.runner, + org.utplsql.sqldev.snippet, + org.utplsql.sqldev.ui.common, + org.utplsql.sqldev.ui.coverage, + org.utplsql.sqldev.ui.preference, + org.utplsql.sqldev.ui.runner <_exportcontents> org.aspectj.runtime.internal, From 3fb8c31c52d616be1027d3bb0b742ba6acd7cb5f Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sat, 26 Dec 2020 12:25:34 +0100 Subject: [PATCH 2/9] update versions of spring and jetbrains dependencies --- sqldev/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sqldev/pom.xml b/sqldev/pom.xml index 2291d0d..9872934 100644 --- a/sqldev/pom.xml +++ b/sqldev/pom.xml @@ -192,19 +192,19 @@ org.springframework spring-jdbc - 5.2.6.RELEASE + 5.3.2 org.springframework spring-core - 5.2.6.RELEASE + 5.3.2 org.springframework spring-web - 5.2.6.RELEASE + 5.3.2 @@ -222,7 +222,7 @@ org.jetbrains annotations - 13.0 + 20.1.0 compile From 34a97c7af76c12b340bd97e703150a9babd4c78e Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sat, 26 Dec 2020 13:19:07 +0100 Subject: [PATCH 3/9] fixes #118 - show hex chars in connection string --- sqldev/src/main/java/org/utplsql/sqldev/model/runner/Run.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Run.java b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Run.java index 9d6b335..0175dca 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Run.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Run.java @@ -21,6 +21,7 @@ import org.springframework.core.style.ToStringCreator; import org.utplsql.sqldev.model.JsonToStringStyler; +import org.utplsql.sqldev.model.URLTools; @SuppressWarnings("unused") public class Run { @@ -82,7 +83,7 @@ public void setStartTime(final String startTime) { public String getName() { final String time = startTime.substring(11, 19); - final String conn = connectionName != null ? connectionName.substring(15) : "n/a"; + final String conn = connectionName != null ? URLTools.replaceHexChars(connectionName.substring(15)) : "n/a"; return time + " (" + conn + ")"; } From 714819c47b6a8a98b11f472665d2a9665d795adf Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sat, 26 Dec 2020 17:07:13 +0100 Subject: [PATCH 4/9] add missing exports for springframework --- sqldev/pom.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sqldev/pom.xml b/sqldev/pom.xml index 9872934..021f0de 100644 --- a/sqldev/pom.xml +++ b/sqldev/pom.xml @@ -454,7 +454,9 @@ org.aspectj.runtime.internal, org.aspectj.lang, org.aspectj.runtime, - org.aspectj.lang.reflect + org.aspectj.lang.reflect, + org.springframework.core.style, + org.springframework.lang oracle.javatools, From c4841ce18b165e50c460399e401f82224ce1e12b Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sat, 26 Dec 2020 17:09:13 +0100 Subject: [PATCH 5/9] eliminate warning: fragment/require bundle cannot be found on the classpath --- sqldev/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sqldev/pom.xml b/sqldev/pom.xml index 021f0de..559ef2d 100644 --- a/sqldev/pom.xml +++ b/sqldev/pom.xml @@ -33,10 +33,10 @@ oracle - javatools-nodeps - 13.0.0 + oracle.javatools-nodeps + 12.2.1 system - ${sqldev.basedir}/modules/oracle.javatools/javatools-nodeps.jar + ${sqldev.basedir}/external/oracle.javatools-nodeps.jar oracle From 71c865c426afbec1c5cb7ba1a8d01791344af1e7 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sat, 26 Dec 2020 17:10:45 +0100 Subject: [PATCH 6/9] handle double quotes, backslash and tabs --- .../main/java/org/utplsql/sqldev/model/JsonToStringStyler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/JsonToStringStyler.java b/sqldev/src/main/java/org/utplsql/sqldev/model/JsonToStringStyler.java index 2fd04e7..5af37f7 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/model/JsonToStringStyler.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/model/JsonToStringStyler.java @@ -45,7 +45,7 @@ private String getIndentSpaces(int indentOffset) { private String getStringStyle(String value) { StringBuilder sb = new StringBuilder(); sb.append('"'); - sb.append(value.replace("\"", "\\\"").replace("\n", "\\n").replace("\r", "")); + sb.append(value.replace("\\", "\\\\").replace("\"", "\\\"").replace("\n", "\\n").replace("\r", "").replace("\t", "\\t")); sb.append('"'); return sb.toString(); } From 6bcfb3879b24cc92139cfa22a3879678487807ce Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sat, 26 Dec 2020 17:14:09 +0100 Subject: [PATCH 7/9] create instance of JsonToStringStyler per local thread --- .../org/utplsql/sqldev/model/JsonToStringStyler.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/JsonToStringStyler.java b/sqldev/src/main/java/org/utplsql/sqldev/model/JsonToStringStyler.java index 5af37f7..37b1640 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/model/JsonToStringStyler.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/model/JsonToStringStyler.java @@ -25,10 +25,11 @@ import org.springframework.core.style.ValueStyler; public class JsonToStringStyler implements ToStringStyler, ValueStyler{ - public static final ToStringStyler INSTANCE = new JsonToStringStyler(); public static final String INDENT_SPACES = " "; private int indent = 0; - + + private static ThreadLocal threadLocal = ThreadLocal.withInitial(JsonToStringStyler::new); + private void newLine(StringBuilder buffer) { buffer.append('\n'); buffer.append(getIndentSpaces(0)); @@ -95,7 +96,11 @@ private String getMapStyle(Map map) { private String getDefaultStyle(Object value) { return String.valueOf(value); } - + + public static ToStringStyler getInstance() { + return threadLocal.get(); + } + @Override public void styleStart(StringBuilder buffer, Object obj) { indent++; From 76b5b66050e556516ee18734de9c4c6445299e55 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sat, 26 Dec 2020 17:15:45 +0100 Subject: [PATCH 8/9] use thread local instance of JsonToStringStyler --- .../main/java/org/utplsql/sqldev/model/oddgen/GenContext.java | 2 +- .../main/java/org/utplsql/sqldev/model/parser/PlsqlObject.java | 2 +- sqldev/src/main/java/org/utplsql/sqldev/model/parser/Unit.java | 2 +- .../org/utplsql/sqldev/model/preference/PreferenceModel.java | 2 +- .../src/main/java/org/utplsql/sqldev/model/runner/Counter.java | 2 +- .../main/java/org/utplsql/sqldev/model/runner/Expectation.java | 2 +- sqldev/src/main/java/org/utplsql/sqldev/model/runner/Item.java | 2 +- .../main/java/org/utplsql/sqldev/model/runner/PostEvent.java | 2 +- .../main/java/org/utplsql/sqldev/model/runner/PostRunEvent.java | 2 +- .../java/org/utplsql/sqldev/model/runner/PostSuiteEvent.java | 2 +- .../java/org/utplsql/sqldev/model/runner/PostTestEvent.java | 2 +- .../main/java/org/utplsql/sqldev/model/runner/PreRunEvent.java | 2 +- .../java/org/utplsql/sqldev/model/runner/PreSuiteEvent.java | 2 +- .../main/java/org/utplsql/sqldev/model/runner/PreTestEvent.java | 2 +- sqldev/src/main/java/org/utplsql/sqldev/model/runner/Run.java | 2 +- sqldev/src/main/java/org/utplsql/sqldev/model/runner/Suite.java | 2 +- sqldev/src/main/java/org/utplsql/sqldev/model/runner/Test.java | 2 +- .../src/main/java/org/utplsql/sqldev/model/ut/Annotation.java | 2 +- .../src/main/java/org/utplsql/sqldev/model/ut/OutputLines.java | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/oddgen/GenContext.java b/sqldev/src/main/java/org/utplsql/sqldev/model/oddgen/GenContext.java index 30fdfbf..41fc456 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/model/oddgen/GenContext.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/model/oddgen/GenContext.java @@ -40,7 +40,7 @@ public Connection getConn() { @Override public String toString() { - return new ToStringCreator(this, JsonToStringStyler.INSTANCE) + return new ToStringCreator(this, JsonToStringStyler.getInstance()) .append("conn", conn) .append("objectType", objectType) .append("objectName", objectName) diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/parser/PlsqlObject.java b/sqldev/src/main/java/org/utplsql/sqldev/model/parser/PlsqlObject.java index 122cfc1..51806d5 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/model/parser/PlsqlObject.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/model/parser/PlsqlObject.java @@ -29,7 +29,7 @@ public class PlsqlObject { @Override public String toString() { - return new ToStringCreator(this, JsonToStringStyler.INSTANCE) + return new ToStringCreator(this, JsonToStringStyler.getInstance()) .append("name", name) .append("type", type) .append("position", position) diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/parser/Unit.java b/sqldev/src/main/java/org/utplsql/sqldev/model/parser/Unit.java index 990e877..c6bdc5f 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/model/parser/Unit.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/model/parser/Unit.java @@ -25,7 +25,7 @@ public class Unit { @Override public String toString() { - return new ToStringCreator(this, JsonToStringStyler.INSTANCE) + return new ToStringCreator(this, JsonToStringStyler.getInstance()) .append("name", name) .append("position", position) .append("positionOfName", positionOfName) diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/preference/PreferenceModel.java b/sqldev/src/main/java/org/utplsql/sqldev/model/preference/PreferenceModel.java index 693ace0..33a3d19 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/model/preference/PreferenceModel.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/model/preference/PreferenceModel.java @@ -70,7 +70,7 @@ public static PreferenceModel getInstance(final PropertyStorage prefs) { @Override public String toString() { - return new ToStringCreator(this, JsonToStringStyler.INSTANCE) + return new ToStringCreator(this, JsonToStringStyler.getInstance()) .append(KEY_USE_REALTIME_REPORTER, isUseRealtimeReporter()) .append(KEY_UNSHARED_WORKSHEET, isUnsharedWorksheet()) .append(KEY_RESET_PACKAGE, isResetPackage()) diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Counter.java b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Counter.java index e14dc38..255a52c 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Counter.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Counter.java @@ -35,7 +35,7 @@ public Counter() { @Override public String toString() { - return new ToStringCreator(this, JsonToStringStyler.INSTANCE) + return new ToStringCreator(this, JsonToStringStyler.getInstance()) .append("disabled", disabled) .append("success", success) .append("failure", failure) diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Expectation.java b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Expectation.java index 2738bce..2ca2945 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Expectation.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Expectation.java @@ -28,7 +28,7 @@ public class Expectation { @Override public String toString() { - return new ToStringCreator(this, JsonToStringStyler.INSTANCE) + return new ToStringCreator(this, JsonToStringStyler.getInstance()) .append("description", description) .append("message", message) .append("caller", caller) diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Item.java b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Item.java index 059102c..5f578ca 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Item.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Item.java @@ -34,7 +34,7 @@ public Item() { @Override public String toString() { - return new ToStringCreator(this, JsonToStringStyler.INSTANCE) + return new ToStringCreator(this, JsonToStringStyler.getInstance()) .append("id", id) .append("startTime", startTime) .append("endTime", endTime) diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PostEvent.java b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PostEvent.java index f24f8f5..73b4599 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PostEvent.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PostEvent.java @@ -29,7 +29,7 @@ public abstract class PostEvent extends RealtimeReporterEvent { @Override public String toString() { - return new ToStringCreator(this, JsonToStringStyler.INSTANCE) + return new ToStringCreator(this, JsonToStringStyler.getInstance()) .append("startTime", startTime) .append("endTime", endTime) .append("executionTime", executionTime) diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PostRunEvent.java b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PostRunEvent.java index 8c8dbe2..0a16743 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PostRunEvent.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PostRunEvent.java @@ -22,7 +22,7 @@ public class PostRunEvent extends PostEvent { @Override public String toString() { - return new ToStringCreator(this, JsonToStringStyler.INSTANCE) + return new ToStringCreator(this, JsonToStringStyler.getInstance()) // ancestor .append("startTime", getStartTime()) .append("endTime", getEndTime()) diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PostSuiteEvent.java b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PostSuiteEvent.java index 292671c..94671c3 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PostSuiteEvent.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PostSuiteEvent.java @@ -23,7 +23,7 @@ public class PostSuiteEvent extends PostEvent { @Override public String toString() { - return new ToStringCreator(this, JsonToStringStyler.INSTANCE) + return new ToStringCreator(this, JsonToStringStyler.getInstance()) // ancestor .append("startTime", getStartTime()) .append("endTime", getEndTime()) diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PostTestEvent.java b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PostTestEvent.java index 92a4348..36b99ab 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PostTestEvent.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PostTestEvent.java @@ -29,7 +29,7 @@ public class PostTestEvent extends PostEvent { @Override public String toString() { - return new ToStringCreator(this, JsonToStringStyler.INSTANCE) + return new ToStringCreator(this, JsonToStringStyler.getInstance()) // ancestor .append("startTime", getStartTime()) .append("endTime", getEndTime()) diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PreRunEvent.java b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PreRunEvent.java index dd1f0db..3e150fe 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PreRunEvent.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PreRunEvent.java @@ -27,7 +27,7 @@ public class PreRunEvent extends RealtimeReporterEvent { @Override public String toString() { - return new ToStringCreator(this, JsonToStringStyler.INSTANCE) + return new ToStringCreator(this, JsonToStringStyler.getInstance()) .append("items", items) .append("totalNumberOfTests", totalNumberOfTests) .toString(); diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PreSuiteEvent.java b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PreSuiteEvent.java index 7b3ccf5..7026952 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PreSuiteEvent.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PreSuiteEvent.java @@ -23,7 +23,7 @@ public class PreSuiteEvent extends RealtimeReporterEvent { @Override public String toString() { - return new ToStringCreator(this, JsonToStringStyler.INSTANCE) + return new ToStringCreator(this, JsonToStringStyler.getInstance()) .append("id", id) .toString(); } diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PreTestEvent.java b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PreTestEvent.java index 1fdbd36..3001933 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PreTestEvent.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/PreTestEvent.java @@ -25,7 +25,7 @@ public class PreTestEvent extends RealtimeReporterEvent { @Override public String toString() { - return new ToStringCreator(this, JsonToStringStyler.INSTANCE) + return new ToStringCreator(this, JsonToStringStyler.getInstance()) .append("id", id) .append("testNumber", testNumber) .append("totalNumberOfTests", totalNumberOfTests) diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Run.java b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Run.java index 0175dca..eaae53b 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Run.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Run.java @@ -46,7 +46,7 @@ public class Run { @Override public String toString() { - return new ToStringCreator(this, JsonToStringStyler.INSTANCE) + return new ToStringCreator(this, JsonToStringStyler.getInstance()) .append("reporterId", reporterId) .append("connectionName", connectionName) .append("pathList", pathList) diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Suite.java b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Suite.java index b6ec4be..1b9b1c1 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Suite.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Suite.java @@ -32,7 +32,7 @@ public Suite() { @Override public String toString() { - return new ToStringCreator(this, JsonToStringStyler.INSTANCE) + return new ToStringCreator(this, JsonToStringStyler.getInstance()) // ancestor .append("id", getId()) .append("startTime", getStartTime()) diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Test.java b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Test.java index 6933866..d24b820 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Test.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Test.java @@ -37,7 +37,7 @@ public class Test extends Item { @Override public String toString() { - return new ToStringCreator(this, JsonToStringStyler.INSTANCE) + return new ToStringCreator(this, JsonToStringStyler.getInstance()) // ancestor .append("id", getId()) .append("startTime", getStartTime()) diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/ut/Annotation.java b/sqldev/src/main/java/org/utplsql/sqldev/model/ut/Annotation.java index 3f69ef7..47e792c 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/model/ut/Annotation.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/model/ut/Annotation.java @@ -27,7 +27,7 @@ public class Annotation { @Override public String toString() { - return new ToStringCreator(this, JsonToStringStyler.INSTANCE) + return new ToStringCreator(this, JsonToStringStyler.getInstance()) .append("objectOwner", objectOwner) .append("objectName", objectName) .append("name", name) diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/ut/OutputLines.java b/sqldev/src/main/java/org/utplsql/sqldev/model/ut/OutputLines.java index a8a041a..75343d6 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/model/ut/OutputLines.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/model/ut/OutputLines.java @@ -24,7 +24,7 @@ public class OutputLines { @Override public String toString() { - return new ToStringCreator(this, JsonToStringStyler.INSTANCE) + return new ToStringCreator(this, JsonToStringStyler.getInstance()) .append("lines", lines) .append("numlines", numlines) .toString(); From 122e92e7703e2c91bfb3de27923b0f10231abea9 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sat, 26 Dec 2020 17:20:14 +0100 Subject: [PATCH 9/9] call getDefaultStyle with String value --- .../main/java/org/utplsql/sqldev/model/JsonToStringStyler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/JsonToStringStyler.java b/sqldev/src/main/java/org/utplsql/sqldev/model/JsonToStringStyler.java index 37b1640..1b5a99c 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/model/JsonToStringStyler.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/model/JsonToStringStyler.java @@ -162,7 +162,7 @@ public String style(Object value) { } else if (value instanceof Map) { return getMapStyle((Map) value); } else { - return getDefaultStyle(value); + return getDefaultStyle(value.toString()); } } }