Skip to content

Commit 13959d4

Browse files
juanalbluejuanalblue
authored
Merge pull request #59 from oracle/release_2018-04-19
Releasing version 1.2.35
2 parents 898620c + abae1ac commit 13959d4

File tree

436 files changed

+2582
-417
lines changed

Some content is hidden

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

436 files changed

+2582
-417
lines changed

‎CHANGELOG.md

Lines changed: 10 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.35 - 2018-04-19
17+
18+
### Fixed
19+
- Upgraded Jackson to version 2.9.5 to address vulnerability [issue#55](https://github.com/oracle/oci-java-sdk/issues/55)
20+
- PutObjectRequest does not callback invocationCallback object [issue#58](https://github.com/oracle/oci-java-sdk/issues/58)
21+
22+
### Added
23+
- Support for tagging DbSystem and Database resources in the Database Service
24+
- Support for filtering by `dbSystemId` in `listDbVersions` operation in Database Service
25+
1626
## 1.2.34 - 2018-04-05
1727

1828
### Fixed

‎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.34</version>
8+
<version>1.2.35</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.34</version>
21+
<version>1.2.35</version>
2222
</dependency>
2323
</dependencies>
2424

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

Lines changed: 58 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,18 +70,18 @@ public AuditAsyncClient(
7070
* @param authenticationDetailsProvider The authentication details provider, required.
7171
* @param configuration The client configuration, optional.
7272
* @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional.
73-
* @param requestSignerFactory The request signer factory used to create the request signer for this service.
73+
* @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service.
7474
*/
7575
public AuditAsyncClient(
7676
com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider,
7777
com.oracle.bmc.ClientConfiguration configuration,
7878
com.oracle.bmc.http.ClientConfigurator clientConfigurator,
79-
com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory) {
79+
com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory) {
8080
this(
8181
authenticationDetailsProvider,
8282
configuration,
8383
clientConfigurator,
84-
requestSignerFactory,
84+
defaultRequestSignerFactory,
8585
new java.util.ArrayList<com.oracle.bmc.http.ClientConfigurator>());
8686
}
8787

@@ -93,20 +93,20 @@ public AuditAsyncClient(
9393
* @param authenticationDetailsProvider The authentication details provider, required.
9494
* @param configuration The client configuration, optional.
9595
* @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional.
96-
* @param requestSignerFactory The request signer factory used to create the request signer for this service.
96+
* @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service.
9797
* @param additionalClientConfigurators Additional client configurators to be run after the primary configurator.
9898
*/
9999
public AuditAsyncClient(
100100
com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider,
101101
com.oracle.bmc.ClientConfiguration configuration,
102102
com.oracle.bmc.http.ClientConfigurator clientConfigurator,
103-
com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory,
103+
com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory,
104104
java.util.List<com.oracle.bmc.http.ClientConfigurator> additionalClientConfigurators) {
105105
this(
106106
authenticationDetailsProvider,
107107
configuration,
108108
clientConfigurator,
109-
requestSignerFactory,
109+
defaultRequestSignerFactory,
110110
additionalClientConfigurators,
111111
null);
112112
}
@@ -119,15 +119,50 @@ public AuditAsyncClient(
119119
* @param authenticationDetailsProvider The authentication details provider, required.
120120
* @param configuration The client configuration, optional.
121121
* @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional.
122-
* @param requestSignerFactory The request signer factory used to create the request signer for this service.
122+
* @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service.
123123
* @param additionalClientConfigurators Additional client configurators to be run after the primary configurator.
124124
* @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider})
125125
*/
126126
public AuditAsyncClient(
127127
com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider,
128128
com.oracle.bmc.ClientConfiguration configuration,
129129
com.oracle.bmc.http.ClientConfigurator clientConfigurator,
130-
com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory,
130+
com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory,
131+
java.util.List<com.oracle.bmc.http.ClientConfigurator> additionalClientConfigurators,
132+
String endpoint) {
133+
this(
134+
authenticationDetailsProvider,
135+
configuration,
136+
clientConfigurator,
137+
defaultRequestSignerFactory,
138+
com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory
139+
.createDefaultRequestSignerFactories(),
140+
additionalClientConfigurators,
141+
endpoint);
142+
}
143+
144+
/**
145+
* Creates a new service instance using the given authentication provider and client configuration. Additionally,
146+
* a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization.
147+
* <p>
148+
* This is an advanced constructor for clients that want to take control over how requests are signed.
149+
* @param authenticationDetailsProvider The authentication details provider, required.
150+
* @param configuration The client configuration, optional.
151+
* @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional.
152+
* @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service.
153+
* @param signingStrategyRequestSignerFactories The request signer factories for each signing strategy used to create the request signer
154+
* @param additionalClientConfigurators Additional client configurators to be run after the primary configurator.
155+
* @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider})
156+
*/
157+
public AuditAsyncClient(
158+
com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider,
159+
com.oracle.bmc.ClientConfiguration configuration,
160+
com.oracle.bmc.http.ClientConfigurator clientConfigurator,
161+
com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory,
162+
java.util.Map<
163+
com.oracle.bmc.http.signing.SigningStrategy,
164+
com.oracle.bmc.http.signing.RequestSignerFactory>
165+
signingStrategyRequestSignerFactories,
131166
java.util.List<com.oracle.bmc.http.ClientConfigurator> additionalClientConfigurators,
132167
String endpoint) {
133168
this.authenticationDetailsProvider = authenticationDetailsProvider;
@@ -136,10 +171,22 @@ public AuditAsyncClient(
136171
.clientConfigurator(clientConfigurator)
137172
.additionalClientConfigurators(additionalClientConfigurators)
138173
.build();
139-
com.oracle.bmc.http.signing.RequestSigner requestSigner =
140-
requestSignerFactory.createRequestSigner(
174+
com.oracle.bmc.http.signing.RequestSigner defaultRequestSigner =
175+
defaultRequestSignerFactory.createRequestSigner(
141176
SERVICE, this.authenticationDetailsProvider);
142-
this.client = restClientFactory.create(requestSigner, configuration);
177+
java.util.Map<
178+
com.oracle.bmc.http.signing.SigningStrategy,
179+
com.oracle.bmc.http.signing.RequestSigner>
180+
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));
188+
}
189+
this.client = restClientFactory.create(defaultRequestSigner, requestSigners, configuration);
143190

144191
if (this.authenticationDetailsProvider instanceof com.oracle.bmc.auth.RegionProvider) {
145192
com.oracle.bmc.auth.RegionProvider provider =

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

Lines changed: 59 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -74,18 +74,18 @@ public AuditClient(
7474
* @param authenticationDetailsProvider The authentication details provider, required.
7575
* @param configuration The client configuration, optional.
7676
* @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional.
77-
* @param requestSignerFactory The request signer factory used to create the request signer for this service.
77+
* @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service.
7878
*/
7979
public AuditClient(
8080
com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider,
8181
com.oracle.bmc.ClientConfiguration configuration,
8282
com.oracle.bmc.http.ClientConfigurator clientConfigurator,
83-
com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory) {
83+
com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory) {
8484
this(
8585
authenticationDetailsProvider,
8686
configuration,
8787
clientConfigurator,
88-
requestSignerFactory,
88+
defaultRequestSignerFactory,
8989
new java.util.ArrayList<com.oracle.bmc.http.ClientConfigurator>());
9090
}
9191

@@ -97,20 +97,20 @@ public AuditClient(
9797
* @param authenticationDetailsProvider The authentication details provider, required.
9898
* @param configuration The client configuration, optional.
9999
* @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional.
100-
* @param requestSignerFactory The request signer factory used to create the request signer for this service.
100+
* @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service.
101101
* @param additionalClientConfigurators Additional client configurators to be run after the primary configurator.
102102
*/
103103
public AuditClient(
104104
com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider,
105105
com.oracle.bmc.ClientConfiguration configuration,
106106
com.oracle.bmc.http.ClientConfigurator clientConfigurator,
107-
com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory,
107+
com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory,
108108
java.util.List<com.oracle.bmc.http.ClientConfigurator> additionalClientConfigurators) {
109109
this(
110110
authenticationDetailsProvider,
111111
configuration,
112112
clientConfigurator,
113-
requestSignerFactory,
113+
defaultRequestSignerFactory,
114114
additionalClientConfigurators,
115115
null);
116116
}
@@ -123,15 +123,50 @@ public AuditClient(
123123
* @param authenticationDetailsProvider The authentication details provider, required.
124124
* @param configuration The client configuration, optional.
125125
* @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional.
126-
* @param requestSignerFactory The request signer factory used to create the request signer for this service.
126+
* @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service.
127127
* @param additionalClientConfigurators Additional client configurators to be run after the primary configurator.
128128
* @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider})
129129
*/
130130
public AuditClient(
131131
com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider,
132132
com.oracle.bmc.ClientConfiguration configuration,
133133
com.oracle.bmc.http.ClientConfigurator clientConfigurator,
134-
com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory,
134+
com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory,
135+
java.util.List<com.oracle.bmc.http.ClientConfigurator> additionalClientConfigurators,
136+
String endpoint) {
137+
this(
138+
authenticationDetailsProvider,
139+
configuration,
140+
clientConfigurator,
141+
defaultRequestSignerFactory,
142+
com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory
143+
.createDefaultRequestSignerFactories(),
144+
additionalClientConfigurators,
145+
endpoint);
146+
}
147+
148+
/**
149+
* Creates a new service instance using the given authentication provider and client configuration. Additionally,
150+
* a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization.
151+
* <p>
152+
* This is an advanced constructor for clients that want to take control over how requests are signed.
153+
* @param authenticationDetailsProvider The authentication details provider, required.
154+
* @param configuration The client configuration, optional.
155+
* @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional.
156+
* @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service.
157+
* @param signingStrategyRequestSignerFactories The request signer factories for each signing strategy used to create the request signer
158+
* @param additionalClientConfigurators Additional client configurators to be run after the primary configurator.
159+
* @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider})
160+
*/
161+
public AuditClient(
162+
com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider,
163+
com.oracle.bmc.ClientConfiguration configuration,
164+
com.oracle.bmc.http.ClientConfigurator clientConfigurator,
165+
com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory,
166+
java.util.Map<
167+
com.oracle.bmc.http.signing.SigningStrategy,
168+
com.oracle.bmc.http.signing.RequestSignerFactory>
169+
signingStrategyRequestSignerFactories,
135170
java.util.List<com.oracle.bmc.http.ClientConfigurator> additionalClientConfigurators,
136171
String endpoint) {
137172
this.authenticationDetailsProvider = authenticationDetailsProvider;
@@ -140,10 +175,22 @@ public AuditClient(
140175
.clientConfigurator(clientConfigurator)
141176
.additionalClientConfigurators(additionalClientConfigurators)
142177
.build();
143-
com.oracle.bmc.http.signing.RequestSigner requestSigner =
144-
requestSignerFactory.createRequestSigner(
178+
com.oracle.bmc.http.signing.RequestSigner defaultRequestSigner =
179+
defaultRequestSignerFactory.createRequestSigner(
145180
SERVICE, this.authenticationDetailsProvider);
146-
this.client = restClientFactory.create(requestSigner, configuration);
181+
java.util.Map<
182+
com.oracle.bmc.http.signing.SigningStrategy,
183+
com.oracle.bmc.http.signing.RequestSigner>
184+
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));
192+
}
193+
this.client = restClientFactory.create(defaultRequestSigner, requestSigners, configuration);
147194

148195
this.paginators = new AuditPaginators(this);
149196

@@ -201,6 +248,7 @@ public AuditClient build(
201248
configuration,
202249
clientConfigurator,
203250
requestSignerFactory,
251+
signingStrategyRequestSignerFactories,
204252
additionalClientConfigurators,
205253
endpoint);
206254
}

‎bmc-audit/src/main/java/com/oracle/bmc/audit/requests/GetConfigurationRequest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ public Builder invocationCallback(
3737
*/
3838
public Builder copy(GetConfigurationRequest o) {
3939
compartmentId(o.getCompartmentId());
40+
invocationCallback(o.getInvocationCallback());
4041
return this;
4142
}
4243

‎bmc-audit/src/main/java/com/oracle/bmc/audit/requests/ListEventsRequest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ public Builder copy(ListEventsRequest o) {
6969
endTime(o.getEndTime());
7070
page(o.getPage());
7171
opcRequestId(o.getOpcRequestId());
72+
invocationCallback(o.getInvocationCallback());
7273
return this;
7374
}
7475

‎bmc-audit/src/main/java/com/oracle/bmc/audit/requests/UpdateConfigurationRequest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public Builder invocationCallback(
4343
public Builder copy(UpdateConfigurationRequest o) {
4444
compartmentId(o.getCompartmentId());
4545
updateConfigurationDetails(o.getUpdateConfigurationDetails());
46+
invocationCallback(o.getInvocationCallback());
4647
return this;
4748
}
4849

0 commit comments

Comments
 (0)