Skip to content

Commit 103b794

Browse files
committed
Merge branch 'remove-eobject-bloat' into 'dev'
Remove eobject bloat See merge request cse2000-software-project/2023-2024/cluster-e/04b/rune-dsl-interpreter!28
2 parents aef0b89 + d0acad7 commit 103b794

File tree

4 files changed

+11
-392
lines changed

4 files changed

+11
-392
lines changed

rosetta-lang/src/main/java/com/regnosys/rosetta/interpreternew/RosettaInterpreterVisitor.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,17 @@
1919
import com.regnosys.rosetta.rosetta.expression.RosettaExistsExpression;
2020
import com.regnosys.rosetta.rosetta.expression.RosettaConditionalExpression;
2121
import com.regnosys.rosetta.rosetta.expression.RosettaIntLiteral;
22+
import com.regnosys.rosetta.rosetta.interpreter.InterpreterVisitor;
2223
import com.regnosys.rosetta.rosetta.interpreter.RosettaInterpreterValue;
2324
import com.regnosys.rosetta.rosetta.expression.RosettaNumberLiteral;
2425
import com.regnosys.rosetta.rosetta.expression.RosettaOnlyElement;
2526
import com.regnosys.rosetta.rosetta.expression.RosettaPatternLiteral;
2627
import com.regnosys.rosetta.rosetta.expression.RosettaStringLiteral;
2728
import com.regnosys.rosetta.rosetta.expression.RosettaSymbolReference;
2829
import com.regnosys.rosetta.rosetta.expression.SumOperation;
30+
31+
import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
32+
2933
import com.regnosys.rosetta.interpreternew.values.RosettaInterpreterEnvironment;
3034
import com.regnosys.rosetta.interpreternew.visitors.RosettaInterpreterLogicalOperationInterpreter;
3135
import com.regnosys.rosetta.interpreternew.values.RosettaInterpreterError;
@@ -42,7 +46,7 @@
4246
import com.regnosys.rosetta.interpreternew.visitors.RosettaInterpreterRosettaStringLiteralInterpreter;
4347
import com.regnosys.rosetta.interpreternew.visitors.RosettaInterpreterVariableInterpreter;
4448

45-
public class RosettaInterpreterVisitor extends RosettaInterpreterVisitorBase {
49+
public class RosettaInterpreterVisitor extends MinimalEObjectImpl implements InterpreterVisitor {
4650

4751

4852
@Override

rosetta-lang/src/main/java/com/regnosys/rosetta/interpreternew/RosettaInterpreterVisitorBase.java

Lines changed: 0 additions & 133 deletions
This file was deleted.
Lines changed: 3 additions & 129 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,14 @@
11
package com.regnosys.rosetta.interpreternew.values;
22

3-
import java.lang.reflect.InvocationTargetException;
43
import java.util.List;
54
import java.util.stream.Collectors;
65
import java.util.stream.Stream;
76

8-
import org.eclipse.emf.common.notify.Adapter;
9-
import org.eclipse.emf.common.notify.Notification;
10-
import org.eclipse.emf.common.util.EList;
11-
import org.eclipse.emf.common.util.TreeIterator;
12-
import org.eclipse.emf.ecore.EClass;
13-
import org.eclipse.emf.ecore.EObject;
14-
import org.eclipse.emf.ecore.EOperation;
15-
import org.eclipse.emf.ecore.EReference;
16-
import org.eclipse.emf.ecore.EStructuralFeature;
17-
import org.eclipse.emf.ecore.resource.Resource;
7+
import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
188
import com.regnosys.rosetta.interpreternew.RosettaInterpreterNewException;
199
import com.regnosys.rosetta.rosetta.interpreter.RosettaInterpreterValue;
2010

21-
public abstract class RosettaInterpreterBaseValue implements RosettaInterpreterValue {
11+
public abstract class RosettaInterpreterBaseValue extends MinimalEObjectImpl implements RosettaInterpreterValue {
2212

2313
/**
2414
* Converts a Value to a Stream of the elements it contains.
@@ -72,127 +62,11 @@ public static Stream<RosettaInterpreterValue> valueStream(RosettaInterpreterValu
7262
* @param val - value to convert
7363
* @return - list of value or its contained values
7464
*/
75-
public static List<RosettaInterpreterValue> toValueList(RosettaInterpreterValue val){
65+
public static List<RosettaInterpreterValue> toValueList(RosettaInterpreterValue val) {
7666
if (!(val instanceof RosettaInterpreterBaseValue)) {
7767
throw new RosettaInterpreterNewException("Cannot take value stream"
7868
+ "of RosettaInterpreterValue");
7969
}
8070
return valueStream(val).collect(Collectors.toList());
8171
}
82-
83-
@Override
84-
public EClass eClass() {
85-
// TODO Auto-generated method stub
86-
return null;
87-
}
88-
89-
@Override
90-
public Resource eResource() {
91-
// TODO Auto-generated method stub
92-
return null;
93-
}
94-
95-
@Override
96-
public EObject eContainer() {
97-
// TODO Auto-generated method stub
98-
return null;
99-
}
100-
101-
@Override
102-
public EStructuralFeature eContainingFeature() {
103-
// TODO Auto-generated method stub
104-
return null;
105-
}
106-
107-
@Override
108-
public EReference eContainmentFeature() {
109-
// TODO Auto-generated method stub
110-
return null;
111-
}
112-
113-
@Override
114-
public EList<EObject> eContents() {
115-
// TODO Auto-generated method stub
116-
return null;
117-
}
118-
119-
@Override
120-
public TreeIterator<EObject> eAllContents() {
121-
// TODO Auto-generated method stub
122-
return null;
123-
}
124-
125-
@Override
126-
public boolean eIsProxy() {
127-
// TODO Auto-generated method stub
128-
return false;
129-
}
130-
131-
@Override
132-
public EList<EObject> eCrossReferences() {
133-
// TODO Auto-generated method stub
134-
return null;
135-
}
136-
137-
@Override
138-
public Object eGet(EStructuralFeature feature) {
139-
// TODO Auto-generated method stub
140-
return null;
141-
}
142-
143-
@Override
144-
public Object eGet(EStructuralFeature feature, boolean resolve) {
145-
// TODO Auto-generated method stub
146-
return null;
147-
}
148-
149-
@Override
150-
public void eSet(EStructuralFeature feature, Object newValue) {
151-
// TODO Auto-generated method stub
152-
153-
}
154-
155-
@Override
156-
public boolean eIsSet(EStructuralFeature feature) {
157-
// TODO Auto-generated method stub
158-
return false;
159-
}
160-
161-
@Override
162-
public void eUnset(EStructuralFeature feature) {
163-
// TODO Auto-generated method stub
164-
165-
}
166-
167-
@Override
168-
public Object eInvoke(EOperation operation, EList<?> arguments)
169-
throws InvocationTargetException {
170-
// TODO Auto-generated method stub
171-
return null;
172-
}
173-
174-
@Override
175-
public EList<Adapter> eAdapters() {
176-
// TODO Auto-generated method stub
177-
return null;
178-
}
179-
180-
@Override
181-
public boolean eDeliver() {
182-
// TODO Auto-generated method stub
183-
return false;
184-
}
185-
186-
@Override
187-
public void eSetDeliver(boolean deliver) {
188-
// TODO Auto-generated method stub
189-
190-
}
191-
192-
@Override
193-
public void eNotify(Notification notification) {
194-
// TODO Auto-generated method stub
195-
196-
}
197-
19872
}

0 commit comments

Comments
 (0)