Skip to content

Commit dec7aa0

Browse files
mrickenmricken
authored
Merge pull request #9 from oracle/release_042717
Releasing version 1.2.7 of the Java SDK for Oracle Bare Metal Cloud Services.
2 parents 39bc716 + 264cea2 commit dec7aa0

File tree

196 files changed

+15389
-243
lines changed

Some content is hidden

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

196 files changed

+15389
-243
lines changed

‎CHANGELOG.md

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

16+
## 1.2.7 - 2017-04-27
17+
### Changed
18+
- A new value called UnknownEnumValue has been added to all enums that are used in responses returned from services. If a service returns a value that cannot be recognized by the version of the SDK, then the enum will be set to this value. Previously this would throw an exception.
19+
20+
### Added
21+
- Support for FastConnect
22+
- Support for Load Balancer Service
23+
1624
## 1.2.5 - 2017-04-06
1725
### Changed
1826
- Added opc-client-request-id truncation logic in MultipartObjectAssembler to prevent failures

‎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.bmc.sdk</groupId>
77
<artifactId>oracle-bmc-java-sdk</artifactId>
8-
<version>1.2.5</version>
8+
<version>1.2.7</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

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

‎bmc-audit/src/main/java/com/oracle/bmc/audit/internal/http/ListEventsConverter.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,20 +44,23 @@ public static Invocation.Builder fromRequest(RestClient client, ListEventsReques
4444
throw new NullPointerException("compartmentId is required");
4545
}
4646

47+
if (request.getStartTime() == null) {
48+
throw new NullPointerException("startTime is required");
49+
}
50+
51+
if (request.getEndTime() == null) {
52+
throw new NullPointerException("endTime is required");
53+
}
54+
4755
WebTarget target = client.getBaseTarget().path("/20160918").path("auditEvents");
4856

4957
target =
5058
target.queryParam(
5159
"compartmentId", attemptEncodeQueryParam(request.getCompartmentId()));
5260

53-
if (request.getStartTime() != null) {
54-
target =
55-
target.queryParam("startTime", attemptEncodeQueryParam(request.getStartTime()));
56-
}
61+
target = target.queryParam("startTime", attemptEncodeQueryParam(request.getStartTime()));
5762

58-
if (request.getEndTime() != null) {
59-
target = target.queryParam("endTime", attemptEncodeQueryParam(request.getEndTime()));
60-
}
63+
target = target.queryParam("endTime", attemptEncodeQueryParam(request.getEndTime()));
6164

