Skip to content

Commit 1267800

Browse files
benthamcbenthamc
authored
Merge pull request #32 from oracle/release_20171127
Releasing version 1.2.18
2 parents 112d6e2 + 054fde5 commit 1267800

File tree

338 files changed

+8471
-1263
lines changed

Some content is hidden

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

338 files changed

+8471
-1263
lines changed

‎.gitignore

+171-14
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,176 @@
1-
# git
2-
**/.gitignore
3-
**/*.orig
1+
#==================
2+
# Eclipse
3+
#==================
4+
# Pilfered shamelessly from: https://raw.githubusercontent.com/github/gitignore/master/Global/Eclipse.gitignore
5+
.metadata
6+
bin/
7+
tmp/
8+
*.tmp
9+
*.bak
10+
*.swp
11+
*~.nib
12+
local.properties
13+
.settings/
14+
.loadpath
15+
.recommenders
416

5-
# intellij
6-
.idea/
17+
# External tool builders
18+
.externalToolBuilders/
19+
20+
# Locally stored "Eclipse launch configurations"
21+
*.launch
22+
23+
# PyDev specific (Python IDE for Eclipse)
24+
*.pydevproject
25+
26+
# CDT-specific (C/C++ Development Tooling)
27+
.cproject
28+
29+
# Java annotation processor (APT)
30+
.factorypath
31+
32+
# PDT-specific (PHP Development Tools)
33+
.buildpath
34+
35+
# sbteclipse plugin
36+
.target
37+
38+
# Tern plugin
39+
.tern-project
40+
41+
# TeXlipse plugin
42+
.texlipse
43+
44+
# STS (Spring Tool Suite)
45+
.springBeans
46+
47+
# Code Recommenders
48+
.recommenders/
49+
50+
# Scala IDE specific (Scala & Java development for Eclipse)
51+
.cache-main
52+
.scala_dependencies
53+
.worksheet
54+
55+
#==================
56+
# Eclipse Patch
57+
#==================
58+
# Eclipse Core
59+
.project
60+
61+
# JDT-specific (Eclipse Java Development Tools)
62+
.classpath
63+
64+
#==================
65+
# JetBrains
66+
#==================
67+
# Original source: https://github.com/github/gitignore/blob/master/Global/JetBrains.gitignore
68+
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
69+
# => updated to ignore .idea directory entirely
70+
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
71+
72+
## File-based project format:
73+
*.iws
74+
75+
## Plugin-specific files:
76+
77+
# IntelliJ
78+
/out/
79+
80+
# mpeltonen/sbt-idea plugin
81+
.idea_modules/
82+
83+
# JIRA plugin
84+
atlassian-ide-plugin.xml
85+
86+
# Ruby plugin and RubyMine
87+
/.rakeTasks
88+
89+
# Crashlytics plugin (for Android Studio and IntelliJ)
90+
com_crashlytics_export_strings.xml
91+
crashlytics.properties
92+
crashlytics-build.properties
93+
fabric.properties
94+
95+
#==================
96+
# Intellij Patch
97+
#==================
98+
# Reference: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
99+
100+
# Ignoring .idea and *.iml files (https://intellij-support.jetbrains.com/hc/en-us/articles/206544839)
7101
*.iml
102+
.idea
103+
104+
#==================
105+
# Java
106+
#==================
107+
# Pilfered shamelessly from: https://github.com/github/gitignore/blob/master/Java.gitignore
108+
# Compiled class file
109+
*.class
110+
111+
# Log file
112+
*.log
113+
114+
# BlueJ files
115+
*.ctxt
116+
117+
# Mobile Tools for Java (J2ME)
118+
.mtj.tmp/
119+
120+
# Package Files #
121+
*.jar
122+
*.war
123+
*.ear
124+
*.zip
125+
*.tar.gz
126+
*.rar
127+
128+
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
129+
hs_err_pid*
130+
131+
#==================
132+
# Maven
133+
#==================
134+
# Pilfered shamelessly from: https://github.com/github/gitignore/blob/master/Maven.gitignore
135+
target/
136+
pom.xml.tag
137+
pom.xml.releaseBackup
138+
pom.xml.versionsBackup
139+
pom.xml.next
140+
release.properties
141+
dependency-reduced-pom.xml
142+
buildNumber.properties
143+
.mvn/timing.properties
144+
145+
# Avoid ignoring Maven wrapper jar file (.jar files are usually ignored)
146+
!/.mvn/wrapper/maven-wrapper.jar
147+
148+
#==================
149+
# MacOS
150+
#==================
151+
# Pilfered shamelessly from: https://github.com/github/gitignore/blob/master/Global/macOS.gitignore
152+
*.DS_Store
153+
.AppleDouble
154+
.LSOverride
155+
156+
# Icon must end with two \r
157+
Icon
8158

9-
# maven
10-
**/target/*
11-
**/*.versionsBackup
159+
# Thumbnails
160+
._*
12161

