Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit7fb1947

Browse files
Merge pull request#119 from PhilippSalvisberg/bugfix/issue-118-special-chars
Bugfix/issue 118 special chars
2 parentsd375f92 +122e92e commit7fb1947

21 files changed

+58
-36
lines changed

‎sqldev/pom.xml

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@
3333
</dependency>
3434
<dependency>
3535
<groupId>oracle</groupId>
36-
<artifactId>javatools-nodeps</artifactId>
37-
<version>13.0.0</version>
36+
<artifactId>oracle.javatools-nodeps</artifactId>
37+
<version>12.2.1</version>
3838
<scope>system</scope>
39-
<systemPath>${sqldev.basedir}/modules/oracle.javatools/javatools-nodeps.jar</systemPath>
39+
<systemPath>${sqldev.basedir}/external/oracle.javatools-nodeps.jar</systemPath>
4040
</dependency>
4141
<dependency>
4242
<groupId>oracle</groupId>
@@ -192,19 +192,19 @@
192192
<!-- used mainly to access the database via JdbcTemplate-->
193193
<groupId>org.springframework</groupId>
194194
<artifactId>spring-jdbc</artifactId>
195-
<version>5.2.6.RELEASE</version>
195+
<version>5.3.2</version>
196196
</dependency>
197197
<dependency>
198198
<!-- transitive reference, but IntelliJ wants to have it explicit (to avoid warnings)-->
199199
<groupId>org.springframework</groupId>
200200
<artifactId>spring-core</artifactId>
201-
<version>5.2.6.RELEASE</version>
201+
<version>5.3.2</version>
202202
</dependency>
203203
<dependency>
204204
<!-- used for HtmlUtils.htmlEscape in RunnerPanel-->
205205
<groupId>org.springframework</groupId>
206206
<artifactId>spring-web</artifactId>
207-
<version>5.2.6.RELEASE</version>
207+
<version>5.3.2</version>
208208
</dependency>
209209
<dependency>
210210
<!-- optional, for RunGenerator and TestGenerator-->
@@ -222,7 +222,7 @@
222222
<dependency>
223223
<groupId>org.jetbrains</groupId>
224224
<artifactId>annotations</artifactId>
225-
<version>13.0</version>
225+
<version>20.1.0</version>
226226
<scope>compile</scope>
227227
</dependency>
228228
</dependencies>
@@ -430,17 +430,33 @@
430430
META-INF/extension.xml=target/classes/META-INF/extension.xml
431431
</Include-Resource>
432432
<Export-Package>
433-
org.utplsql.sqldev,
433+
org.utplsql.sqldev.coverage,
434+
org.utplsql.sqldev.dal,
435+
org.utplsql.sqldev.exception,
434436
org.utplsql.sqldev.menu,
437+
org.utplsql.sqldev.model,
438+
org.utplsql.sqldev.model.oddgen,
439+
org.utplsql.sqldev.model.parser,
435440
org.utplsql.sqldev.model.preference,
436-
org.utplsql.sqldev.actions,
437-
org.utplsql.sqldev.resources
441+
org.utplsql.sqldev.model.runner,
442+
org.utplsql.sqldev.model.ut,
443+
org.utplsql.sqldev.oddgen,
444+
org.utplsql.sqldev.parser,
445+
org.utplsql.sqldev.resources,
446+
org.utplsql.sqldev.runner,
447+
org.utplsql.sqldev.snippet,
448+
org.utplsql.sqldev.ui.common,
449+
org.utplsql.sqldev.ui.coverage,
450+
org.utplsql.sqldev.ui.preference,
451+
org.utplsql.sqldev.ui.runner
438452
</Export-Package>
439453
<_exportcontents>
440454
org.aspectj.runtime.internal,
441455
org.aspectj.lang,
442456
org.aspectj.runtime,
443-
org.aspectj.lang.reflect
457+
org.aspectj.lang.reflect,
458+
org.springframework.core.style,
459+
org.springframework.lang
444460
</_exportcontents>
445461
<Require-Bundle>
446462
oracle.javatools,

‎sqldev/src/main/java/org/utplsql/sqldev/model/JsonToStringStyler.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,11 @@
2525
importorg.springframework.core.style.ValueStyler;
2626

