remove unnecessary parenthesis, valueOf calls for readability

PhilippSalvisberg · PhilippSalvisberg · commit 9d2c62355320 · 2020-05-29T21:54:25.000+02:00
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/coverage/CodeCoverageReporter.java b/sqldev/src/main/java/org/utplsql/sqldev/coverage/CodeCoverageReporter.java
@@ -132,7 +132,7 @@ public List<String> getPathList() {
     }
 
     public List<String> getIncludeObjectList() {
-        if ((includeObjectList == null)) {
+        if (includeObjectList == null) {
             return new ArrayList<>();
         } else {
             return includeObjectList;
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/dal/RealtimeReporterDao.java b/sqldev/src/main/java/org/utplsql/sqldev/dal/RealtimeReporterDao.java
@@ -114,7 +114,7 @@ public Void doInCallableStatement(final CallableStatement cs) throws SQLExceptio
                     final Clob textClob = rs.getClob("text");
                     final String textString = textClob.getSubString(1, ((int) textClob.length()));
                     final RealtimeReporterEvent event = convert(itemType, textString);
-                    if ((event != null)) {
+                    if (event != null) {
                         consumer.process(event);
                     }
                 }
@@ -264,7 +264,7 @@ private void populate(final Test test, final Node node) {
             test.setOwnerName(xmlTools.getElementValue(node, "ownerName"));
             test.setObjectName(xmlTools.getElementValue(node, "objectName"));
             test.setProcedureName(xmlTools.getElementValue(node, "procedureName"));
-            test.setDisabled(Boolean.valueOf("true".equals(xmlTools.getElementValue(node, "disabled"))));
+            test.setDisabled("true".equals(xmlTools.getElementValue(node, "disabled")));
             test.setName(xmlTools.getElementValue(node, "name"));
             test.setDescription(xmlTools.getElementValue(node, "description"));
             test.setTestNumber(Integer.valueOf(xmlTools.getElementValue(node, "testNumber")));
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/dal/UtplsqlDao.java b/sqldev/src/main/java/org/utplsql/sqldev/dal/UtplsqlDao.java
@@ -64,7 +64,7 @@ public void setUtPlsqlVersion(final String utPlsqlVersion) {
      */
     public String normalizedUtPlsqlVersion() {
         final String version = this.getUtPlsqlVersion();
-        if ((version != null)) {
+        if (version != null) {
             final Pattern p = Pattern.compile("(\\d+\\.\\d+\\.\\d+)");
             final Matcher m = p.matcher(version);
             if (m.find()) {
@@ -117,7 +117,7 @@ public String doInCallableStatement(final CallableStatement cs) throws SQLExcept
     }
 
     public boolean isDbaViewAccessible() {
-        if ((cachedDbaViewAccessible == null)) {
+        if (cachedDbaViewAccessible == null) {
             try {
                 final StringBuilder sb = new StringBuilder();
                 sb.append("SELECT 1 AS dummy\n");
@@ -161,7 +161,7 @@ public String getDbaView(String viewName) {
      *             if there is a problem
      */
     public String getUtplsqlSchema() {
-        if ((cachedUtplsqlSchema == null)) {
+        if (cachedUtplsqlSchema == null) {
             final StringBuilder sb = new StringBuilder();
             sb.append("SELECT table_owner\n");
             sb.append("  FROM ");
@@ -235,7 +235,7 @@ public Boolean doInCallableStatement(final CallableStatement cs) throws SQLExcep
                         cs.registerOutParameter(4, Types.VARCHAR);
                         cs.execute();
                         final String ret = cs.getString(4);
-                        return Boolean.valueOf("1".equals(ret));
+                        return "1".equals(ret);
                     }
                 });
             } else if (normalizedUtPlsqlVersionNumber() >= FIRST_VERSION_WITH_ANNOTATION_API) {
@@ -307,7 +307,7 @@ public Boolean doInCallableStatement(final CallableStatement cs)
                     cs.registerOutParameter(2, Types.VARCHAR);
                     cs.execute();
                     final String ret = cs.getString(2);
-                    return Boolean.valueOf("1".equals(ret));
+                    return "1".equals(ret);
                 }
             });
         } else {
@@ -336,7 +336,7 @@ public Boolean doInCallableStatement(final CallableStatement cs)
                     cs.registerOutParameter(3, Types.VARCHAR);
                     cs.execute();
                     final String ret = cs.getString(3);
-                    return Boolean.valueOf("1".equals(ret));
+                    return "1".equals(ret);
                 }
             });
         } else {
@@ -876,14 +876,14 @@ public OutputLines doInCallableStatement(final CallableStatement cs) throws SQLE
                     cs.execute();
                     final OutputLines out = new OutputLines();
                     Object array = cs.getArray(1).getArray();
-                    out.setLines(((String[]) array));
-                    out.setNumlines(Integer.valueOf(cs.getInt(2)));
+                    out.setLines((String[]) array);
+                    out.setNumlines(cs.getInt(2));
                     return out;
                 }
             });
             for (int i = 0; i < ret.getNumlines(); i++) {
                 final String line = ret.getLines()[i];
-                if ((line != null)) {
+                if (line != null) {
                     resultSb.append(ret.getLines()[i]);
                 }
                 resultSb.append(System.lineSeparator());
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/menu/UtplsqlController.java b/sqldev/src/main/java/org/utplsql/sqldev/menu/UtplsqlController.java
@@ -113,7 +113,7 @@ public boolean update(final IdeAction action, final Context context) {
                             connectionName = ((DatabaseSourceNode) node).getConnectionName();
                             owner = ((DatabaseSourceNode) node).getOwner();
                         } else {
-                            if ((view instanceof Worksheet)) {
+                            if (view instanceof Worksheet) {
                                 connectionName = ((Worksheet) view).getConnectionName();
                             }
                         }
@@ -144,17 +144,17 @@ public boolean update(final IdeAction action, final Context context) {
                                 if (element instanceof DatabaseConnection) {
                                     final String schema = DatabaseTools.getSchema((DatabaseConnection) element);
                                     action.setEnabled(dao.containsUtplsqlTest(schema));
-                                } else if ((element instanceof SchemaFolder)) {
+                                } else if (element instanceof SchemaFolder) {
                                     final String schema = ((SchemaFolder) element).getSchemaName();
                                     action.setEnabled(dao.containsUtplsqlTest(schema));
-                                } else if ((element instanceof ObjectFolder)) {
+                                } else if (element instanceof ObjectFolder) {
                                     final String schema = URLTools.getSchema(((ObjectFolder) element).getURL());
                                     action.setEnabled(dao.containsUtplsqlTest(schema));
-                                } else if ((element instanceof PlSqlNode)) {
+                                } else if (element instanceof PlSqlNode) {
                                     final String schema = ((PlSqlNode) element).getOwner();
                                     final String objectName = ((PlSqlNode) element).getObjectName();
                                     action.setEnabled(dao.containsUtplsqlTest(schema, objectName));
-                                } else if ((element instanceof ChildObjectElement)) {
+                                } else if (element instanceof ChildObjectElement) {
                                     final String schema = URLTools.getSchema(((ChildObjectElement) element).getURL());
                                     final String objectName = URLTools.getMemberObject(((ChildObjectElement) element).getURL());
                                     final String subObjectName = ((ChildObjectElement) element).getShortLabel();
@@ -305,7 +305,7 @@ private GenContext getGenContext(final Context context) {
         if (Connections.getInstance().isConnectionOpen(connectionName)) {
             genContext.setConn(DatabaseTools.getConnection(connectionName));
             final Object element = context.getSelection()[0];
-            if ((element instanceof PlSqlNode)) {
+            if (element instanceof PlSqlNode) {
                 genContext.setObjectType(((PlSqlNode) element).getObjectType().replace(" BODY", ""));
                 genContext.setObjectName(((PlSqlNode) element).getObjectName());
                 final PreferenceModel preferences = PreferenceModel.getInstance(Preferences.getPreferences());
@@ -326,7 +326,7 @@ public void runTest(final Context context) {
         sb.append(node != null ? node.getClass().getName() : "???");
         sb.append(".");
         logger.finer(() -> sb.toString());
-        if ((view instanceof Editor)) {
+        if (view instanceof Editor) {
             final Component component = ((Editor) view).getDefaultFocusComponent();
             if (component instanceof JEditorPane) {
                 String connectionName = null;
@@ -356,7 +356,7 @@ public void runTest(final Context context) {
             }
         } else if (view instanceof DBNavigatorWindow) {
             final URL url = getURL(context);
-            if ((url != null)) {
+            if (url != null) {
                 final String connectionName = URLTools.getConnectionName(url);
                 logger.fine("connectionName: " + connectionName);
                 final Connection conn = DatabaseTools.getConnection(connectionName);
@@ -450,7 +450,7 @@ public void codeCoverage(final Context context) {
                 final CodeCoverageReporter reporter = new CodeCoverageReporter(getPathList(path), includeObjectList, connectionName);
                 reporter.showParameterWindow();
             }
-        } else if ((view instanceof DBNavigatorWindow)) {
+        } else if (view instanceof DBNavigatorWindow) {
             logger.finer("Code coverage from DB navigator");
             final URL url = getURL(context);
             if (url != 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
@@ -73,7 +73,7 @@ public Run(final String reporterId, final String connectionName, final List<Stri
 
     public void setStartTime(final String startTime) {
         this.startTime = startTime;
-        start = Long.valueOf(System.currentTimeMillis());
+        start = System.currentTimeMillis();
     }
 
     public String getName() {
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/oddgen/TestGenerator.java b/sqldev/src/main/java/org/utplsql/sqldev/oddgen/TestGenerator.java
@@ -89,7 +89,7 @@ private void saveConsoleOutput(final String s) {
 
     private void logConsoleOutput() {
         for (final String line : consoleOutput) {
-            if ((line.contains("error") || line.startsWith("Cannot"))) {
+            if (line.contains("error") || line.startsWith("Cannot")) {
                 logger.severe(line);
             } else {
                 logger.fine(line);
@@ -178,27 +178,27 @@ public List<Node> getNodes(final Connection conn, final String parentNodeId) {
             final Node packageNode = new Node();
             packageNode.setId("PACKAGE");
             packageNode.setParams(params);
-            packageNode.setLeaf(Boolean.valueOf(false));
-            packageNode.setGeneratable(Boolean.valueOf(true));
-            packageNode.setMultiselectable(Boolean.valueOf(true));
+            packageNode.setLeaf(false);
+            packageNode.setGeneratable(true);
+            packageNode.setMultiselectable(true);
             final Node typeNode = new Node();
             typeNode.setId("TYPE");
             typeNode.setParams(params);
-            typeNode.setLeaf(Boolean.valueOf(false));
-            typeNode.setGeneratable(Boolean.valueOf(true));
-            typeNode.setMultiselectable(Boolean.valueOf(true));
+            typeNode.setLeaf(false);
+            typeNode.setGeneratable(true);
+            typeNode.setMultiselectable(true);
             final Node functionNode = new Node();
             functionNode.setId("FUNCTION");
             functionNode.setParams(params);
-            functionNode.setLeaf(Boolean.valueOf(false));
-            functionNode.setGeneratable(Boolean.valueOf(true));
-            functionNode.setMultiselectable(Boolean.valueOf(true));
+            functionNode.setLeaf(false);
+            functionNode.setGeneratable(true);
+            functionNode.setMultiselectable(true);
             final Node procedureNode = new Node();
             procedureNode.setId("PROCEDURE");
             procedureNode.setParams(params);
-            procedureNode.setLeaf(Boolean.valueOf(false));
-            procedureNode.setGeneratable(Boolean.valueOf(true));
-            procedureNode.setMultiselectable(Boolean.valueOf(true));
+            procedureNode.setLeaf(false);
+            procedureNode.setGeneratable(true);
+            procedureNode.setMultiselectable(true);
             return Arrays.asList(packageNode, typeNode, functionNode, procedureNode);
         } else {
             final UtplsqlDao dao = new UtplsqlDao(conn);
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/parser/UtplsqlParser.java b/sqldev/src/main/java/org/utplsql/sqldev/parser/UtplsqlParser.java
@@ -108,7 +108,7 @@ private void populateObjects() {
             final PlsqlObject o = new PlsqlObject();
             o.setType(m.group(4).toUpperCase());
             o.setName(m.group(6));
-            o.setPosition(Integer.valueOf(m.start()));
+            o.setPosition(m.start());
             objects.add(o);
         }
     }
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/runner/UtplsqlWorksheetRunner.java b/sqldev/src/main/java/org/utplsql/sqldev/runner/UtplsqlWorksheetRunner.java
@@ -106,7 +106,7 @@ private void resizeResultPanel(final Worksheet worksheet) {
                 && selectedResultPanel.getGUI().getParent().getParent() != null && selectedResultPanel.getGUI().getParent().getParent().getParent() != null) {
             splitPane = selectedResultPanel.getGUI().getParent().getParent().getParent();
         }
-        if ((splitPane instanceof JSplitPane)) {
+        if (splitPane instanceof JSplitPane) {
             ((JSplitPane) splitPane).setDividerLocation(0.15);
         } else {
             final String msg = "Could not adjust size of worksheet. Expected JSplitPane but got "
@@ -119,7 +119,7 @@ private void runScript(final Worksheet worksheet) {
         if (preferences.isAutoExecute()) {
             SystemTools.sleep(100);
             final IdeAction action = ((IdeAction) Ide.getIdeActionMap().get(Ide.findCmdID("Worksheet.RunScript")));
-            if ((action != null)) {
+            if (action != null) {
                 try {
                     action.performAction(worksheet.getContext());
                 } catch (Exception e) {
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/ui/preference/PreferencePanel.java b/sqldev/src/main/java/org/utplsql/sqldev/ui/preference/PreferencePanel.java
@@ -367,7 +367,7 @@ public void onEntry(final TraversableContext traversableContext) {
         autoExecuteCheckBox.setSelected(info.isAutoExecute());
         checkRunUtplsqlTestCheckBox.setSelected(info.isCheckRunUtplsqlTest());
         useSmartTimesCheckBox.setSelected(info.isUseSmartTimes());
-        numberOfRunsInHistorySpinner.setValue(Integer.valueOf(info.getNumberOfRunsInHistory()));
+        numberOfRunsInHistorySpinner.setValue(info.getNumberOfRunsInHistory());
         showDisabledCounterCheckBox.setSelected(info.isShowDisabledCounter());
         showWarningsCounterCheckBox.setSelected(info.isShowWarningsCounter());
         showInfoCounterCheckBox.setSelected(info.isShowInfoCounter());
@@ -381,13 +381,13 @@ public void onEntry(final TraversableContext traversableContext) {
         testPackageSuffixTextField.setText(info.getTestPackageSuffix());
         testUnitPrefixTextField.setText(info.getTestUnitPrefix());
         testUnitSuffixTextField.setText(info.getTestUnitSuffix());
-        numberOfTestsPerUnitSpinner.setValue(Integer.valueOf(info.getNumberOfTestsPerUnit()));
+        numberOfTestsPerUnitSpinner.setValue(info.getNumberOfTestsPerUnit());
         checkGenerateUtplsqlTestCheckBox.setSelected(info.isCheckGenerateUtplsqlTest());
         loadCodeTemplates();
         generateCommentsCheckBox.setSelected(info.isGenerateComments());
         disableTestsCheckBox.setSelected(info.isDisableTests());
         suitePathTextField.setText(info.getSuitePath());
-        indentSpacesSpinner.setValue(Integer.valueOf(info.getIndentSpaces()));
+        indentSpacesSpinner.setValue(info.getIndentSpaces());
         rootFolderInOddgenViewTextField.setText(info.getRootFolderInOddgenView());
         generateFilesCheckBox.setSelected(info.isGenerateFiles());
         outputDirectoryTextField.setText(info.getOutputDirectory());
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
@@ -570,7 +570,7 @@ private void comboBoxAction() {
     }
 
     private String getLinkedAndFormattedText(final String text) {
-        if ((text == null)) {
+        if (text == null) {
             return "";
         }
         // Patterns (primarily Asserts, Errors, ServerOutput): 
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
@@ -614,6 +614,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.assertTrue(version != null);
     }
 }
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
@@ -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(Boolean.valueOf(false), Boolean.valueOf(model.isDeleteExistingFiles()));
+        Assert.assertEquals(false, model.isDeleteExistingFiles());
         Assert.assertEquals("utPLSQL", model.getRootFolderInOddgenView());
     }
 }
diff --git a/sqldev/src/test/java/org/utplsql/sqldev/test/preference/PreferencePanelTest.java b/sqldev/src/test/java/org/utplsql/sqldev/test/preference/PreferencePanelTest.java
@@ -40,7 +40,7 @@ public void layout() {
             frame.setLocation(dim.width / 2 - frame.getSize().width / 2, dim.height / 2 - frame.getSize().height / 2);
             frame.setVisible(true);
         });
-        SystemTools.sleep((4 * 1000));
+        SystemTools.sleep(4 * 1000);
         Assert.assertNotNull(frame);
         frame.dispose();
     }

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ public List<String> getPathList() {`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`public List<String> getIncludeObjectList() {`
`135`		`- if ((includeObjectList == null)) {`
	`135`	`+ if (includeObjectList == null) {`
`136`	`136`	`return new ArrayList<>();`
`137`	`137`	`} else {`
`138`	`138`	`return includeObjectList;`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public Run(final String reporterId, final String connectionName, final List<Stri`
`73`	`73`
`74`	`74`	`public void setStartTime(final String startTime) {`
`75`	`75`	`this.startTime = startTime;`
`76`		`- start = Long.valueOf(System.currentTimeMillis());`
	`76`	`+ start = System.currentTimeMillis();`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`public String getName() {`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ private void populateObjects() {`
`108`	`108`	`final PlsqlObject o = new PlsqlObject();`
`109`	`109`	`o.setType(m.group(4).toUpperCase());`
`110`	`110`	`o.setName(m.group(6));`
`111`		`- o.setPosition(Integer.valueOf(m.start()));`
	`111`	`+ o.setPosition(m.start());`
`112`	`112`	`objects.add(o);`
`113`	`113`	`}`
`114`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -570,7 +570,7 @@ private void comboBoxAction() {`
`570`	`570`	`}`
`571`	`571`
`572`	`572`	`private String getLinkedAndFormattedText(final String text) {`
`573`		`- if ((text == null)) {`
	`573`	`+ if (text == null) {`
`574`	`574`	`return "";`
`575`	`575`	`}`
`576`	`576`	`// Patterns (primarily Asserts, Errors, ServerOutput):`
Original file line number	Diff line number	Diff line change
`@@ -614,6 +614,6 @@ public void getObjectType() {`
`614`	`614`	`public void normalizedUtPlsqlVersion() {`
`615`	`615`	`final UtplsqlDao dao = new UtplsqlDao(DatabaseTools.getConnection(dataSource));`
`616`	`616`	`final String version = dao.normalizedUtPlsqlVersion();`
`617`		`- Assert.assertTrue((version != null));`
	`617`	`+ Assert.assertTrue(version != null);`
`618`	`618`	`}`
`619`	`619`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public void defaultValues() {`
`53`	`53`	`Assert.assertEquals(3, model.getIndentSpaces());`
`54`	`54`	`Assert.assertTrue(model.isGenerateFiles());`
`55`	`55`	`Assert.assertEquals(PreferenceModel.DEFAULT_OUTPUT_DIRECTORY, model.getOutputDirectory());`
`56`		`- Assert.assertEquals(Boolean.valueOf(false), Boolean.valueOf(model.isDeleteExistingFiles()));`
	`56`	`+ Assert.assertEquals(false, model.isDeleteExistingFiles());`
`57`	`57`	`Assert.assertEquals("utPLSQL", model.getRootFolderInOddgenView());`
`58`	`58`	`}`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public void layout() {`
`40`	`40`	`frame.setLocation(dim.width / 2 - frame.getSize().width / 2, dim.height / 2 - frame.getSize().height / 2);`
`41`	`41`	`frame.setVisible(true);`
`42`	`42`	`});`
`43`		`- SystemTools.sleep((4 * 1000));`
	`43`	`+ SystemTools.sleep(4 * 1000);`
`44`	`44`	`Assert.assertNotNull(frame);`
`45`	`45`	`frame.dispose();`
`46`	`46`	`}`