Skip to content

Commit 7640c39

Browse files
committed
fix comments
1 parent 3758326 commit 7640c39

File tree

3 files changed

+26
-3
lines changed

3 files changed

+26
-3
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,10 @@ private Object resolveKeyInIterable(Reference reference, Collection<?> listOfPro
222222
}
223223

224224
private String buildFullQualifiedPath(Reference reference) {
225-
String raw = reference.getDependencyName() != null
225+
String referenceKey = reference.getDependencyName() != null
226226
? String.format(FULL_PATH_TEMPLATE, reference.getDependencyName(), NameUtil.DEFAULT_PREFIX_SEPARATOR, reference.getKey())
227227
: reference.getKey();
228-
return NameUtil.getPrefixedPath(prefix, raw);
228+
return NameUtil.getPrefixedPath(prefix, referenceKey);
229229
}
230230

231231
private String getReferencedPropertyKeyWithSuffix(Reference reference) {

multiapps-mta/src/test/java/org/cloudfoundry/multiapps/mta/resolvers/v3/DescriptorReferenceResolverTest.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,11 @@ static Stream<Arguments> testResolve() {
3232
Arguments.of("merged-04.yaml", new Expectation(Expectation.Type.JSON, "resolved-03.yaml.json")),
3333
// (4)
3434
Arguments.of("mtad-with-escaped-references.yaml",
35-
new Expectation(Expectation.Type.JSON, "result-from-escaped-references.json")));
35+
new Expectation(Expectation.Type.JSON, "result-from-escaped-references.json")),
36+
// (5)
37+
Arguments.of("merged-05.yaml",
38+
new Expectation(Expectation.Type.EXCEPTION,
39+
"Unable to resolve \"qux#benefits-app-example1#benefits-app-example1##parameters##destinations##0##url\"")));
3640
}
3741

3842
@ParameterizedTest
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
_schema-version: "3"
2+
ID: com.sap.mta.v3.test.array
3+
version: 1.0.0
4+
5+
modules:
6+
- name: qux
7+
type: qux
8+
requires:
9+
- name: benefits-app-example1
10+
group: configuration
11+
properties:
12+
array-ref: ~{benefits-app-example1##parameters##destinations##0##url}
13+
14+
resources:
15+
- name: benefits-app-example1
16+
type: configuration
17+
parameters:
18+
destinations:
19+
- name: dest-0

0 commit comments

Comments
 (0)