Solve some SonarQube issues

3D-e-Chem · Feb 23, 2017 · 358e79b · 358e79b
1 parent 62ccab4
commit 358e79b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/plugin/src/java/nl/esciencecenter/e3dchem/python/PythonWrapperNodeModel.java b/plugin/src/java/nl/esciencecenter/e3dchem/python/PythonWrapperNodeModel.java
@@ -119,7 +119,7 @@ protected void addNewVariables(Collection<FlowVariable> newVariables) {
 						// Old variable has the same value
 						push = false;
 					} else if (variable.getType().equals(Type.DOUBLE)
-							&& new Double(oldVariable.getDoubleValue()).equals(new Double(variable.getDoubleValue()))) {
+							&& Double.valueOf(oldVariable.getDoubleValue()).equals(Double.valueOf(variable.getDoubleValue()))) {
 						// Old variable has the same value
 						push = false;
 					} else if (variable.getType().equals(Type.STRING)

diff --git a/tests/src/java/nl/esciencecenter/e3dchem/python/ConcreteNodeModel.java b/tests/src/java/nl/esciencecenter/e3dchem/python/ConcreteNodeModel.java
@@ -7,7 +7,7 @@
 import org.knime.core.node.workflow.FlowVariable;
 
 public class ConcreteNodeModel extends PythonWrapperNodeModel<ConcreteNodeConfig> {
-	public Collection<FlowVariable> variables;
+	private Collection<FlowVariable> variables;
 
 	public ConcreteNodeModel(PortType[] inPortTypes, PortType[] outPortTypes) {
 		super(inPortTypes, outPortTypes);
@@ -17,7 +17,7 @@ public ConcreteNodeModel(PortType[] inPortTypes, PortType[] outPortTypes) {
 
 	public ConcreteNodeModel() {
 		this(new PortType[] { BufferedDataTable.TYPE }, new PortType[] { BufferedDataTable.TYPE });
-	};
+	}
 
 	@Override
 	protected void addNewVariables(Collection<FlowVariable> newVariables) {
@@ -27,6 +27,10 @@ protected void addNewVariables(Collection<FlowVariable> newVariables) {
 		this.variables = newVariables;
 	}
 
+	public Collection<FlowVariable> getVariables() {
+		return variables;
+	}
+
 	@Override
 	protected ConcreteNodeConfig createConfig() {
 		return new ConcreteNodeConfig();

diff --git a/tests/src/java/nl/esciencecenter/e3dchem/python/PythonWrapperNodeModelTest.java b/tests/src/java/nl/esciencecenter/e3dchem/python/PythonWrapperNodeModelTest.java
@@ -105,7 +105,7 @@ public void testValidPython_NoPackageequired() throws InvalidSettingsException {
 	}
 
 	@Test
-	public void getPythonCode() throws IOException, Exception {
+	public void getPythonCode() throws IOException {
 		ConcreteNodeModel model = new ConcreteNodeModel();
 
 		String code = model.getPythonCode();
@@ -115,7 +115,7 @@ public void getPythonCode() throws IOException, Exception {
 	}
 
 	@Test
-	public void getPythonCode_missingpyfile() throws IOException, Exception {
+	public void getPythonCode_missingpyfile() throws IOException {
 		FoobarNodeModel model = new FoobarNodeModel();
 		thrown.expect(FileNotFoundException.class);
 		thrown.expectMessage("foobar_test.py");
@@ -124,7 +124,7 @@ public void getPythonCode_missingpyfile() throws IOException, Exception {
 	}
 
 	@Test
-	public void testExecuteKernel() throws IOException, Exception {
+	public void testExecuteKernel() throws Exception {
 		ConcreteNodeModel model = new ConcreteNodeModel();
 		BufferedDataTable[] inData = { mock(BufferedDataTable.class) };
 		ExecutionContext exec = mock(ExecutionContext.class);
@@ -146,7 +146,7 @@ public void testExecuteKernel() throws IOException, Exception {
 	}
 
 	@Test
-	public void testExecuteKernel__warningMessageSet() throws IOException, Exception {
+	public void testExecuteKernel__warningMessageSet() throws Exception {
 		ConcreteNodeModel model = new ConcreteNodeModel();
 		BufferedDataTable[] inData = { mock(BufferedDataTable.class) };
 		ExecutionContext exec = mock(ExecutionContext.class);
@@ -164,6 +164,6 @@ public void testExecuteKernel__warningMessageSet() throws IOException, Exception
 		model.executeKernel(inData, exec, kernel);
 
 		verify(listener, times(1)).warningChanged(eq("some warning"));
-		assertEquals(variables, model.variables);
+		assertEquals(variables, model.getVariables());
 	}
 }