diff --git a/sqldev/src/main/java/org/utplsql/sqldev/coverage/CodeCoverageReporter.java b/sqldev/src/main/java/org/utplsql/sqldev/coverage/CodeCoverageReporter.java index f71a7c1c..8935af08 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/coverage/CodeCoverageReporter.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/coverage/CodeCoverageReporter.java @@ -152,6 +152,7 @@ private void populateCoverageAssets() { Path f = Paths.get(assetDir.toString() + File.separator + entry.getName().substring(ASSETS_PATH.length())); copyStreamToFile(jar.getInputStream(entry), f); } + jar.close(); } else { // class loaded from file system (IDE or during test/build) ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(); diff --git a/sqldev/src/main/java/org/utplsql/sqldev/dal/RealtimeReporterDao.java b/sqldev/src/main/java/org/utplsql/sqldev/dal/RealtimeReporterDao.java index bd269307..1fea9bcb 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/dal/RealtimeReporterDao.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/dal/RealtimeReporterDao.java @@ -52,7 +52,6 @@ import oracle.jdbc.OracleTypes; -@SuppressWarnings("StringBufferReplaceableByString") public class RealtimeReporterDao { private static final Logger logger = Logger.getLogger(RealtimeReporterDao.class.getName()); private static final int FIRST_VERSION_WITH_REALTIME_REPORTER = 3001004; @@ -246,7 +245,6 @@ private RealtimeReporterEvent convert(final String itemType, final String text) } } - @SuppressWarnings("DuplicatedCode") private RealtimeReporterEvent convertToPreRunEvent(final Document doc) { final PreRunEvent event = new PreRunEvent(); final Node totalNumberOfTestsNode = xmlTools.getNode(doc, "/event/totalNumberOfTests"); @@ -327,7 +325,6 @@ private RealtimeReporterEvent convertToPostTestEvent(final Document doc) { return event; } - @SuppressWarnings("DuplicatedCode") private void populate(final Suite suite, final Node node) { if (node instanceof Element) { suite.setId(xmlTools.getAttributeValue(node, "id")); diff --git a/sqldev/src/main/java/org/utplsql/sqldev/dal/RealtimeReporterEventConsumer.java b/sqldev/src/main/java/org/utplsql/sqldev/dal/RealtimeReporterEventConsumer.java index 65427f35..cede3ca7 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/dal/RealtimeReporterEventConsumer.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/dal/RealtimeReporterEventConsumer.java @@ -18,5 +18,5 @@ import org.utplsql.sqldev.model.runner.RealtimeReporterEvent; public interface RealtimeReporterEventConsumer { - public abstract void process(final RealtimeReporterEvent event); + void process(final RealtimeReporterEvent event); } diff --git a/sqldev/src/main/java/org/utplsql/sqldev/dal/UtplsqlDao.java b/sqldev/src/main/java/org/utplsql/sqldev/dal/UtplsqlDao.java index baab0c4d..5282b469 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/dal/UtplsqlDao.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/dal/UtplsqlDao.java @@ -16,11 +16,9 @@ package org.utplsql.sqldev.dal; import java.net.URL; -import java.sql.CallableStatement; import java.sql.Connection; -import java.sql.SQLException; import java.sql.Types; -import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -38,13 +36,12 @@ public class UtplsqlDao { public static final String UTPLSQL_PACKAGE_NAME = "UT"; - public static final int NOT_INSTALLED = 0; public static final int FIRST_VERSION_WITH_INTERNAL_ANNOTATION_API = 3000004; public static final int FIRST_VERSION_WITH_ANNOTATION_API = 3001003; public static final int FIRST_VERSION_WITHOUT_INTERNAL_API = 3001008; public static final int FIRST_VERSION_WITH_HAS_SUITES_API = 3001008; public static final int FETCH_ROWS = 100; - private JdbcTemplate jdbcTemplate; + private final JdbcTemplate jdbcTemplate; // cache fields private Boolean cachedDbaViewAccessible; private String cachedUtplsqlSchema; @@ -90,7 +87,7 @@ public int normalizedUtPlsqlVersionNumber() { final String minor = m.group(); m.find(); final String bugfix = m.group(); - return Integer.valueOf(major) * 1000000 + Integer.valueOf(minor) * 1000 + Integer.valueOf(bugfix); + return Integer.parseInt(major) * 1000000 + Integer.parseInt(minor) * 1000 + Integer.parseInt(bugfix); } /** @@ -104,13 +101,10 @@ public String getUtPlsqlVersion() { sb.append("END;"); final String sql = sb.toString(); try { - cachedUtPlsqlVersion = jdbcTemplate.execute(sql, new CallableStatementCallback() { - @Override - public String doInCallableStatement(final CallableStatement cs) throws SQLException { - cs.registerOutParameter(1, Types.VARCHAR); - cs.execute(); - return cs.getString(1); - } + cachedUtPlsqlVersion = jdbcTemplate.execute(sql, (CallableStatementCallback) cs -> { + cs.registerOutParameter(1, Types.VARCHAR); + cs.execute(); + return cs.getString(1); }); } catch (DataAccessException e) { // ignore error @@ -141,7 +135,7 @@ public boolean isDbaViewAccessible() { cachedDbaViewAccessible = false; } } - return cachedDbaViewAccessible.booleanValue(); + return cachedDbaViewAccessible; } public String getDbaView(String viewName) { @@ -178,8 +172,7 @@ public String getUtplsqlSchema() { sb.append("'"); final String sql = sb.toString(); try { - final String schema = jdbcTemplate.queryForObject(sql, String.class); - cachedUtplsqlSchema = schema; + cachedUtplsqlSchema = jdbcTemplate.queryForObject(sql, String.class); } catch (EmptyResultDataAccessException e) { cachedUtplsqlSchema = null; } @@ -229,18 +222,16 @@ public boolean containsUtplsqlTest(final String owner, final String objectName, sb.append(" ? := l_return;\n"); sb.append("END;"); final String sql = sb.toString(); - return jdbcTemplate.execute(sql, new CallableStatementCallback() { - @Override - public Boolean doInCallableStatement(final CallableStatement cs) throws SQLException { - cs.setString(1, owner); - cs.setString(2, objectName); - cs.setString(3, subobjectName); - cs.registerOutParameter(4, Types.VARCHAR); - cs.execute(); - final String ret = cs.getString(4); - return "1".equals(ret); - } + final Boolean ret = jdbcTemplate.execute(sql, (CallableStatementCallback) cs -> { + cs.setString(1, owner); + cs.setString(2, objectName); + cs.setString(3, subobjectName); + cs.registerOutParameter(4, Types.VARCHAR); + cs.execute(); + final String ret1 = cs.getString(4); + return "1".equals(ret1); }); + return ret != null && ret; } else if (normalizedUtPlsqlVersionNumber() >= FIRST_VERSION_WITH_ANNOTATION_API) { // using API available since 3.1.3, can handle nulls in objectName and subobjectName StringBuilder sb = new StringBuilder(); @@ -251,7 +242,7 @@ public Boolean doInCallableStatement(final CallableStatement cs) throws SQLExcep final String sql = sb.toString(); final Object[] binds = new Object[] {owner, objectName, subobjectName, subobjectName}; final Integer found = jdbcTemplate.queryForObject(sql, Integer.class, binds); - return found > 0; + return found != null && found > 0; } else { // using internal API (deprecated, not accessible in latest version) StringBuilder sb = new StringBuilder(); @@ -282,7 +273,7 @@ public Boolean doInCallableStatement(final CallableStatement cs) throws SQLExcep final String sql = sb.toString(); final Object[] binds = new Object[] {subobjectName, subobjectName, owner, objectName, objectName}; final Integer found = jdbcTemplate.queryForObject(sql, Integer.class, binds); - return found > 0; + return found != null && found > 0; } } catch (EmptyResultDataAccessException e) { return false; @@ -302,17 +293,14 @@ public boolean containsUtplsqlTest(final String owner) { sb.append(" ? := l_return;\n"); sb.append("END;"); final String sql = sb.toString(); - return jdbcTemplate.execute(sql, new CallableStatementCallback() { - @Override - public Boolean doInCallableStatement(final CallableStatement cs) - throws SQLException { - cs.setString(1, owner); - cs.registerOutParameter(2, Types.VARCHAR); - cs.execute(); - final String ret = cs.getString(2); - return "1".equals(ret); - } + final Boolean ret = jdbcTemplate.execute(sql, (CallableStatementCallback) cs -> { + cs.setString(1, owner); + cs.registerOutParameter(2, Types.VARCHAR); + cs.execute(); + final String ret1 = cs.getString(2); + return "1".equals(ret1); }); + return ret != null && ret; } else { return containsUtplsqlTest(owner, null, null); } @@ -330,18 +318,15 @@ public boolean containsUtplsqlTest(final String owner, final String objectName) sb.append(" ? := l_return;\n"); sb.append("END;"); final String sql = sb.toString(); - return jdbcTemplate.execute(sql, new CallableStatementCallback() { - @Override - public Boolean doInCallableStatement(final CallableStatement cs) - throws SQLException { - cs.setString(1, owner); - cs.setString(2, objectName); - cs.registerOutParameter(3, Types.VARCHAR); - cs.execute(); - final String ret = cs.getString(3); - return "1".equals(ret); - } + Boolean ret = jdbcTemplate.execute(sql, (CallableStatementCallback) cs -> { + cs.setString(1, owner); + cs.setString(2, objectName); + cs.registerOutParameter(3, Types.VARCHAR); + cs.execute(); + final String ret1 = cs.getString(3); + return "1".equals(ret1); }); + return ret != null && ret; } else { return containsUtplsqlTest(owner, objectName, null); } @@ -410,7 +395,7 @@ public List units(final String objectType, final String objectName) { final Object[] binds = new Object[] {objectType, objectName}; return jdbcTemplate.queryForList(sql, String.class, binds); } else { - return Arrays.asList(objectName); + return Collections.singletonList(objectName); } } @@ -868,30 +853,34 @@ public String getDbmsOutput(final int bufferSize) { sb.append(" sys.dbms_output.get_lines(?, ?);\n"); sb.append("END;"); final String sql = sb.toString(); - OutputLines ret = null; + OutputLines ret; do { - ret = jdbcTemplate.execute(sql, new CallableStatementCallback() { - @Override - public OutputLines doInCallableStatement(final CallableStatement cs) throws SQLException { - cs.registerOutParameter(1, Types.ARRAY, "DBMSOUTPUT_LINESARRAY"); - cs.registerOutParameter(2, Types.INTEGER); - cs.setInt(2, bufferSize); - cs.execute(); - final OutputLines out = new OutputLines(); + ret = jdbcTemplate.execute(sql, (CallableStatementCallback) cs -> { + cs.registerOutParameter(1, Types.ARRAY, "DBMSOUTPUT_LINESARRAY"); + cs.registerOutParameter(2, Types.INTEGER); + cs.setInt(2, bufferSize); + cs.execute(); + final OutputLines out = new OutputLines(); + try { Object array = cs.getArray(1).getArray(); out.setLines((String[]) array); out.setNumlines(cs.getInt(2)); - return out; + } catch (NullPointerException e) { + out.setLines(null); + out.setNumlines(0); } + return out; }); - for (int i = 0; i < ret.getNumlines(); i++) { - final String line = ret.getLines()[i]; - if (line != null) { - resultSb.append(ret.getLines()[i]); + if (ret != null && ret.getNumlines() != null) { + for (int i = 0; i < ret.getNumlines(); i++) { + final String line = ret.getLines()[i]; + if (line != null) { + resultSb.append(ret.getLines()[i]); + } + resultSb.append(System.lineSeparator()); } - resultSb.append(System.lineSeparator()); } - } while (ret.getNumlines() > 0); + } while (ret != null && ret.getNumlines() != null && ret.getNumlines() > 0); return resultSb.toString(); } @@ -1032,16 +1021,13 @@ public String getSource(final String owner, final String objectType, final Strin sb.append(" );\n"); sb.append("END;"); final String sql = sb.toString(); - return jdbcTemplate.execute(sql, new CallableStatementCallback() { - @Override - public String doInCallableStatement(final CallableStatement cs) throws SQLException { - cs.registerOutParameter(1, Types.CLOB); - cs.setString(2, owner); - cs.setString(3, fixedObjectType); - cs.setString(4, objectName); - cs.execute(); - return cs.getString(1); - } + return jdbcTemplate.execute(sql, (CallableStatementCallback) cs -> { + cs.registerOutParameter(1, Types.CLOB); + cs.setString(2, owner); + cs.setString(3, fixedObjectType); + cs.setString(4, objectName); + cs.execute(); + return cs.getString(1); }); } @@ -1071,6 +1057,6 @@ public String getObjectType(final String owner, final String objectName) { sb.append(" WHERE rownum = 1"); final String sql = sb.toString(); final Object[] binds = new Object[] {owner, objectName}; - return jdbcTemplate.queryForObject(sql, binds, String.class); + return jdbcTemplate.queryForObject(sql, String.class, binds); } } 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 1b5a99c0..7b4d429e 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/model/JsonToStringStyler.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/model/JsonToStringStyler.java @@ -21,6 +21,7 @@ import javax.annotation.Nullable; +import org.jetbrains.annotations.NotNull; import org.springframework.core.style.ToStringStyler; import org.springframework.core.style.ValueStyler; @@ -28,7 +29,7 @@ public class JsonToStringStyler implements ToStringStyler, ValueStyler{ public static final String INDENT_SPACES = " "; private int indent = 0; - private static ThreadLocal threadLocal = ThreadLocal.withInitial(JsonToStringStyler::new); + private static final ThreadLocal threadLocal = ThreadLocal.withInitial(JsonToStringStyler::new); private void newLine(StringBuilder buffer) { buffer.append('\n'); @@ -102,7 +103,7 @@ public static ToStringStyler getInstance() { } @Override - public void styleStart(StringBuilder buffer, Object obj) { + public void styleStart(@NotNull StringBuilder buffer, Object obj) { indent++; if (!obj.getClass().isArray()) { buffer.append("{"); @@ -119,7 +120,7 @@ public void styleStart(StringBuilder buffer, Object obj) { } @Override - public void styleEnd(StringBuilder buffer, Object obj) { + public void styleEnd(@NotNull StringBuilder buffer, Object obj) { indent--; newLine(buffer); if (!obj.getClass().isArray()) { @@ -130,7 +131,7 @@ public void styleEnd(StringBuilder buffer, Object obj) { } @Override - public void styleField(StringBuilder buffer, String fieldName, @Nullable Object value) { + public void styleField(@NotNull StringBuilder buffer, @NotNull String fieldName, @Nullable Object value) { newLine(buffer); buffer.append('"'); buffer.append(fieldName); @@ -140,7 +141,7 @@ public void styleField(StringBuilder buffer, String fieldName, @Nullable Object } @Override - public void styleValue(StringBuilder buffer, Object value) { + public void styleValue(StringBuilder buffer, @Nullable Object value) { buffer.append(style(value)); } @@ -149,6 +150,7 @@ public void styleFieldSeparator(StringBuilder buffer) { buffer.append(","); } + @NotNull @Override public String style(Object value) { if (value == null) { diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/LimitedLinkedHashMap.java b/sqldev/src/main/java/org/utplsql/sqldev/model/LimitedLinkedHashMap.java index de702252..550e6d72 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/model/LimitedLinkedHashMap.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/model/LimitedLinkedHashMap.java @@ -18,7 +18,7 @@ import java.util.LinkedHashMap; import java.util.Map; -public class LimitedLinkedHashMap extends LinkedHashMap { +public class LimitedLinkedHashMap extends LinkedHashMap { private static final long serialVersionUID = -4184317926729190411L; private final int maxEntries; diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/XMLTools.java b/sqldev/src/main/java/org/utplsql/sqldev/model/XMLTools.java index b9f2b982..8756b9ab 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/model/XMLTools.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/model/XMLTools.java @@ -106,7 +106,7 @@ public String nodeToString(final Node node, final String cdataSectionElements) { public String getAttributeValue(final Node node, final String namedItem) { String value = null; if (node instanceof Element) { - final NamedNodeMap attributes = ((Element) node).getAttributes(); + final NamedNodeMap attributes = node.getAttributes(); if (attributes != null) { final Node item = attributes.getNamedItem(namedItem); if (item != null) { 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 eaae53b2..94d7c172 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 @@ -23,7 +23,6 @@ import org.utplsql.sqldev.model.JsonToStringStyler; import org.utplsql.sqldev.model.URLTools; -@SuppressWarnings("unused") public class Run { private String reporterId; private String connectionName; 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 d24b8203..79e8a3fe 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 @@ -23,7 +23,6 @@ import org.utplsql.sqldev.model.JsonToStringStyler; import org.utplsql.sqldev.resources.UtplsqlResources; -@SuppressWarnings("unused") public class Test extends Item { private String executableType; private String ownerName; diff --git a/sqldev/src/main/java/org/utplsql/sqldev/oddgen/RunGenerator.java b/sqldev/src/main/java/org/utplsql/sqldev/oddgen/RunGenerator.java index 215baf2f..ecc55269 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/oddgen/RunGenerator.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/oddgen/RunGenerator.java @@ -160,7 +160,7 @@ public String generateProlog(final Connection conn, final List nodes) { sb.append("/\n"); } final String ret = sb.toString(); - return StringTools.replaceTabsWithSpaces(ret, Integer.valueOf(params.get(INDENT_SPACES))); + return StringTools.replaceTabsWithSpaces(ret, Integer.parseInt(params.get(INDENT_SPACES))); } @Override diff --git a/sqldev/src/main/java/org/utplsql/sqldev/oddgen/TestGenerator.java b/sqldev/src/main/java/org/utplsql/sqldev/oddgen/TestGenerator.java index 77b2aa42..422e7e1d 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/oddgen/TestGenerator.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/oddgen/TestGenerator.java @@ -17,11 +17,7 @@ import java.io.File; import java.sql.Connection; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; +import java.util.*; import java.util.logging.Logger; import org.oddgen.sqldev.generators.OddgenGenerator2; @@ -67,11 +63,11 @@ private GenContext toContext(final Node node) { context.setTestPackageSuffix(node.getParams().get(TEST_PACKAGE_SUFFIX).toLowerCase()); context.setTestUnitPrefix(node.getParams().get(TEST_UNIT_PREFIX).toLowerCase()); context.setTestUnitSuffix(node.getParams().get(TEST_UNIT_SUFFIX).toLowerCase()); - context.setNumberOfTestsPerUnit((Integer.valueOf(node.getParams().get(NUMBER_OF_TESTS_PER_UNIT))).intValue()); + context.setNumberOfTestsPerUnit(Integer.parseInt(node.getParams().get(NUMBER_OF_TESTS_PER_UNIT))); context.setGenerateComments(YES.equals(node.getParams().get(GENERATE_COMMENTS))); context.setDisableTests(YES.equals(node.getParams().get(DISABLE_TESTS))); context.setSuitePath(node.getParams().get(SUITE_PATH).toLowerCase()); - context.setIndentSpaces((Integer.valueOf(node.getParams().get(INDENT_SPACES))).intValue()); + context.setIndentSpaces(Integer.parseInt(node.getParams().get(INDENT_SPACES))); return context; } @@ -81,9 +77,7 @@ private void resetConsoleOutput() { private void saveConsoleOutput(final String s) { if (s != null) { - for (final String line : s.split("[\\n\\r]+")) { - consoleOutput.add(line); - } + consoleOutput.addAll(Arrays.asList(s.split("[\\n\\r]+"))); } } @@ -98,7 +92,7 @@ private void logConsoleOutput() { } private String deleteFile(final File file) { - String ret = null; + String ret; if (file.delete()) { StringBuilder sb = new StringBuilder(); sb.append(file.getAbsoluteFile()); @@ -117,11 +111,15 @@ private String deleteFile(final File file) { private CharSequence deleteFiles(final String directory) { StringBuilder sb = new StringBuilder(); final File dir = new File(directory); - for (final File file : dir.listFiles()) { - if (!file.isDirectory() && (file.getName().endsWith(".pks") || file.getName().endsWith(".pkb"))) { - sb.append(deleteFile(file)); - sb.append('\n'); + try { + for (final File file : Objects.requireNonNull(dir.listFiles())) { + if (!file.isDirectory() && (file.getName().endsWith(".pks") || file.getName().endsWith(".pkb"))) { + sb.append(deleteFile(file)); + sb.append('\n'); + } } + } catch (NullPointerException e) { + // ignore } return sb; } diff --git a/sqldev/src/main/java/org/utplsql/sqldev/oddgen/TestTemplate.java b/sqldev/src/main/java/org/utplsql/sqldev/oddgen/TestTemplate.java index 036b5995..bc445465 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/oddgen/TestTemplate.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/oddgen/TestTemplate.java @@ -24,15 +24,14 @@ import org.utplsql.sqldev.model.oddgen.GenContext; public class TestTemplate { - private GenContext context; - private UtplsqlDao dao; - private List units; - private DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - private String today = dateTimeFormatter.format(LocalDateTime.now()); + private final GenContext context; + private final List units; + private final DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + private final String today = dateTimeFormatter.format(LocalDateTime.now()); public TestTemplate(final GenContext context) { this.context = context; - dao = new UtplsqlDao(context.getConn()); + UtplsqlDao dao = new UtplsqlDao(context.getConn()); units = dao.units(context.getObjectType(), context.getObjectName()); } diff --git a/sqldev/src/main/java/org/utplsql/sqldev/parser/SqlDevParser.java b/sqldev/src/main/java/org/utplsql/sqldev/parser/SqlDevParser.java index 4bda72a6..bf7962b1 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/parser/SqlDevParser.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/parser/SqlDevParser.java @@ -59,10 +59,6 @@ private int getStartLine(final String plsql, final int offset) { public int getMemberStartLine(final String plsql, final String memberName) { final Set members = this.getMembers(plsql); final Optional member = members.stream().filter(it -> it.name.equalsIgnoreCase(memberName)).findFirst(); - if (member.isPresent()) { - return this.getStartLine(plsql, member.get().codeOffset); - } else { - return 1; - } + return member.map(value -> this.getStartLine(plsql, value.codeOffset)).orElse(1); } } diff --git a/sqldev/src/main/java/org/utplsql/sqldev/runner/UtplsqlRunner.java b/sqldev/src/main/java/org/utplsql/sqldev/runner/UtplsqlRunner.java index ece63940..fbd0ab47 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/runner/UtplsqlRunner.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/runner/UtplsqlRunner.java @@ -152,7 +152,6 @@ public void dispose() { run.setConsumerConn(null); } - @SuppressWarnings("StatementWithEmptyBody") @Override public void process(final RealtimeReporterEvent event) { logger.fine(event::toString); diff --git a/sqldev/src/main/java/org/utplsql/sqldev/snippet/SnippetMerger.java b/sqldev/src/main/java/org/utplsql/sqldev/snippet/SnippetMerger.java index ce940803..1a10e5c9 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/snippet/SnippetMerger.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/snippet/SnippetMerger.java @@ -36,8 +36,8 @@ public class SnippetMerger { private final XMLTools xmlTools = new XMLTools(); - private File userSnippetsFile; - private String utplsqlSnippets; + private final File userSnippetsFile; + private final String utplsqlSnippets; public String getUtplsqlSnippetsAsString() { final InputStream stream = getClass() @@ -57,7 +57,7 @@ public SnippetMerger(final File file) { } public void merge() { - String result = null; + String result; if (userSnippetsFile.exists()) { // file exists, proper merge required final String userSnippets = new String(FileTools.readFile(Paths.get(userSnippetsFile.getAbsolutePath()))); diff --git a/sqldev/src/main/java/org/utplsql/sqldev/ui/coverage/CodeCoverageReporterDialog.java b/sqldev/src/main/java/org/utplsql/sqldev/ui/coverage/CodeCoverageReporterDialog.java index 525e5516..cfaebf81 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/ui/coverage/CodeCoverageReporterDialog.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/ui/coverage/CodeCoverageReporterDialog.java @@ -48,12 +48,11 @@ public class CodeCoverageReporterDialog extends JFrame implements ActionListener, FocusListener { private static final long serialVersionUID = 5503685225300993401L; - private CodeCoverageReporter reporter; - private JButton runButton; - private JButton cancelButton; - private JPanel paneParams; + private final CodeCoverageReporter reporter; + private final JButton runButton; + private final JButton cancelButton; + private final JPanel paneParams; private int paramPos = (-1); - private final JTextArea pathsTextArea = new JTextArea(); private final JTextField schemasTextField = new JTextField(); private final JTextArea includeObjectsTextArea = new JTextArea(); private final JTextArea excludeObjectsTextArea = new JTextArea(); @@ -83,6 +82,7 @@ public CodeCoverageReporterDialog(final CodeCoverageReporter reporter) { // parameters pane paneParams = new JPanel(new GridBagLayout()); + JTextArea pathsTextArea = new JTextArea(); pathsTextArea.setEditable(false); pathsTextArea.setEnabled(false); addParam(UtplsqlResources.getString("WINDOW_PATHS_LABEL"), StringTools.getSimpleCSV(reporter.getPathList()), pathsTextArea, 50, 2); diff --git a/sqldev/src/main/java/org/utplsql/sqldev/ui/runner/ComboBoxItem.java b/sqldev/src/main/java/org/utplsql/sqldev/ui/runner/ComboBoxItem.java index ac8f701b..77cf6644 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/ui/runner/ComboBoxItem.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/ui/runner/ComboBoxItem.java @@ -17,7 +17,7 @@ import java.util.AbstractMap; -public class ComboBoxItem extends AbstractMap.SimpleEntry { +public class ComboBoxItem extends AbstractMap.SimpleEntry { private static final long serialVersionUID = 7869442222989031548L; public ComboBoxItem(final K key, final V value) { diff --git a/sqldev/src/main/java/org/utplsql/sqldev/ui/runner/FailuresTableModel.java b/sqldev/src/main/java/org/utplsql/sqldev/ui/runner/FailuresTableModel.java index 3acf505c..67777bbf 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/ui/runner/FailuresTableModel.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/ui/runner/FailuresTableModel.java @@ -26,7 +26,7 @@ public class FailuresTableModel extends DefaultTableModel { private static final long serialVersionUID = 8119453059788497567L; private List failedExpectations; - private List columnNames = Arrays.asList("#", UtplsqlResources.getString("RUNNER_ASSERT_DESCRIPTION_COLUMN")); + private final List columnNames = Arrays.asList("#", UtplsqlResources.getString("RUNNER_ASSERT_DESCRIPTION_COLUMN")); public FailuresTableModel() { super(); @@ -81,13 +81,9 @@ public boolean isCellEditable(final int row, final int column) { @Override public Class getColumnClass(final int col) { - switch (col) { - case 0: + if (col == 0) { return Integer.class; - case 1: - return String.class; - default: - return String.class; } + return String.class; } } diff --git a/sqldev/src/main/java/org/utplsql/sqldev/ui/runner/RunnerPanel.java b/sqldev/src/main/java/org/utplsql/sqldev/ui/runner/RunnerPanel.java index 274a08db..a49e91d8 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/ui/runner/RunnerPanel.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/ui/runner/RunnerPanel.java @@ -291,7 +291,6 @@ private void applyFilter(final boolean showSuccessfulTests, final boolean showDi @SuppressWarnings("unchecked") final TableRowSorter sorter = ((TableRowSorter) testOverviewTable.getRowSorter()); final RowFilter filter = new RowFilter() { - @SuppressWarnings("RedundantIfStatement") @Override public boolean include(final RowFilter.Entry entry) { final Test test = entry.getModel().getTest((entry.getIdentifier()).intValue()); @@ -344,7 +343,6 @@ private void openSelectedFailure() { } } - @SuppressWarnings("StringBufferReplaceableByString") private String getHtml(final String text) { StringBuilder sb = new StringBuilder(); sb.append("\n"); @@ -381,7 +379,6 @@ private void openLink(final String link) { openEditor(ownerName, objectType, objectName.toUpperCase(), line, 1); } - @SuppressWarnings("SameParameterValue") private void openEditor(final String owner, final String type, final String name, final int line, final int col) { DefaultDrillLink drillLink = new DefaultDrillLink(); drillLink.setConnName(currentRun.getConnectionName()); @@ -744,7 +741,6 @@ private void fixCountersAndUpdate() { update(currentRun.getReporterId()); } - @SuppressWarnings("DuplicatedCode") private void initializeGUI() { // Base panel containing all components basePanel = new JPanel(); diff --git a/sqldev/src/main/java/org/utplsql/sqldev/ui/runner/SmartTime.java b/sqldev/src/main/java/org/utplsql/sqldev/ui/runner/SmartTime.java index 8e4e046b..69ea1500 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/ui/runner/SmartTime.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/ui/runner/SmartTime.java @@ -45,7 +45,7 @@ public Double getSeconds() { @Override public String toString() { - String ret = null; + String ret; if (seconds == null) { ret = null; } else if (smart) { diff --git a/sqldev/src/main/java/org/utplsql/sqldev/ui/runner/TestOverviewTableModel.java b/sqldev/src/main/java/org/utplsql/sqldev/ui/runner/TestOverviewTableModel.java index 02e85d81..25349b20 100644 --- a/sqldev/src/main/java/org/utplsql/sqldev/ui/runner/TestOverviewTableModel.java +++ b/sqldev/src/main/java/org/utplsql/sqldev/ui/runner/TestOverviewTableModel.java @@ -17,7 +17,6 @@ import java.util.ArrayList; import java.util.LinkedHashMap; -import java.util.Map.Entry; import javax.swing.Icon; import javax.swing.table.DefaultTableModel; @@ -41,7 +40,7 @@ public TestOverviewTableModel() { private void calcCommonPrefix() { if (!commonPrefixCalculated && tests != null && tests.size() > 0) { - commonPrefix = PrefixTools.commonPrefix(new ArrayList(tests.keySet())); + commonPrefix = PrefixTools.commonPrefix(new ArrayList<>(tests.keySet())); fireTableDataChanged(); commonPrefixCalculated = true; } @@ -89,7 +88,7 @@ public String getTimeColumnName() { } public Test getTest(final int row) { - return new ArrayList>(tests.entrySet()).get(row).getValue(); + return new ArrayList<>(tests.entrySet()).get(row).getValue(); } @Override @@ -131,16 +130,16 @@ public Object getValueAt(final int row, final int col) { @Override public String getColumnName(final int col) { switch (col) { - case 0: - case 1: - case 2: - return ""; // icons are used instead of descriptions - case 3: - return UtplsqlResources.getString(showDescription ? "RUNNER_DESCRIPTION_LABEL" : "RUNNER_TEST_ID_COLUMN"); - case 4: - return getTimeColumnName(); - default: - return null; + case 0: + case 1: + case 2: + return ""; // icons are used instead of descriptions + case 3: + return UtplsqlResources.getString(showDescription ? "RUNNER_DESCRIPTION_LABEL" : "RUNNER_TEST_ID_COLUMN"); + case 4: + return getTimeColumnName(); + default: + return null; } } @@ -153,18 +152,14 @@ public boolean isCellEditable(final int row, final int column) { @Override public Class getColumnClass(final int col) { switch (col) { - case 0: - return Icon.class; - case 1: - return Icon.class; - case 2: - return Icon.class; - case 3: - return String.class; - case 4: - return Double.class; - default: - return String.class; + case 0: + case 1: + case 2: + return Icon.class; + case 4: + return Double.class; + default: + return String.class; } } } diff --git a/sqldev/src/test/java/org/utplsql/sqldev/test/AbstractJdbcTest.java b/sqldev/src/test/java/org/utplsql/sqldev/test/AbstractJdbcTest.java index c0f16809..756ac0e3 100644 --- a/sqldev/src/test/java/org/utplsql/sqldev/test/AbstractJdbcTest.java +++ b/sqldev/src/test/java/org/utplsql/sqldev/test/AbstractJdbcTest.java @@ -31,15 +31,15 @@ import oracle.dbtools.worksheet.scriptparser.sqlplus.SQLPlusScriptParser; public abstract class AbstractJdbcTest { - protected static SingleConnectionDataSource dataSource; - protected static JdbcTemplate jdbcTemplate; - protected static SingleConnectionDataSource sysDataSource; - protected static JdbcTemplate sysJdbcTemplate; + protected static final SingleConnectionDataSource dataSource; + protected static final JdbcTemplate jdbcTemplate; + protected static final SingleConnectionDataSource sysDataSource; + protected static final JdbcTemplate sysJdbcTemplate; static { final Properties p = new Properties(); try { - p.load(AbstractJdbcTest.class.getClass().getResourceAsStream("/test.properties")); + p.load(AbstractJdbcTest.class.getResourceAsStream("/test.properties")); } catch (IOException e) { throw new GenericRuntimeException("Cannot read test.properties", e); } diff --git a/sqldev/src/test/java/org/utplsql/sqldev/test/JsonToStringStylerTest.java b/sqldev/src/test/java/org/utplsql/sqldev/test/JsonToStringStylerTest.java index bbeb735d..84668056 100644 --- a/sqldev/src/test/java/org/utplsql/sqldev/test/JsonToStringStylerTest.java +++ b/sqldev/src/test/java/org/utplsql/sqldev/test/JsonToStringStylerTest.java @@ -22,7 +22,6 @@ import org.utplsql.sqldev.model.runner.Run; import org.utplsql.sqldev.model.ut.OutputLines; -@SuppressWarnings("StringBufferReplaceableByString") public class JsonToStringStylerTest { @Test diff --git a/sqldev/src/test/java/org/utplsql/sqldev/test/PrefixToolsTest.java b/sqldev/src/test/java/org/utplsql/sqldev/test/PrefixToolsTest.java index c4b0983e..675b8bda 100644 --- a/sqldev/src/test/java/org/utplsql/sqldev/test/PrefixToolsTest.java +++ b/sqldev/src/test/java/org/utplsql/sqldev/test/PrefixToolsTest.java @@ -16,6 +16,7 @@ package org.utplsql.sqldev.test; import java.util.Arrays; +import java.util.Collections; import org.junit.Assert; import org.junit.Test; @@ -31,14 +32,14 @@ public void two() { @Test public void oneWithDot() { - final String actual = PrefixTools.commonPrefix(Arrays.asList("junit.test.a")); + final String actual = PrefixTools.commonPrefix(Collections.singletonList("junit.test.a")); final String expected = "junit.test."; Assert.assertEquals(expected, actual); } @Test public void oneWithoutDot() { - final String actual = PrefixTools.commonPrefix(Arrays.asList("junit-test-a")); + final String actual = PrefixTools.commonPrefix(Collections.singletonList("junit-test-a")); final String expected = ""; Assert.assertEquals(expected, actual); } diff --git a/sqldev/src/test/java/org/utplsql/sqldev/test/coverage/CodeCoverageReporterDialogTest.java b/sqldev/src/test/java/org/utplsql/sqldev/test/coverage/CodeCoverageReporterDialogTest.java index 5ada53d1..b0471bfd 100644 --- a/sqldev/src/test/java/org/utplsql/sqldev/test/coverage/CodeCoverageReporterDialogTest.java +++ b/sqldev/src/test/java/org/utplsql/sqldev/test/coverage/CodeCoverageReporterDialogTest.java @@ -16,6 +16,7 @@ package org.utplsql.sqldev.test.coverage; import java.util.Arrays; +import java.util.Collections; import org.junit.Assert; import org.junit.Test; @@ -29,7 +30,7 @@ public class CodeCoverageReporterDialogTest extends AbstractJdbcTest { @Test public void layout() { - final CodeCoverageReporter reporter = new CodeCoverageReporter(Arrays.asList("SCOTT"), + final CodeCoverageReporter reporter = new CodeCoverageReporter(Collections.singletonList("SCOTT"), Arrays.asList("a", "b", "c"), DatabaseTools.getConnection(dataSource)); reporter.showParameterWindow(); SystemTools.sleep(4 * 1000); diff --git a/sqldev/src/test/java/org/utplsql/sqldev/test/coverage/CodeCoverageReporterTest.java b/sqldev/src/test/java/org/utplsql/sqldev/test/coverage/CodeCoverageReporterTest.java index 4043f71d..03ebf152 100644 --- a/sqldev/src/test/java/org/utplsql/sqldev/test/coverage/CodeCoverageReporterTest.java +++ b/sqldev/src/test/java/org/utplsql/sqldev/test/coverage/CodeCoverageReporterTest.java @@ -20,10 +20,7 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import java.util.Arrays; -import java.util.Comparator; -import java.util.List; -import java.util.Optional; +import java.util.*; import org.junit.After; import org.junit.Assert; @@ -96,8 +93,8 @@ private Path getNewestOutputFile() { @Test public void produceReportAndCloseConnection() { - final List pathList = Arrays.asList(":test_f"); - final List includeObjectList = Arrays.asList("f"); + final List pathList = Collections.singletonList(":test_f"); + final List includeObjectList = Collections.singletonList("f"); final CodeCoverageReporter reporter = new CodeCoverageReporter(pathList, includeObjectList, DatabaseTools.getConnection(dataSource)); final Thread run = reporter.runAsync(); SystemTools.waitForThread(run, 20000); @@ -113,28 +110,28 @@ public void produceReportAndCloseConnection() { @Test public void defaultSchemaCalculationMixedCase() { - final CodeCoverageReporter reporter = new CodeCoverageReporter(Arrays.asList(":something"), + final CodeCoverageReporter reporter = new CodeCoverageReporter(Collections.singletonList(":something"), Arrays.asList("scott.a", "scott.b", "hR.a", "HR.B", "hr.c"), DatabaseTools.getConnection(dataSource)); Assert.assertEquals("HR, SCOTT", reporter.getSchemas()); } @Test public void defaultSchemaCalculationWithoutIncludeObjects() { - final CodeCoverageReporter reporter = new CodeCoverageReporter(Arrays.asList(":something"), - Arrays.asList(), DatabaseTools.getConnection(dataSource)); - Assert.assertEquals(null, reporter.getSchemas()); + final CodeCoverageReporter reporter = new CodeCoverageReporter(Collections.singletonList(":something"), + Collections.emptyList(), DatabaseTools.getConnection(dataSource)); + Assert.assertNull(reporter.getSchemas()); } @Test public void defaultSchemaCalculationWithoutOwnerInformation() { - final CodeCoverageReporter reporter = new CodeCoverageReporter(Arrays.asList(":something"), + final CodeCoverageReporter reporter = new CodeCoverageReporter(Collections.singletonList(":something"), Arrays.asList("a", "b", "c"), DatabaseTools.getConnection(dataSource)); Assert.assertEquals("", reporter.getSchemas()); } @Test public void defaultSchemaCalculationWithJustOneOwner() { - final CodeCoverageReporter reporter = new CodeCoverageReporter(Arrays.asList(":something"), + final CodeCoverageReporter reporter = new CodeCoverageReporter(Collections.singletonList(":something"), Arrays.asList("a", "b", "scott.c"), DatabaseTools.getConnection(dataSource)); Assert.assertEquals("SCOTT", reporter.getSchemas()); } diff --git a/sqldev/src/test/java/org/utplsql/sqldev/test/dal/DalTest.java b/sqldev/src/test/java/org/utplsql/sqldev/test/dal/DalTest.java index 395dbbd2..a044cca5 100644 --- a/sqldev/src/test/java/org/utplsql/sqldev/test/dal/DalTest.java +++ b/sqldev/src/test/java/org/utplsql/sqldev/test/dal/DalTest.java @@ -15,10 +15,7 @@ */ package org.utplsql.sqldev.test.dal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; +import java.util.*; import org.junit.After; import org.junit.Assert; @@ -60,7 +57,7 @@ public void isDbaViewAccessibleAsSys() { public void utplsqlSchemaWithoutPublicSynonym() { sysJdbcTemplate.execute("DROP PUBLIC SYNONYM ut"); final UtplsqlDao dao = new UtplsqlDao(DatabaseTools.getConnection(dataSource)); - Assert.assertEquals(null, dao.getUtplsqlSchema()); + Assert.assertNull(dao.getUtplsqlSchema()); } @Test @@ -172,7 +169,7 @@ private void annotations(final String utPlsqlVersion) { sb.append("END junit_utplsql_test_pkg;"); jdbcTemplate.execute(sb.toString()); final List actual = dao.annotations("scott", "junit_utplsql_test_pkg"); - final ArrayList expected = new ArrayList(); + final ArrayList expected = new ArrayList<>(); final Annotation suite = new Annotation(); suite.setObjectOwner("SCOTT"); suite.setObjectName("JUNIT_UTPLSQL_TEST_PKG"); @@ -387,6 +384,7 @@ public void testablesProcedures318() { public void runnables(final String utPlsqlVersion) { final UtplsqlDao dao = new UtplsqlDao(DatabaseTools.getConnection(dataSource)); + dao.setUtPlsqlVersion(utPlsqlVersion); StringBuilder sb = new StringBuilder(); sb.append("CREATE OR REPLACE PACKAGE junit_utplsql_test_pkg IS\n"); sb.append(" -- %suite\n"); @@ -411,17 +409,17 @@ public void runnables(final String utPlsqlVersion) { jdbcTemplate.execute(sb.toString()); final List actualNodes = dao.runnables(); Assert.assertEquals(16, actualNodes.size()); - final HashMap actual = new HashMap(); + final HashMap actual = new HashMap<>(); for (final Node node : actualNodes) { actual.put(node.getId(), node.getParentId()); } - Assert.assertEquals(null, actual.get("SUITE")); + Assert.assertNull(actual.get("SUITE")); Assert.assertEquals("SUITE", actual.get("SCOTT.JUNIT_UTPLSQL_TEST_PKG")); Assert.assertEquals("SCOTT.JUNIT_UTPLSQL_TEST_PKG", actual.get("SCOTT.JUNIT_UTPLSQL_TEST_PKG.T0")); Assert.assertEquals("SCOTT.JUNIT_UTPLSQL_TEST_PKG", actual.get("SCOTT.JUNIT_UTPLSQL_TEST_PKG.T1")); Assert.assertEquals("SCOTT.JUNIT_UTPLSQL_TEST_PKG", actual.get("SCOTT.JUNIT_UTPLSQL_TEST_PKG.T2")); Assert.assertEquals("SCOTT.JUNIT_UTPLSQL_TEST_PKG", actual.get("SCOTT.JUNIT_UTPLSQL_TEST_PKG.T3")); - Assert.assertEquals(null, actual.get("SUITEPATH")); + Assert.assertNull(actual.get("SUITEPATH")); Assert.assertEquals("SUITEPATH", actual.get("SCOTT:a")); Assert.assertEquals("SCOTT:a", actual.get("SCOTT:a.b")); Assert.assertEquals("SCOTT:a.b", actual.get("SCOTT:a.b.c")); @@ -474,11 +472,26 @@ public void dbmsOutput() { Assert.assertEquals(expected, actual); } + @Test + public void disableDbmsOutput() { + final UtplsqlDao dao = new UtplsqlDao(DatabaseTools.getConnection(dataSource)); + dao.enableDbmsOutput(); + StringBuilder sb = new StringBuilder(); + sb.append("BEGIN\n"); + sb.append(" sys.dbms_output.put_line('line1');\n"); + sb.append("END;"); + jdbcTemplate.execute(sb.toString()); + Assert.assertEquals("line1\n", dao.getDbmsOutput()); + dao.disableDbmsOutput(); + jdbcTemplate.execute(sb.toString()); + Assert.assertEquals("", dao.getDbmsOutput()); + } + @Test public void htmlCodeCoverage() { final UtplsqlDao dao = new UtplsqlDao(DatabaseTools.getConnection(dataSource)); - final String actual = dao.htmlCodeCoverage(Arrays.asList("SCOTT"), Arrays.asList("scott"), Arrays.asList(), - Arrays.asList(), null); + final String actual = dao.htmlCodeCoverage(Collections.singletonList("SCOTT"), Collections.singletonList("scott"), Collections.emptyList(), + Collections.emptyList(), null); Assert.assertTrue(actual.startsWith("")); Assert.assertTrue(actual.trim().endsWith("")); // default assets accessed via internet @@ -514,7 +527,7 @@ public void includes() { jdbcTemplate.execute(sb.toString()); final UtplsqlDao dao = new UtplsqlDao(DatabaseTools.getConnection(dataSource)); final List actualEmpty = dao.includes("SCOTT", "TEST_F1"); - Assert.assertEquals(Arrays.asList(), actualEmpty); + Assert.assertEquals(Collections.emptyList(), actualEmpty); final List actual = dao.includes("SCOTT", "junit_utplsql_test_pkg"); Assert.assertTrue(actual.stream().anyMatch(it -> it.equals("SCOTT.JUNIT_UTPLSQL_TEST_PKG"))); Assert.assertTrue(actual.stream().anyMatch(it -> it.equals("SCOTT.JUNIT_F"))); @@ -558,7 +571,7 @@ public void utPlsqlVersion() { final UtplsqlDao dao = new UtplsqlDao(DatabaseTools.getConnection(dataSource)); final String actual = dao.getUtPlsqlVersion(); final String sql = "SELECT ut.version FROM DUAL"; - final String expected = jdbcTemplate.queryForObject(sql, String.class); + final String expected = jdbcTemplate.queryForObject(sql, String.class); Assert.assertEquals(expected, actual); } @@ -616,6 +629,6 @@ public void getObjectType() { public void normalizedUtPlsqlVersion() { final UtplsqlDao dao = new UtplsqlDao(DatabaseTools.getConnection(dataSource)); final String version = dao.normalizedUtPlsqlVersion(); - Assert.assertTrue(version != null); + Assert.assertNotNull(version); } } diff --git a/sqldev/src/test/java/org/utplsql/sqldev/test/dal/RealtimeReporterFetchSizeTest.java b/sqldev/src/test/java/org/utplsql/sqldev/test/dal/RealtimeReporterFetchSizeTest.java index 94064821..a68e4b25 100644 --- a/sqldev/src/test/java/org/utplsql/sqldev/test/dal/RealtimeReporterFetchSizeTest.java +++ b/sqldev/src/test/java/org/utplsql/sqldev/test/dal/RealtimeReporterFetchSizeTest.java @@ -15,7 +15,7 @@ */ package org.utplsql.sqldev.test.dal; -import java.util.Arrays; +import java.util.Collections; import java.util.UUID; import java.util.logging.Logger; @@ -95,7 +95,7 @@ private void delayFreeStreamingConsumtionProducer(final String reporterId) { ds.setUsername(dataSource.getUsername()); ds.setPassword(dataSource.getPassword()); final RealtimeReporterDao dao = new RealtimeReporterDao(DatabaseTools.getConnection(ds)); - dao.produceReport(reporterId, Arrays.asList("junit_utplsql_fetch_size_pkg")); + dao.produceReport(reporterId, Collections.singletonList("junit_utplsql_fetch_size_pkg")); } @Test diff --git a/sqldev/src/test/java/org/utplsql/sqldev/test/dal/RealtimeReporterTest.java b/sqldev/src/test/java/org/utplsql/sqldev/test/dal/RealtimeReporterTest.java index eec8ee60..fac234a9 100644 --- a/sqldev/src/test/java/org/utplsql/sqldev/test/dal/RealtimeReporterTest.java +++ b/sqldev/src/test/java/org/utplsql/sqldev/test/dal/RealtimeReporterTest.java @@ -16,6 +16,7 @@ package org.utplsql.sqldev.test.dal; import java.util.Arrays; +import java.util.Collections; import java.util.UUID; import java.util.logging.Logger; @@ -179,7 +180,7 @@ public void produceAndConsumeWithCoverage() { final String realtimeReporterId = UUID.randomUUID().toString().replace("-", ""); final String coverageReporterId = UUID.randomUUID().toString().replace("-", ""); final TestRealtimerReporterEventConsumer consumer = new TestRealtimerReporterEventConsumer(); - dao.produceReportWithCoverage(realtimeReporterId, coverageReporterId, Arrays.asList(":test_f"), null, null, null, null); + dao.produceReportWithCoverage(realtimeReporterId, coverageReporterId, Collections.singletonList(":test_f"), null, null, null, null); dao.consumeReport(realtimeReporterId, consumer); logger.fine(consumer.getConsumedList().toString()); Assert.assertEquals(6, consumer.getConsumedList().size()); diff --git a/sqldev/src/test/java/org/utplsql/sqldev/test/parser/UtplsqlParserTest.java b/sqldev/src/test/java/org/utplsql/sqldev/test/parser/UtplsqlParserTest.java index 5694eb3f..d33d3dc1 100644 --- a/sqldev/src/test/java/org/utplsql/sqldev/test/parser/UtplsqlParserTest.java +++ b/sqldev/src/test/java/org/utplsql/sqldev/test/parser/UtplsqlParserTest.java @@ -209,7 +209,7 @@ public void unknown() { sb.append("/\n"); final String plsql = sb.toString(); final UtplsqlParser parser = new UtplsqlParser(plsql); - Assert.assertEquals(null, parser.getObjectAt(0)); + Assert.assertNull(parser.getObjectAt(0)); } @Test diff --git a/sqldev/src/test/java/org/utplsql/sqldev/test/preference/PreferenceModelTest.java b/sqldev/src/test/java/org/utplsql/sqldev/test/preference/PreferenceModelTest.java index d246c315..904681b6 100644 --- a/sqldev/src/test/java/org/utplsql/sqldev/test/preference/PreferenceModelTest.java +++ b/sqldev/src/test/java/org/utplsql/sqldev/test/preference/PreferenceModelTest.java @@ -53,7 +53,7 @@ public void defaultValues() { Assert.assertEquals(3, model.getIndentSpaces()); Assert.assertTrue(model.isGenerateFiles()); Assert.assertEquals(PreferenceModel.DEFAULT_OUTPUT_DIRECTORY, model.getOutputDirectory()); - Assert.assertEquals(false, model.isDeleteExistingFiles()); + Assert.assertFalse(model.isDeleteExistingFiles()); Assert.assertEquals("utPLSQL", model.getRootFolderInOddgenView()); } } diff --git a/sqldev/src/test/java/org/utplsql/sqldev/test/runner/ExpectationTest.java b/sqldev/src/test/java/org/utplsql/sqldev/test/runner/ExpectationTest.java index 554e3741..a72e7d87 100644 --- a/sqldev/src/test/java/org/utplsql/sqldev/test/runner/ExpectationTest.java +++ b/sqldev/src/test/java/org/utplsql/sqldev/test/runner/ExpectationTest.java @@ -39,7 +39,7 @@ private Expectation getExpectationWithoutDescription() { @Test public void failedExpectationCallerLine() { final Integer actual = getExpectationWithDescription().getCallerLine(); - final Integer expected = Integer.valueOf(14); + final Integer expected = 14; Assert.assertEquals(expected, actual); } diff --git a/sqldev/src/test/java/org/utplsql/sqldev/test/runner/SmartTimeTest.java b/sqldev/src/test/java/org/utplsql/sqldev/test/runner/SmartTimeTest.java index 640e9ad3..297a33f1 100644 --- a/sqldev/src/test/java/org/utplsql/sqldev/test/runner/SmartTimeTest.java +++ b/sqldev/src/test/java/org/utplsql/sqldev/test/runner/SmartTimeTest.java @@ -24,13 +24,13 @@ public class SmartTimeTest { @Test public void null_default() { final String effective = new SmartTime(null, false).toString(); - Assert.assertEquals(null, effective); + Assert.assertNull(effective); } @Test public void null_smart() { final String effective = new SmartTime(null, true).toString(); - Assert.assertEquals(null, effective); + Assert.assertNull(effective); } @Test