Cleaned

Author: SimonCockx

rosetta-lang/src/main/java/com/regnosys/rosetta/generator/GeneratorScope.java

@@ -178,37 +178,6 @@ public GeneratedIdentifier getOrCreateIdentifier(RosettaNamed obj) {
 		return getOrCreateIdentifier(obj, obj.getName());
 	}
 
-	/**
-	 * Remove an identifier from this scope. Also removes any key synonyms to this identifier.
-	 * Returns the set of keys to the given removed identifier.
-	 * 
-	 * @throws IllegalStateException if this scope is closed.
-	 */
-	public Set<Object> removeIdentifier(GeneratedIdentifier identifier) {
-		if (isClosed) {
-			throw new IllegalStateException("Cannot delete an identifier in a closed scope. (" + identifier + ")\n" + this);
-		}
-		Set<Object> keys = this.identifiers.entrySet().stream()
-			.filter(e -> e.getValue().equals(identifier))
-			.map(Map.Entry::getKey)
-			.collect(Collectors.toSet());
-		keys.forEach(k -> {
-			this.identifiers.remove(k);
-			removeKeySynonyms(k);
-		});
-		return keys;
-	}
-	private void removeKeySynonyms(Object key) {
-		Set<Object> synonyms = this.keySynonyms.entrySet().stream()
-			.filter(e -> e.getValue().equals(key))
-			.map(Map.Entry::getKey)
-			.collect(Collectors.toSet());
-		synonyms.forEach(s -> {
-			this.keySynonyms.remove(s);
-			removeKeySynonyms(s);
-		});
-	}
-	
 	/**
 	 * Create an synonym between an object and an already existing identifiable object.
 	 * 
@@ -299,7 +268,7 @@ private void computeActualNames() {
 	}
 	private LinkedListMultimap<String, GeneratedIdentifier> localIdentifiersByDesiredName() {
 		LinkedListMultimap<String, GeneratedIdentifier> result = LinkedListMultimap.create();
-		new HashSet<>(identifiers.values()).forEach(id -> result.put(id.getDesiredName(), id));
+		identifiers.values().stream().distinct().forEach(id -> result.put(id.getDesiredName(), id));
 		return result;
 	}
 	protected Set<String> getTakenNames() {

rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/expression/ExpressionGenerator.xtend

@@ -160,7 +160,7 @@ class ExpressionGenerator extends RosettaExpressionSwitch<JavaStatementBuilder,
 		'''«importWildcard(method(ExpressionOperators, methodName))»'''
 	}
 	private def JavaStatementBuilder applyRuntimeMethod(JavaStatementBuilder expr, String methodName, JavaType resultType) {
-		return expr.mapExpression[JavaExpression.from('''«importWildcard(method(ExpressionOperators, methodName))»(«it»)''', resultType)]
+		expr.mapExpression[JavaExpression.from('''«runtimeMethod(methodName)»(«it»)''', resultType)]
 	}	
 
 	private def JavaStatementBuilder callableWithArgsCall(RosettaCallableWithArgs callable, List<RosettaExpression> arguments, JavaScope scope) {

rosetta-runtime/src/main/java/com/rosetta/model/lib/mapper/MapperC.java

@@ -41,7 +41,7 @@ public static <T> MapperC<T> of(MapperBuilder<T>... ts) {
 		return new MapperC<T>(items);
 	}
 
-	public static <T> MapperC<T> of(List<? extends T> ts) {		
+	public static <T> MapperC<T> of(List<? extends T> ts) {
 		List<MapperItem<T, ?>> items = new ArrayList<>();
 		if (ts != null) {
 			for (T ele : ts) {