diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/binders/AssignCorrectHostnameAndBindAsHostPrefixIfConfigured.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/binders/AssignCorrectHostnameAndBindAsHostPrefixIfConfigured.java index ca0c31e9e4..aa8795472c 100644 --- a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/binders/AssignCorrectHostnameAndBindAsHostPrefixIfConfigured.java +++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/binders/AssignCorrectHostnameAndBindAsHostPrefixIfConfigured.java @@ -19,11 +19,14 @@ package org.jclouds.aws.s3.binders; import static org.jclouds.http.utils.ModifyRequest.endpoint; +import static org.jclouds.s3.reference.S3Constants.PROPERTY_S3_SERVICE_PATH; +import static org.jclouds.s3.reference.S3Constants.PROPERTY_S3_VIRTUAL_HOST_BUCKETS; import java.net.URI; import java.util.Map; import javax.inject.Inject; +import javax.inject.Named; import javax.inject.Provider; import javax.inject.Singleton; import javax.ws.rs.core.UriBuilder; @@ -45,9 +48,11 @@ public class AssignCorrectHostnameAndBindAsHostPrefixIfConfigured extends BindAs @Inject public AssignCorrectHostnameAndBindAsHostPrefixIfConfigured(BindAsHostPrefix bindAsHostPrefix, + @Named(PROPERTY_S3_VIRTUAL_HOST_BUCKETS) boolean isVhostStyle, + @Named(PROPERTY_S3_SERVICE_PATH) String servicePath, RegionToEndpointOrProviderIfNull r2, Provider uriBuilderProvider, @Bucket Map bucketToRegion) { - super(bindAsHostPrefix, true, "/", uriBuilderProvider); + super(bindAsHostPrefix, isVhostStyle, servicePath, uriBuilderProvider); this.bucketToRegion = bucketToRegion; this.r2 = r2; } diff --git a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/binders/AssignCorrectHostnameAndBindAsHostPrefixIfConfiguredTest.java b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/binders/AssignCorrectHostnameAndBindAsHostPrefixIfConfiguredTest.java index 03441f200b..aae81e2686 100644 --- a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/binders/AssignCorrectHostnameAndBindAsHostPrefixIfConfiguredTest.java +++ b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/binders/AssignCorrectHostnameAndBindAsHostPrefixIfConfiguredTest.java @@ -58,7 +58,7 @@ public class AssignCorrectHostnameAndBindAsHostPrefixIfConfiguredTest { HttpRequest request = new HttpRequest("GET", URI.create("https://s3.amazonaws.com")); AssignCorrectHostnameAndBindAsHostPrefixIfConfigured binder = new AssignCorrectHostnameAndBindAsHostPrefixIfConfigured( - new BindAsHostPrefix(uriBuilderProvider), new RegionToEndpointOrProviderIfNull("aws-s3", Suppliers + new BindAsHostPrefix(uriBuilderProvider), true, "/", new RegionToEndpointOrProviderIfNull("aws-s3", Suppliers .ofInstance(URI.create("https://s3.amazonaws.com")), Suppliers.>> ofInstance(ImmutableMap.of("us-standard", Suppliers @@ -76,7 +76,7 @@ public class AssignCorrectHostnameAndBindAsHostPrefixIfConfiguredTest { HttpRequest request = new HttpRequest("GET", URI.create("https://s3.amazonaws.com")); AssignCorrectHostnameAndBindAsHostPrefixIfConfigured binder = new AssignCorrectHostnameAndBindAsHostPrefixIfConfigured( - new BindAsHostPrefix(uriBuilderProvider), new RegionToEndpointOrProviderIfNull("aws-s3", Suppliers + new BindAsHostPrefix(uriBuilderProvider), true, "/", new RegionToEndpointOrProviderIfNull("aws-s3", Suppliers .ofInstance(URI.create("https://s3.amazonaws.com")), Suppliers.>> ofInstance(ImmutableMap.of("us-standard", Suppliers