Skip to content

Commit 703fd78

Browse files
committed
Refactor: Removes unnecessary imports and variables
1 parent 1df0416 commit 703fd78

5 files changed

Lines changed: 15 additions & 10 deletions

File tree

src/main/java/de/vill/conversion/ConvertAggregateFunction.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ private void searchAggregateFunctionInExpression(Expression expression) {
5656

5757
private void replaceAggregateFunctionInExpression(Expression parentExpression, AggregateFunctionExpression aggregateFunctionExpression) {
5858
Feature rootFeature;
59-
Expression aggregateFunctionReplacement;
6059
if (aggregateFunctionExpression.getRootFeature() == null) {
6160
rootFeature = rootFeatureModel.getRootFeature();
6261
} else {
@@ -74,7 +73,6 @@ private void replaceAggregateFunctionInExpression(Expression parentExpression, A
7473

7574
private void replaceAggregateFunctionInExpressionConstraint(ExpressionConstraint parentExpression, AggregateFunctionExpression aggregateFunctionExpression) {
7675
Feature rootFeature;
77-
Expression aggregateFunctionReplacement;
7876
if (aggregateFunctionExpression.getRootFeature() == null) {
7977
rootFeature = rootFeatureModel.getRootFeature();
8078
} else {
@@ -155,7 +153,6 @@ private void removeAggregateFunctionFromAttributes(Feature feature) {
155153
}
156154
}
157155
if (attributeConstraintList != null && attributeConstraintList.getValue() instanceof List<?>) {
158-
List<Object> newConstraintList = new LinkedList<>();
159156
for (Object constraint : (List<?>) attributeConstraintList.getValue()) {
160157
if (constraint instanceof Constraint) {
161158
searchAggregateFunctionInConstraint((Constraint) constraint);

src/main/java/de/vill/conversion/ConvertSMTLevel.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import com.google.common.collect.Sets;
44
import de.vill.model.*;
55
import de.vill.model.constraint.*;
6-
import de.vill.model.expression.AggregateFunctionExpression;
7-
import de.vill.model.expression.BinaryExpression;
86
import de.vill.model.expression.Expression;
97
import de.vill.model.expression.LiteralExpression;
108

src/main/java/de/vill/conversion/ConvertStringConstraints.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import de.vill.model.constraint.Constraint;
99
import de.vill.model.constraint.EqualEquationConstraint;
1010
import de.vill.model.constraint.ExpressionConstraint;
11-
import de.vill.model.expression.AggregateFunctionExpression;
1211
import de.vill.model.expression.Expression;
1312
import de.vill.model.expression.LengthAggregateFunctionExpression;
1413
import de.vill.model.expression.LiteralExpression;
@@ -23,7 +22,6 @@
2322

2423
public class ConvertStringConstraints implements IConversionStrategy {
2524
private final Map<String, Map<String, Attribute<?>>> featuresToBeUpdated = new HashMap<>();
26-
private FeatureModel rootFeatureModel;
2725

2826
@Override
2927
public Set<LanguageLevel> getLevelsToBeRemoved() {
@@ -35,9 +33,10 @@ public Set<LanguageLevel> getTargetLevelsOfConversion() {
3533
return new HashSet<>(Collections.singletonList(LanguageLevel.TYPE_LEVEL));
3634
}
3735

36+
37+
// TODO is not matching with the Interface definition, should be fixed
3838
@Override
3939
public void convertFeatureModel(final FeatureModel rootFeatureModel, final FeatureModel featureModel) {
40-
this.rootFeatureModel = rootFeatureModel;
4140
rootFeatureModel.getOwnConstraints().forEach(this::convertStringAggregateFunctionInExpressionConstraint);
4241
rootFeatureModel.getOwnConstraints().removeIf(x -> containsStringEqualityExpression(x));
4342
this.traverseFeatures(rootFeatureModel.getRootFeature());

src/main/java/de/vill/conversion/ConvertTypeLevel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import java.util.Set;
1717

1818
public class ConvertTypeLevel implements IConversionStrategy {
19-
FeatureModel rootFeatureModel;
19+
private FeatureModel rootFeatureModel;
2020

2121
@Override
2222
public Set<LanguageLevel> getLevelsToBeRemoved() {

src/main/java/de/vill/conversion/IConversionStrategy.java

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,17 @@ public interface IConversionStrategy {
1010

1111
Set<LanguageLevel> getTargetLevelsOfConversion();
1212

13+
/**
14+
* Converts the given feature model according to the implemented strategy.
15+
* <p>
16+
* The {@code rootFeatureModel} provides the context of the entire feature model,
17+
* while {@code featureModel} is the (sub-)model that will be modified during the conversion.
18+
* <p>
19+
* Typically, only {@code featureModel} is changed; {@code rootFeatureModel} is used for reference.
20+
* If the entire model should be converted, both parameters can reference the same instance.
21+
*
22+
* @param rootFeatureModel the root or complete feature model, used as context/reference (not modified)
23+
* @param featureModel the feature model (or submodel) to be converted (will be modified)
24+
*/
1325
void convertFeatureModel(FeatureModel rootFeatureModel, FeatureModel featureModel);
14-
1526
}

0 commit comments

Comments
 (0)