Skip to content

Commit 9d2c623

Browse files
PhilippSalvisbergPhilippSalvisberg
committed
remove unnecessary parenthesis, valueOf calls for readability
1 parent e9cd7e2 commit 9d2c623

File tree

13 files changed

+45
-45
lines changed

13 files changed

+45
-45
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public List<String> getPathList() {
132132
}
133133

134134
public List<String> getIncludeObjectList() {
135-
if ((includeObjectList == null)) {
135+
if (includeObjectList == null) {
136136
return new ArrayList<>();
137137
} else {
138138
return includeObjectList;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public Void doInCallableStatement(final CallableStatement cs) throws SQLExceptio
114114
final Clob textClob = rs.getClob("text");
115115
final String textString = textClob.getSubString(1, ((int) textClob.length()));
116116
final RealtimeReporterEvent event = convert(itemType, textString);
117-
if ((event != null)) {
117+
if (event != null) {
118118
consumer.process(event);
119119
}
120120
}
@@ -264,7 +264,7 @@ private void populate(final Test test, final Node node) {
264264
test.setOwnerName(xmlTools.getElementValue(node, "ownerName"));
265265
test.setObjectName(xmlTools.getElementValue(node, "objectName"));
266266
test.setProcedureName(xmlTools.getElementValue(node, "procedureName"));
267-
test.setDisabled(Boolean.valueOf("true".equals(xmlTools.getElementValue(node, "disabled"))));
267+
test.setDisabled("true".equals(xmlTools.getElementValue(node, "disabled")));
268268
test.setName(xmlTools.getElementValue(node, "name"));
269269
test.setDescription(xmlTools.getElementValue(node, "description"));
270270
test.setTestNumber(Integer.valueOf(xmlTools.getElementValue(node, "testNumber")));

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public void setUtPlsqlVersion(final String utPlsqlVersion) {
6464
*/
6565
public String normalizedUtPlsqlVersion() {
6666
final String version = this.getUtPlsqlVersion();
67-
if ((version != null)) {
67+
if (version != null) {
6868
final Pattern p = Pattern.compile("(\\d+\\.\\d+\\.\\d+)");
6969
final Matcher m = p.matcher(version);
7070
if (m.find()) {
@@ -117,7 +117,7 @@ public String doInCallableStatement(final CallableStatement cs) throws SQLExcept
117117
}
118118

119119
public boolean isDbaViewAccessible() {
120-
if ((cachedDbaViewAccessible == null)) {
120+
if (cachedDbaViewAccessible == null) {
121121
try {
122122
final StringBuilder sb = new StringBuilder();
123123
sb.append("SELECT 1 AS dummy\n");
@@ -161,7 +161,7 @@ public String getDbaView(String viewName) {
161161
* if there is a problem
162162
*/
163163
public String getUtplsqlSchema() {
164-
if ((cachedUtplsqlSchema == null)) {
164+
if (cachedUtplsqlSchema == null) {
165165
final StringBuilder sb = new StringBuilder();
166166
sb.append("SELECT table_owner\n");
167167
sb.append(" FROM ");
@@ -235,7 +235,7 @@ public Boolean doInCallableStatement(final CallableStatement cs) throws SQLExcep
235235
cs.registerOutParameter(4, Types.VARCHAR);
236236
cs.execute();
237237
final String ret = cs.getString(4);
238-
return Boolean.valueOf("1".equals(ret));
238+
return "1".equals(ret);
239239
}
240240
});
241241
} else if (normalizedUtPlsqlVersionNumber() >= FIRST_VERSION_WITH_ANNOTATION_API) {
@@ -307,7 +307,7 @@ public Boolean doInCallableStatement(final CallableStatement cs)
307307
cs.registerOutParameter(2, Types.VARCHAR);
308308
cs.execute();
309309
final String ret = cs.getString(2);
310-
return Boolean.valueOf("1".equals(ret));
310+
return "1".equals(ret);
311311
}
312312
});
313313
} else {
@@ -336,7 +336,7 @@ public Boolean doInCallableStatement(final CallableStatement cs)
336336
cs.registerOutParameter(3, Types.VARCHAR);
337337
cs.execute();
338338
final String ret = cs.getString(3);
339-
return Boolean.valueOf("1".equals(ret));
339+
return "1".equals(ret);
340340
}
341341
});
342342
} else {
@@ -876,14 +876,14 @@ public OutputLines doInCallableStatement(final CallableStatement cs) throws SQLE
876876
cs.execute();
877877
final OutputLines out = new OutputLines();
878878
Object array = cs.getArray(1).getArray();
879-
out.setLines(((String[]) array));
880-
out.setNumlines(Integer.valueOf(cs.getInt(2)));
879+
out.setLines((String[]) array);
880+
out.setNumlines(cs.getInt(2));
881881
return out;
882882
}
883883
});
884884
for (int i = 0; i < ret.getNumlines(); i++) {
885885
final String line = ret.getLines()[i];
886-
if ((line != null)) {
886+
if (line != null) {
887887
resultSb.append(ret.getLines()[i]);
888888
}
889889
resultSb.append(System.lineSeparator());

‎sqldev/src/main/java/org/utplsql/sqldev/menu/UtplsqlController.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public boolean update(final IdeAction action, final Context context) {
113113
connectionName = ((DatabaseSourceNode) node).getConnectionName();
114114
owner = ((DatabaseSourceNode) node).getOwner();
115115
} else {
116-
if ((view instanceof Worksheet)) {
116+
if (view instanceof Worksheet) {
117117
connectionName = ((Worksheet) view).getConnectionName();
118118
}
119119
}
@@ -144,17 +144,17 @@ public boolean update(final IdeAction action, final Context context) {
144144
if (element instanceof DatabaseConnection) {
145145
final String schema = DatabaseTools.getSchema((DatabaseConnection) element);
146146
action.setEnabled(dao.containsUtplsqlTest(schema));
147-
} else if ((element instanceof SchemaFolder)) {
147+
} else if (element instanceof SchemaFolder) {
148148
final String schema = ((SchemaFolder) element).getSchemaName();
149149
action.setEnabled(dao.containsUtplsqlTest(schema));
150-
} else if ((element instanceof ObjectFolder)) {
150+
} else if (element instanceof ObjectFolder) {
151151
final String schema = URLTools.getSchema(((ObjectFolder) element).getURL());
152152
action.setEnabled(dao.containsUtplsqlTest(schema));
153-
} else if ((element instanceof PlSqlNode)) {
153+
} else if (element instanceof PlSqlNode) {
154154
final String schema = ((PlSqlNode) element).getOwner();
155155
final String objectName = ((PlSqlNode) element).getObjectName();
156156
action.setEnabled(dao.containsUtplsqlTest(schema, objectName));
157-
} else if ((element instanceof ChildObjectElement)) {
157+
} else if (element instanceof ChildObjectElement) {
158158
final String schema = URLTools.getSchema(((ChildObjectElement) element).getURL());
159159
final String objectName = URLTools.getMemberObject(((ChildObjectElement) element).getURL());
160160
final String subObjectName = ((ChildObjectElement) element).getShortLabel();
@@ -305,7 +305,7 @@ private GenContext getGenContext(final Context context) {
305305
if (Connections.getInstance().isConnectionOpen(connectionName)) {
306306
genContext.setConn(DatabaseTools.getConnection(connectionName));
307307
final Object element = context.getSelection()[0];
308-
if ((element instanceof PlSqlNode)) {
308+
if (element instanceof PlSqlNode) {
309309
genContext.setObjectType(((PlSqlNode) element).getObjectType().replace(" BODY", ""));
310310
genContext.setObjectName(((PlSqlNode) element).getObjectName());
311311
final PreferenceModel preferences = PreferenceModel.getInstance(Preferences.getPreferences());
@@ -326,7 +326,7 @@ public void runTest(final Context context) {
326326
sb.append(node != null ? node.getClass().getName() : "???");
327327
sb.append(".");
328328
logger.finer(() -> sb.toString());
329-
if ((view instanceof Editor)) {
329+
if (view instanceof Editor) {
330330
final Component component = ((Editor) view).getDefaultFocusComponent();
331331
if (component instanceof JEditorPane) {
332332
String connectionName = null;
@@ -356,7 +356,7 @@ public void runTest(final Context context) {
356356
}
357357
} else if (view instanceof DBNavigatorWindow) {
358358
final URL url = getURL(context);
359-
if ((url != null)) {
359+
if (url != null) {
360360
final String connectionName = URLTools.getConnectionName(url);
361361
logger.fine("connectionName: " + connectionName);
362362
final Connection conn = DatabaseTools.getConnection(connectionName);
@@ -450,7 +450,7 @@ public void codeCoverage(final Context context) {
450450
final CodeCoverageReporter reporter = new CodeCoverageReporter(getPathList(path), includeObjectList, connectionName);
451451
reporter.showParameterWindow();
452452
}
453-
} else if ((view instanceof DBNavigatorWindow)) {
453+
} else if (view instanceof DBNavigatorWindow) {
454454
logger.finer("Code coverage from DB navigator");
455455
final URL url = getURL(context);
456456
if (url != null) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public Run(final String reporterId, final String connectionName, final List<Stri
7373

7474
public void setStartTime(final String startTime) {
7575
this.startTime = startTime;
76-
start = Long.valueOf(System.currentTimeMillis());
76+
start = System.currentTimeMillis();
7777
}
7878

7979
public String getName() {

‎sqldev/src/main/java/org/utplsql/sqldev/oddgen/TestGenerator.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ private void saveConsoleOutput(final String s) {
8989

9090
private void logConsoleOutput() {
9191
for (final String line : consoleOutput) {
92-
if ((line.contains("error") || line.startsWith("Cannot"))) {
92+
if (line.contains("error") || line.startsWith("Cannot")) {
9393
logger.severe(line);
9494
} else {
9595
logger.fine(line);
@@ -178,27 +178,27 @@ public List<Node> getNodes(final Connection conn, final String parentNodeId) {
178178
final Node packageNode = new Node();
179179
packageNode.setId("PACKAGE");
180180
packageNode.setParams(params);
181-
packageNode.setLeaf(Boolean.valueOf(false));
182-
packageNode.setGeneratable(Boolean.valueOf(true));
183-
packageNode.setMultiselectable(Boolean.valueOf(true));
181+
packageNode.setLeaf(false);
182+
packageNode.setGeneratable(true);
183+
packageNode.setMultiselectable(true);
184184
final Node typeNode = new Node();
185185
typeNode.setId("TYPE");
186186
typeNode.setParams(params);
187-
typeNode.setLeaf(Boolean.valueOf(false));
188-
typeNode.setGeneratable(Boolean.valueOf(true));
189-
typeNode.setMultiselectable(Boolean.valueOf(true));
187+
typeNode.setLeaf(false);
188+
typeNode.setGeneratable(true);
189+
typeNode.setMultiselectable(true);
190190
final Node functionNode = new Node();
191191
functionNode.setId("FUNCTION");
192192
functionNode.setParams(params);
193-
functionNode.setLeaf(Boolean.valueOf(false));
194-
functionNode.setGeneratable(Boolean.valueOf(true));
195-
functionNode.setMultiselectable(Boolean.valueOf(true));
193+
functionNode.setLeaf(false);
194+
functionNode.setGeneratable(true);
195+
functionNode.setMultiselectable(true);
196196
final Node procedureNode = new Node();
197197
procedureNode.setId("PROCEDURE");
198198
procedureNode.setParams(params);
199-
procedureNode.setLeaf(Boolean.valueOf(false));
200-
procedureNode.setGeneratable(Boolean.valueOf(true));
201-
procedureNode.setMultiselectable(Boolean.valueOf(true));
199+
procedureNode.setLeaf(false);
200+
procedureNode.setGeneratable(true);
201+
procedureNode.setMultiselectable(true);
202202
return Arrays.asList(packageNode, typeNode, functionNode, procedureNode);
203203
} else {
204204
final UtplsqlDao dao = new UtplsqlDao(conn);

‎sqldev/src/main/java/org/utplsql/sqldev/parser/UtplsqlParser.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ private void populateObjects() {
108108
final PlsqlObject o = new PlsqlObject();
109109
o.setType(m.group(4).toUpperCase());
110110
o.setName(m.group(6));
111-
o.setPosition(Integer.valueOf(m.start()));
111+
o.setPosition(m.start());
112112
objects.add(o);
113113
}
114114
}

‎sqldev/src/main/java/org/utplsql/sqldev/runner/UtplsqlWorksheetRunner.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ private void resizeResultPanel(final Worksheet worksheet) {
106106
&& selectedResultPanel.getGUI().getParent().getParent() != null && selectedResultPanel.getGUI().getParent().getParent().getParent() != null) {
107107
splitPane = selectedResultPanel.getGUI().getParent().getParent().getParent();
108108
}
109-
if ((splitPane instanceof JSplitPane)) {
109+
if (splitPane instanceof JSplitPane) {
110110
((JSplitPane) splitPane).setDividerLocation(0.15);
111111
} else {
112112
final String msg = "Could not adjust size of worksheet. Expected JSplitPane but got "
@@ -119,7 +119,7 @@ private void runScript(final Worksheet worksheet) {
119119
if (preferences.isAutoExecute()) {
120120
SystemTools.sleep(100);
121121
final IdeAction action = ((IdeAction) Ide.getIdeActionMap().get(Ide.findCmdID("Worksheet.RunScript")));
122-
if ((action != null)) {
122+
if (action != null) {
123123
try {
124124
action.performAction(worksheet.getContext());
125125
} catch (Exception e) {

‎sqldev/src/main/java/org/utplsql/sqldev/ui/preference/PreferencePanel.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ public void onEntry(final TraversableContext traversableContext) {
367367
autoExecuteCheckBox.setSelected(info.isAutoExecute());
368368
checkRunUtplsqlTestCheckBox.setSelected(info.isCheckRunUtplsqlTest());
369369
useSmartTimesCheckBox.setSelected(info.isUseSmartTimes());
370-
numberOfRunsInHistorySpinner.setValue(Integer.valueOf(info.getNumberOfRunsInHistory()));
370+
numberOfRunsInHistorySpinner.setValue(info.getNumberOfRunsInHistory());
371371
showDisabledCounterCheckBox.setSelected(info.isShowDisabledCounter());
372372
showWarningsCounterCheckBox.setSelected(info.isShowWarningsCounter());
373373
showInfoCounterCheckBox.setSelected(info.isShowInfoCounter());
@@ -381,13 +381,13 @@ public void onEntry(final TraversableContext traversableContext) {
381381
testPackageSuffixTextField.setText(info.getTestPackageSuffix());
382382
testUnitPrefixTextField.setText(info.getTestUnitPrefix());
383383
testUnitSuffixTextField.setText(info.getTestUnitSuffix());
384-
numberOfTestsPerUnitSpinner.setValue(Integer.valueOf(info.getNumberOfTestsPerUnit()));
384+
numberOfTestsPerUnitSpinner.setValue(info.getNumberOfTestsPerUnit());
385385
checkGenerateUtplsqlTestCheckBox.setSelected(info.isCheckGenerateUtplsqlTest());
386386
loadCodeTemplates();
387387
generateCommentsCheckBox.setSelected(info.isGenerateComments());
388388
disableTestsCheckBox.setSelected(info.isDisableTests());
389389
suitePathTextField.setText(info.getSuitePath());
390-
indentSpacesSpinner.setValue(Integer.valueOf(info.getIndentSpaces()));
390+
indentSpacesSpinner.setValue(info.getIndentSpaces());
391391
rootFolderInOddgenViewTextField.setText(info.getRootFolderInOddgenView());
392392
generateFilesCheckBox.setSelected(info.isGenerateFiles());
393393
outputDirectoryTextField.setText(info.getOutputDirectory());

‎sqldev/src/main/java/org/utplsql/sqldev/ui/runner/RunnerPanel.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ private void comboBoxAction() {
570570
}
571571

572572
private String getLinkedAndFormattedText(final String text) {
573-
if ((text == null)) {
573+
if (text == null) {
574574
return "";
575575
}
576576
// Patterns (primarily Asserts, Errors, ServerOutput):

0 commit comments

Comments
 (0)