Skip to content

Commit 51ee5ae

Browse files
committed
Changes from latest comments
1 parent 3e42598 commit 51ee5ae

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/resolvers/ParameterChecker.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
public abstract class ParameterChecker extends Visitor implements SimplePropertyVisitor {
2222
private List<CustomParameterContainer> unsupportedParameters;
2323

24-
private Set<String> currentParameters;
24+
private Set<String> predefinedParametersForContainer;
2525

2626
protected abstract Set<String> getModuleParametersToMatch();
2727

@@ -70,7 +70,7 @@ public void visit(ElementContext context, Hook hook) {
7070
}
7171

7272
private void matchAndStore(String name, Set<String> parametersToMatch, ParametersContainer parametersContainer, String prefixedName) {
73-
this.currentParameters = parametersToMatch;
73+
this.predefinedParametersForContainer = parametersToMatch;
7474
List<String> unmatched = findMatchesInParameters(parametersContainer);
7575
if (!unmatched.isEmpty()) {
7676
unsupportedParameters.add(new CustomParameterContainer(name, unmatched, prefixedName));
@@ -95,7 +95,7 @@ public Object visit(String key, String value) {
9595
}
9696

9797
private String parameterKeyMatches(String valueToMatch) {
98-
if (currentParameters != null && !currentParameters.contains(valueToMatch)) {
98+
if (predefinedParametersForContainer != null && !predefinedParametersForContainer.contains(valueToMatch)) {
9999
return valueToMatch;
100100
}
101101
return null;

multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/resolvers/ReferencePattern.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
package org.cloudfoundry.multiapps.mta.resolvers;
22

33
import java.util.ArrayList;
4-
import java.util.Arrays;
54
import java.util.List;
65
import java.util.regex.Matcher;
76
import java.util.regex.Pattern;
8-
import java.util.stream.Collectors;
97

108
public enum ReferencePattern implements ValueMatcher {
119

@@ -16,11 +14,7 @@ public enum ReferencePattern implements ValueMatcher {
1614
private String patternFormat;
1715

1816
private final Pattern compiledPattern;
19-
20-
public static final List<Pattern> COMPILED_PATTERNS = Arrays.stream(values())
21-
.map(referencePattern -> referencePattern.compiledPattern)
22-
.collect(Collectors.toList());
23-
17+
2418
ReferencePattern(String pattern, String patternFormat) {
2519
this.pattern = pattern;
2620
this.patternFormat = patternFormat;

0 commit comments

Comments
 (0)