13-
# eclipse
14-
**/.settings/*
15-
**/.classpath
16-
**/.project
162+
# Files that might appear in the root of a volume
163+
.DocumentRevisions-V100
164+
.fseventsd
165+
.Spotlight-V100
166+
.TemporaryItems
167+
.Trashes
168+
.VolumeIcon.icns
169+
.com.apple.timemachine.donotpresent
17170

18-
# mac
19-
**/.DS_Store
171+
# Directories potentially created on remote AFP share
172+
.AppleDB
173+
.AppleDesktop
174+
Network Trash Folder
175+
Temporary Items
176+
.apdisk

‎CHANGELOG.md

+12-2
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,21 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
77
### Fixed
88
- N/A
99

10+
## 1.2.18 - 2017-11-27
11+
1012
### Changed
11-
- N/A
13+
- Passphrases are now passed as char[] instead of as String
14+
- Requests are now buffered in memory by default, except by the ObjectStorageClient and ObjectStorageAsyncClient. This allows for better error messages on PUT and POST requests. If you do not want to buffer requests in memory, pass an instance of `com.oracle.bmc.http.DefaultConfigurator.NonBuffering` to the constructor of the client.
1215

1316
### Added
14-
- N/A
17+
- Support for VCN to VCN peering within region
18+
- Support option for second NIC on X7 bare metal instances
19+
- Support for user-managed boot volumes
20+
- Support for creating database from backup in Database service
21+
- Support for sort and filter in ListLoadBalancers method in Load Balancer Service
22+
23+
### Deprecated
24+
- Methods accepting passphrases as String are deprecated; use char[] instead
1525

