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

Commit8dfb38f

Browse files
Merge pull request#122 from utPLSQL/feature/refactoring
Feature/refactoring
2 parents5b262a4 +7ae1cb3 commit8dfb38f

File tree

33 files changed

+183
-208
lines changed

33 files changed

+183
-208
lines changed

‎sqldev/src/main/java/org/utplsql/sqldev/coverage/CodeCoverageReporter.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ private void populateCoverageAssets() {
152152
Pathf =Paths.get(assetDir.toString() +File.separator +entry.getName().substring(ASSETS_PATH.length()));
153153
copyStreamToFile(jar.getInputStream(entry),f);
154154
}
155+
jar.close();
155156
}else {
156157
// class loaded from file system (IDE or during test/build)
157158
ResourcePatternResolverresolver =newPathMatchingResourcePatternResolver();

‎sqldev/src/main/java/org/utplsql/sqldev/dal/RealtimeReporterDao.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252

5353
importoracle.jdbc.OracleTypes;
5454

55-
@SuppressWarnings("StringBufferReplaceableByString")
5655
publicclassRealtimeReporterDao {
5756
privatestaticfinalLoggerlogger =Logger.getLogger(RealtimeReporterDao.class.getName());
5857
privatestaticfinalintFIRST_VERSION_WITH_REALTIME_REPORTER =3001004;
@@ -246,7 +245,6 @@ private RealtimeReporterEvent convert(final String itemType, final String text)
246245
}
247246
}
248247

