MC-25873: Sync latest changes with upstream repository

joelplourde4 · joelplourde4 · commit b1ea6c5bd065 · 2025-07-17T10:57:05.000-04:00
diff --git a/connectors/http-connector/pom.xml b/connectors/http-connector/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.github.openstack4j.core.connectors</groupId>
         <artifactId>openstack4j-connectors</artifactId>
-        <version>3.13-SNAPSHOT</version>
+        <version>3.12</version>
     </parent>
     <name>OpenStack4j HttpURL Connector</name>
     <artifactId>openstack4j-http-connector</artifactId>
diff --git a/connectors/httpclient/pom.xml b/connectors/httpclient/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>com.github.openstack4j.core.connectors</groupId>
         <artifactId>openstack4j-connectors</artifactId>
-        <version>3.13-SNAPSHOT</version>
+        <version>3.12</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>openstack4j-httpclient</artifactId>
diff --git a/connectors/jersey2/pom.xml b/connectors/jersey2/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>com.github.openstack4j.core.connectors</groupId>
         <artifactId>openstack4j-connectors</artifactId>
-        <version>3.13-SNAPSHOT</version>
+        <version>3.12</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>openstack4j-jersey2</artifactId>
diff --git a/connectors/okhttp/pom.xml b/connectors/okhttp/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>com.github.openstack4j.core.connectors</groupId>
         <artifactId>openstack4j-connectors</artifactId>
-        <version>3.13-SNAPSHOT</version>
+        <version>3.12</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>openstack4j-okhttp</artifactId>
diff --git a/connectors/pom.xml b/connectors/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>com.github.openstack4j.core</groupId>
         <artifactId>openstack4j-parent</artifactId>
-        <version>3.13-SNAPSHOT</version>
+        <version>3.12</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.openstack4j.core.connectors</groupId>
diff --git a/connectors/resteasy/pom.xml b/connectors/resteasy/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>com.github.openstack4j.core.connectors</groupId>
         <artifactId>openstack4j-connectors</artifactId>
-        <version>3.13-SNAPSHOT</version>
+        <version>3.12</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>openstack4j-resteasy</artifactId>
diff --git a/core-integration-test/it-httpclient/pom.xml b/core-integration-test/it-httpclient/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.github.openstack4j.core</groupId>
         <artifactId>openstack4j-core-integration-test</artifactId>
-        <version>3.13-SNAPSHOT</version>
+        <version>3.12</version>
     </parent>
     <artifactId>it-httpclient</artifactId>
     <name>OpenStack4j IntegrationTest Apache HttpClient</name>
diff --git a/core-integration-test/it-jersey2/pom.xml b/core-integration-test/it-jersey2/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.github.openstack4j.core</groupId>
         <artifactId>openstack4j-core-integration-test</artifactId>
-        <version>3.13-SNAPSHOT</version>
+        <version>3.12</version>
     </parent>
     <artifactId>it-jersey2</artifactId>
     <name>OpenStack4j IntegrationTest Jersey2 Connector</name>
diff --git a/core-integration-test/it-okhttp/pom.xml b/core-integration-test/it-okhttp/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.github.openstack4j.core</groupId>
         <artifactId>openstack4j-core-integration-test</artifactId>
-        <version>3.13-SNAPSHOT</version>
+        <version>3.12</version>
     </parent>
     <artifactId>it-okhttp</artifactId>
     <name>OpenStack4j IntegrationTest OKHttp Connector</name>
diff --git a/core-integration-test/it-resteasy/pom.xml b/core-integration-test/it-resteasy/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.github.openstack4j.core</groupId>
         <artifactId>openstack4j-core-integration-test</artifactId>
-        <version>3.13-SNAPSHOT</version>
+        <version>3.12</version>
     </parent>
     <artifactId>it-resteasy</artifactId>
     <name>OpenStack4j IntegrationTest RestEasy Connector</name>
diff --git a/core-integration-test/pom.xml b/core-integration-test/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>com.github.openstack4j.core</groupId>
         <artifactId>openstack4j-parent</artifactId>