6265
if (request.getPage() != null) {
6366
target = target.queryParam("page", attemptEncodeQueryParam(request.getPage()));

‎bmc-bom/pom.xml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.oracle.bmc.sdk</groupId>
99
<artifactId>oracle-bmc-java-sdk</artifactId>
10-
<version>1.2.5</version>
10+
<version>1.2.7</version>
1111
<relativePath>../pom.xml</relativePath>
1212
</parent>
1313

@@ -24,7 +24,7 @@
2424
<dependency>
2525
<groupId>com.oracle.bmc.sdk</groupId>
2626
<artifactId>oracle-bmc-java-sdk-common</artifactId>
27-
<version>1.2.5</version>
27+
<version>1.2.7</version>
2828
<optional>false</optional>
2929
</dependency>
3030

@@ -33,25 +33,31 @@
3333
<dependency>
3434
<groupId>com.oracle.bmc.sdk</groupId>
3535
<artifactId>oracle-bmc-java-sdk-audit</artifactId>
36-
<version>1.2.5</version>
36+
<version>1.2.7</version>
3737
<optional>false</optional>
3838
</dependency>
3939
<dependency>
4040
<groupId>com.oracle.bmc.sdk</groupId>
4141
<artifactId>oracle-bmc-java-sdk-core</artifactId>
42-
<version>1.2.5</version>
42+
<version>1.2.7</version>
4343
<optional>false</optional>
4444
</dependency>
4545
<dependency>
4646
<groupId>com.oracle.bmc.sdk</groupId>
4747
<artifactId>oracle-bmc-java-sdk-identity</artifactId>
48-
<version>1.2.5</version>
48+
<version>1.2.7</version>
49+
<optional>false</optional>
50+
</dependency>
51+
<dependency>
52+
<groupId>com.oracle.bmc.sdk</groupId>
53+
<artifactId>oracle-bmc-java-sdk-loadbalancer</artifactId>
54+
<version>1.2.7</version>
4955
<optional>false</optional>
5056
</dependency>
5157
<dependency>
5258
<groupId>com.oracle.bmc.sdk</groupId>
5359
<artifactId>oracle-bmc-java-sdk-objectstorage</artifactId>
54-
<version>1.2.5</version>
60+
<version>1.2.7</version>
5561
<optional>false</optional>
5662
</dependency>
5763
</dependencies>

‎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.bmc.sdk</groupId>
77
<artifactId>oracle-bmc-java-sdk</artifactId>
8-
<version>1.2.5</version>
8+
<version>1.2.7</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import com.google.common.base.Optional;
2626
import com.google.common.base.Preconditions;
2727
import com.google.common.base.Throwables;
28+
import com.oracle.bmc.util.StreamUtils;
2829

2930
import lombok.extern.slf4j.Slf4j;
3031

@@ -49,7 +50,7 @@ public class PEMFileRSAPrivateKeySupplier implements KeySupplier<RSAPrivateKey>
4950

5051
/**
5152
* Constructs a new file key supplier which reads the private key from the
52-
* specified file.
53+
* specified file. The provided stream will be closed by this supplier automatically.
5354
*
5455
* @param inputStream
5556
* the path to the RSA private key
@@ -95,6 +96,8 @@ public PEMFileRSAPrivateKeySupplier(
9596
}
9697

9798
this.key = (RSAPrivateKey) converter.getPrivateKey(keyInfo);
99+
} finally {
100+
StreamUtils.closeQuietly(inputStream);
98101
}
99102
} catch (IOException ex) {
100103
LOG.debug("Failed to read RSA private key from file", ex);

‎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.bmc.sdk</groupId>
77
<artifactId>oracle-bmc-java-sdk</artifactId>
8-
<version>1.2.5</version>
8+
<version>1.2.7</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

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

‎bmc-core/src/main/java/com/oracle/bmc/core/BlockstorageWaiters.java

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
*/
44
package com.oracle.bmc.core;
55

6-
import com.oracle.bmc.core.model.*;
76
import com.oracle.bmc.core.requests.*;
87
import com.oracle.bmc.core.responses.*;
98

@@ -38,7 +37,7 @@ public class BlockstorageWaiters {
3837
* @return A new Waiter instance.
3938
*/
4039
public Waiter<GetVolumeRequest, GetVolumeResponse> forVolume(
41-
GetVolumeRequest request, Volume.LifecycleState targetState) {
40+
GetVolumeRequest request, com.oracle.bmc.core.model.Volume.LifecycleState targetState) {
4241
return forVolume(Waiters.DEFAULT_POLLING_WAITER, request, targetState);
4342
}
4443

@@ -53,7 +52,7 @@ public Waiter<GetVolumeRequest, GetVolumeResponse> forVolume(
5352
*/
5453
public Waiter<GetVolumeRequest, GetVolumeResponse> forVolume(
5554
GetVolumeRequest request,
56-
Volume.LifecycleState targetState,
55+
com.oracle.bmc.core.model.Volume.LifecycleState targetState,
5756
TerminationStrategy terminationStrategy,
5857
DelayStrategy delayStrategy) {
5958
return forVolume(
@@ -64,7 +63,7 @@ public Waiter<GetVolumeRequest, GetVolumeResponse> forVolume(
6463
private Waiter<GetVolumeRequest, GetVolumeResponse> forVolume(
6564
BmcGenericWaiter waiter,
6665
final GetVolumeRequest request,
67-
final Volume.LifecycleState targetState) {
66+
final com.oracle.bmc.core.model.Volume.LifecycleState targetState) {
6867
return new SimpleWaiterImpl<>(
6968
executorService,
7069
waiter.toCallable(
@@ -81,7 +80,7 @@ public boolean apply(GetVolumeResponse response) {
8180
return response.getVolume().getLifecycleState() == targetState;
8281
}
8382
},
84-
targetState == Volume.LifecycleState.Terminated),
83+
targetState == com.oracle.bmc.core.model.Volume.LifecycleState.Terminated),
8584
request);
8685
}
8786

@@ -93,7 +92,8 @@ public boolean apply(GetVolumeResponse response) {
9392
* @return A new Waiter instance.
9493
*/
9594
public Waiter<GetVolumeBackupRequest, GetVolumeBackupResponse> forVolumeBackup(
96-
GetVolumeBackupRequest request, VolumeBackup.LifecycleState targetState) {
95+
GetVolumeBackupRequest request,
96+
com.oracle.bmc.core.model.VolumeBackup.LifecycleState targetState) {
9797
return forVolumeBackup(Waiters.DEFAULT_POLLING_WAITER, request, targetState);
9898
}
9999

@@ -108,7 +108,7 @@ public Waiter<GetVolumeBackupRequest, GetVolumeBackupResponse> forVolumeBackup(
108108
*/
109109
public Waiter<GetVolumeBackupRequest, GetVolumeBackupResponse> forVolumeBackup(
110110
GetVolumeBackupRequest request,
111-
VolumeBackup.LifecycleState targetState,
111+
com.oracle.bmc.core.model.VolumeBackup.LifecycleState targetState,
112112
TerminationStrategy terminationStrategy,
113113
DelayStrategy delayStrategy) {
114114
return forVolumeBackup(
@@ -119,7 +119,7 @@ public Waiter<GetVolumeBackupRequest, GetVolumeBackupResponse> forVolumeBackup(
119119
private Waiter<GetVolumeBackupRequest, GetVolumeBackupResponse> forVolumeBackup(
120120
BmcGenericWaiter waiter,
121121
final GetVolumeBackupRequest request,
122-
final VolumeBackup.LifecycleState targetState) {
122+
final com.oracle.bmc.core.model.VolumeBackup.LifecycleState targetState) {
123123
return new SimpleWaiterImpl<>(
124124
executorService,
125125
waiter.toCallable(
@@ -137,7 +137,9 @@ public boolean apply(GetVolumeBackupResponse response) {
137137
== targetState;
138138
}
139139
},
140-
targetState == VolumeBackup.LifecycleState.Terminated),
140+
targetState
141+
== com.oracle.bmc.core.model.VolumeBackup.LifecycleState
142+
.Terminated),
141143
request);
142144
}
143145
}

‎bmc-core/src/main/java/com/oracle/bmc/core/ComputeWaiters.java

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
*/
44
package com.oracle.bmc.core;
55

6-
import com.oracle.bmc.core.model.*;
76
import com.oracle.bmc.core.requests.*;
87
import com.oracle.bmc.core.responses.*;
98

@@ -38,7 +37,8 @@ public class ComputeWaiters {
3837
* @return A new Waiter instance.
3938
*/
4039
public Waiter<GetConsoleHistoryRequest, GetConsoleHistoryResponse> forConsoleHistory(
41-
GetConsoleHistoryRequest request, ConsoleHistory.LifecycleState targetState) {
40+
GetConsoleHistoryRequest request,
41+
com.oracle.bmc.core.model.ConsoleHistory.LifecycleState targetState) {
4242
return forConsoleHistory(Waiters.DEFAULT_POLLING_WAITER, request, targetState);
4343
}
4444

@@ -53,7 +53,7 @@ public Waiter<GetConsoleHistoryRequest, GetConsoleHistoryResponse> forConsoleHis
5353
*/
5454
public Waiter<GetConsoleHistoryRequest, GetConsoleHistoryResponse> forConsoleHistory(
5555
GetConsoleHistoryRequest request,
56-
ConsoleHistory.LifecycleState targetState,
56+
com.oracle.bmc.core.model.ConsoleHistory.LifecycleState targetState,
5757
TerminationStrategy terminationStrategy,
5858
DelayStrategy delayStrategy) {
5959
return forConsoleHistory(
@@ -64,7 +64,7 @@ public Waiter<GetConsoleHistoryRequest, GetConsoleHistoryResponse> forConsoleHis
6464
private Waiter<GetConsoleHistoryRequest, GetConsoleHistoryResponse> forConsoleHistory(
6565
BmcGenericWaiter waiter,
6666
final GetConsoleHistoryRequest request,
67-
final ConsoleHistory.LifecycleState targetState) {
67+
final com.oracle.bmc.core.model.ConsoleHistory.LifecycleState targetState) {
6868
return new SimpleWaiterImpl<>(
6969
executorService,
7070
waiter.toCallable(
@@ -95,7 +95,7 @@ public boolean apply(GetConsoleHistoryResponse response) {
9595
* @return A new Waiter instance.
9696
*/
9797
public Waiter<GetImageRequest, GetImageResponse> forImage(
98-
GetImageRequest request, Image.LifecycleState targetState) {
98+
GetImageRequest request, com.oracle.bmc.core.model.Image.LifecycleState targetState) {
9999
return forImage(Waiters.DEFAULT_POLLING_WAITER, request, targetState);
100100
}
101101

@@ -110,7 +110,7 @@ public Waiter<GetImageRequest, GetImageResponse> forImage(
110110
*/
111111
public Waiter<GetImageRequest, GetImageResponse> forImage(
112112
GetImageRequest request,
113-
Image.LifecycleState targetState,
113+
com.oracle.bmc.core.model.Image.LifecycleState targetState,
114114
TerminationStrategy terminationStrategy,
115115
DelayStrategy delayStrategy) {
116116
return forImage(
@@ -121,7 +121,7 @@ public Waiter<GetImageRequest, GetImageResponse> forImage(
121121
private Waiter<GetImageRequest, GetImageResponse> forImage(
122122
BmcGenericWaiter waiter,
123123
final GetImageRequest request,
124-
final Image.LifecycleState targetState) {
124+
final com.oracle.bmc.core.model.Image.LifecycleState targetState) {
125125
return new SimpleWaiterImpl<>(
126126
executorService,
127127
waiter.toCallable(
@@ -138,7 +138,7 @@ public boolean apply(GetImageResponse response) {
138138
return response.getImage().getLifecycleState() == targetState;
139139
}
140140
},
141-
targetState == Image.LifecycleState.Deleted),
141+
targetState == com.oracle.bmc.core.model.Image.LifecycleState.Deleted),
142142
request);
143143
}
144144

@@ -150,7 +150,8 @@ public boolean apply(GetImageResponse response) {
150150
* @return A new Waiter instance.
151151
*/
152152
public Waiter<GetInstanceRequest, GetInstanceResponse> forInstance(
153-
GetInstanceRequest request, Instance.LifecycleState targetState) {
153+
GetInstanceRequest request,
154+
com.oracle.bmc.core.model.Instance.LifecycleState targetState) {
154155
return forInstance(Waiters.DEFAULT_POLLING_WAITER, request, targetState);
155156
}
156157

@@ -165,7 +166,7 @@ public Waiter<GetInstanceRequest, GetInstanceResponse> forInstance(
165166
*/
166167
public Waiter<GetInstanceRequest, GetInstanceResponse> forInstance(
167168
GetInstanceRequest request,
168-
Instance.LifecycleState targetState,
169+
com.oracle.bmc.core.model.Instance.LifecycleState targetState,
169170
TerminationStrategy terminationStrategy,
170171
DelayStrategy delayStrategy) {
171172
return forInstance(
@@ -176,7 +177,7 @@ public Waiter<GetInstanceRequest, GetInstanceResponse> forInstance(
176177
private Waiter<GetInstanceRequest, GetInstanceResponse> forInstance(
177178
BmcGenericWaiter waiter,
178179
final GetInstanceRequest request,
179-
final Instance.LifecycleState targetState) {
180+
final com.oracle.bmc.core.model.Instance.LifecycleState targetState) {
180181
return new SimpleWaiterImpl<>(
181182
executorService,
182183
waiter.toCallable(
@@ -193,7 +194,8 @@ public boolean apply(GetInstanceResponse response) {
193194
return response.getInstance().getLifecycleState() == targetState;
194195
}
195196
},
196-
targetState == Instance.LifecycleState.Terminated),
197+
targetState
198+
== com.oracle.bmc.core.model.Instance.LifecycleState.Terminated),
197199
request);
198200
}
199201

@@ -205,7 +207,8 @@ public boolean apply(GetInstanceResponse response) {
205207
* @return A new Waiter instance.
206208
*/
207209
public Waiter<GetVolumeAttachmentRequest, GetVolumeAttachmentResponse> forVolumeAttachment(
208-
GetVolumeAttachmentRequest request, VolumeAttachment.LifecycleState targetState) {
210+
GetVolumeAttachmentRequest request,
211+
com.oracle.bmc.core.model.VolumeAttachment.LifecycleState targetState) {
209212
return forVolumeAttachment(Waiters.DEFAULT_POLLING_WAITER, request, targetState);
210213
}
211214

@@ -220,7 +223,7 @@ public Waiter<GetVolumeAttachmentRequest, GetVolumeAttachmentResponse> forVolume
220223
*/
221224
public Waiter<GetVolumeAttachmentRequest, GetVolumeAttachmentResponse> forVolumeAttachment(
222225
GetVolumeAttachmentRequest request,
223-
VolumeAttachment.LifecycleState targetState,
226+
com.oracle.bmc.core.model.VolumeAttachment.LifecycleState targetState,
224227
TerminationStrategy terminationStrategy,
225228
DelayStrategy delayStrategy) {
226229
return forVolumeAttachment(
@@ -231,7 +234,7 @@ public Waiter<GetVolumeAttachmentRequest, GetVolumeAttachmentResponse> forVolume
231234
private Waiter<GetVolumeAttachmentRequest, GetVolumeAttachmentResponse> forVolumeAttachment(
232235
BmcGenericWaiter waiter,
233236
final GetVolumeAttachmentRequest request,
234-
final VolumeAttachment.LifecycleState targetState) {
237+
final com.oracle.bmc.core.model.VolumeAttachment.LifecycleState targetState) {
235238
return new SimpleWaiterImpl<>(
236239
executorService,
237240
waiter.toCallable(

0 commit comments

Comments
 (0)