Skip to content

Commit 6f83017

Browse files
committed
MC-25873: Sync latest changes with upstream repository
1 parent fe5a4cd commit 6f83017

File tree

9 files changed

+70
-9
lines changed

9 files changed

+70
-9
lines changed

core/pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
</parent>
77
<modelVersion>4.0.0</modelVersion>
88
<artifactId>openstack4j-core</artifactId>
9+
<version>co-3.6.3</version>
910
<name>OpenStack4j Core</name>
1011
<description>OpenStack Java API</description>
1112
<url>https://github.com/openstack4j/openstack4j/</url>
@@ -188,7 +189,7 @@
188189
<dependency>
189190
<groupId>org.yaml</groupId>
190191
<artifactId>snakeyaml</artifactId>
191-
<version>1.33</version>
192+
<version>2.0</version>
192193
</dependency>
193194

194195
<dependency>
@@ -205,11 +206,11 @@
205206
<version>${maven.javadoc.plugin.version}</version>
206207
<configuration>
207208
<author>true</author>
208-
<protected>true</protected>
209209
<excludePackageNames>*.internal</excludePackageNames>
210210
<reportOutputDirectory>docs</reportOutputDirectory>
211211
<destDir>javadoc</destDir>
212212
<doclint>none</doclint>
213+
<additionalparam>-Xdoclint:none</additionalparam>
213214
</configuration>
214215
</plugin>
215216
</plugins>

core/src/main/java/org/openstack4j/api/identity/v3/ProjectService.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,11 @@ public interface ProjectService extends RestService {
7878
*/
7979
List<? extends Project> list();
8080

81+
/**
82+
* List all projects in domain
83+
*
84+
* @param domainId
85+
* @return
86+
*/
87+
List<? extends Project> list(String domainId);
8188
}

core/src/main/java/org/openstack4j/api/identity/v3/UserService.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,13 @@ public interface UserService extends RestService {
120120
*/
121121
List<? extends User> list();
122122

123+
/**
124+
* lists users for domain
125+
*
126+
* @return list of users
127+
*/
128+
List<? extends User> list(String domainId);
129+
123130
/**
124131
* change password for user.
125132
*

core/src/main/java/org/openstack4j/model/storage/block/options/DownloadOptions.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
public class DownloadOptions {
1818

1919
List<HeaderNameValue> headers = new ArrayList<>();
20+
Map<String, String> queryParams = new HashMap<>();
2021

2122
private DownloadOptions() {
2223
}
@@ -68,10 +69,29 @@ public DownloadOptions conditions(IfCondition... condition) {
6869
return this;
6970
}
7071

72+
73+
public DownloadOptions queryParam(String key, String value) {
74+
if (value == null) {
75+
return this;
76+
}
77+
if (key == null) {
78+
return this;
79+
}
80+
queryParams.put(key, value);
81+
return this;
82+
}
83+
7184
/**
7285
* @return all headers configured from this options object
7386
*/
7487
public List<HeaderNameValue> getHeaders() {
7588
return headers;
7689
}
90+
91+
/**
92+
* @return all query parameters configured from this options object
93+
*/
94+
public Map<String, String> getQueryParams() {
95+
return queryParams;
96+
}
7797
}

core/src/main/java/org/openstack4j/openstack/identity/v3/internal/ProjectServiceImpl.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,9 @@ public List<? extends Project> list() {
6464
return get(Projects.class, uri(PATH_PROJECTS)).execute().getList();
6565
}
6666

67+
@Override
68+
public List<? extends Project> list(String domainId) {
69+
return get(Projects.class, uri(PATH_PROJECTS)).param("domain_id", domainId).execute().getList();
70+
}
71+
6772
}

core/src/main/java/org/openstack4j/openstack/identity/v3/internal/UserServiceImpl.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,15 @@ public List<? extends Project> listUserProjects(String userId) {
125125
public List<? extends User> list() {
126126
return get(Users.class, uri(PATH_USERS)).execute().getList();
127127
}
128+
129+
/**
130+
* {@inheritDoc}
131+
*/
132+
@Override
133+
public List<? extends User> list(String domainId) {
134+
checkNotNull(domainId);
135+
return get(Users.class, uri(PATH_USERS)).param("domain_id", domainId).execute().getList();
136+
}
128137

129138
/**
130139
* {@inheritDoc}

core/src/main/java/org/openstack4j/openstack/internal/BaseOpenStackService.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,17 @@ public Invocation<R> updateParam(String name, Object value) {
162162

163163
public Invocation<R> params(Map<String, ?> params) {
164164
if (params != null) {
165-
for (String name : params.keySet())
165+
for (String name : params.keySet()) {
166166
req.queryParam(name, params.get(name));
167+
Object obj = params.get(name);
168+
if (Collection.class.isAssignableFrom(obj.getClass())) {
169+
for (String value : (Collection<String>) obj) {
170+
req.queryParam(name, value);
171+
}
172+
} else {
173+
req.queryParam(name, obj);
174+
}
175+
}
167176
}
168177
return this;
169178
}

core/src/main/java/org/openstack4j/openstack/storage/object/internal/ObjectStorageObjectServiceImpl.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ public DLPayload download(ObjectLocation location, DownloadOptions options) {
225225

226226
return DLPayloadEntity.create(
227227
get(Void.class, location.getURI())
228+
.params(options.getQueryParams())
228229
.headers(HeaderNameValuesToHeaderMap.INSTANCE.apply(options.getHeaders()))
229230
.executeWithResponse()
230231
);

pom.xml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -278,14 +278,16 @@
278278
</dependencyManagement>
279279

280280
<distributionManagement>
281-
<snapshotRepository>
282-
<id>ossrh</id>
283-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
284-
</snapshotRepository>
285281
<repository>
286-
<id>ossrh</id>
287-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
282+
<id>release</id>
283+
<name>Releases CloudOps Repository</name>
284+
<url>https://us-maven.pkg.dev/cloudmc-saas-shared/libs-release-internal</url>
288285
</repository>
286+
<snapshotRepository>
287+
<id>snapshots</id>
288+
<name>Snapshots CloudOps Repository</name>
289+
<url>https://us-maven.pkg.dev/cloudmc-saas-shared/libs-snapshot-internal</url>
290+
</snapshotRepository>
289291
</distributionManagement>
290292

291293
<profiles>

0 commit comments

Comments
 (0)