-        <version>3.13-SNAPSHOT</version>
+        <version>3.12</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>openstack4j-core-integration-test</artifactId>
diff --git a/core-test/pom.xml b/core-test/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>com.github.openstack4j.core</groupId>
         <artifactId>openstack4j-parent</artifactId>
-        <version>3.13-SNAPSHOT</version>
+        <version>3.12</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>openstack4j-core-test</artifactId>
diff --git a/core-test/src/main/java/org/openstack4j/api/image/v2/ImageV2Tests.java b/core-test/src/main/java/org/openstack4j/api/image/v2/ImageV2Tests.java
@@ -258,7 +258,7 @@ public void DownloadImage() throws IOException {
         String imageId = "4b434528-032b-4467-946c-b5880ce15c06";
         URI uri = null;
         try {
-            uri = new URI("file:////test.iso");
+            uri = new URI("file:///randomFolder/test.iso");
         } catch (URISyntaxException e) {
             e.printStackTrace();
         }
diff --git a/core/pom.xml b/core/pom.xml
@@ -2,10 +2,11 @@
     <parent>
         <groupId>com.github.openstack4j.core</groupId>
         <artifactId>openstack4j-parent</artifactId>
-        <version>3.13-SNAPSHOT</version>
+        <version>3.12</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>openstack4j-core</artifactId>
+    <version>co-3.12.1</version>
     <name>OpenStack4j Core</name>
     <description>OpenStack Java API</description>
     <url>https://github.com/openstack4j/openstack4j/</url>
@@ -188,7 +189,7 @@
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>1.33</version>
+            <version>2.0</version>
         </dependency>
 
         <dependency>
@@ -205,11 +206,11 @@
                 <version>${maven.javadoc.plugin.version}</version>
                 <configuration>
                     <author>true</author>
-                    <protected>true</protected>
                     <excludePackageNames>*.internal</excludePackageNames>
                     <reportOutputDirectory>docs</reportOutputDirectory>
                     <destDir>javadoc</destDir>
                     <doclint>none</doclint>
+                    <additionalparam>-Xdoclint:none</additionalparam>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/core/src/main/java/org/openstack4j/api/identity/v3/ProjectService.java b/core/src/main/java/org/openstack4j/api/identity/v3/ProjectService.java
@@ -78,4 +78,11 @@ public interface ProjectService extends RestService {
      */
     List<? extends Project> list();
 
+    /**
+	 * List all projects in domain
+	 *
+	 * @param domainId
+	 * @return
+	 */
+	List<? extends Project> list(String domainId);
 }
diff --git a/core/src/main/java/org/openstack4j/api/identity/v3/UserService.java b/core/src/main/java/org/openstack4j/api/identity/v3/UserService.java
@@ -120,6 +120,13 @@ public interface UserService extends RestService {
      */
     List<? extends User> list();
 
+    /**
+     * lists users for domain
+	 *
+	 * @return list of users
+	 */
+	List<? extends User> list(String domainId);
+
     /**
      * change password for user.
      *
diff --git a/core/src/main/java/org/openstack4j/model/storage/block/options/DownloadOptions.java b/core/src/main/java/org/openstack4j/model/storage/block/options/DownloadOptions.java
@@ -2,6 +2,8 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
 
 import org.openstack4j.model.common.functions.RangesToHeaderNameValue;
 import org.openstack4j.model.common.header.HeaderNameValue;
@@ -17,6 +19,7 @@
 public class DownloadOptions {
 
     List<HeaderNameValue> headers = new ArrayList<>();
+    Map<String, String> queryParams = new HashMap<>();
 
     private DownloadOptions() {
     }
@@ -68,10 +71,29 @@ public DownloadOptions conditions(IfCondition... condition) {
         return this;
     }
 
+
+    public DownloadOptions queryParam(String key, String value) {
+        if (value == null) {
+            return this;
+        }
+        if (key == null) {
+            return this;
+        }
+        queryParams.put(key, value);
+        return this;
+    }
+
     /**
      * @return all headers configured from this options object
      */
     public List<HeaderNameValue> getHeaders() {
         return headers;
     }
+
+    /**
+     * @return all query parameters configured from this options object
+     */
+    public Map<String, String> getQueryParams() {
+        return queryParams;
+    }
 }
diff --git a/core/src/main/java/org/openstack4j/openstack/identity/v3/internal/ProjectServiceImpl.java b/core/src/main/java/org/openstack4j/openstack/identity/v3/internal/ProjectServiceImpl.java
@@ -64,4 +64,9 @@ public List<? extends Project> list() {
         return get(Projects.class, uri(PATH_PROJECTS)).execute().getList();
     }
 
+    @Override
+    public List<? extends Project> list(String domainId) {
+        return get(Projects.class, uri(PATH_PROJECTS)).param("domain_id", domainId).execute().getList();
+    }
+
 }
