Skip to content

Commit

Permalink
Merge pull request #29 from oracle/release_20171102
Browse files Browse the repository at this point in the history
Releasing version 1.2.17
  • Loading branch information
benthamc authored Nov 2, 2017
2 parents 837494e + 2b55215 commit 112d6e2
Show file tree
Hide file tree
Showing 207 changed files with 8,304 additions and 357 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,15 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
### Added
- N/A

## 1.2.17 - 2017-11-02

### Added
- Support for updating audit retention policy in Audit service
- Support for archive storage tier, object rename and namespace metadata in Object Storage service
- Support for fast clones of volumes in Block Storage service
- Support for backup and restore in Database service
- Support for sorting and filtering in list APIs in Core Services

## 1.2.16 - 2017-10-12

### Changed
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.oci.sdk</groupId>
<artifactId>oci-java-sdk</artifactId>
<version>1.2.16</version>
<version>1.2.17</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.16</version>
<version>1.2.17</version>
</dependency>
</dependencies>

Expand Down
16 changes: 16 additions & 0 deletions bmc-audit/src/main/java/com/oracle/bmc/audit/Audit.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,27 @@ public interface Audit extends AutoCloseable {
*/
void setRegion(String regionId);

/**
* Get the configuration
* @param request The request object containing the details to send
* @return A response object containing details about the completed operation
* @throws BmcException when an error occurs.
*/
GetConfigurationResponse getConfiguration(GetConfigurationRequest request);

/**
* Returns all audit events for the specified compartment that were processed within the specified time range.
* @param request The request object containing the details to send
* @return A response object containing details about the completed operation
* @throws BmcException when an error occurs.
*/
ListEventsResponse listEvents(ListEventsRequest request);

/**
* Update the configuration
* @param request The request object containing the details to send
* @return A response object containing details about the completed operation
* @throws BmcException when an error occurs.
*/
UpdateConfigurationResponse updateConfiguration(UpdateConfigurationRequest request);
}
31 changes: 31 additions & 0 deletions bmc-audit/src/main/java/com/oracle/bmc/audit/AuditAsync.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,21 @@ public interface AuditAsync extends AutoCloseable {
*/
void setRegion(String regionId);

/**
* Get the configuration
*
* @param request The request object containing the details to send
* @param handler The request handler to invoke upon completion, may be null.
* @return A Future that can be used to get the response if no AsyncHandler was
* provided. Note, if you provide an AsyncHandler and use the Future, some
* types of responses (like java.io.InputStream) may not be able to be read in
* both places as the underlying stream may only be consumed once.
*/
java.util.concurrent.Future<GetConfigurationResponse> getConfiguration(
GetConfigurationRequest request,
com.oracle.bmc.responses.AsyncHandler<GetConfigurationRequest, GetConfigurationResponse>
handler);

/**
* Returns all audit events for the specified compartment that were processed within the specified time range.
*
Expand All @@ -49,4 +64,20 @@ public interface AuditAsync extends AutoCloseable {
java.util.concurrent.Future<ListEventsResponse> listEvents(
ListEventsRequest request,
com.oracle.bmc.responses.AsyncHandler<ListEventsRequest, ListEventsResponse> handler);

/**
* Update the configuration
*
* @param request The request object containing the details to send
* @param handler The request handler to invoke upon completion, may be null.
* @return A Future that can be used to get the response if no AsyncHandler was
* provided. Note, if you provide an AsyncHandler and use the Future, some
* types of responses (like java.io.InputStream) may not be able to be read in
* both places as the underlying stream may only be consumed once.
*/
java.util.concurrent.Future<UpdateConfigurationResponse> updateConfiguration(
UpdateConfigurationRequest request,
com.oracle.bmc.responses.AsyncHandler<
UpdateConfigurationRequest, UpdateConfigurationResponse>
handler);
}
46 changes: 46 additions & 0 deletions bmc-audit/src/main/java/com/oracle/bmc/audit/AuditAsyncClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,28 @@ public void close() {
client.close();
}

@Override
public java.util.concurrent.Future<GetConfigurationResponse> getConfiguration(
GetConfigurationRequest request,
com.oracle.bmc.responses.AsyncHandler<GetConfigurationRequest, GetConfigurationResponse>
handler) {
LOG.trace("Called async getConfiguration");
request = GetConfigurationConverter.interceptRequest(request);
com.oracle.bmc.http.internal.WrappedInvocationBuilder ib =
GetConfigurationConverter.fromRequest(client, request);
com.google.common.base.Function<javax.ws.rs.core.Response, GetConfigurationResponse>
transformer = GetConfigurationConverter.fromResponse();

com.oracle.bmc.util.internal.Consumer<javax.ws.rs.core.Response> onSuccess =
new com.oracle.bmc.http.internal.SuccessConsumer<>(handler, transformer, request);
com.oracle.bmc.util.internal.Consumer<Throwable> onError =
new com.oracle.bmc.http.internal.ErrorConsumer<>(handler, request);

java.util.concurrent.Future<javax.ws.rs.core.Response> responseFuture =
client.get(ib, request, onSuccess, onError);
return new com.oracle.bmc.util.internal.TransformingFuture<>(responseFuture, transformer);
}

