Merge pull request #30 from ligangty/3.3.x

Rebase from main branch
Commonjava · Jul 17, 2024 · 6b12503 · 6b12503
2 parents 87ccba2 + d991f1a
commit 6b12503
Show file tree

Hide file tree

Showing 17 changed files with 38 additions and 24 deletions.
diff --git a/addons-client/content-browse/client-java/pom.xml b/addons-client/content-browse/client-java/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>indy-content-browse-client-parent</artifactId>
     <groupId>org.commonjava.indy</groupId>
-    <version>3.3.2-SNAPSHOT</version>
+    <version>3.3.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/addons-client/content-browse/pom.xml b/addons-client/content-browse/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.commonjava.indy</groupId>
     <artifactId>indy-addons-client</artifactId>
-    <version>3.3.2-SNAPSHOT</version>
+    <version>3.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>indy-content-browse-client-parent</artifactId>

diff --git a/addons-client/diagnostics/client-java/pom.xml b/addons-client/diagnostics/client-java/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.commonjava.indy</groupId>
     <artifactId>indy-diagnostics-client-parent</artifactId>
-    <version>3.3.2-SNAPSHOT</version>
+    <version>3.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>indy-diagnostics-client-java</artifactId>

diff --git a/addons-client/diagnostics/pom.xml b/addons-client/diagnostics/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.commonjava.indy</groupId>
     <artifactId>indy-addons-client</artifactId>
-    <version>3.3.2-SNAPSHOT</version>
+    <version>3.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>indy-diagnostics-client-parent</artifactId>

diff --git a/addons-client/folo/client-java/pom.xml b/addons-client/folo/client-java/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>indy-folo-client-parent</artifactId>
     <groupId>org.commonjava.indy</groupId>
-    <version>3.3.2-SNAPSHOT</version>
+    <version>3.3.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/addons-client/folo/pom.xml b/addons-client/folo/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.commonjava.indy</groupId>
     <artifactId>indy-addons-client</artifactId>
-    <version>3.3.2-SNAPSHOT</version>
+    <version>3.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>indy-folo-client-parent</artifactId>

diff --git a/addons-client/koji/client-java/pom.xml b/addons-client/koji/client-java/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.commonjava.indy</groupId>
     <artifactId>indy-koji-client-parent</artifactId>
-    <version>3.3.2-SNAPSHOT</version>
+    <version>3.3.3-SNAPSHOT</version>
   </parent>
   <artifactId>indy-koji-client-java</artifactId>
   <name>Indy :: Add-Ons :: Koji Integration :: Java Client</name>

diff --git a/addons-client/koji/pom.xml b/addons-client/koji/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.commonjava.indy</groupId>
     <artifactId>indy-addons-client</artifactId>
-    <version>3.3.2-SNAPSHOT</version>
+    <version>3.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>indy-koji-client-parent</artifactId>

diff --git a/addons-client/pom.xml b/addons-client/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.commonjava.indy</groupId>
     <artifactId>indy-clients-parent</artifactId>
-    <version>3.3.2-SNAPSHOT</version>
+    <version>3.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>indy-addons-client</artifactId>

diff --git a/addons-client/promote/client-java/pom.xml b/addons-client/promote/client-java/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.commonjava.indy</groupId>
     <artifactId>indy-promote-client-parent</artifactId>
-    <version>3.3.2-SNAPSHOT</version>
+    <version>3.3.3-SNAPSHOT</version>
   </parent>
   <artifactId>indy-promote-client-java</artifactId>
   <name>Indy :: Add-Ons :: Artifact Promotion :: Java Client</name>

diff --git a/...t-java/src/main/java/org/commonjava/indy/promote/client/IndyPromoteAdminClientModule.java b/...t-java/src/main/java/org/commonjava/indy/promote/client/IndyPromoteAdminClientModule.java
@@ -31,7 +31,7 @@ public class IndyPromoteAdminClientModule
         extends IndyClientModule
 {
 
-    public static final String PROMOTE_ADMIN_BASEPATH = "admin/promotion";
+    public static final String PROMOTE_ADMIN_BASEPATH = "promotion/admin";
 
     public static final String VALIDATION_BASEPATH = PROMOTE_ADMIN_BASEPATH + "/validation";
 
@@ -56,6 +56,7 @@ public class IndyPromoteAdminClientModule
     public static final String VALIDATION_RULESET_GET_BY_STOREKEY_PATH = VALIDATION_RULESET_BASEPATH + "/storekey";
 
     public static final String VALIDATION_RULESET_GET_BY_NAME_PATH = VALIDATION_RULESET_BASEPATH + "/named";
+    private static final String TRACKING = "/tracking";
 
     public boolean reloadRules()
             throws IndyClientException
@@ -109,4 +110,11 @@ public ValidationRuleSet getRuleSetByStoreKey( final StoreKey key )
     {
         return http.get( buildUrl( VALIDATION_RULESET_GET_BY_STOREKEY_PATH, key.toString() ), ValidationRuleSet.class );
     }
+
+    public void deleteTrackingRecords( final String trackingId )
+            throws IndyClientException
+    {
+        http.delete( buildUrl(TRACKING, trackingId ) );
+    }
+
 }
diff --git a/addons-client/promote/model-java/pom.xml b/addons-client/promote/model-java/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.commonjava.indy</groupId>
     <artifactId>indy-promote-client-parent</artifactId>
-    <version>3.3.2-SNAPSHOT</version>
+    <version>3.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>indy-promote-model-java</artifactId>

