Skip to content

Commit bab8f17

Browse files
dshelbyodshelbyo
authored
Merge pull request #96 from oracle/release_2019-01-14
Releasing version 1.3.4
2 parents b60d045 + 5f384d8 commit bab8f17

File tree

2,504 files changed

+14151
-6249
lines changed

Some content is hidden

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

2,504 files changed

+14151
-6249
lines changed

‎CHANGELOG.md‎

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

16+
## 1.3.4 - 2019-01-10
17+
### Added
18+
- Support for device attributes on volume attachments in the Compute service
19+
- Support for custom header rulesets in the Load Balancing service
20+
- Add support to use RESTEasy with Java SDK. Examples can be found at [ResteasyClientWithObjectStorageExample](https://github.com/oracle/oci-java-sdk/blob/master/bmc-examples/src/main/java/ResteasyClientWithObjectStorageExample.java) and [InstancePrincipalsAuthenticationDetailsProviderWithResteasyClientExample](https://github.com/oracle/oci-java-sdk/blob/master/bmc-examples/src/main/java/InstancePrincipalsAuthenticationDetailsProviderWithResteasyClientExample.java)
21+
22+
### Fixed
23+
- Reading entities from HTTP response without a Content-Type header no longer throws a NullPointerException
24+
1625
## 1.3.3 - 2018-12-13
1726
### Added
1827
- Support for Data Guard for VM shapes in the Database service

‎bmc-addons/bmc-apache-connector-provider/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-addons</artifactId>
8-
<version>1.3.3</version>
8+
<version>1.3.4</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

@@ -37,7 +37,7 @@
3737
<dependency>
3838
<groupId>com.oracle.oci.sdk</groupId>
3939
<artifactId>oci-java-sdk-common</artifactId>
40-
<version>1.3.3</version>
40+
<version>1.3.4</version>
4141
</dependency>
4242
</dependencies>
4343
</project>

‎bmc-addons/bmc-apache-connector-provider/src/main/java/com/oracle/bmc/http/ApacheConfigurator.java‎

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
/**
2-
* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
33
*/
44
package com.oracle.bmc.http;
55

6+
import com.oracle.bmc.http.internal.ContentLengthFilter;
67
import lombok.extern.slf4j.Slf4j;
7-
import org.apache.commons.lang3.StringUtils;
88
import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
99
import org.glassfish.jersey.client.ClientConfig;
1010
import org.glassfish.jersey.client.ClientProperties;
1111
import org.glassfish.jersey.client.RequestEntityProcessing;
1212

1313
import javax.ws.rs.client.Client;
1414
import javax.ws.rs.client.ClientBuilder;
15-
import javax.ws.rs.client.ClientRequestContext;
16-
import javax.ws.rs.client.ClientRequestFilter;
1715
import java.util.LinkedList;
1816
import java.util.List;
1917

@@ -72,30 +70,4 @@ protected void setConnectorProvider(ClientBuilder builder) {
7270

7371
builder.withConfig(clientConfig);
7472
}
75-
76-
private static class ContentLengthFilter implements ClientRequestFilter {
77-
@Override
78-
public void filter(ClientRequestContext requestContext) {
79-
String contentLengthHeader = null;
80-
for (String key : requestContext.getHeaders().keySet()) {
81-
if (StringUtils.equalsIgnoreCase("content-length", key)) {
82-
contentLengthHeader = key;
83-
}
84-
}
85-
86-
final String method = requestContext.getMethod();
87-
final String uri = requestContext.getUri().toString();
88-
final Object existingContentLengthValue =
89-
requestContext.getHeaders().remove(contentLengthHeader);
90-
if (existingContentLengthValue != null) {
91-
LOG.debug(
92-
"Removed existing content-length header for Method [{}], URI [{}], Existing Value [{}]",
93-
method,
94-
uri,
95-
existingContentLengthValue);
96-
} else {
97-
LOG.debug("content-length not found for Method [{}], URI [{}]", method, uri);
98-
}
99-
}
100-
}
10173
}

‎bmc-addons/bmc-apache-connector-provider/src/main/java/com/oracle/bmc/http/ApacheConnectionPoolConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
33
*/
44
package com.oracle.bmc.http;
55

‎bmc-addons/bmc-apache-connector-provider/src/main/java/com/oracle/bmc/http/ApacheConnectionPoolingClientConfigDecorator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
33
*/
44
package com.oracle.bmc.http;
55

‎bmc-addons/bmc-apache-connector-provider/src/main/java/com/oracle/bmc/http/ApacheProxyConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
33
*/
44
package com.oracle.bmc.http;
55

‎bmc-addons/bmc-apache-connector-provider/src/main/java/com/oracle/bmc/http/ApacheProxyConfigDecorator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
33
*/
44
package com.oracle.bmc.http;
55

‎bmc-addons/bmc-resteasy-client-configurator/README.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# OCI Java SDK Resteasy Client Configurator Add-On
2+
3+
## About
4+
5+
The oci-java-sdk-addons-resteasy-client-configurator is an optional add-on to the OCI Java SDK. It makes resteasy client work with Java SDK.
6+
7+
## Installation
8+
1. The OCI Java SDK must be installed and configured before installing the add-on. See [the documentation](https://docs.us-phoenix-1.oraclecloud.com/Content/API/SDKDocs/javasdk.htm) for details.
9+
2. Copy the supplied oci-java-sdk-addons-resteasy-client-configurator and third-party jar files to your application's classpath.
10+
11+
#### Example
12+
An example of configuring the client to use RestEasy with the Java SDK can be found [here](https://github.com/oracle/oci-java-sdk/tree/master/bmc-examples/src/main/java/ResteasyClientExample.java).
13+
14+
15+
## License
16+
Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
17+
18+
This SDK and sample is dual licensed under the Universal Permissive License 1.0 and the Apache License 2.0.
19+
20+
See [LICENSE](../../LICENSE.txt) for more details.

‎bmc-addons/bmc-resteasy-client-configurator/pom.xml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<parent>
6+
<groupId>com.oracle.oci.sdk</groupId>
7+
<artifactId>oci-java-sdk-addons</artifactId>
8+
<version>1.3.4</version>
9+
<relativePath>../pom.xml</relativePath>
10+
</parent>
11+
12+
<artifactId>oci-java-sdk-addons-resteasy-client-configurator</artifactId>
13+
<name>Oracle Cloud Infrastructure SDK - RestEasyClientConfigurator</name>
14+
<description>This project adds support for the RestEasyClientConfigurator for the Java SDK</description>
15+
<url>https://docs.us-phoenix-1.oraclecloud.com/Content/API/SDKDocs/javasdk.htm</url>
16+
17+
18+
<dependencies>
19+
<!-- https://mvnrepository.com/artifact/org.jboss.resteasy/resteasy-client -->
20+
<dependency>
21+
<groupId>org.jboss.resteasy</groupId>
22+
<artifactId>resteasy-client</artifactId>
23+
<version>3.1.2.Final</version>
24+
</dependency>
25+
26+
<dependency>
27+
<groupId>org.jboss.resteasy</groupId>
28+
<artifactId>resteasy-jaxrs</artifactId>
29+
<version>3.1.2.Final</version>
30+
</dependency>
31+
32+
<dependency>
33+
<groupId>org.jboss.resteasy</groupId>
34+
<artifactId>jaxrs-api</artifactId>
35+
<version>3.0.12.Final</version>
36+
</dependency>
37+
38+
<dependency>
39+
<groupId>com.oracle.oci.sdk</groupId>
40+
<artifactId>oci-java-sdk-common</artifactId>
41+
<version>1.3.4</version>
42+
</dependency>
43+
</dependencies>
44+
</project>

‎bmc-addons/bmc-resteasy-client-configurator/src/main/assembly/assembly.xml‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
4+
5+
<id>release</id>
6+
<includeBaseDirectory>false</includeBaseDirectory>
7+
<formats>
8+
<format>zip</format>
9+
</formats>
10+
<fileSets>
11+
<!-- Include the README.md -->
12+
<fileSet>
13+
<directory>${project.basedir}</directory>
14+
<outputDirectory></outputDirectory>
15+
<includes>
16+
<include>README.md</include>
17+
</includes>
18+
</fileSet>
19+
<!-- Include all of the Javadocs -->
20+
<fileSet>
21+
<directory>${project.build.directory}/apidocs</directory>
22+
<outputDirectory>apidocs</outputDirectory>
23+
</fileSet>
24+
<!-- Include the sources and javadoc jars for developers -->
25+
<fileSet>
26+
<directory>${project.build.directory}</directory>
27+
<includes>
28+
<include>oci-java-sdk-addons-resteasy-client-configurator-${project.version}-*.jar</include>
29+
</includes>
30+
<outputDirectory>lib</outputDirectory>
31+
</fileSet>
32+
</fileSets>
33+
<files>
34+
<!-- Explicitly copy the signed/unsigned jar and rename it in the release zip file.
35+
If this is for a "signed" release, then the signed jar should be defined; else, the unsigned if the
36+
build profile is "ziponly" -->
37+
<file>
38+
<source>${source.jar.for.zip}</source>
39+
<outputDirectory>lib</outputDirectory>
40+
<destName>oci-java-sdk-addons-resteasy-client-configurator-${project.version}.jar</destName>
41+
</file>
42+
</files>
43+
<dependencySets>
44+
<!-- 3P dependencies only that's exclusive to this add-on, exclude OCI and its related third-party dependencies -->
45+
<dependencySet>
46+
<includes>
47+
<include>javax.activation:activation</include>
48+
<include>commons-logging:commons-logging</include>
49+
<include>org.jboss.resteasy:*</include>
50+
<include>org.apache.httpcomponents:*</include>
51+
<include>org.jboss.spec.javax.annotation:*</include>
52+
<include>org.jboss.logging:*</include>
53+
<include>org.jboss.spec.javax.ws.rs:*</include>
54+
</includes>
55+
<outputDirectory>third-party/lib</outputDirectory>
56+
<useProjectArtifact>true</useProjectArtifact>
57+
<useProjectAttachments>true</useProjectAttachments>
58+
<scope>runtime</scope>
59+
</dependencySet>
60+
</dependencySets>
61+
</assembly>

0 commit comments

Comments
 (0)