@Override
public java.util.concurrent.Future<ListEventsResponse> listEvents(
ListEventsRequest request,
Expand All @@ -137,4 +159,28 @@ public java.util.concurrent.Future<ListEventsResponse> listEvents(
client.get(ib, request, onSuccess, onError);
return new com.oracle.bmc.util.internal.TransformingFuture<>(responseFuture, transformer);
}

@Override
public java.util.concurrent.Future<UpdateConfigurationResponse> updateConfiguration(
UpdateConfigurationRequest request,
com.oracle.bmc.responses.AsyncHandler<
UpdateConfigurationRequest, UpdateConfigurationResponse>
handler) {
LOG.trace("Called async updateConfiguration");
request = UpdateConfigurationConverter.interceptRequest(request);
com.oracle.bmc.http.internal.WrappedInvocationBuilder ib =
UpdateConfigurationConverter.fromRequest(client, request);
com.google.common.base.Function<javax.ws.rs.core.Response, UpdateConfigurationResponse>
transformer = UpdateConfigurationConverter.fromResponse();

com.oracle.bmc.util.internal.Consumer<javax.ws.rs.core.Response> onSuccess =
new com.oracle.bmc.http.internal.SuccessConsumer<>(handler, transformer, request);
com.oracle.bmc.util.internal.Consumer<Throwable> onError =
new com.oracle.bmc.http.internal.ErrorConsumer<>(handler, request);

java.util.concurrent.Future<javax.ws.rs.core.Response> responseFuture =
client.put(
ib, request.getUpdateConfigurationDetails(), request, onSuccess, onError);
return new com.oracle.bmc.util.internal.TransformingFuture<>(responseFuture, transformer);
}
}
27 changes: 27 additions & 0 deletions bmc-audit/src/main/java/com/oracle/bmc/audit/AuditClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,19 @@ public void close() {
client.close();
}

@Override
public GetConfigurationResponse getConfiguration(GetConfigurationRequest request) {
LOG.trace("Called getConfiguration");
request = GetConfigurationConverter.interceptRequest(request);
com.oracle.bmc.http.internal.WrappedInvocationBuilder ib =
GetConfigurationConverter.fromRequest(client, request);
com.google.common.base.Function<javax.ws.rs.core.Response, GetConfigurationResponse>
transformer = GetConfigurationConverter.fromResponse();

javax.ws.rs.core.Response response = client.get(ib, request);
return transformer.apply(response);
}

