Skip to content

Commit c68cbbc

Browse files
juanalbluejuanalblue
authored
Merge pull request #63 from oracle/release_2018-05-03
Releasing version 1.2.37
2 parents 13959d4 + d29adaf commit c68cbbc

File tree

137 files changed

+4990
-877
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+4990
-877
lines changed

‎CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,16 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
1313
### Added
1414
- N/A
1515

16+
## 1.2.37 - 2018-05-03
17+
18+
### Fixed
19+
- `RestClientFactory` now uses the `JerseyClientBuilder` to create clients [issue#56](https://github.com/oracle/oci-java-sdk/issues/56)
20+
- Shaded artifact now includes pom.xml [issue#57](https://github.com/oracle/oci-java-sdk/issues/57)
21+
22+
### Added
23+
- Support for returning names for events in the Audit service
24+
- Support for multiple hostnames per listener in the Load Balancing service
25+
1626
## 1.2.35 - 2018-04-19
1727

1828
### Fixed
@@ -22,6 +32,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
2232
### Added
2333
- Support for tagging DbSystem and Database resources in the Database Service
2434
- Support for filtering by `dbSystemId` in `listDbVersions` operation in Database Service
35+
- Support waiting on multiple target states in `Waiter`
2536

2637
## 1.2.34 - 2018-04-05
2738

‎bmc-audit/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.oracle.oci.sdk</groupId>
77
<artifactId>oci-java-sdk</artifactId>
8-
<version>1.2.35</version>
8+
<version>1.2.37</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

@@ -18,7 +18,7 @@
1818
<dependency>
1919
<groupId>com.oracle.oci.sdk</groupId>
2020
<artifactId>oci-java-sdk-common</artifactId>
21-
<version>1.2.35</version>
21+
<version>1.2.37</version>
2222
</dependency>
2323
</dependencies>
2424

‎bmc-audit/src/main/java/com/oracle/bmc/audit/AuditAsyncClient.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -178,13 +178,16 @@ public AuditAsyncClient(
178178
com.oracle.bmc.http.signing.SigningStrategy,
179179
com.oracle.bmc.http.signing.RequestSigner>
180180
requestSigners = new java.util.HashMap<>();
181-
for (com.oracle.bmc.http.signing.SigningStrategy s :
182-
com.oracle.bmc.http.signing.SigningStrategy.values()) {
183-
requestSigners.put(
184-
s,
185-
signingStrategyRequestSignerFactories
186-
.get(s)
187-
.createRequestSigner(SERVICE, authenticationDetailsProvider));
181+
if (this.authenticationDetailsProvider
182+
instanceof com.oracle.bmc.auth.BasicAuthenticationDetailsProvider) {
183+
for (com.oracle.bmc.http.signing.SigningStrategy s :
184+
com.oracle.bmc.http.signing.SigningStrategy.values()) {
185+
requestSigners.put(
186+
s,
187+
signingStrategyRequestSignerFactories
188+
.get(s)
189+
.createRequestSigner(SERVICE, authenticationDetailsProvider));
190+
}
188191
}
189192
this.client = restClientFactory.create(defaultRequestSigner, requestSigners, configuration);
190193

‎bmc-audit/src/main/java/com/oracle/bmc/audit/AuditClient.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -182,13 +182,16 @@ public AuditClient(
182182
com.oracle.bmc.http.signing.SigningStrategy,
183183
com.oracle.bmc.http.signing.RequestSigner>
184184
requestSigners = new java.util.HashMap<>();
185-
for (com.oracle.bmc.http.signing.SigningStrategy s :
186-
com.oracle.bmc.http.signing.SigningStrategy.values()) {
187-
requestSigners.put(
188-
s,
189-
signingStrategyRequestSignerFactories
190-
.get(s)
191-
.createRequestSigner(SERVICE, authenticationDetailsProvider));
185+
if (this.authenticationDetailsProvider
186+
instanceof com.oracle.bmc.auth.BasicAuthenticationDetailsProvider) {
187+
for (com.oracle.bmc.http.signing.SigningStrategy s :
188+
com.oracle.bmc.http.signing.SigningStrategy.values()) {
189+
requestSigners.put(
190+
s,
191+
signingStrategyRequestSignerFactories
192+
.get(s)
193+
.createRequestSigner(SERVICE, authenticationDetailsProvider));
194+
}
192195
}
193196
this.client = restClientFactory.create(defaultRequestSigner, requestSigners, configuration);
194197

‎bmc-audit/src/main/java/com/oracle/bmc/audit/model/AuditEvent.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,15 @@ public Builder eventId(String eventId) {
4848
return this;
4949
}
5050

51+
@com.fasterxml.jackson.annotation.JsonProperty("eventName")
52+
private String eventName;
53+
54+
public Builder eventName(String eventName) {
55+
this.eventName = eventName;
56+
this.__explicitlySet__.add("eventName");
57+
return this;
58+
}
59+
5160
@com.fasterxml.jackson.annotation.JsonProperty("eventSource")
5261
private String eventSource;
5362

@@ -204,6 +213,7 @@ public AuditEvent build() {
204213
tenantId,
205214
compartmentId,
206215
eventId,
216+
eventName,
207217
eventSource,
208218
eventType,
209219
eventTime,
@@ -230,6 +240,7 @@ public Builder copy(AuditEvent o) {
230240
tenantId(o.getTenantId())
231241
.compartmentId(o.getCompartmentId())
232242
.eventId(o.getEventId())
243+
.eventName(o.getEventName())
233244
.eventSource(o.getEventSource())
234245
.eventType(o.getEventType())
235246
.eventTime(o.getEventTime())
@@ -277,6 +288,14 @@ public static Builder builder() {
277288
@com.fasterxml.jackson.annotation.JsonProperty("eventId")
278289
String eventId;
279290

291+
/**
292+
* The name of the event.
293+
* Example: `LaunchInstance`
294+
*
295+
**/
296+
@com.fasterxml.jackson.annotation.JsonProperty("eventName")
297+
String eventName;
298+
280299
/**
281300
* The source of the event.
282301
**/

‎bmc-bom/pom.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.oracle.oci.sdk</groupId>
77
<artifactId>oci-java-sdk</artifactId>
8-
<version>1.2.35</version>
8+
<version>1.2.37</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111
<artifactId>oci-java-sdk-bom</artifactId>
@@ -19,62 +19,62 @@
1919
<dependency>
2020
<groupId>com.oracle.oci.sdk</groupId>
2121
<artifactId>oci-java-sdk-common</artifactId>
22-
<version>1.2.35</version>
22+
<version>1.2.37</version>
2323
<optional>false</optional>
2424
</dependency>
2525
<!-- Service modules, alpha sorted -->
2626
<dependency>
2727
<groupId>com.oracle.oci.sdk</groupId>
2828
<artifactId>oci-java-sdk-audit</artifactId>
29-
<version>1.2.35</version>
29+
<version>1.2.37</version>
3030
<optional>false</optional>
3131
</dependency>
3232
<dependency>
3333
<groupId>com.oracle.oci.sdk</groupId>
3434
<artifactId>oci-java-sdk-core</artifactId>
35-
<version>1.2.35</version>
35+
<version>1.2.37</version>
3636
<optional>false</optional>
3737
</dependency>
3838
<dependency>
3939
<groupId>com.oracle.oci.sdk</groupId>
4040
<artifactId>oci-java-sdk-database</artifactId>
41-
<version>1.2.35</version>
41+
<version>1.2.37</version>
4242
<optional>false</optional>
4343
</dependency>
4444
<dependency>
4545
<groupId>com.oracle.oci.sdk</groupId>
4646
<artifactId>oci-java-sdk-dns</artifactId>
47-
<version>1.2.35</version>
47+
<version>1.2.37</version>
4848
<optional>false</optional>
4949
</dependency>
5050
<dependency>
5151
<groupId>com.oracle.oci.sdk</groupId>
5252
<artifactId>oci-java-sdk-email</artifactId>
53-
<version>1.2.35</version>
53+
<version>1.2.37</version>
5454
<optional>false</optional>
5555
</dependency>
5656
<dependency>
5757
<groupId>com.oracle.oci.sdk</groupId>
5858
<artifactId>oci-java-sdk-filestorage</artifactId>
59-
<version>1.2.35</version>
59+
<version>1.2.37</version>
6060
<optional>false</optional>
6161
</dependency>
6262
<dependency>
6363
<groupId>com.oracle.oci.sdk</groupId>
6464
<artifactId>oci-java-sdk-identity</artifactId>
65-
<version>1.2.35</version>
65+
<version>1.2.37</version>
6666
<optional>false</optional>
6767
</dependency>
6868
<dependency>
6969
<groupId>com.oracle.oci.sdk</groupId>
7070
<artifactId>oci-java-sdk-loadbalancer</artifactId>
71-
<version>1.2.35</version>
71+
<version>1.2.37</version>
7272
<optional>false</optional>
7373
</dependency>
7474
<dependency>
7575
<groupId>com.oracle.oci.sdk</groupId>
7676
<artifactId>oci-java-sdk-objectstorage</artifactId>
77-
<version>1.2.35</version>
77+
<version>1.2.37</version>
7878
<optional>false</optional>
7979
<type>pom</type>
8080
</dependency>

‎bmc-common/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.oracle.oci.sdk</groupId>
77
<artifactId>oci-java-sdk</artifactId>
8-
<version>1.2.35</version>
8+
<version>1.2.37</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

‎bmc-common/src/main/java/com/oracle/bmc/auth/internal/RestClientUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ private static RestClient createRestClient(
118118

119119
RestClientFactory restClientFactory =
120120
RestClientFactoryBuilder.builder().clientConfigurator(clientConfigurator).build();
121-
RestClient restClient = restClientFactory.create(requestSigner, null);
121+
RestClient restClient = restClientFactory.create(requestSigner);
122122
restClient.setEndpoint(endpoint);
123123
return restClient;
124124
}

‎bmc-common/src/main/java/com/oracle/bmc/auth/internal/X509FederationClient.java

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
*/
44
package com.oracle.bmc.auth.internal;
55

6-
import javax.security.auth.RefreshFailedException;
7-
import javax.security.auth.Refreshable;
86
import com.fasterxml.jackson.annotation.JsonInclude;
97
import com.fasterxml.jackson.annotation.JsonProperty;
108
import com.google.common.base.Function;
@@ -14,7 +12,12 @@
1412
import com.oracle.bmc.auth.SessionKeySupplier;
1513
import com.oracle.bmc.auth.X509CertificateSupplier;
1614
import com.oracle.bmc.http.ClientConfigurator;
17-
import com.oracle.bmc.http.internal.*;
15+
import com.oracle.bmc.http.internal.ResponseConversionFunctionFactory;
16+
import com.oracle.bmc.http.internal.RestClient;
17+
import com.oracle.bmc.http.internal.RestClientFactory;
18+
import com.oracle.bmc.http.internal.RestClientFactoryBuilder;
19+
import com.oracle.bmc.http.internal.WithHeaders;
20+
import com.oracle.bmc.http.internal.WrappedInvocationBuilder;
1821
import com.oracle.bmc.http.signing.RequestSigner;
1922
import com.oracle.bmc.http.signing.internal.Constants;
2023
import com.oracle.bmc.http.signing.internal.KeySupplier;
@@ -27,14 +30,20 @@
2730
import lombok.extern.slf4j.Slf4j;
2831

2932
import javax.annotation.concurrent.Immutable;
33+
import javax.security.auth.RefreshFailedException;
34+
import javax.security.auth.Refreshable;
3035
import javax.ws.rs.client.Invocation.Builder;
3136
import javax.ws.rs.client.WebTarget;
3237
import javax.ws.rs.core.Response;
3338
import java.security.cert.CertificateException;
3439
import java.security.cert.X509Certificate;
3540
import java.security.interfaces.RSAPrivateKey;
3641
import java.security.interfaces.RSAPublicKey;
37-
import java.util.*;
42+
import java.util.ArrayList;
43+
import java.util.HashSet;
44+
import java.util.List;
45+
import java.util.Map;
46+
import java.util.Set;
3847

3948
/**
4049
* This class gets a security token from the auth service by signing the request with a PKI issued leaf certificate,
@@ -216,7 +225,7 @@ public String get() {
216225
new RequestSignerImpl(keySupplier, signingConfiguration, keyIdSupplier);
217226

218227
RestClientFactory restClientFactory = RestClientFactoryBuilder.builder().build();
219-
RestClient restClient = restClientFactory.create(requestSigner, null);
228+
RestClient restClient = restClientFactory.create(requestSigner);
220229
restClient.setEndpoint(endpoint);
221230
return restClient;
222231
}

‎bmc-common/src/main/java/com/oracle/bmc/http/internal/RestClientFactory.java

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,12 @@
1717
import com.oracle.bmc.http.signing.SigningStrategy;
1818
import lombok.Getter;
1919
import org.glassfish.jersey.client.ClientProperties;
20+
import org.glassfish.jersey.client.JerseyClientBuilder;
2021

2122
import javax.annotation.Nonnull;
2223
import javax.ws.rs.client.Client;
2324
import javax.ws.rs.client.ClientBuilder;
25+
import java.util.Collections;
2426
import java.util.Map;
2527

2628
/**
@@ -66,6 +68,40 @@ public RestClientFactory(@Nonnull ClientConfigurator clientConfigurator) {
6668
this.clientConfigurator = clientConfigurator;
6769
}
6870

71+
/**
72+
* Creates a new client that will use the given
73+
* {@link AuthenticationDetailsProvider}.
74+
*
75+
* @param requestSigner The strategy used to sign requests.
76+
* @return A new RestClient instance.
77+
*
78+
* @deprecated use {@link RestClientFactory#create(RequestSigner, Map)} instead
79+
*/
80+
@Deprecated
81+
public RestClient create(RequestSigner requestSigner) {
82+
return this.create(requestSigner, Collections.<SigningStrategy, RequestSigner>emptyMap());
83+
}
84+
85+
/**
86+
* Creates a new client that will use the given
87+
* {@link AuthenticationDetailsProvider} and {@link ClientConfiguration}.
88+
*
89+
* @param requestSigner The strategy used to sign requests.
90+
* @param configuration
91+
* The client configuration to use, or null for default
92+
* configuration.
93+
* @return A new RestClient instance.
94+
*
95+
* @deprecated use {@link RestClientFactory#create(RequestSigner, Map, ClientConfiguration)} instead
96+
*/
97+
@Deprecated
98+
public RestClient create(RequestSigner requestSigner, ClientConfiguration configuration) {
99+
return this.create(
100+
requestSigner,
101+
Collections.<SigningStrategy, RequestSigner>emptyMap(),
102+
configuration);
103+
}
104+
69105
/**
70106
* Creates a new client that will use the given
71107
* {@link AuthenticationDetailsProvider}.
@@ -81,6 +117,7 @@ public RestClient create(
81117
Map<SigningStrategy, RequestSigner> requestSigners) {
82118
return this.create(defaultRequestSigner, requestSigners, null);
83119
}
120+
84121
/**
85122
* Creates a new client that will use the given
86123
* {@link AuthenticationDetailsProvider} and {@link ClientConfiguration}.
@@ -114,7 +151,7 @@ private static Client createClient(
114151
Map<SigningStrategy, RequestSigner> requestSigners,
115152
ClientConfiguration configuration,
116153
ClientConfigurator clientConfigurator) {
117-
ClientBuilder builder = ClientBuilder.newBuilder();
154+
ClientBuilder builder = JerseyClientBuilder.newBuilder();
118155
clientConfigurator.customizeBuilder(builder);
119156

120157
Client client =

‎bmc-core/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.oracle.oci.sdk</groupId>
77
<artifactId>oci-java-sdk</artifactId>
8-
<version>1.2.35</version>
8+
<version>1.2.37</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

@@ -18,7 +18,7 @@
1818
<dependency>
1919
<groupId>com.oracle.oci.sdk</groupId>
2020
<artifactId>oci-java-sdk-common</artifactId>
21-
<version>1.2.35</version>
21+
<version>1.2.37</version>
2222
</dependency>
2323
</dependencies>
2424

0 commit comments

Comments
 (0)