1626
## 1.2.17 - 2017-11-02
1727

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Oracle Cloud Infrastructure Java SDK
2-
[![Build Status](https://travis-ci.org/oracle/bmcs-java-sdk.svg?branch=master)](https://travis-ci.org/oracle/bmcs-java-sdk)
2+
[![Build Status](https://travis-ci.org/oracle/oci-java-sdk.svg?branch=master)](https://travis-ci.org/oracle/oci-java-sdk)
33

44
## About
55

‎bmc-audit/pom.xml

+2-2
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.17</version>
8+
<version>1.2.18</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.17</version>
21+
<version>1.2.18</version>
2222
</dependency>
2323
</dependencies>
2424

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
*/
44
package com.oracle.bmc.audit;
55

6+
import java.util.Locale;
67
import com.oracle.bmc.audit.internal.http.*;
78
import com.oracle.bmc.audit.requests.*;
89
import com.oracle.bmc.audit.responses.*;
@@ -101,7 +102,7 @@ public void setRegion(com.oracle.bmc.Region region) {
101102

102103
@Override
103104
public void setRegion(String regionId) {
104-
regionId = regionId.toLowerCase();
105+
regionId = regionId.toLowerCase(Locale.ENGLISH);
105106
try {
106107
com.oracle.bmc.Region region = com.oracle.bmc.Region.fromRegionId(regionId);
107108
setRegion(region);

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
*/
44
package com.oracle.bmc.audit;
55

6+
import java.util.Locale;
67
import com.oracle.bmc.audit.internal.http.*;
78
import com.oracle.bmc.audit.requests.*;
89
import com.oracle.bmc.audit.responses.*;
@@ -101,7 +102,7 @@ public void setRegion(com.oracle.bmc.Region region) {
101102

102103
@Override
103104
public void setRegion(String regionId) {
104-
regionId = regionId.toLowerCase();
105+
regionId = regionId.toLowerCase(Locale.ENGLISH);
105106
try {
106107
com.oracle.bmc.Region region = com.oracle.bmc.Region.fromRegionId(regionId);
107108
setRegion(region);

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

+22-18
Original file line numberDiff line numberDiff line change
@@ -206,24 +206,28 @@ public AuditEvent build() {
206206

207207
@com.fasterxml.jackson.annotation.JsonIgnore
208208
public Builder copy(AuditEvent o) {
209-
return tenantId(o.getTenantId())
210-
.compartmentId(o.getCompartmentId())
211-
.eventId(o.getEventId())
212-
.eventSource(o.getEventSource())
213-
.eventType(o.getEventType())
214-
.eventTime(o.getEventTime())
215-
.principalId(o.getPrincipalId())
216-
.credentialId(o.getCredentialId())
217-
.requestAction(o.getRequestAction())
218-
.requestId(o.getRequestId())
219-
.requestAgent(o.getRequestAgent())
220-
.requestHeaders(o.getRequestHeaders())
221-
.requestOrigin(o.getRequestOrigin())
222-
.requestParameters(o.getRequestParameters())
223-
.requestResource(o.getRequestResource())
224-
.responseHeaders(o.getResponseHeaders())
225-
.responseStatus(o.getResponseStatus())
226-
.responseTime(o.getResponseTime());
209+
Builder copiedBuilder =
210+
tenantId(o.getTenantId())
211+
.compartmentId(o.getCompartmentId())
212+
.eventId(o.getEventId())
213+
.eventSource(o.getEventSource())
214+
.eventType(o.getEventType())
215+
.eventTime(o.getEventTime())
216+
.principalId(o.getPrincipalId())
217+
.credentialId(o.getCredentialId())
218+
.requestAction(o.getRequestAction())
219+
.requestId(o.getRequestId())
220+
.requestAgent(o.getRequestAgent())
221+
.requestHeaders(o.getRequestHeaders())
222+
.requestOrigin(o.getRequestOrigin())
223+
.requestParameters(o.getRequestParameters())
224+
.requestResource(o.getRequestResource())
225+
.responseHeaders(o.getResponseHeaders())
226+
.responseStatus(o.getResponseStatus())
227+
.responseTime(o.getResponseTime());
228+
229+
copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__);
230+
return copiedBuilder;
227231
}
228232
}
229233

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,10 @@ public Configuration build() {
3131

3232
@com.fasterxml.jackson.annotation.JsonIgnore
3333
public Builder copy(Configuration o) {
34-
return retentionPeriodDays(o.getRetentionPeriodDays());
34+
Builder copiedBuilder = retentionPeriodDays(o.getRetentionPeriodDays());
35+
36+
copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__);
37+
return copiedBuilder;
3538
}
3639
}
3740

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ public UpdateConfigurationDetails build() {
3434

3535
@com.fasterxml.jackson.annotation.JsonIgnore
3636
public Builder copy(UpdateConfigurationDetails o) {
37-
return retentionPeriodDays(o.getRetentionPeriodDays());
37+
Builder copiedBuilder = retentionPeriodDays(o.getRetentionPeriodDays());
38+
39+
copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__);
40+
return copiedBuilder;
3841
}
3942
}
4043

0 commit comments

Comments
 (0)