Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
### Added
- N/A

## 1.2.7 - 2017-04-27
### Changed
- 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.

### Added
- Support for FastConnect
- Support for Load Balancer Service

## 1.2.5 - 2017-04-06
### Changed
- Added opc-client-request-id truncation logic in MultipartObjectAssembler to prevent failures
Expand Down
4 changes: 2 additions & 2 deletions bmc-audit/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.oracle.bmc.sdk</groupId>
<artifactId>oracle-bmc-java-sdk</artifactId>
<version>1.2.5</version>
<version>1.2.7</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -18,7 +18,7 @@
<dependency>
<groupId>com.oracle.bmc.sdk</groupId>
<artifactId>oracle-bmc-java-sdk-common</artifactId>
<version>1.2.5</version>
<version>1.2.7</version>
</dependency>
</dependencies>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,20 +44,23 @@ public static Invocation.Builder fromRequest(RestClient client, ListEventsReques
throw new NullPointerException("compartmentId is required");
}

if (request.getStartTime() == null) {
throw new NullPointerException("startTime is required");
}

if (request.getEndTime() == null) {
throw new NullPointerException("endTime is required");
}

WebTarget target = client.getBaseTarget().path("/20160918").path("auditEvents");

target =
target.queryParam(
"compartmentId", attemptEncodeQueryParam(request.getCompartmentId()));

if (request.getStartTime() != null) {
target =
target.queryParam("startTime", attemptEncodeQueryParam(request.getStartTime()));
}
target = target.queryParam("startTime", attemptEncodeQueryParam(request.getStartTime()));

if (request.getEndTime() != null) {
target = target.queryParam("endTime", attemptEncodeQueryParam(request.getEndTime()));
}
target = target.queryParam("endTime", attemptEncodeQueryParam(request.getEndTime()));