2727
publicclassJsonToStringStylerimplementsToStringStyler,ValueStyler{
28-
publicstaticfinalToStringStylerINSTANCE =newJsonToStringStyler();
2928
publicstaticfinalStringINDENT_SPACES =" ";
3029
privateintindent =0;
31-
30+
31+
privatestaticThreadLocal<JsonToStringStyler>threadLocal =ThreadLocal.withInitial(JsonToStringStyler::new);
32+
3233
privatevoidnewLine(StringBuilderbuffer) {
3334
buffer.append('\n');
3435
buffer.append(getIndentSpaces(0));
@@ -45,7 +46,7 @@ private String getIndentSpaces(int indentOffset) {
4546
privateStringgetStringStyle(Stringvalue) {
4647
StringBuildersb =newStringBuilder();
4748
sb.append('"');
48-
sb.append(value.replace("\"","\\\"").replace("\n","\\n").replace("\r",""));
49+
sb.append(value.replace("\\","\\\\").replace("\"","\\\"").replace("\n","\\n").replace("\r","").replace("\t","\\t"));
4950
sb.append('"');
5051
returnsb.toString();
5152
}
@@ -95,7 +96,11 @@ private String getMapStyle(Map<?, ?> map) {
9596
privateStringgetDefaultStyle(Objectvalue) {
9697
returnString.valueOf(value);
9798
}
98-
99+
100+
publicstaticToStringStylergetInstance() {
101+
returnthreadLocal.get();
102+
}
103+
99104
@Override
100105
publicvoidstyleStart(StringBuilderbuffer,Objectobj) {
101106
indent++;
@@ -157,7 +162,7 @@ public String style(Object value) {
157162
}elseif (valueinstanceofMap) {
158163
returngetMapStyle((Map<?, ?>)value);
159164
}else {
160-
returngetDefaultStyle(value);
165+
returngetDefaultStyle(value.toString());
161166
}
162167
}
163168
}

‎sqldev/src/main/java/org/utplsql/sqldev/model/oddgen/GenContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public Connection getConn() {
4040

4141
@Override
4242
publicStringtoString() {
43-
returnnewToStringCreator(this,JsonToStringStyler.INSTANCE)
43+
returnnewToStringCreator(this,JsonToStringStyler.getInstance())
4444
.append("conn",conn)
4545
.append("objectType",objectType)
4646
.append("objectName",objectName)

‎sqldev/src/main/java/org/utplsql/sqldev/model/parser/PlsqlObject.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class PlsqlObject {
2929

3030
@Override
3131
publicStringtoString() {
32-
returnnewToStringCreator(this,JsonToStringStyler.INSTANCE)
32+
returnnewToStringCreator(this,JsonToStringStyler.getInstance())
3333
.append("name",name)
3434
.append("type",type)
3535
.append("position",position)

‎sqldev/src/main/java/org/utplsql/sqldev/model/parser/Unit.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class Unit {
2525

2626
@Override
2727
publicStringtoString() {
28-
returnnewToStringCreator(this,JsonToStringStyler.INSTANCE)
28+
returnnewToStringCreator(this,JsonToStringStyler.getInstance())
2929
.append("name",name)
3030
.append("position",position)
3131
.append("positionOfName",positionOfName)

‎sqldev/src/main/java/org/utplsql/sqldev/model/preference/PreferenceModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public static PreferenceModel getInstance(final PropertyStorage prefs) {
7070

7171
@Override
7272
publicStringtoString() {
73-
returnnewToStringCreator(this,JsonToStringStyler.INSTANCE)
73+
returnnewToStringCreator(this,JsonToStringStyler.getInstance())
7474
.append(KEY_USE_REALTIME_REPORTER,isUseRealtimeReporter())
7575
.append(KEY_UNSHARED_WORKSHEET,isUnsharedWorksheet())
7676
.append(KEY_RESET_PACKAGE,isResetPackage())

‎sqldev/src/main/java/org/utplsql/sqldev/model/runner/Counter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public Counter() {
3535

3636
@Override
3737
publicStringtoString() {
38-
returnnewToStringCreator(this,JsonToStringStyler.INSTANCE)
38+
returnnewToStringCreator(this,JsonToStringStyler.getInstance())
3939
.append("disabled",disabled)
4040
.append("success",success)
4141
.append("failure",failure)

‎sqldev/src/main/java/org/utplsql/sqldev/model/runner/Expectation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class Expectation {
2828

2929
@Override
3030
publicStringtoString() {
31-
returnnewToStringCreator(this,JsonToStringStyler.INSTANCE)
31+
returnnewToStringCreator(this,JsonToStringStyler.getInstance())
3232
.append("description",description)
3333
.append("message",message)
3434
.append("caller",caller)

‎sqldev/src/main/java/org/utplsql/sqldev/model/runner/Item.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public Item() {
3434

3535
@Override
3636
publicStringtoString() {
37-
returnnewToStringCreator(this,JsonToStringStyler.INSTANCE)
37+
returnnewToStringCreator(this,JsonToStringStyler.getInstance())
3838
.append("id",id)
3939
.append("startTime",startTime)
4040
.append("endTime",endTime)

‎sqldev/src/main/java/org/utplsql/sqldev/model/runner/PostEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public abstract class PostEvent extends RealtimeReporterEvent {
2929

3030
@Override
3131
publicStringtoString() {
32-
returnnewToStringCreator(this,JsonToStringStyler.INSTANCE)
32+
returnnewToStringCreator(this,JsonToStringStyler.getInstance())
3333
.append("startTime",startTime)
3434
.append("endTime",endTime)
3535
.append("executionTime",executionTime)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp