Add property resolution for provided dependencies

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

@@ -0,0 +1,41 @@
+package org.cloudfoundry.multiapps.mta.resolvers;
+
+import static java.text.MessageFormat.format;
+
+import java.util.Map;
+
+import org.cloudfoundry.multiapps.common.ContentException;
+import org.cloudfoundry.multiapps.mta.Messages;
+import org.cloudfoundry.multiapps.mta.handlers.v2.DescriptorHandler;
+import org.cloudfoundry.multiapps.mta.model.DeploymentDescriptor;
+import org.cloudfoundry.multiapps.mta.model.RequiredDependency;
+import org.cloudfoundry.multiapps.mta.model.Resource;
+
+public class ProvidesValuesResolver implements ProvidedValuesResolver {
+
+    private DescriptorHandler handler;
+    private String consumerName;
+    private DeploymentDescriptor descriptor;
+
+    public ProvidesValuesResolver(String consumerName, DescriptorHandler handler, DeploymentDescriptor descriptor) {
+
+        this.handler = handler;
+        this.consumerName = consumerName;
+        this.descriptor = descriptor;
+    }
+
+    @Override
+    public Map<String, Object> resolveProvidedValues(String dependencyName) throws ContentException {
+        assertRequiredDependencyExists(dependencyName);
+        Resource resource = handler.findResource(descriptor, dependencyName);
+        return resource.getProperties();
+    }
+
+    protected void assertRequiredDependencyExists(String dependencyName) {
+        RequiredDependency requiredDependency = handler.findRequiredDependency(descriptor, consumerName, dependencyName);
+        if (requiredDependency == null) {
+            throw new ContentException(format(Messages.ILLEGAL_REFERENCES_DETECTED, consumerName, dependencyName));
+        }
+    }
+
+}

multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/resolvers/v2/ModuleReferenceResolver.java

@@ -8,9 +8,11 @@
 import org.cloudfoundry.multiapps.common.ContentException;
 import org.cloudfoundry.multiapps.mta.model.DeploymentDescriptor;
 import org.cloudfoundry.multiapps.mta.model.Module;
+import org.cloudfoundry.multiapps.mta.model.ProvidedDependency;
 import org.cloudfoundry.multiapps.mta.model.RequiredDependency;
 import org.cloudfoundry.multiapps.mta.resolvers.Resolver;
 import org.cloudfoundry.multiapps.mta.resolvers.ResolverBuilder;
+import org.cloudfoundry.multiapps.mta.resolvers.v3.ProvidedDependencyReferenceResolver;
 import org.cloudfoundry.multiapps.mta.util.NameUtil;
 
 public class ModuleReferenceResolver implements Resolver<Module> {
@@ -37,6 +39,7 @@ public Module resolve() throws ContentException {
         module.setProperties(getResolvedProperties());
         module.setParameters(getResolvedParameters());
         module.setRequiredDependencies(getResolvedDependencies());
+        module.setProvidedDependencies(getResolvedProvidedDependencies());
         return module;
     }
 
@@ -77,4 +80,20 @@ protected RequiredDependencyReferenceResolver createRequiredDependencyResolver(R
                                                        dynamicResolvableParameters);
     }
 
+    protected ProvidedDependencyReferenceResolver getProvidedDependencyResolver(ProvidedDependency providedDependency) {
+        return new ProvidedDependencyReferenceResolver(descriptor,
+                                                       module,
+                                                       providedDependency,
+                                                       prefix,
+                                                       new ResolverBuilder(),
+                                                       dynamicResolvableParameters);
+    }
+
+    protected List<ProvidedDependency> getResolvedProvidedDependencies() {
+        return module.getProvidedDependencies()
+                     .stream()
+                     .map(providedDependency -> getProvidedDependencyResolver(providedDependency).resolve())
+                     .collect(Collectors.toList());
+    }
+
 }

multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/resolvers/v3/ProvidedDependencyReferenceResolver.java

@@ -0,0 +1,60 @@
+package org.cloudfoundry.multiapps.mta.resolvers.v3;
+
+import static org.cloudfoundry.multiapps.mta.resolvers.ReferencePattern.FULLY_QUALIFIED;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+
+import org.cloudfoundry.multiapps.common.ContentException;
+import org.cloudfoundry.multiapps.mta.handlers.v2.DescriptorHandler;
+import org.cloudfoundry.multiapps.mta.model.DeploymentDescriptor;
+import org.cloudfoundry.multiapps.mta.model.NamedElement;
+import org.cloudfoundry.multiapps.mta.model.ProvidedDependency;
+import org.cloudfoundry.multiapps.mta.resolvers.ProvidedValuesResolver;
+import org.cloudfoundry.multiapps.mta.resolvers.ProvidesValuesResolver;
+import org.cloudfoundry.multiapps.mta.resolvers.ReferenceResolver;
+import org.cloudfoundry.multiapps.mta.resolvers.ResolverBuilder;
+
+public class ProvidedDependencyReferenceResolver extends ReferenceResolver<ProvidedDependency> {
+
+    protected final ProvidedDependency dependency;
+    protected final ResolverBuilder propertiesResolverBuilder;
+    private DescriptorHandler handler;
+    private DeploymentDescriptor descriptor;
+    private String consumerName;
+
+    public ProvidedDependencyReferenceResolver(DeploymentDescriptor descriptor, NamedElement container, ProvidedDependency dependency,
+                                               String prefix, ResolverBuilder propertiesResolverBuilder,
+                                               Set<String> dynamicResolvableParameters) {
+        this(descriptor, container, dependency, prefix, new DescriptorHandler(), propertiesResolverBuilder, dynamicResolvableParameters);
+    }
+
+    public ProvidedDependencyReferenceResolver(DeploymentDescriptor descriptor, NamedElement container, ProvidedDependency dependency,
+                                               String prefix, DescriptorHandler handler, ResolverBuilder propertiesResolverBuilder,
+                                               Set<String> dynamicResolvableParameters) {
+        super(dependency.getName(), prefix, handler, descriptor, container.getName(), FULLY_QUALIFIED, dynamicResolvableParameters);
+        this.dependency = dependency;
+        this.propertiesResolverBuilder = propertiesResolverBuilder;
+        this.handler = handler;
+        this.consumerName = container.getName();
+        this.descriptor = descriptor;
+    }
+
+    @Override
+    public ProvidedDependency resolve() throws ContentException {
+        Map<String, Object> resolvedProperties = resolve(dependency.getProperties(), Collections.emptyMap(), true);
+        Map<String, Object> resolvedParameters = resolve(dependency.getParameters(), Collections.emptyMap(), true);
+        dependency.setProperties(resolvedProperties);
+        dependency.setParameters(resolvedParameters);
+        return dependency;
+    }
+
+    @Override
+    protected Map<String, Object> resolve(Map<String, Object> properties, final Map<String, Object> propertyValues, Boolean isStrict) {
+        ProvidedValuesResolver valuesResolver = new ProvidesValuesResolver(consumerName, handler, descriptor);
+        return propertiesResolverBuilder.build(properties, valuesResolver, patternToMatch, prefix, isStrict, dynamicResolvableParameters)
+                                        .resolve();
+    }
+
+}

multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v2/resolved-05.yaml.json

@@ -41,11 +41,11 @@
         "url" : "https://localhost:52030",
         "destinations" : [ {
           "name" : "backend1",
-          "url" : "~{backend1/url}",
+          "url" : "https://example.com:51088",
           "forwardAuthToken" : true
         }, {
           "name" : "backend2",
-          "url" : "~{backend2/url}",
+          "url" : "https://www.ynet.co.il",
           "forwardAuthToken" : true
         } ]
       },