if (request.getPage() != null) {
target = target.queryParam("page", attemptEncodeQueryParam(request.getPage()));
Expand Down
18 changes: 12 additions & 6 deletions bmc-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.oracle.bmc.sdk</groupId>
<artifactId>oracle-bmc-java-sdk</artifactId>
<version>1.2.5</version>
<version>1.2.7</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -24,7 +24,7 @@
<dependency>
<groupId>com.oracle.bmc.sdk</groupId>
<artifactId>oracle-bmc-java-sdk-common</artifactId>
<version>1.2.5</version>
<version>1.2.7</version>
<optional>false</optional>
</dependency>

Expand All @@ -33,25 +33,31 @@
<dependency>
<groupId>com.oracle.bmc.sdk</groupId>
<artifactId>oracle-bmc-java-sdk-audit</artifactId>
<version>1.2.5</version>
<version>1.2.7</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>com.oracle.bmc.sdk</groupId>
<artifactId>oracle-bmc-java-sdk-core</artifactId>
<version>1.2.5</version>
<version>1.2.7</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>com.oracle.bmc.sdk</groupId>
<artifactId>oracle-bmc-java-sdk-identity</artifactId>
<version>1.2.5</version>
<version>1.2.7</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>com.oracle.bmc.sdk</groupId>
<artifactId>oracle-bmc-java-sdk-loadbalancer</artifactId>
<version>1.2.7</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>com.oracle.bmc.sdk</groupId>
<artifactId>oracle-bmc-java-sdk-objectstorage</artifactId>
<version>1.2.5</version>
<version>1.2.7</version>
<optional>false</optional>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion bmc-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.oracle.bmc.sdk</groupId>
<artifactId>oracle-bmc-java-sdk</artifactId>
<version>1.2.5</version>
<version>1.2.7</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.base.Throwables;
import com.oracle.bmc.util.StreamUtils;

import lombok.extern.slf4j.Slf4j;

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

/**
* Constructs a new file key supplier which reads the private key from the
* specified file.
* specified file. The provided stream will be closed by this supplier automatically.
*
* @param inputStream
* the path to the RSA private key
Expand Down Expand Up @@ -95,6 +96,8 @@ public PEMFileRSAPrivateKeySupplier(
}

this.key = (RSAPrivateKey) converter.getPrivateKey(keyInfo);
} finally {
StreamUtils.closeQuietly(inputStream);
}
} catch (IOException ex) {
LOG.debug("Failed to read RSA private key from file", ex);
Expand Down
4 changes: 2 additions & 2 deletions bmc-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.oracle.bmc.sdk</groupId>
<artifactId>oracle-bmc-java-sdk</artifactId>
<version>1.2.5</version>
<version>1.2.7</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -18,7 +18,7 @@
<dependency>
<groupId>com.oracle.bmc.sdk</groupId>
<artifactId>oracle-bmc-java-sdk-common</artifactId>
<version>1.2.5</version>
<version>1.2.7</version>
</dependency>
</dependencies>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
*/
package com.oracle.bmc.core;

import com.oracle.bmc.core.model.*;
import com.oracle.bmc.core.requests.*;
import com.oracle.bmc.core.responses.*;

Expand Down Expand Up @@ -38,7 +37,7 @@ public class BlockstorageWaiters {
* @return A new Waiter instance.
*/
public Waiter<GetVolumeRequest, GetVolumeResponse> forVolume(
GetVolumeRequest request, Volume.LifecycleState targetState) {
GetVolumeRequest request, com.oracle.bmc.core.model.Volume.LifecycleState targetState) {
return forVolume(Waiters.DEFAULT_POLLING_WAITER, request, targetState);
}

Expand All @@ -53,7 +52,7 @@ public Waiter<GetVolumeRequest, GetVolumeResponse> forVolume(
*/
public Waiter<GetVolumeRequest, GetVolumeResponse> forVolume(
GetVolumeRequest request,
Volume.LifecycleState targetState,
com.oracle.bmc.core.model.Volume.LifecycleState targetState,
TerminationStrategy terminationStrategy,
DelayStrategy delayStrategy) {
return forVolume(
Expand All @@ -64,7 +63,7 @@ public Waiter<GetVolumeRequest, GetVolumeResponse> forVolume(
private Waiter<GetVolumeRequest, GetVolumeResponse> forVolume(
BmcGenericWaiter waiter,
final GetVolumeRequest request,
final Volume.LifecycleState targetState) {
final com.oracle.bmc.core.model.Volume.LifecycleState targetState) {
return new SimpleWaiterImpl<>(
executorService,
waiter.toCallable(
Expand All @@ -81,7 +80,7 @@ public boolean apply(GetVolumeResponse response) {
return response.getVolume().getLifecycleState() == targetState;
}
},
targetState == Volume.LifecycleState.Terminated),
targetState == com.oracle.bmc.core.model.Volume.LifecycleState.Terminated),
request);
}

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

Expand All @@ -108,7 +108,7 @@ public Waiter<GetVolumeBackupRequest, GetVolumeBackupResponse> forVolumeBackup(
*/
public Waiter<GetVolumeBackupRequest, GetVolumeBackupResponse> forVolumeBackup(
GetVolumeBackupRequest request,
VolumeBackup.LifecycleState targetState,
com.oracle.bmc.core.model.VolumeBackup.LifecycleState targetState,
TerminationStrategy terminationStrategy,
DelayStrategy delayStrategy) {
return forVolumeBackup(
Expand All @@ -119,7 +119,7 @@ public Waiter<GetVolumeBackupRequest, GetVolumeBackupResponse> forVolumeBackup(
private Waiter<GetVolumeBackupRequest, GetVolumeBackupResponse> forVolumeBackup(
BmcGenericWaiter waiter,
final GetVolumeBackupRequest request,
final VolumeBackup.LifecycleState targetState) {
final com.oracle.bmc.core.model.VolumeBackup.LifecycleState targetState) {
return new SimpleWaiterImpl<>(
executorService,
waiter.toCallable(
Expand All @@ -137,7 +137,9 @@ public boolean apply(GetVolumeBackupResponse response) {
== targetState;
}
},
targetState == VolumeBackup.LifecycleState.Terminated),
targetState
== com.oracle.bmc.core.model.VolumeBackup.LifecycleState
.Terminated),
request);
}
}
33 changes: 18 additions & 15 deletions bmc-core/src/main/java/com/oracle/bmc/core/ComputeWaiters.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
*/
package com.oracle.bmc.core;

import com.oracle.bmc.core.model.*;
import com.oracle.bmc.core.requests.*;
import com.oracle.bmc.core.responses.*;

Expand Down Expand Up @@ -38,7 +37,8 @@ public class ComputeWaiters {
* @return A new Waiter instance.
*/
public Waiter<GetConsoleHistoryRequest, GetConsoleHistoryResponse> forConsoleHistory(
GetConsoleHistoryRequest request, ConsoleHistory.LifecycleState targetState) {
GetConsoleHistoryRequest request,
com.oracle.bmc.core.model.ConsoleHistory.LifecycleState targetState) {
return forConsoleHistory(Waiters.DEFAULT_POLLING_WAITER, request, targetState);
}

Expand All @@ -53,7 +53,7 @@ public Waiter<GetConsoleHistoryRequest, GetConsoleHistoryResponse> forConsoleHis
*/
public Waiter<GetConsoleHistoryRequest, GetConsoleHistoryResponse> forConsoleHistory(
GetConsoleHistoryRequest request,
ConsoleHistory.LifecycleState targetState,
com.oracle.bmc.core.model.ConsoleHistory.LifecycleState targetState,
TerminationStrategy terminationStrategy,
DelayStrategy delayStrategy) {
return forConsoleHistory(
Expand All @@ -64,7 +64,7 @@ public Waiter<GetConsoleHistoryRequest, GetConsoleHistoryResponse> forConsoleHis
private Waiter<GetConsoleHistoryRequest, GetConsoleHistoryResponse> forConsoleHistory(
BmcGenericWaiter waiter,
final GetConsoleHistoryRequest request,
final ConsoleHistory.LifecycleState targetState) {
final com.oracle.bmc.core.model.ConsoleHistory.LifecycleState targetState) {
return new SimpleWaiterImpl<>(
executorService,
waiter.toCallable(
Expand Down Expand Up @@ -95,7 +95,7 @@ public boolean apply(GetConsoleHistoryResponse response) {
* @return A new Waiter instance.
*/
public Waiter<GetImageRequest, GetImageResponse> forImage(
GetImageRequest request, Image.LifecycleState targetState) {
GetImageRequest request, com.oracle.bmc.core.model.Image.LifecycleState targetState) {
return forImage(Waiters.DEFAULT_POLLING_WAITER, request, targetState);
}

Expand All @@ -110,7 +110,7 @@ public Waiter<GetImageRequest, GetImageResponse> forImage(
*/
public Waiter<GetImageRequest, GetImageResponse> forImage(
GetImageRequest request,
Image.LifecycleState targetState,
com.oracle.bmc.core.model.Image.LifecycleState targetState,
TerminationStrategy terminationStrategy,
DelayStrategy delayStrategy) {
return forImage(
Expand All @@ -121,7 +121,7 @@ public Waiter<GetImageRequest, GetImageResponse> forImage(
private Waiter<GetImageRequest, GetImageResponse> forImage(
BmcGenericWaiter waiter,
final GetImageRequest request,
final Image.LifecycleState targetState) {
final com.oracle.bmc.core.model.Image.LifecycleState targetState) {
return new SimpleWaiterImpl<>(
executorService,
waiter.toCallable(
Expand All @@ -138,7 +138,7 @@ public boolean apply(GetImageResponse response) {
return response.getImage().getLifecycleState() == targetState;
}
},
targetState == Image.LifecycleState.Deleted),
targetState == com.oracle.bmc.core.model.Image.LifecycleState.Deleted),
request);
}

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

Expand All @@ -165,7 +166,7 @@ public Waiter<GetInstanceRequest, GetInstanceResponse> forInstance(
*/
public Waiter<GetInstanceRequest, GetInstanceResponse> forInstance(
GetInstanceRequest request,
Instance.LifecycleState targetState,
com.oracle.bmc.core.model.Instance.LifecycleState targetState,
TerminationStrategy terminationStrategy,
DelayStrategy delayStrategy) {
return forInstance(
Expand All @@ -176,7 +177,7 @@ public Waiter<GetInstanceRequest, GetInstanceResponse> forInstance(
private Waiter<GetInstanceRequest, GetInstanceResponse> forInstance(
BmcGenericWaiter waiter,
final GetInstanceRequest request,
final Instance.LifecycleState targetState) {
final com.oracle.bmc.core.model.Instance.LifecycleState targetState) {
return new SimpleWaiterImpl<>(
executorService,
waiter.toCallable(
Expand All @@ -193,7 +194,8 @@ public boolean apply(GetInstanceResponse response) {
return response.getInstance().getLifecycleState() == targetState;
}
},
targetState == Instance.LifecycleState.Terminated),
targetState
== com.oracle.bmc.core.model.Instance.LifecycleState.Terminated),
request);
}

Expand All @@ -205,7 +207,8 @@ public boolean apply(GetInstanceResponse response) {
* @return A new Waiter instance.
*/
public Waiter<GetVolumeAttachmentRequest, GetVolumeAttachmentResponse> forVolumeAttachment(
GetVolumeAttachmentRequest request, VolumeAttachment.LifecycleState targetState) {
GetVolumeAttachmentRequest request,
com.oracle.bmc.core.model.VolumeAttachment.LifecycleState targetState) {
return forVolumeAttachment(Waiters.DEFAULT_POLLING_WAITER, request, targetState);
}

Expand All @@ -220,7 +223,7 @@ public Waiter<GetVolumeAttachmentRequest, GetVolumeAttachmentResponse> forVolume
*/
public Waiter<GetVolumeAttachmentRequest, GetVolumeAttachmentResponse> forVolumeAttachment(
GetVolumeAttachmentRequest request,
VolumeAttachment.LifecycleState targetState,
com.oracle.bmc.core.model.VolumeAttachment.LifecycleState targetState,
TerminationStrategy terminationStrategy,
DelayStrategy delayStrategy) {
return forVolumeAttachment(
Expand All @@ -231,7 +234,7 @@ public Waiter<GetVolumeAttachmentRequest, GetVolumeAttachmentResponse> forVolume
private Waiter<GetVolumeAttachmentRequest, GetVolumeAttachmentResponse> forVolumeAttachment(
BmcGenericWaiter waiter,
final GetVolumeAttachmentRequest request,
final VolumeAttachment.LifecycleState targetState) {
final com.oracle.bmc.core.model.VolumeAttachment.LifecycleState targetState) {
return new SimpleWaiterImpl<>(
executorService,
waiter.toCallable(
Expand Down
Loading