diff --git a/core/src/main/java/org/openstack4j/openstack/identity/v3/internal/UserServiceImpl.java b/core/src/main/java/org/openstack4j/openstack/identity/v3/internal/UserServiceImpl.java
@@ -19,6 +19,8 @@
 import static org.openstack4j.core.transport.ClientConstants.PATH_DOMAINS;
 import static org.openstack4j.core.transport.ClientConstants.PATH_USERS;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * implementation of v3 user service
  */
@@ -125,6 +127,15 @@ public List<? extends Project> listUserProjects(String userId) {
     public List<? extends User> list() {
         return get(Users.class, uri(PATH_USERS)).execute().getList();
     }
+    
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public List<? extends User> list(String domainId) {
+        checkNotNull(domainId);
+        return get(Users.class, uri(PATH_USERS)).param("domain_id", domainId).execute().getList();
+    }
 
     /**
      * {@inheritDoc}
diff --git a/core/src/main/java/org/openstack4j/openstack/internal/BaseOpenStackService.java b/core/src/main/java/org/openstack4j/openstack/internal/BaseOpenStackService.java
@@ -162,8 +162,17 @@ public Invocation<R> updateParam(String name, Object value) {
 
         public Invocation<R> params(Map<String, ?> params) {
             if (params != null) {
-                for (String name : params.keySet())
+                for (String name : params.keySet()) {
                     req.queryParam(name, params.get(name));
+                    Object obj = params.get(name);
+                    if (Collection.class.isAssignableFrom(obj.getClass())) {
+                        for (String value : (Collection<String>) obj) {
+                            req.queryParam(name, value);
+                        }
+                    } else {
+                        req.queryParam(name, obj);
+                    }
+                }
             }
             return this;
         }
diff --git a/core/src/main/java/org/openstack4j/openstack/storage/object/internal/ObjectStorageObjectServiceImpl.java b/core/src/main/java/org/openstack4j/openstack/storage/object/internal/ObjectStorageObjectServiceImpl.java
@@ -225,6 +225,7 @@ public DLPayload download(ObjectLocation location, DownloadOptions options) {
 
         return DLPayloadEntity.create(
                 get(Void.class, location.getURI())
+                        .params(options.getQueryParams())
                         .headers(HeaderNameValuesToHeaderMap.INSTANCE.apply(options.getHeaders()))
                         .executeWithResponse()
         );
diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>com.github.openstack4j.core</groupId>
         <artifactId>openstack4j-parent</artifactId>
-        <version>3.13-SNAPSHOT</version>
+        <version>3.12</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>openstack4j</artifactId>
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.openstack4j.core</groupId>
     <artifactId>openstack4j-parent</artifactId>
-    <version>3.13-SNAPSHOT</version>
+    <version>3.12</version>
     <name>OpenStack4j Parent</name>
     <description>OpenStack Java API</description>
     <url>https://github.com/openstack4j/openstack4j/</url>
@@ -278,14 +278,16 @@
     </dependencyManagement>
 
     <distributionManagement>
-        <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
         <repository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+            <id>release</id>
+            <name>Releases CloudOps Repository</name>
+            <url>https://us-maven.pkg.dev/cloudmc-saas-shared/libs-release-internal</url>
         </repository>
+        <snapshotRepository>
+            <id>snapshots</id>
+            <name>Snapshots CloudOps Repository</name>
+            <url>https://us-maven.pkg.dev/cloudmc-saas-shared/libs-snapshot-internal</url>
+        </snapshotRepository>
     </distributionManagement>
 
     <profiles>