diff --git a/addons-client/promote/pom.xml b/addons-client/promote/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.commonjava.indy</groupId>
     <artifactId>indy-addons-client</artifactId>
-    <version>3.3.2-SNAPSHOT</version>
+    <version>3.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>indy-promote-client-parent</artifactId>

diff --git a/core-java/pom.xml b/core-java/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.commonjava.indy</groupId>
     <artifactId>indy-clients-parent</artifactId>
-    <version>3.3.2-SNAPSHOT</version>
+    <version>3.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>indy-client-core-java</artifactId>

diff --git a/core-java/src/main/java/org/commonjava/indy/client/core/module/IndyStoresClientModule.java b/core-java/src/main/java/org/commonjava/indy/client/core/module/IndyStoresClientModule.java
@@ -29,6 +29,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.commonjava.indy.client.core.util.UrlUtils.encode;
 import static org.commonjava.indy.pkg.maven.model.MavenPackageTypeDescriptor.MAVEN_PKG_KEY;
 
 public class IndyStoresClientModule
@@ -59,7 +60,7 @@ public boolean exists( final StoreType type, final String name )
     public boolean exists( final StoreKey key )
             throws IndyClientException
     {
-        return http.exists( UrlUtils.buildUrl( STORE_BASEPATH, key.getPackageType(), key.getType().singularEndpointName(), key.getName() ) );
+        return http.exists( UrlUtils.buildUrl( STORE_BASEPATH, key.getPackageType(), key.getType().singularEndpointName(), encode( key.getName() ) ) );
     }
 
     @Deprecated
@@ -72,15 +73,15 @@ public void delete( final StoreType type, final String name, final String change
     public void delete( final StoreKey key, final String changelog )
             throws IndyClientException
     {
-        http.deleteWithChangelog( UrlUtils.buildUrl( STORE_BASEPATH, key.getPackageType(), key.getType().singularEndpointName(), key.getName() ), changelog );
+        http.deleteWithChangelog( UrlUtils.buildUrl( STORE_BASEPATH, key.getPackageType(), key.getType().singularEndpointName(), encode( key.getName() ) ), changelog );
     }
 
     public void delete( final StoreKey key, final String changelog, final boolean deleteContent )
                     throws IndyClientException
     {
         http.deleteWithChangelog(
                         UrlUtils.buildUrl( STORE_BASEPATH, key.getPackageType(), key.getType().singularEndpointName(),
-                                           key.getName(), deleteContent ? "?deleteContent=true" : "" ), changelog );
+                                           encode( key.getName() ), deleteContent ? "?deleteContent=true" : "" ), changelog );
     }
 
     public boolean update( final ArtifactStore store, final String changelog )
@@ -102,7 +103,7 @@ public <T extends ArtifactStore> T load( StoreType type, String name, final Clas
     public <T extends ArtifactStore> T load( StoreKey key, final Class<T> cls )
         throws IndyClientException
     {
-        return http.get( UrlUtils.buildUrl( STORE_BASEPATH, key.getPackageType(), key.getType().singularEndpointName(), key.getName() ), cls );
+        return http.get( UrlUtils.buildUrl( STORE_BASEPATH, key.getPackageType(), key.getType().singularEndpointName(), encode( key.getName() ) ), cls );
     }
 
     public StoreListingDTO<HostedRepository> listHostedRepositories()

diff --git a/core-java/src/main/java/org/commonjava/indy/client/core/util/UrlUtils.java b/core-java/src/main/java/org/commonjava/indy/client/core/util/UrlUtils.java
@@ -15,9 +15,12 @@
  */
 package org.commonjava.indy.client.core.util;
 
+import org.commonjava.indy.client.core.IndyClientException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -193,4 +196,8 @@ public static String normalizePath( final String... path )
         return sb.toString();
     }
 
+    public static String encode( String value )
+    {
+        return URLEncoder.encode( value, StandardCharsets.UTF_8 );
+    }
 }
diff --git a/pom.xml b/pom.xml
@@ -28,7 +28,7 @@
   <groupId>org.commonjava.indy</groupId>
   <artifactId>indy-clients-parent</artifactId>
   <packaging>pom</packaging>
-  <version>3.3.2-SNAPSHOT</version>
+  <version>3.3.3-SNAPSHOT</version>
 
   <name>Indy :: Client APIs :: Parent</name>
   <inceptionYear>2023</inceptionYear>
@@ -49,11 +49,9 @@
     <projectOwner>Red Hat, Inc.</projectOwner>
     <projectEmail>https://github.com/Commonjava/indy-client</projectEmail>
     <javaVersion>11</javaVersion>
-
     <jhttpcVersion>1.12</jhttpcVersion>
     <atlasVersion>1.1.1</atlasVersion>
-
-    <indyModelVersion>1.4</indyModelVersion>
+    <indyModelVersion>1.5</indyModelVersion>
     <o11yphantVersion>1.9.1</o11yphantVersion>
     <httpclientVersion>4.5.13</httpclientVersion>
     <slf4jVersion>1.7.36</slf4jVersion>
@@ -90,13 +88,13 @@
       <dependency>
         <groupId>org.commonjava.indy</groupId>
         <artifactId>indy-promote-model-java</artifactId>
-        <version>3.3.2-SNAPSHOT</version>
+        <version>3.3.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>org.commonjava.indy</groupId>
         <artifactId>indy-client-core-java</artifactId>
-        <version>3.3.2-SNAPSHOT</version>
+        <version>3.3.3-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.commonjava.indy</groupId>