@Override
public ListEventsResponse listEvents(ListEventsRequest request) {
LOG.trace("Called listEvents");
Expand All @@ -129,4 +142,18 @@ public ListEventsResponse listEvents(ListEventsRequest request) {
javax.ws.rs.core.Response response = client.get(ib, request);
return transformer.apply(response);
}

@Override
public UpdateConfigurationResponse updateConfiguration(UpdateConfigurationRequest request) {
LOG.trace("Called updateConfiguration");
request = UpdateConfigurationConverter.interceptRequest(request);
com.oracle.bmc.http.internal.WrappedInvocationBuilder ib =
UpdateConfigurationConverter.fromRequest(client, request);
com.google.common.base.Function<javax.ws.rs.core.Response, UpdateConfigurationResponse>
transformer = UpdateConfigurationConverter.fromResponse();

javax.ws.rs.core.Response response =
client.put(ib, request.getUpdateConfigurationDetails(), request);
return transformer.apply(response);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
/**
* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
*/
package com.oracle.bmc.audit.internal.http;

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

@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918")
@lombok.extern.slf4j.Slf4j
public class GetConfigurationConverter {
private static final com.oracle.bmc.http.internal.ResponseConversionFunctionFactory
RESPONSE_CONVERSION_FACTORY =
new com.oracle.bmc.http.internal.ResponseConversionFunctionFactory();

public static GetConfigurationRequest interceptRequest(GetConfigurationRequest request) {

return request;
}

public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest(
com.oracle.bmc.http.internal.RestClient client, GetConfigurationRequest request) {
if (request == null) {
throw new NullPointerException("request instance is required");
}

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

com.oracle.bmc.http.internal.WrappedWebTarget target =
client.getBaseTarget().path("/20160918").path("configuration");

target =
target.queryParam(
"compartmentId",
com.oracle.bmc.util.internal.HttpUtils.attemptEncodeQueryParam(
request.getCompartmentId()));

com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = target.request();

ib.accept(javax.ws.rs.core.MediaType.APPLICATION_JSON);

return ib;
}

public static com.google.common.base.Function<
javax.ws.rs.core.Response, GetConfigurationResponse>
fromResponse() {
final com.google.common.base.Function<javax.ws.rs.core.Response, GetConfigurationResponse>
transformer =
new com.google.common.base.Function<
javax.ws.rs.core.Response, GetConfigurationResponse>() {
@Override
public GetConfigurationResponse apply(
javax.ws.rs.core.Response rawResponse) {
LOG.trace(
"Transform function invoked for GetConfigurationResponse");
com.google.common.base.Function<
javax.ws.rs.core.Response,
com.oracle.bmc.http.internal.WithHeaders<
Configuration>>
responseFn =
RESPONSE_CONVERSION_FACTORY.create(
Configuration.class);

com.oracle.bmc.http.internal.WithHeaders<Configuration> response =
responseFn.apply(rawResponse);
javax.ws.rs.core.MultivaluedMap<String, String> headers =
response.getHeaders();

GetConfigurationResponse.Builder builder =
GetConfigurationResponse.builder();

builder.configuration(response.getItem());

GetConfigurationResponse responseWrapper = builder.build();

return responseWrapper;
}
};
return transformer;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
/**
* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
*/
package com.oracle.bmc.audit.internal.http;

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

@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918")
@lombok.extern.slf4j.Slf4j
public class UpdateConfigurationConverter {
private static final com.oracle.bmc.http.internal.ResponseConversionFunctionFactory
RESPONSE_CONVERSION_FACTORY =
new com.oracle.bmc.http.internal.ResponseConversionFunctionFactory();

public static UpdateConfigurationRequest interceptRequest(UpdateConfigurationRequest request) {

return request;
}

public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest(
com.oracle.bmc.http.internal.RestClient client, UpdateConfigurationRequest request) {
if (request == null) {
throw new NullPointerException("request instance is required");
}

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

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

com.oracle.bmc.http.internal.WrappedWebTarget target =
client.getBaseTarget().path("/20160918").path("configuration");

target =
target.queryParam(
"compartmentId",
com.oracle.bmc.util.internal.HttpUtils.attemptEncodeQueryParam(
request.getCompartmentId()));

com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = target.request();

ib.accept(javax.ws.rs.core.MediaType.APPLICATION_JSON);

return ib;
}

public static com.google.common.base.Function<
javax.ws.rs.core.Response, UpdateConfigurationResponse>
fromResponse() {
final com.google.common.base.Function<
javax.ws.rs.core.Response, UpdateConfigurationResponse>
transformer =
new com.google.common.base.Function<
javax.ws.rs.core.Response, UpdateConfigurationResponse>() {
@Override
public UpdateConfigurationResponse apply(
javax.ws.rs.core.Response rawResponse) {
LOG.trace(
"Transform function invoked for UpdateConfigurationResponse");
com.google.common.base.Function<
javax.ws.rs.core.Response,
com.oracle.bmc.http.internal.WithHeaders<Void>>
responseFn = RESPONSE_CONVERSION_FACTORY.create();

com.oracle.bmc.http.internal.WithHeaders<Void> response =
responseFn.apply(rawResponse);
javax.ws.rs.core.MultivaluedMap<String, String> headers =
response.getHeaders();

UpdateConfigurationResponse.Builder builder =
UpdateConfigurationResponse.builder();

com.google.common.base.Optional<java.util.List<String>>
opcRequestIdHeader =
com.oracle.bmc.http.internal.HeaderUtils.get(
headers, "opc-request-id");
if (opcRequestIdHeader.isPresent()) {
builder.opcRequestId(
com.oracle.bmc.http.internal.HeaderUtils.toValue(
"opc-request-id",
opcRequestIdHeader.get().get(0),
String.class));
}

com.google.common.base.Optional<java.util.List<String>>
opcWorkRequestIdHeader =
com.oracle.bmc.http.internal.HeaderUtils.get(
headers, "opc-work-request-id");
if (opcWorkRequestIdHeader.isPresent()) {
builder.opcWorkRequestId(
com.oracle.bmc.http.internal.HeaderUtils.toValue(
"opc-work-request-id",
opcWorkRequestIdHeader.get().get(0),
String.class));
}

UpdateConfigurationResponse responseWrapper = builder.build();

return responseWrapper;
}
};
return transformer;
}
}
Loading

0 comments on commit 112d6e2

Please sign in to comment.