Merge branch 'fix-checkstyle-errors' into 'dev'

Senteran · Senteran · commit 6104ee279b72 · 2024-05-21T13:08:15.000+02:00
Checkstyle fixed

See merge request cse2000-software-project/2023-2024/cluster-e/04b/rune-dsl-interpreter!13
diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/interpreternew/RosettaInterpreterNew.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/interpreternew/RosettaInterpreterNew.java
@@ -2,9 +2,7 @@
 
 import javax.inject.Inject;
 
-import com.regnosys.rosetta.interpreternew.values.RosettaInterpreterIntegerValue;
 import com.regnosys.rosetta.rosetta.expression.RosettaExpression;
-import com.regnosys.rosetta.rosetta.expression.RosettaIntLiteral;
 import com.regnosys.rosetta.rosetta.interpreter.RosettaInterpreterValue;
 
 public class RosettaInterpreterNew {
@@ -13,8 +11,10 @@ public class RosettaInterpreterNew {
 	private RosettaInterpreterVisitor visitor;
 	
 	/**
-	 * Simple example interpret function to allow for better understanding of the development workflow
-	 * @param expression
+	 * Simple example interpret function to allow for better understanding 
+	 * of the development workflow.
+	 *
+	 * @param expression the expression to be interpreted
 	 * @return value of RosettaIntLiteral otherwise exception
 	 */
 	public RosettaInterpreterValue interp(RosettaExpression expression) {
diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/interpreternew/RosettaInterpreterNewException.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/interpreternew/RosettaInterpreterNewException.java
@@ -1,6 +1,6 @@
 package com.regnosys.rosetta.interpreternew;
 
-public class RosettaInterpreterNewException extends RuntimeException{
+public class RosettaInterpreterNewException extends RuntimeException {
 	private static final long serialVersionUID = 1L;
 
 	public RosettaInterpreterNewException(String message) {
diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/interpreternew/RosettaInterpreterVisitor.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/interpreternew/RosettaInterpreterVisitor.java
@@ -21,7 +21,7 @@
 import com.regnosys.rosetta.interpreternew.visitors.RosettaInterpreterRosettaNumberLiteralInterpreter;
 import com.regnosys.rosetta.interpreternew.visitors.RosettaInterpreterRosettaStringLiteralInterpreter;
 
-public class RosettaInterpreterVisitor extends RosettaInterpreterVisitorBase{
+public class RosettaInterpreterVisitor extends RosettaInterpreterVisitorBase {
 
 	@Override
 	public RosettaInterpreterValue interp(RosettaBooleanLiteral exp) {
diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/interpreternew/RosettaInterpreterVisitorBase.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/interpreternew/RosettaInterpreterVisitorBase.java
@@ -101,7 +101,8 @@ public void eUnset(EStructuralFeature feature) {
 	}
 
 	@Override
-	public Object eInvoke(EOperation operation, EList<?> arguments) throws InvocationTargetException {
+	public Object eInvoke(EOperation operation, EList<?> arguments) 
+			throws InvocationTargetException {
 		// TODO Auto-generated method stub
 		return null;
 	}
diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/interpreternew/visitors/RosettaInterpreterConcreteInterpreter.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/interpreternew/visitors/RosettaInterpreterConcreteInterpreter.java
@@ -3,7 +3,6 @@
 import javax.inject.Inject;
 
 import com.regnosys.rosetta.interpreternew.RosettaInterpreterVisitor;
-import com.regnosys.rosetta.interpreternew.RosettaInterpreterVisitorBase;
 
 
 public abstract class RosettaInterpreterConcreteInterpreter {
diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/interpreternew/visitors/RosettaInterpreterListLiteralInterpreter.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/interpreternew/visitors/RosettaInterpreterListLiteralInterpreter.java
@@ -2,32 +2,39 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Stream;
 
-
-import com.regnosys.rosetta.interpreternew.RosettaInterpreterVisitor;
 import com.regnosys.rosetta.interpreternew.values.RosettaInterpreterListValue;
 import com.regnosys.rosetta.rosetta.expression.ListLiteral;
 import com.regnosys.rosetta.rosetta.expression.RosettaExpression;
 import com.regnosys.rosetta.rosetta.interpreter.RosettaInterpreterValue;
 
-public class RosettaInterpreterListLiteralInterpreter extends RosettaInterpreterConcreteInterpreter {
+public class RosettaInterpreterListLiteralInterpreter
+	extends RosettaInterpreterConcreteInterpreter {
 
 	public RosettaInterpreterListLiteralInterpreter() {
 		super();
 	}
 	
+	/**
+	 * Interprets a list literal, evaluating it to a list value.
+	 *
+	 * @param exp the expression to be interpreted
+	 * @return the list value it represents
+	 */
 	public RosettaInterpreterListValue interp(ListLiteral exp) {
 		List<RosettaExpression> expressions = exp.getElements();
 		List<RosettaInterpreterValue> interpretedExpressions = new ArrayList<>();
 		
-		for(RosettaExpression e : expressions) {
+		for (RosettaExpression e : expressions) {
 			RosettaInterpreterValue val = e.accept(visitor);
 			
 			if (val instanceof RosettaInterpreterListValue) {
-				interpretedExpressions.addAll(((RosettaInterpreterListValue)val).getExpressions());
+				interpretedExpressions.addAll(
+						((RosettaInterpreterListValue)val)
+						.getExpressions());
+			} else {
+				interpretedExpressions.add(val);
 			}
-			else interpretedExpressions.add(val);
 		}
 		
 		
diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/interpreternew/visitors/RosettaInterpreterRosettaBooleanLiteralInterpreter.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/interpreternew/visitors/RosettaInterpreterRosettaBooleanLiteralInterpreter.java
@@ -3,7 +3,8 @@
 import com.regnosys.rosetta.interpreternew.values.RosettaInterpreterBooleanValue;
 import com.regnosys.rosetta.rosetta.expression.RosettaBooleanLiteral;
 
-public class RosettaInterpreterRosettaBooleanLiteralInterpreter extends RosettaInterpreterConcreteInterpreter{
+public class RosettaInterpreterRosettaBooleanLiteralInterpreter
+	extends RosettaInterpreterConcreteInterpreter {
 
 	public RosettaInterpreterBooleanValue interp(RosettaBooleanLiteral expr) {
 		return new RosettaInterpreterBooleanValue(expr.isValue());
diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/interpreternew/visitors/RosettaInterpreterRosettaIntLiteralInterpreter.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/interpreternew/visitors/RosettaInterpreterRosettaIntLiteralInterpreter.java
@@ -3,7 +3,8 @@
 import com.regnosys.rosetta.interpreternew.values.RosettaInterpreterIntegerValue;
 import com.regnosys.rosetta.rosetta.expression.RosettaIntLiteral;
 
-public class RosettaInterpreterRosettaIntLiteralInterpreter extends RosettaInterpreterConcreteInterpreter{
+public class RosettaInterpreterRosettaIntLiteralInterpreter 
+	extends RosettaInterpreterConcreteInterpreter {
 	
 	public RosettaInterpreterIntegerValue interp(RosettaIntLiteral expr) {
 		return new RosettaInterpreterIntegerValue(expr.getValue());
diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/interpreternew/visitors/RosettaInterpreterRosettaNumberLiteralInterpreter.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/interpreternew/visitors/RosettaInterpreterRosettaNumberLiteralInterpreter.java
@@ -3,7 +3,8 @@
 import com.regnosys.rosetta.interpreternew.values.RosettaInterpreterNumberValue;
 import com.regnosys.rosetta.rosetta.expression.RosettaNumberLiteral;
 
-public class RosettaInterpreterRosettaNumberLiteralInterpreter extends RosettaInterpreterConcreteInterpreter {
+public class RosettaInterpreterRosettaNumberLiteralInterpreter 
+	extends RosettaInterpreterConcreteInterpreter {
 
 	public RosettaInterpreterNumberValue interp(RosettaNumberLiteral exp) {
 		return new RosettaInterpreterNumberValue(exp.getValue());
diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/interpreternew/visitors/RosettaInterpreterRosettaStringLiteralInterpreter.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/interpreternew/visitors/RosettaInterpreterRosettaStringLiteralInterpreter.java
@@ -3,7 +3,8 @@
 import com.regnosys.rosetta.interpreternew.values.RosettaInterpreterStringValue;
 import com.regnosys.rosetta.rosetta.expression.RosettaStringLiteral;
 
-public class RosettaInterpreterRosettaStringLiteralInterpreter extends RosettaInterpreterConcreteInterpreter{
+public class RosettaInterpreterRosettaStringLiteralInterpreter 
+	extends RosettaInterpreterConcreteInterpreter {
 
 	public RosettaInterpreterStringValue interp(RosettaStringLiteral exp) {
 		return new RosettaInterpreterStringValue(exp.getValue());
diff --git a/rosetta-testing/src/test/java/com/regnosys/rosetta/interpreternew/RosettaInterpreterComparisonTest.java b/rosetta-testing/src/test/java/com/regnosys/rosetta/interpreternew/RosettaInterpreterComparisonTest.java
@@ -30,11 +30,12 @@ public class RosettaInterpreterComparisonTest {
 	@Inject
 	RosettaInterpreterNew interpreter;
 	
-	private ExpressionFactory eFactory;
+	@SuppressWarnings("unused")
+	private ExpressionFactory exFactory;
 	
 	@BeforeEach
 	public void setup() {
-		eFactory = ExpressionFactoryImpl.init();
+		exFactory = ExpressionFactoryImpl.init();
 	}
 	
 	@Test
@@ -117,8 +118,9 @@ public void errorThrownAllElementsTest() {
 		assertEquals(expectedError.getErrors(),
 				(errorVal.getErrors()));
 		
-		assertEquals(((RosettaInterpreterError) expectedError.getErrors().get(0)).getError(),
-				(((RosettaInterpreterError) (errorVal.getErrors().get(0))).getError()));
+		assertEquals(((RosettaInterpreterError)expectedError.getErrors().get(0)).getError(),
+				(((RosettaInterpreterError)(errorVal.getErrors().get(0)))
+						.getError()));
 	}
 	
 }
diff --git a/rosetta-testing/src/test/java/com/regnosys/rosetta/interpreternew/RosettaInterpreterEqualityTest.java b/rosetta-testing/src/test/java/com/regnosys/rosetta/interpreternew/RosettaInterpreterEqualityTest.java
@@ -2,8 +2,6 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import java.math.BigInteger;
-
 import javax.inject.Inject;
 
 import org.eclipse.xtext.testing.InjectWith;
@@ -16,10 +14,7 @@
 import com.regnosys.rosetta.interpreternew.values.RosettaInterpreterError;
 import com.regnosys.rosetta.interpreternew.values.RosettaInterpreterErrorValue;
 import com.regnosys.rosetta.rosetta.expression.ExpressionFactory;
-import com.regnosys.rosetta.rosetta.expression.ListLiteral;
-import com.regnosys.rosetta.rosetta.expression.RosettaBooleanLiteral;
 import com.regnosys.rosetta.rosetta.expression.RosettaExpression;
-import com.regnosys.rosetta.rosetta.expression.RosettaIntLiteral;
 import com.regnosys.rosetta.rosetta.expression.impl.ExpressionFactoryImpl;
 import com.regnosys.rosetta.rosetta.interpreter.RosettaInterpreterValue;
 import com.regnosys.rosetta.tests.RosettaInjectorProvider;
@@ -34,11 +29,12 @@ public class RosettaInterpreterEqualityTest {
 	@Inject
 	RosettaInterpreterNew interpreter;
 	
-	private ExpressionFactory eFactory;
+	@SuppressWarnings("unused")
+	private ExpressionFactory exFactory;
 	
 	@BeforeEach
 	public void setup() {
-		eFactory = ExpressionFactoryImpl.init();
+		exFactory = ExpressionFactoryImpl.init();
 	}
 	
 	@Test
diff --git a/rosetta-testing/src/test/java/com/regnosys/rosetta/interpreternew/RosettaInterpreterErrorTest.java b/rosetta-testing/src/test/java/com/regnosys/rosetta/interpreternew/RosettaInterpreterErrorTest.java
@@ -2,42 +2,25 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import java.math.BigDecimal;
-import java.math.BigInteger;
 import java.util.List;
 
-import javax.inject.Inject;
-
 import org.eclipse.xtext.testing.InjectWith;
 import org.eclipse.xtext.testing.extensions.InjectionExtension;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
-import com.regnosys.rosetta.interpreternew.values.RosettaInterpreterBooleanValue;
 import com.regnosys.rosetta.interpreternew.values.RosettaInterpreterError;
 import com.regnosys.rosetta.interpreternew.values.RosettaInterpreterErrorValue;
-import com.regnosys.rosetta.interpreternew.values.RosettaInterpreterIntegerValue;
-import com.regnosys.rosetta.interpreternew.values.RosettaInterpreterListValue;
-import com.regnosys.rosetta.interpreternew.values.RosettaInterpreterNumberValue;
-import com.regnosys.rosetta.interpreternew.values.RosettaInterpreterStringValue;
-import com.regnosys.rosetta.rosetta.expression.ExpressionFactory;
-import com.regnosys.rosetta.rosetta.expression.ListLiteral;
-import com.regnosys.rosetta.rosetta.expression.RosettaExpression;
-import com.regnosys.rosetta.rosetta.interpreter.RosettaInterpreterValue;
-import com.regnosys.rosetta.rosetta.expression.impl.ExpressionFactoryImpl;
 import com.regnosys.rosetta.tests.RosettaInjectorProvider;
-import com.regnosys.rosetta.tests.util.ExpressionParser;
 
 @ExtendWith(InjectionExtension.class)
 @InjectWith(RosettaInjectorProvider.class)
 public class RosettaInterpreterErrorTest {
 
 	@Test
-	public void SimpleErrorTest() {
+	public void simpleErrorTest() {
 		RosettaInterpreterError e1 = new RosettaInterpreterError("e1");
 		RosettaInterpreterError e2 = new RosettaInterpreterError("e2");
-		List<RosettaInterpreterError> el = List.of(e1, e2);
 		
 		RosettaInterpreterErrorValue val1 = new RosettaInterpreterErrorValue();
 		RosettaInterpreterErrorValue val2 = new RosettaInterpreterErrorValue();
@@ -47,11 +30,12 @@ public void SimpleErrorTest() {
 		
 		val1.addAllErrors(val2);
 		
+		List<RosettaInterpreterError> el = List.of(e1, e2);
 		assertEquals(el, val1.getErrors());
 	}
 	
 	@Test
-	public void ErrorMessageExists() {
+	public void errorMessageExists() {
 		RosettaInterpreterError e1 = new RosettaInterpreterError("e1");
 		RosettaInterpreterErrorValue val1 = new RosettaInterpreterErrorValue(e1);
 		assertEquals("e1", val1.getErrors().get(0).getMessage());
diff --git a/rosetta-testing/src/test/java/com/regnosys/rosetta/interpreternew/RosettaInterpreterLiteralsTest.java b/rosetta-testing/src/test/java/com/regnosys/rosetta/interpreternew/RosettaInterpreterLiteralsTest.java
@@ -37,79 +37,92 @@ public class RosettaInterpreterLiteralsTest {
 	@Inject
 	private ExpressionValidationHelper validation;
 	
-	private ExpressionFactory eFactory;
+	@SuppressWarnings("unused")
+	private ExpressionFactory exFactory;
 	
 	@BeforeEach
 	public void setup() {
-		eFactory = ExpressionFactoryImpl.init();
+		exFactory = ExpressionFactoryImpl.init();
 	}
 	
 	@Test
-	public void BooleanTest() {
+	public void booleanTest() {
 		RosettaExpression expr = parser.parseExpression("True");
 		RosettaInterpreterValue val = interpreter.interp(expr);
 		assertEquals(true, ((RosettaInterpreterBooleanValue)val).getValue());
 	}
 	 
 	@Test
-	public void ListTest() {
+	public void listTest() {
 		RosettaExpression expr = parser.parseExpression("[1,2]");
 		validation.assertNoIssues(expr);
 		RosettaInterpreterValue val = interpreter.interp(expr);
 		RosettaInterpreterListValue expected = 
 				new RosettaInterpreterListValue(List.of(
-						new RosettaInterpreterIntegerValue(BigInteger.valueOf(1)), 
-						new RosettaInterpreterIntegerValue(BigInteger.valueOf(2))));
+						new RosettaInterpreterIntegerValue(
+								BigInteger.valueOf(1)), 
+						new RosettaInterpreterIntegerValue(
+								BigInteger.valueOf(2))));
 		assertEquals(expected, val);
 		
 	}
 	
 	@Test
-	public void NestedListTest() {
+	public void nestedListTest() {
 		RosettaExpression expr = parser.parseExpression("[1,[2,3]]");
 		validation.assertNoIssues(expr);
 		RosettaInterpreterValue val = interpreter.interp(expr);
 		RosettaInterpreterListValue expected = 
 				new RosettaInterpreterListValue(List.of(
-						new RosettaInterpreterIntegerValue(BigInteger.valueOf(1)), 
-						new RosettaInterpreterIntegerValue(BigInteger.valueOf(2)),
-						new RosettaInterpreterIntegerValue(BigInteger.valueOf(3))));
+						new RosettaInterpreterIntegerValue(
+								BigInteger.valueOf(1)), 
+						new RosettaInterpreterIntegerValue(
+								BigInteger.valueOf(2)),
+						new RosettaInterpreterIntegerValue(
+								BigInteger.valueOf(3))));
 		assertEquals(expected, val);
 		
 	}
 	
 	@Test
-	public void VeryNestedListTest() {
+	public void veryNestedListTest() {
 		RosettaExpression expr = parser.parseExpression("[1,[2,[3, [4, [5]]]]]");
 		validation.assertNoIssues(expr);
 		RosettaInterpreterValue val = interpreter.interp(expr);
 		RosettaInterpreterListValue expected = 
 				new RosettaInterpreterListValue(List.of(
-						new RosettaInterpreterIntegerValue(BigInteger.valueOf(1)), 
-						new RosettaInterpreterIntegerValue(BigInteger.valueOf(2)),
-						new RosettaInterpreterIntegerValue(BigInteger.valueOf(3)),
-						new RosettaInterpreterIntegerValue(BigInteger.valueOf(4)),
-						new RosettaInterpreterIntegerValue(BigInteger.valueOf(5))));
+						new RosettaInterpreterIntegerValue(
+								BigInteger.valueOf(1)), 
+						new RosettaInterpreterIntegerValue(
+								BigInteger.valueOf(2)),
+						new RosettaInterpreterIntegerValue(
+								BigInteger.valueOf(3)),
+						new RosettaInterpreterIntegerValue(
+								BigInteger.valueOf(4)),
+						new RosettaInterpreterIntegerValue(
+								BigInteger.valueOf(5))));
 		assertEquals(expected, val);
 		
 	}
 	
 	@Test
-	public void IntTest() {
+	public void intTest() {
 		RosettaExpression expr = parser.parseExpression("5");
 		RosettaInterpreterValue val = interpreter.interp(expr);
-		assertEquals(BigInteger.valueOf(5), ((RosettaInterpreterIntegerValue)val).getValue());
+		assertEquals(BigInteger.valueOf(5),
+				((RosettaInterpreterIntegerValue)val).getValue());
 	}
 	
 	@Test
-	public void NumberTest() {
+	public void numberTest() {
 		RosettaExpression expr = parser.parseExpression("5.5");
 		RosettaInterpreterValue val = interpreter.interp(expr);
-		assertEquals(BigDecimal.valueOf(5.5), ((RosettaInterpreterNumberValue)val).getValue());
+		assertEquals(BigDecimal.valueOf(5.5),
+				((RosettaInterpreterNumberValue)val).getValue());
 	}
 	
 	@Test
-	public void StringTest() {
+	public void stringTest() {
 		RosettaExpression expr = parser.parseExpression("\"hello\"");
 		RosettaInterpreterValue val = interpreter.interp(expr);
 		assertEquals("hello", ((RosettaInterpreterStringValue)val).getValue());
diff --git a/rosetta-testing/src/test/java/com/regnosys/rosetta/interpreternew/RosettaInterpreterNewTest.java b/rosetta-testing/src/test/java/com/regnosys/rosetta/interpreternew/RosettaInterpreterNewTest.java
diff --git a/rosetta-testing/src/test/java/com/regnosys/rosetta/interpreternew/value/RosettaInterpreterErrorValueTest.java b/rosetta-testing/src/test/java/com/regnosys/rosetta/interpreternew/value/RosettaInterpreterErrorValueTest.java

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,8 @@ public void eUnset(EStructuralFeature feature) {`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`@Override`
`104`		`- public Object eInvoke(EOperation operation, EList<?> arguments) throws InvocationTargetException {`
	`104`	`+ public Object eInvoke(EOperation operation, EList<?> arguments)`
	`105`	`+ throws InvocationTargetException {`
`105`	`106`	`// TODO Auto-generated method stub`
`106`	`107`	`return null;`
`107`	`108`	`}`