Skip to content

Releasing version 1.2.33 #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 27, 2018
Merged

Releasing version 1.2.33 #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
### Added
- N/A

## 1.2.33 - 2018-03-27

### Added
- Added support for remote VCN peering across regions. See [here](https://github.com/oracle/oci-java-sdk/blob/master/bmc-examples/src/main/java/RemotePeeringConnectionExample.java) for a sample
- Added support for calling Oracle Cloud Infrastructure services in the uk-london-1 (LHR) region
- Added a version of the Java SDK library that bundles several of its dependencies in shaded form

## 1.2.29 - 2018-03-08

### Added
Expand Down
4 changes: 2 additions & 2 deletions bmc-audit/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk</artifactId>
<version>1.2.29</version>
<version>1.2.33</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -18,7 +18,7 @@
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-common</artifactId>
<version>1.2.29</version>
<version>1.2.33</version>
</dependency>
</dependencies>

Expand Down
86 changes: 85 additions & 1 deletion bmc-audit/src/main/java/com/oracle/bmc/audit/AuditAsyncClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,34 @@ public AuditAsyncClient(
com.oracle.bmc.http.ClientConfigurator clientConfigurator,
com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory,
java.util.List<com.oracle.bmc.http.ClientConfigurator> additionalClientConfigurators) {
this(
authenticationDetailsProvider,
configuration,
clientConfigurator,
requestSignerFactory,
additionalClientConfigurators,
null);
}

/**
* Creates a new service instance using the given authentication provider and client configuration. Additionally,
* a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization.
* <p>
* This is an advanced constructor for clients that want to take control over how requests are signed.
* @param authenticationDetailsProvider The authentication details provider, required.
* @param configuration The client configuration, optional.
* @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional.
* @param requestSignerFactory The request signer factory used to create the request signer for this service.
* @param additionalClientConfigurators Additional client configurators to be run after the primary configurator.
* @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider})
*/
public AuditAsyncClient(
com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider,
com.oracle.bmc.ClientConfiguration configuration,
com.oracle.bmc.http.ClientConfigurator clientConfigurator,
com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory,
java.util.List<com.oracle.bmc.http.ClientConfigurator> additionalClientConfigurators,
String endpoint) {
this.authenticationDetailsProvider = authenticationDetailsProvider;
com.oracle.bmc.http.internal.RestClientFactory restClientFactory =
com.oracle.bmc.http.internal.RestClientFactoryBuilder.builder()
Expand All @@ -119,8 +147,17 @@ public AuditAsyncClient(

if (provider.getRegion() != null) {
this.setRegion(provider.getRegion());
if (endpoint != null) {
LOG.info(
"Authentication details provider configured for region '{}', but endpoint specifically set to '{}'. Using endpoint setting instead of region.",
provider.getRegion(),
endpoint);
}
}
}
if (endpoint != null) {
setEndpoint(endpoint);
}
}

/**
Expand All @@ -143,6 +180,7 @@ public static class Builder {
protected com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory =
new com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory(
com.oracle.bmc.http.signing.SigningStrategy.STANDARD);
protected String endpoint;

private Builder() {}

Expand Down Expand Up @@ -207,6 +245,51 @@ public Builder requestSignerFactory(
return this;
}

/**
* Set the endpoint for the client to be created.
* @param endpoint endpoint
* @return this builder
*/
public Builder endpoint(String endpoint) {
this.endpoint = endpoint;
return this;
}

/**
* Set the region for the client to be created.
* @param region region
* @return this builder
*/
public Builder region(com.oracle.bmc.Region region) {
com.google.common.base.Optional<String> endpoint = region.getEndpoint(SERVICE);
if (endpoint.isPresent()) {
endpoint(endpoint.get());
} else {
throw new IllegalArgumentException(
"Endpoint for " + SERVICE + " is not known in region " + region);
}
return this;
}

/**
* Set the region for the client to be created.
* @param region region
* @return this builder
*/
public Builder region(String regionId) {
regionId = regionId.toLowerCase(Locale.ENGLISH);
try {
com.oracle.bmc.Region region = com.oracle.bmc.Region.fromRegionId(regionId);
return region(region);
} catch (IllegalArgumentException e) {
LOG.info(
"Unknown regionId '{}', falling back to default endpoint format", regionId);
String endpoint =
com.oracle.bmc.Region.formatDefaultRegionEndpoint(SERVICE, regionId);
return endpoint(endpoint);
}
}

/**
* Build the client, with the authentication details provider.
* @param authenticationDetailsProvider authentication details provider
Expand All @@ -221,7 +304,8 @@ public AuditAsyncClient build(
configuration,
clientConfigurator,
requestSignerFactory,
additionalClientConfigurators);
additionalClientConfigurators,
endpoint);
}
}

Expand Down
86 changes: 85 additions & 1 deletion bmc-audit/src/main/java/com/oracle/bmc/audit/AuditClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,34 @@ public AuditClient(
com.oracle.bmc.http.ClientConfigurator clientConfigurator,
com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory,
java.util.List<com.oracle.bmc.http.ClientConfigurator> additionalClientConfigurators) {
this(
authenticationDetailsProvider,
configuration,
clientConfigurator,
requestSignerFactory,
additionalClientConfigurators,
null);
}

/**
* Creates a new service instance using the given authentication provider and client configuration. Additionally,
* a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization.
* <p>
* This is an advanced constructor for clients that want to take control over how requests are signed.
* @param authenticationDetailsProvider The authentication details provider, required.
* @param configuration The client configuration, optional.
* @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional.
* @param requestSignerFactory The request signer factory used to create the request signer for this service.
* @param additionalClientConfigurators Additional client configurators to be run after the primary configurator.
* @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider})
*/
public AuditClient(
com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider,
com.oracle.bmc.ClientConfiguration configuration,
com.oracle.bmc.http.ClientConfigurator clientConfigurator,
com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory,
java.util.List<com.oracle.bmc.http.ClientConfigurator> additionalClientConfigurators,
String endpoint) {
this.authenticationDetailsProvider = authenticationDetailsProvider;
com.oracle.bmc.http.internal.RestClientFactory restClientFactory =
com.oracle.bmc.http.internal.RestClientFactoryBuilder.builder()
Expand All @@ -125,8 +153,17 @@ public AuditClient(

if (provider.getRegion() != null) {
this.setRegion(provider.getRegion());
if (endpoint != null) {
LOG.info(
"Authentication details provider configured for region '{}', but endpoint specifically set to '{}'. Using endpoint setting instead of region.",
provider.getRegion(),
endpoint);
}
}
}
if (endpoint != null) {
setEndpoint(endpoint);
}
}

/**
Expand All @@ -149,6 +186,7 @@ public static class Builder {
protected com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory =
new com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory(
com.oracle.bmc.http.signing.SigningStrategy.STANDARD);
protected String endpoint;

private Builder() {}

Expand Down Expand Up @@ -213,6 +251,51 @@ public Builder requestSignerFactory(
return this;
}

/**
* Set the endpoint for the client to be created.
* @param endpoint endpoint
* @return this builder
*/
public Builder endpoint(String endpoint) {
this.endpoint = endpoint;
return this;
}

/**
* Set the region for the client to be created.
* @param region region
* @return this builder
*/
public Builder region(com.oracle.bmc.Region region) {
com.google.common.base.Optional<String> endpoint = region.getEndpoint(SERVICE);
if (endpoint.isPresent()) {
endpoint(endpoint.get());
} else {
throw new IllegalArgumentException(
"Endpoint for " + SERVICE + " is not known in region " + region);
}
return this;
}

/**
* Set the region for the client to be created.
* @param region region
* @return this builder
*/
public Builder region(String regionId) {
regionId = regionId.toLowerCase(Locale.ENGLISH);
try {
com.oracle.bmc.Region region = com.oracle.bmc.Region.fromRegionId(regionId);
return region(region);
} catch (IllegalArgumentException e) {
LOG.info(
"Unknown regionId '{}', falling back to default endpoint format", regionId);
String endpoint =
com.oracle.bmc.Region.formatDefaultRegionEndpoint(SERVICE, regionId);
return endpoint(endpoint);
}
}

/**
* Set the authentication details provider. Once this is called, the builder can build the client.
* @param authenticationDetailsProvider authentication details provider
Expand All @@ -227,7 +310,8 @@ public AuditClient build(
configuration,
clientConfigurator,
requestSignerFactory,
additionalClientConfigurators);
additionalClientConfigurators,
endpoint);
}
}

Expand Down
22 changes: 11 additions & 11 deletions bmc-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk</artifactId>
<version>1.2.29</version>
<version>1.2.33</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>oci-java-sdk-bom</artifactId>
Expand All @@ -19,62 +19,62 @@
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-common</artifactId>
<version>1.2.29</version>
<version>1.2.33</version>
<optional>false</optional>
</dependency>
<!-- Service modules, alpha sorted -->
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-audit</artifactId>
<version>1.2.29</version>
<version>1.2.33</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-core</artifactId>
<version>1.2.29</version>
<version>1.2.33</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-database</artifactId>
<version>1.2.29</version>
<version>1.2.33</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-dns</artifactId>
<version>1.2.29</version>
<version>1.2.33</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-email</artifactId>
<version>1.2.29</version>
<version>1.2.33</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-filestorage</artifactId>
<version>1.2.29</version>
<version>1.2.33</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-identity</artifactId>
<version>1.2.29</version>
<version>1.2.33</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-loadbalancer</artifactId>
<version>1.2.29</version>
<version>1.2.33</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-objectstorage</artifactId>
<version>1.2.29</version>
<version>1.2.33</version>
<optional>false</optional>
</dependency>
</dependencies>
Expand Down
7 changes: 1 addition & 6 deletions bmc-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk</artifactId>
<version>1.2.29</version>
<version>1.2.33</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -84,11 +84,6 @@
<artifactId>nimbus-jose-jwt</artifactId>
<version>4.9</version>
</dependency>
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
<version>4.9</version>
</dependency>
</dependencies>

</project>
Loading