◐ Shell
reader mode source ↗
Skip to content
Merged

Bugfix/issue 118 special chars #119

Show file tree
Hide file tree
Changes from all commits
File filter
Conversations
Jump to
Diff view
Apply and reload
Show whitespace
Diff view
Apply and reload
15 changes: 10 additions & 5 deletions sqldev/src/main/java/org/utplsql/sqldev/model/JsonToStringStyler.java
View file Edit file Delete file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 void newLine(StringBuilder buffer) {
buffer.append('\n');
buffer.append(getIndentSpaces(0));
Expand All @@ -45,7 +46,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('"');
return sb.toString();
}
Expand Down Expand Up @@ -95,7 +96,11 @@ private String getMapStyle(Map<?, ?> map) {
private String getDefaultStyle(Object value) {
return String.valueOf(value);
}

@Override
public void styleStart(StringBuilder buffer, Object obj) {
indent++;
Expand Down Expand Up @@ -157,7 +162,7 @@ public String style(Object value) {
} else if (value instanceof Map) {
return getMapStyle((Map<?, ?>) value);
} else {
return getDefaultStyle(value);
}
}
}
2 changes: 1 addition & 1 deletion sqldev/src/main/java/org/utplsql/sqldev/model/oddgen/GenContext.java
View file Edit file Delete file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public Connection getConn() {

@Override
public String toString() {
return new ToStringCreator(this, JsonToStringStyler.INSTANCE)
.append("conn", conn)
.append("objectType", objectType)
.append("objectName", objectName)
Expand Down
2 changes: 1 addition & 1 deletion sqldev/src/main/java/org/utplsql/sqldev/model/parser/PlsqlObject.java
View file Edit file Delete file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public class PlsqlObject {

@Override
public String toString() {
return new ToStringCreator(this, JsonToStringStyler.INSTANCE)
.append("name", name)
.append("type", type)
.append("position", position)
Expand Down
2 changes: 1 addition & 1 deletion sqldev/src/main/java/org/utplsql/sqldev/model/parser/Unit.java
View file Edit file Delete file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class Unit {

@Override
public String toString() {
return new ToStringCreator(this, JsonToStringStyler.INSTANCE)
.append("name", name)
.append("position", position)
.append("positionOfName", positionOfName)
Expand Down
2 changes: 1 addition & 1 deletion sqldev/src/main/java/org/utplsql/sqldev/model/preference/PreferenceModel.java
View file Edit file Delete file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public static PreferenceModel getInstance(final PropertyStorage prefs) {

@Override
public String toString() {
return new ToStringCreator(this, JsonToStringStyler.INSTANCE)
.append(KEY_USE_REALTIME_REPORTER, isUseRealtimeReporter())
.append(KEY_UNSHARED_WORKSHEET, isUnsharedWorksheet())
.append(KEY_RESET_PACKAGE, isResetPackage())
Expand Down
2 changes: 1 addition & 1 deletion sqldev/src/main/java/org/utplsql/sqldev/model/runner/Counter.java
View file Edit file Delete file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public Counter() {

@Override
public String toString() {
return new ToStringCreator(this, JsonToStringStyler.INSTANCE)
.append("disabled", disabled)
.append("success", success)
.append("failure", failure)
2 changes: 1 addition & 1 deletion sqldev/src/main/java/org/utplsql/sqldev/model/runner/Expectation.java
View file Edit file Delete file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class Expectation {

@Override
public String toString() {
return new ToStringCreator(this, JsonToStringStyler.INSTANCE)
.append("description", description)
.append("message", message)
.append("caller", caller)
Expand Down
2 changes: 1 addition & 1 deletion sqldev/src/main/java/org/utplsql/sqldev/model/runner/Item.java
View file Edit file Delete file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public Item() {

@Override
public String toString() {
return new ToStringCreator(this, JsonToStringStyler.INSTANCE)
.append("id", id)
.append("startTime", startTime)
.append("endTime", endTime)
Expand Down
2 changes: 1 addition & 1 deletion sqldev/src/main/java/org/utplsql/sqldev/model/runner/PostEvent.java
View file Edit file Delete file
Open in desktop
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ public abstract class PostEvent extends RealtimeReporterEvent {

@Override
public String toString() {
return new ToStringCreator(this, JsonToStringStyler.INSTANCE)
.append("startTime", startTime)
.append("endTime", endTime)
.append("executionTime", executionTime)
Expand Down
2 changes: 1 addition & 1 deletion sqldev/src/main/java/org/utplsql/sqldev/model/runner/PostRunEvent.java
View file Edit file Delete file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class PostRunEvent extends PostEvent {

@Override
public String toString() {
return new ToStringCreator(this, JsonToStringStyler.INSTANCE)
// ancestor
.append("startTime", getStartTime())
.append("endTime", getEndTime())
Expand Down
2 changes: 1 addition & 1 deletion sqldev/src/main/java/org/utplsql/sqldev/model/runner/PostTestEvent.java
View file Edit file Delete file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public class PostTestEvent extends PostEvent {

@Override
public String toString() {
return new ToStringCreator(this, JsonToStringStyler.INSTANCE)
// ancestor
.append("startTime", getStartTime())
.append("endTime", getEndTime())
Expand Down
2 changes: 1 addition & 1 deletion sqldev/src/main/java/org/utplsql/sqldev/model/runner/PreRunEvent.java
View file Edit file Delete file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class PreRunEvent extends RealtimeReporterEvent {

@Override
public String toString() {
return new ToStringCreator(this, JsonToStringStyler.INSTANCE)
.append("items", items)
.append("totalNumberOfTests", totalNumberOfTests)
.toString();
Expand Down
2 changes: 1 addition & 1 deletion sqldev/src/main/java/org/utplsql/sqldev/model/runner/PreSuiteEvent.java
View file Edit file Delete file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class PreSuiteEvent extends RealtimeReporterEvent {

@Override
public String toString() {
return new ToStringCreator(this, JsonToStringStyler.INSTANCE)
.append("id", id)
.toString();
}
Expand Down
2 changes: 1 addition & 1 deletion sqldev/src/main/java/org/utplsql/sqldev/model/runner/PreTestEvent.java
View file Edit file Delete file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class PreTestEvent extends RealtimeReporterEvent {

@Override
public String toString() {
return new ToStringCreator(this, JsonToStringStyler.INSTANCE)
.append("id", id)
.append("testNumber", testNumber)
.append("totalNumberOfTests", totalNumberOfTests)
Expand Down
5 changes: 3 additions & 2 deletions sqldev/src/main/java/org/utplsql/sqldev/model/runner/Run.java
View file Edit file Delete file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import org.springframework.core.style.ToStringCreator;
import org.utplsql.sqldev.model.JsonToStringStyler;

@SuppressWarnings("unused")
public class Run {
Expand All @@ -45,7 +46,7 @@ public class Run {

@Override
public String toString() {
return new ToStringCreator(this, JsonToStringStyler.INSTANCE)
.append("reporterId", reporterId)
.append("connectionName", connectionName)
.append("pathList", pathList)
Expand Down @@ -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";
return time + " (" + conn + ")";
}

Expand Down
2 changes: 1 addition & 1 deletion sqldev/src/main/java/org/utplsql/sqldev/model/runner/Suite.java
View file Edit file Delete file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public Suite() {

@Override
public String toString() {
return new ToStringCreator(this, JsonToStringStyler.INSTANCE)
// ancestor
.append("id", getId())
.append("startTime", getStartTime())
Expand Down
2 changes: 1 addition & 1 deletion sqldev/src/main/java/org/utplsql/sqldev/model/ut/Annotation.java
View file Edit file Delete file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class Annotation {

@Override
public String toString() {
return new ToStringCreator(this, JsonToStringStyler.INSTANCE)
.append("objectOwner", objectOwner)
.append("objectName", objectName)
.append("name", name)
Expand Down
2 changes: 1 addition & 1 deletion sqldev/src/main/java/org/utplsql/sqldev/model/ut/OutputLines.java
View file Edit file Delete file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class OutputLines {

@Override
public String toString() {
return new ToStringCreator(this, JsonToStringStyler.INSTANCE)
.append("lines", lines)
.append("numlines", numlines)
.toString();
Expand Down
Toggle all file notes Toggle all file annotations