249-
@SuppressWarnings("DuplicatedCode")
250248
privateRealtimeReporterEventconvertToPreRunEvent(finalDocumentdoc) {
251249
finalPreRunEventevent =newPreRunEvent();
252250
finalNodetotalNumberOfTestsNode =xmlTools.getNode(doc,"/event/totalNumberOfTests");
@@ -327,7 +325,6 @@ private RealtimeReporterEvent convertToPostTestEvent(final Document doc) {
327325
returnevent;
328326
}
329327

330-
@SuppressWarnings("DuplicatedCode")
331328
privatevoidpopulate(finalSuitesuite,finalNodenode) {
332329
if (nodeinstanceofElement) {
333330
suite.setId(xmlTools.getAttributeValue(node,"id"));

‎sqldev/src/main/java/org/utplsql/sqldev/dal/RealtimeReporterEventConsumer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@
1818
importorg.utplsql.sqldev.model.runner.RealtimeReporterEvent;
1919

2020
publicinterfaceRealtimeReporterEventConsumer {
21-
publicabstractvoidprocess(finalRealtimeReporterEventevent);
21+
voidprocess(finalRealtimeReporterEventevent);
2222
}

‎sqldev/src/main/java/org/utplsql/sqldev/dal/UtplsqlDao.java

Lines changed: 64 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@
1616
packageorg.utplsql.sqldev.dal;
1717

1818
importjava.net.URL;
19-
importjava.sql.CallableStatement;
2019
importjava.sql.Connection;
21-
importjava.sql.SQLException;
2220
importjava.sql.Types;
23-
importjava.util.Arrays;
21+
importjava.util.Collections;
2422
importjava.util.List;
2523
importjava.util.regex.Matcher;
2624
importjava.util.regex.Pattern;
@@ -38,13 +36,12 @@
3836

3937
publicclassUtplsqlDao {
4038
publicstaticfinalStringUTPLSQL_PACKAGE_NAME ="UT";
41-
publicstaticfinalintNOT_INSTALLED =0;
4239
publicstaticfinalintFIRST_VERSION_WITH_INTERNAL_ANNOTATION_API =3000004;
4340
publicstaticfinalintFIRST_VERSION_WITH_ANNOTATION_API =3001003;
4441
publicstaticfinalintFIRST_VERSION_WITHOUT_INTERNAL_API =3001008;
4542
publicstaticfinalintFIRST_VERSION_WITH_HAS_SUITES_API =3001008;
4643
publicstaticfinalintFETCH_ROWS =100;
47-
privateJdbcTemplatejdbcTemplate;
44+
privatefinalJdbcTemplatejdbcTemplate;
4845
// cache fields
4946
privateBooleancachedDbaViewAccessible;
5047
privateStringcachedUtplsqlSchema;
@@ -90,7 +87,7 @@ public int normalizedUtPlsqlVersionNumber() {
9087
finalStringminor =m.group();
9188
m.find();
9289
finalStringbugfix =m.group();
93-
returnInteger.valueOf(major) *1000000 +Integer.valueOf(minor) *1000 +Integer.valueOf(bugfix);
90+
returnInteger.parseInt(major) *1000000 +Integer.parseInt(minor) *1000 +Integer.parseInt(bugfix);
9491
}
9592

9693
/**
@@ -104,13 +101,10 @@ public String getUtPlsqlVersion() {
104101
sb.append("END;");
105102
finalStringsql =sb.toString();
106103
try {
107-
cachedUtPlsqlVersion =jdbcTemplate.execute(sql,newCallableStatementCallback<String>() {
108-
@Override
109-
publicStringdoInCallableStatement(finalCallableStatementcs)throwsSQLException {
110-
cs.registerOutParameter(1,Types.VARCHAR);
111-
cs.execute();
112-
returncs.getString(1);
113-
}
104+
cachedUtPlsqlVersion =jdbcTemplate.execute(sql, (CallableStatementCallback<String>)cs -> {
105+
cs.registerOutParameter(1,Types.VARCHAR);
106+
cs.execute();
107+
returncs.getString(1);
114108
});
115109
}catch (DataAccessExceptione) {
116110
// ignore error
@@ -141,7 +135,7 @@ public boolean isDbaViewAccessible() {
141135
cachedDbaViewAccessible =false;
142136
}
143137
}
144-
returncachedDbaViewAccessible.booleanValue();
138+
returncachedDbaViewAccessible;
145139
}
146140

147141
publicStringgetDbaView(StringviewName) {
@@ -178,8 +172,7 @@ public String getUtplsqlSchema() {
178172
sb.append("'");
179173
finalStringsql =sb.toString();
180174
try {
181-
finalStringschema =jdbcTemplate.queryForObject(sql,String.class);
182-
cachedUtplsqlSchema =schema;
175+
cachedUtplsqlSchema =jdbcTemplate.queryForObject(sql,String.class);
183176
}catch (EmptyResultDataAccessExceptione) {
184177
cachedUtplsqlSchema =null;
185178
}
@@ -229,18 +222,16 @@ public boolean containsUtplsqlTest(final String owner, final String objectName,
229222
sb.append(" ? := l_return;\n");
230223
sb.append("END;");
231224
finalStringsql =sb.toString();
232-
returnjdbcTemplate.execute(sql,newCallableStatementCallback<Boolean>() {
233-
@Override
234-
publicBooleandoInCallableStatement(finalCallableStatementcs)throwsSQLException {
235-
cs.setString(1,owner);
236-
cs.setString(2,objectName);
237-
cs.setString(3,subobjectName);
238-
cs.registerOutParameter(4,Types.VARCHAR);
239-
cs.execute();
240-
finalStringret =cs.getString(4);
241-
return"1".equals(ret);
242-
}
225+
finalBooleanret =jdbcTemplate.execute(sql, (CallableStatementCallback<Boolean>)cs -> {
226+
cs.setString(1,owner);
227+
cs.setString(2,objectName);
228+
cs.setString(3,subobjectName);
229+
cs.registerOutParameter(4,Types.VARCHAR);
230+
cs.execute();
231+
finalStringret1 =cs.getString(4);
232+
return"1".equals(ret1);
243233
});
234+
returnret !=null &&ret;
244235
}elseif (normalizedUtPlsqlVersionNumber() >=FIRST_VERSION_WITH_ANNOTATION_API) {
245236
// using API available since 3.1.3, can handle nulls in objectName and subobjectName
246237
StringBuildersb =newStringBuilder();
@@ -251,7 +242,7 @@ public Boolean doInCallableStatement(final CallableStatement cs) throws SQLExcep
251242
finalStringsql =sb.toString();
252243
finalObject[]binds =newObject[] {owner,objectName,subobjectName,subobjectName};
253244
finalIntegerfound =jdbcTemplate.queryForObject(sql,Integer.class,binds);
254-
returnfound >0;
245+
returnfound!=null &&found>0;
255246
}else {
256247
// using internal API (deprecated, not accessible in latest version)
257248
StringBuildersb =newStringBuilder();
@@ -282,7 +273,7 @@ public Boolean doInCallableStatement(final CallableStatement cs) throws SQLExcep
282273
finalStringsql =sb.toString();
283274
finalObject[]binds =newObject[] {subobjectName,subobjectName,owner,objectName,objectName};
284275
finalIntegerfound =jdbcTemplate.queryForObject(sql,Integer.class,binds);
285-
returnfound >0;
276+
returnfound!=null &&found>0;
286277
}
287278
}catch (EmptyResultDataAccessExceptione) {
288279
returnfalse;
@@ -302,17 +293,14 @@ public boolean containsUtplsqlTest(final String owner) {
302293
sb.append(" ? := l_return;\n");
303294
sb.append("END;");
304295
finalStringsql =sb.toString();
305-
returnjdbcTemplate.execute(sql,newCallableStatementCallback<Boolean>() {
306-
@Override
307-
publicBooleandoInCallableStatement(finalCallableStatementcs)
308-
throwsSQLException {
309-
cs.setString(1,owner);
310-
cs.registerOutParameter(2,Types.VARCHAR);
311-
cs.execute();
312-
finalStringret =cs.getString(2);
313-
return"1".equals(ret);
314-
}
296+
finalBooleanret =jdbcTemplate.execute(sql, (CallableStatementCallback<Boolean>)cs -> {
297+
cs.setString(1,owner);
298+
cs.registerOutParameter(2,Types.VARCHAR);
299+
cs.execute();
300+
finalStringret1 =cs.getString(2);
301+
return"1".equals(ret1);
315302
});
303+
returnret !=null &&ret;
316304
}else {
317305
returncontainsUtplsqlTest(owner,null,null);
318306
}
@@ -330,18 +318,15 @@ public boolean containsUtplsqlTest(final String owner, final String objectName)
330318
sb.append(" ? := l_return;\n");
331319
sb.append("END;");
332320
finalStringsql =sb.toString();
333-
returnjdbcTemplate.execute(sql,newCallableStatementCallback<Boolean>() {
334-
@Override
335-
publicBooleandoInCallableStatement(finalCallableStatementcs)
336-
throwsSQLException {
337-
cs.setString(1,owner);
338-
cs.setString(2,objectName);
339-
cs.registerOutParameter(3,Types.VARCHAR);
340-
cs.execute();
341-
finalStringret =cs.getString(3);
342-
return"1".equals(ret);
343-
}
321+
Booleanret =jdbcTemplate.execute(sql, (CallableStatementCallback<Boolean>)cs -> {
322+
cs.setString(1,owner);
323+
cs.setString(2,objectName);
324+
cs.registerOutParameter(3,Types.VARCHAR);
325+
cs.execute();
326+
finalStringret1 =cs.getString(3);
327+
return"1".equals(ret1);
344328
});
329+
returnret !=null &&ret;
345330
}else {
346331
returncontainsUtplsqlTest(owner,objectName,null);
347332
}
@@ -410,7 +395,7 @@ public List<String> units(final String objectType, final String objectName) {
410395
finalObject[]binds =newObject[] {objectType,objectName};
411396
returnjdbcTemplate.queryForList(sql,String.class,binds);
412397
}else {
413-
returnArrays.asList(objectName);
398+
returnCollections.singletonList(objectName);
414399
}
415400
}
416401

@@ -868,30 +853,34 @@ public String getDbmsOutput(final int bufferSize) {
868853
sb.append(" sys.dbms_output.get_lines(?, ?);\n");
869854
sb.append("END;");
870855
finalStringsql =sb.toString();
871-
OutputLinesret =null;
856+
OutputLinesret;
872857
do {
873-
ret =jdbcTemplate.execute(sql,newCallableStatementCallback<OutputLines>() {
874-
@Override
875-
publicOutputLinesdoInCallableStatement(finalCallableStatementcs)throwsSQLException {
876-
cs.registerOutParameter(1,Types.ARRAY,"DBMSOUTPUT_LINESARRAY");
877-
cs.registerOutParameter(2,Types.INTEGER);
878-
cs.setInt(2,bufferSize);
879-
cs.execute();
880-
finalOutputLinesout =newOutputLines();
858+
ret =jdbcTemplate.execute(sql, (CallableStatementCallback<OutputLines>)cs -> {
859+
cs.registerOutParameter(1,Types.ARRAY,"DBMSOUTPUT_LINESARRAY");
860+
cs.registerOutParameter(2,Types.INTEGER);
861+
cs.setInt(2,bufferSize);
862+
cs.execute();
863+
finalOutputLinesout =newOutputLines();
864+
try {
881865
Objectarray =cs.getArray(1).getArray();
882866
out.setLines((String[])array);
883867
out.setNumlines(cs.getInt(2));
884-
returnout;
868+
}catch (NullPointerExceptione) {
869+
out.setLines(null);
870+
out.setNumlines(0);
885871
}
872+
returnout;
886873
});
887-
for (inti =0;i <ret.getNumlines();i++) {
888-
finalStringline =ret.getLines()[i];
889-
if (line !=null) {
890-
resultSb.append(ret.getLines()[i]);
874+
if (ret !=null &&ret.getNumlines() !=null) {
875+
for (inti =0;i <ret.getNumlines();i++) {
876+
finalStringline =ret.getLines()[i];
877+
if (line !=null) {
878+
resultSb.append(ret.getLines()[i]);
879+
}
880+
resultSb.append(System.lineSeparator());
891881
}
892-
resultSb.append(System.lineSeparator());
893882
}
894-
}while (ret.getNumlines() >0);
883+
}while (ret !=null &&ret.getNumlines() !=null &&ret.getNumlines() >0);
895884
returnresultSb.toString();
896885
}
897886

@@ -1032,16 +1021,13 @@ public String getSource(final String owner, final String objectType, final Strin
10321021
sb.append(" );\n");
10331022
sb.append("END;");
10341023
finalStringsql =sb.toString();
1035-
returnjdbcTemplate.execute(sql,newCallableStatementCallback<String>() {
1036-
@Override
1037-
publicStringdoInCallableStatement(finalCallableStatementcs)throwsSQLException {
1038-
cs.registerOutParameter(1,Types.CLOB);
1039-
cs.setString(2,owner);
1040-
cs.setString(3,fixedObjectType);
1041-
cs.setString(4,objectName);
1042-
cs.execute();
1043-
returncs.getString(1);
1044-
}
1024+
returnjdbcTemplate.execute(sql, (CallableStatementCallback<String>)cs -> {
1025+
cs.registerOutParameter(1,Types.CLOB);
1026+
cs.setString(2,owner);
1027+
cs.setString(3,fixedObjectType);
1028+
cs.setString(4,objectName);
1029+
cs.execute();
1030+
returncs.getString(1);
10451031
});
10461032
}
10471033

@@ -1071,6 +1057,6 @@ public String getObjectType(final String owner, final String objectName) {
10711057
sb.append(" WHERE rownum = 1");
10721058
finalStringsql =sb.toString();
10731059
finalObject[]binds =newObject[] {owner,objectName};
1074-
returnjdbcTemplate.queryForObject(sql,binds,String.class);
1060+
returnjdbcTemplate.queryForObject(sql,String.class,binds);
10751061
}
10761062
}

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,15 @@
2121

2222
importjavax.annotation.Nullable;
2323

24+
importorg.jetbrains.annotations.NotNull;
2425
importorg.springframework.core.style.ToStringStyler;
2526
importorg.springframework.core.style.ValueStyler;
2627

2728
publicclassJsonToStringStylerimplementsToStringStyler,ValueStyler{
2829
publicstaticfinalStringINDENT_SPACES =" ";
2930
privateintindent =0;
3031

31-
privatestaticThreadLocal<JsonToStringStyler>threadLocal =ThreadLocal.withInitial(JsonToStringStyler::new);
32+
privatestaticfinalThreadLocal<JsonToStringStyler>threadLocal =ThreadLocal.withInitial(JsonToStringStyler::new);
3233

3334
privatevoidnewLine(StringBuilderbuffer) {
3435
buffer.append('\n');
@@ -102,7 +103,7 @@ public static ToStringStyler getInstance() {
102103
}
103104

104105
@Override
105-
publicvoidstyleStart(StringBuilderbuffer,Objectobj) {
106+
publicvoidstyleStart(@NotNullStringBuilderbuffer,Objectobj) {
106107
indent++;
107108
if (!obj.getClass().isArray()) {
108109
buffer.append("{");
@@ -119,7 +120,7 @@ public void styleStart(StringBuilder buffer, Object obj) {
119120
}
120121

121122
@Override
122-
publicvoidstyleEnd(StringBuilderbuffer,Objectobj) {
123+
publicvoidstyleEnd(@NotNullStringBuilderbuffer,Objectobj) {
123124
indent--;
124125
newLine(buffer);
125126
if (!obj.getClass().isArray()) {
@@ -130,7 +131,7 @@ public void styleEnd(StringBuilder buffer, Object obj) {
130131
}
131132

132133
@Override
133-
publicvoidstyleField(StringBuilderbuffer,StringfieldName,@NullableObjectvalue) {
134+
publicvoidstyleField(@NotNullStringBuilderbuffer,@NotNullStringfieldName,@NullableObjectvalue) {
134135
newLine(buffer);
135136
buffer.append('"');
136137
buffer.append(fieldName);
@@ -140,7 +141,7 @@ public void styleField(StringBuilder buffer, String fieldName, @Nullable Object
140141
}
141142

142143
@Override
143-
publicvoidstyleValue(StringBuilderbuffer,Objectvalue) {
144+
publicvoidstyleValue(StringBuilderbuffer,@NullableObjectvalue) {
144145
buffer.append(style(value));
145146
}
146147

@@ -149,6 +150,7 @@ public void styleFieldSeparator(StringBuilder buffer) {
149150
buffer.append(",");
150151
}
151152

153+
@NotNull
152154
@Override
153155
publicStringstyle(Objectvalue) {
154156
if (value ==null) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
importjava.util.LinkedHashMap;
1919
importjava.util.Map;
2020

21-
publicclassLimitedLinkedHashMap<KextendsObject,VextendsObject>extendsLinkedHashMap<K,V> {
21+
publicclassLimitedLinkedHashMap<K,V>extendsLinkedHashMap<K,V> {
2222
privatestaticfinallongserialVersionUID = -4184317926729190411L;
2323
privatefinalintmaxEntries;
2424

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public String nodeToString(final Node node, final String cdataSectionElements) {
106106
publicStringgetAttributeValue(finalNodenode,finalStringnamedItem) {
107107
Stringvalue =null;
108108
if (nodeinstanceofElement) {
109-
finalNamedNodeMapattributes =((Element)node).getAttributes();
109+
finalNamedNodeMapattributes =node.getAttributes();
110110
if (attributes !=null) {
111111
finalNodeitem =attributes.getNamedItem(namedItem);
112112
if (item !=null) {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
importorg.utplsql.sqldev.model.JsonToStringStyler;
2424
importorg.utplsql.sqldev.model.URLTools;
2525

26-
@SuppressWarnings("unused")
2726
publicclassRun {
2827
privateStringreporterId;
2928
privateStringconnectionName;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
importorg.utplsql.sqldev.model.JsonToStringStyler;
2424
importorg.utplsql.sqldev.resources.UtplsqlResources;
2525

26-
@SuppressWarnings("unused")
2726
publicclassTestextendsItem {
2827
privateStringexecutableType;
2928
privateStringownerName;

0 commit comments

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