Fixed endpoint property issue

Author: gkatzioura

S3StorageWagon/src/main/java/com/gkatzioura/maven/cloud/s3/EndpointProperty.java

@@ -31,6 +31,14 @@ public EndpointProperty(String endpoint){
         this.endpoint = endpoint;
     }
 
+    public static final EndpointProperty empty() {
+        return new EndpointProperty(null);
+    }
+
+    public boolean isPresent() {
+        return endpoint != null || System.getProperty(S3_ENDPOINT)!=null;
+    }
+
     /**
      * @return the endpoint set in the constructor or set using the S3_ENDPOINT system property or null
      * */

S3StorageWagon/src/main/java/com/gkatzioura/maven/cloud/s3/plugin/download/S3DownloadMojo.java

@@ -80,7 +80,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
         try {
             //Sending the authenticationInfo as null will make this use the default S3 authentication, which will only
             //look at the environment Java properties or environment variables
-            amazonS3 = S3Connect.connect(null, region, new EndpointProperty(bucket), new PathStyleEnabledProperty(String.valueOf(S3ClientOptions.DEFAULT_PATH_STYLE_ACCESS)));
+            amazonS3 = S3Connect.connect(null, region, EndpointProperty.empty(), new PathStyleEnabledProperty(String.valueOf(S3ClientOptions.DEFAULT_PATH_STYLE_ACCESS)));
         } catch (AuthenticationException e) {
             throw new MojoExecutionException(
                     String.format("Unable to authenticate to S3 with the available credentials. Make sure to either define the environment variables or System properties defined in https://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/auth/DefaultAWSCredentialsProviderChain.html.%n" +

S3StorageWagon/src/main/java/com/gkatzioura/maven/cloud/s3/plugin/upload/S3UploadMojo.java

@@ -87,7 +87,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
         try {
             //Sending the authenticationInfo as null will make this use the default S3 authentication, which will only
             //look at the environment Java properties or environment variables
-            amazonS3 = S3Connect.connect(null, region, new EndpointProperty(bucket), new PathStyleEnabledProperty(String.valueOf(S3ClientOptions.DEFAULT_PATH_STYLE_ACCESS)));
+            amazonS3 = S3Connect.connect(null, region, EndpointProperty.empty(), new PathStyleEnabledProperty(String.valueOf(S3ClientOptions.DEFAULT_PATH_STYLE_ACCESS)));
         } catch (AuthenticationException e) {
             throw new MojoExecutionException(
                     String.format("Unable to authenticate to S3 with the available credentials. Make sure to either define the environment variables or System properties defined in https://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/auth/DefaultAWSCredentialsProviderChain.html.%n" +

S3StorageWagon/src/main/java/com/gkatzioura/maven/cloud/s3/utils/S3Connect.java

@@ -82,10 +82,11 @@ private static AmazonS3ClientBuilder createAmazonS3ClientBuilder(AuthenticationI
 
         AmazonS3ClientBuilder builder;
         builder = AmazonS3ClientBuilder.standard().withCredentials(new CredentialsFactory().create(authenticationInfo));
-        builder.setRegion(regionProvider.getRegion());
 
-        if (endpoint.get() != null){
+        if (endpoint.isPresent()){
             builder.setEndpointConfiguration( new AwsClientBuilder.EndpointConfiguration(endpoint.get(), builder.getRegion()));
+        } else {
+            builder.setRegion(regionProvider.getRegion());
         }
 
         builder.setPathStyleAccessEnabled(pathStyle.get());