Merge pull request #184 from TechnologyBrewery/pypiUploadSuffix-fix

#177 Fixed pypiUploadSuffix null issue
TechnologyBrewery · Aug 9, 2024 · 8a68dbb · 8a68dbb
2 parents 59ee4f9 + efb5fe5
commit 8a68dbb
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/habushu-maven-plugin/src/main/java/org/technologybrewery/habushu/PublishToPyPiRepoMojo.java b/habushu-maven-plugin/src/main/java/org/technologybrewery/habushu/PublishToPyPiRepoMojo.java
@@ -90,9 +90,10 @@ public class PublishToPyPiRepoMojo extends AbstractHabushuMojo {
      * "legacy/").  This variable allows customization in a manner that does not impact the installation API for the
      * same repository.  Defaults to empty as the most common scenario when overriding the repository URL is to leverage
      * one of the repositories mentioned above.
+     * Note: The property must be set equal to "" in order for Maven to not set the default value to null
      */
     @Parameter(property = "habushu.pypiUploadSuffix", defaultValue = "")
-    protected String pypiUploadSuffix;
+    protected String pypiUploadSuffix = "";
 
     /**
      * {{@link #pypiUploadSuffix repositoryUploadSuffix} contains critical information.  The main difference is that
@@ -192,7 +193,6 @@ protected void publishPackage(PoetryCommandHelper poetryHelper, boolean rebuildP
         }
 
         String repoUrl = getRepositoryUrl(publishToDev);
-
         if (StringUtils.isNotEmpty(repoUrl)) {
             if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password)) {
                 throw new MojoExecutionException(String.format(
@@ -308,14 +308,13 @@ protected Retryer<Boolean> getRetryer() {
     }
 
     String getRepositoryUrl(boolean publishToDev) {
-        String repoUrl;
+        String repoUrl = addTrailingSlash(pypiRepoUrl);
         if (publishToDev) {
-            repoUrl = addTrailingSlash(devRepositoryUrl) + devRepositoryUrlUploadSuffix;
-        } else {
-            repoUrl = addTrailingSlash(pypiRepoUrl) + pypiUploadSuffix;
+            repoUrl = addTrailingSlash(devRepositoryUrl) + addTrailingSlash(devRepositoryUrlUploadSuffix);
+        } else if(!StringUtils.isEmpty(pypiUploadSuffix)) {
+            repoUrl += addTrailingSlash(pypiUploadSuffix);
         }
-
-        return addTrailingSlash(repoUrl);
+        return repoUrl;
     }
 
     static String addTrailingSlash(String inputUrl) {