Skip to content

Commit 40f6c13

Browse files
PhilippSalvisbergPhilippSalvisberg
committed
simplify return result as early as possible
1 parent 165e602 commit 40f6c13

1 file changed

Lines changed: 15 additions & 28 deletions

File tree

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

Lines changed: 15 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,7 @@ public int normalizedUtPlsqlVersionNumber() {
9090
final String minor = m.group();
9191
m.find();
9292
final String bugfix = m.group();
93-
final int versionNumber = Integer.valueOf(major) * 1000000 + Integer.valueOf(minor) * 1000
94-
+ Integer.valueOf(bugfix);
95-
return versionNumber;
93+
return Integer.valueOf(major) * 1000000 + Integer.valueOf(minor) * 1000 + Integer.valueOf(bugfix);
9694
}
9795

9896
/**
@@ -111,8 +109,7 @@ public String getUtPlsqlVersion() {
111109
public String doInCallableStatement(final CallableStatement cs) throws SQLException {
112110
cs.registerOutParameter(1, Types.VARCHAR);
113111
cs.execute();
114-
final String version = cs.getString(1);
115-
return version;
112+
return cs.getString(1);
116113
}
117114
});
118115
} catch (DataAccessException e) {
@@ -232,7 +229,7 @@ public boolean containsUtplsqlTest(final String owner, final String objectName,
232229
sb.append(" ? := l_return;\n");
233230
sb.append("END;");
234231
final String sql = sb.toString();
235-
final Boolean ret = jdbcTemplate.execute(sql, new CallableStatementCallback<Boolean>() {
232+
return jdbcTemplate.execute(sql, new CallableStatementCallback<Boolean>() {
236233
@Override
237234
public Boolean doInCallableStatement(final CallableStatement cs) throws SQLException {
238235
cs.setString(1, owner);
@@ -244,7 +241,6 @@ public Boolean doInCallableStatement(final CallableStatement cs) throws SQLExcep
244241
return Boolean.valueOf(Objects.equal(ret, "1"));
245242
}
246243
});
247-
return ret;
248244
} else if (normalizedUtPlsqlVersionNumber() >= FIRST_VERSION_WITH_ANNOTATION_API) {
249245
// using API available since 3.1.3, can handle nulls in objectName and subobjectName
250246
StringBuilder sb = new StringBuilder();
@@ -306,7 +302,7 @@ public boolean containsUtplsqlTest(final String owner) {
306302
sb.append(" ? := l_return;\n");
307303
sb.append("END;");
308304
final String sql = sb.toString();
309-
final Boolean ret = jdbcTemplate.execute(sql, new CallableStatementCallback<Boolean>() {
305+
return jdbcTemplate.execute(sql, new CallableStatementCallback<Boolean>() {
310306
@Override
311307
public Boolean doInCallableStatement(final CallableStatement cs)
312308
throws SQLException {
@@ -317,7 +313,6 @@ public Boolean doInCallableStatement(final CallableStatement cs)
317313
return Boolean.valueOf(Objects.equal(ret, "1"));
318314
}
319315
});
320-
return ret;
321316
} else {
322317
return containsUtplsqlTest(owner, null, null);
323318
}
@@ -335,7 +330,7 @@ public boolean containsUtplsqlTest(final String owner, final String objectName)
335330
sb.append(" ? := l_return;\n");
336331
sb.append("END;");
337332
final String sql = sb.toString();
338-
final Boolean ret = jdbcTemplate.execute(sql, new CallableStatementCallback<Boolean>() {
333+
return jdbcTemplate.execute(sql, new CallableStatementCallback<Boolean>() {
339334
@Override
340335
public Boolean doInCallableStatement(final CallableStatement cs)
341336
throws SQLException {
@@ -347,7 +342,6 @@ public Boolean doInCallableStatement(final CallableStatement cs)
347342
return Boolean.valueOf(Objects.equal(ret, "1"));
348343
}
349344
});
350-
return ret;
351345
} else {
352346
return containsUtplsqlTest(owner, objectName, null);
353347
}
@@ -388,8 +382,7 @@ public List<Annotation> annotations(final String owner, final String objectName)
388382
final String sql = sb.toString();
389383
final BeanPropertyRowMapper<Annotation> rowMapper = new BeanPropertyRowMapper<>(Annotation.class);
390384
final Object[] binds = new Object[] {owner, objectName};
391-
final List<Annotation> result = jdbcTemplate.query(sql, rowMapper, binds);
392-
return result;
385+
return jdbcTemplate.query(sql, rowMapper, binds);
393386
}
394387

395388
/**
@@ -415,8 +408,7 @@ public List<String> units(final String objectType, final String objectName) {
415408
sb.append(" ORDER BY min(subprogram_id)");
416409
final String sql = sb.toString();
417410
final Object[] binds = new Object[] {objectType, objectName};
418-
final List<String> result = jdbcTemplate.queryForList(sql, String.class, binds);
419-
return result;
411+
return jdbcTemplate.queryForList(sql, String.class, binds);
420412
} else {
421413
return CollectionLiterals.newArrayList(objectName);
422414
}
@@ -495,8 +487,7 @@ public List<Node> testables(final String objectType) {
495487
final String sql = sb.toString();
496488
final Object[] binds = new Object[] {objectType};
497489
BeanPropertyRowMapper<Node> rowMapper = new BeanPropertyRowMapper<>(Node.class);
498-
final List<Node> nodes = jdbcTemplate.query(sql, rowMapper, binds);
499-
return nodes;
490+
return jdbcTemplate.query(sql, rowMapper, binds);
500491
}
501492

502493
/**
@@ -818,8 +809,7 @@ public List<Node> runnables() {
818809
}
819810
BeanPropertyRowMapper<Node> rowMapper = new BeanPropertyRowMapper<>(Node.class);
820811
final String sql = sb.toString();
821-
final List<Node> nodes = jdbcTemplate.query(sql, rowMapper);
822-
return nodes;
812+
return jdbcTemplate.query(sql, rowMapper);
823813
}
824814

825815
/**
@@ -931,17 +921,17 @@ public String htmlCodeCoverage(final List<String> pathList, final List<String> s
931921
sb.append(" a_paths => ut_varchar2_list(\n");
932922
sb.append(StringTools.getCSV(pathList, 16));
933923
sb.append(" ),\n");
934-
if (schemaList.size() > 0) {
924+
if (!schemaList.isEmpty()) {
935925
sb.append(" a_coverage_schemes => ut_varchar2_list(\n");
936926
sb.append(StringTools.getCSV(schemaList, 16));
937927
sb.append(" ),\n");
938928
}
939-
if (includeObjectList.size() > 0) {
929+
if (!includeObjectList.isEmpty()) {
940930
sb.append(" a_include_objects => ut_varchar2_list(\n");
941931
sb.append(StringTools.getCSV(includeObjectList, 16));
942932
sb.append(" ),\n");
943933
}
944-
if (excludeObjectList.size() > 0) {
934+
if (!excludeObjectList.isEmpty()) {
945935
sb.append(" a_exclude_objects => ut_varchar2_list(\n");
946936
sb.append(StringTools.getCSV(excludeObjectList, 16));
947937
sb.append(" ),\n");
@@ -999,8 +989,7 @@ public List<String> includes(final String owner, final String name) {
999989
sb.append(" AND referenced_type IN ('PACKAGE', 'TYPE', 'PROCEDURE', 'FUNCTION', 'TRIGGER')");
1000990
final String sql = sb.toString();
1001991
final Object[] binds = new Object[] {owner, name};
1002-
final List<String> deps = jdbcTemplate.queryForList(sql, String.class, binds);
1003-
return deps;
992+
return jdbcTemplate.queryForList(sql, String.class, binds);
1004993
}
1005994

1006995
/**
@@ -1034,7 +1023,7 @@ public String getSource(final String owner, final String objectType, final Strin
10341023
sb.append(" );\n");
10351024
sb.append("END;");
10361025
final String sql = sb.toString();
1037-
final String ret = jdbcTemplate.execute(sql, new CallableStatementCallback<String>() {
1026+
return jdbcTemplate.execute(sql, new CallableStatementCallback<String>() {
10381027
@Override
10391028
public String doInCallableStatement(final CallableStatement cs) throws SQLException {
10401029
cs.registerOutParameter(1, Types.CLOB);
@@ -1045,7 +1034,6 @@ public String doInCallableStatement(final CallableStatement cs) throws SQLExcept
10451034
return cs.getString(1);
10461035
}
10471036
});
1048-
return ret;
10491037
}
10501038

10511039
/**
@@ -1074,7 +1062,6 @@ public String getObjectType(final String owner, final String objectName) {
10741062
sb.append(" WHERE rownum = 1");
10751063
final String sql = sb.toString();
10761064
final Object[] binds = new Object[] {owner, objectName};
1077-
final String objectType = jdbcTemplate.queryForObject(sql, binds, String.class);
1078-
return objectType;
1065+
return jdbcTemplate.queryForObject(sql, binds, String.class);
10791066
}
10801067
}

0 commit comments

Comments
 (0)