Sync GAPIC clients with latest toolchain by shinfan · Pull Request #2429 · googleapis/google-cloud-java · GitHub
Skip to content

Sync GAPIC clients with latest toolchain #2429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shinfan merged 1 commit into from
Sep 11, 2017
Merged

Sync GAPIC clients with latest toolchain #2429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
257 changes: 220 additions & 37 deletions google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/DlpServiceClient.java
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/DlpServiceSettings.java
View file
Open in desktop
17 changes: 15 additions & 2 deletions google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,21 @@
* <pre>
* <code>
* try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
* InspectConfig inspectConfig = InspectConfig.newBuilder().build();
* List&lt;ContentItem&gt; items = new ArrayList&lt;&gt;();
* String name = "EMAIL_ADDRESS";
* InfoType infoTypesElement = InfoType.newBuilder()
* .setName(name)
* .build();
* List&lt;InfoType&gt; infoTypes = Arrays.asList(infoTypesElement);
* InspectConfig inspectConfig = InspectConfig.newBuilder()
* .addAllInfoTypes(infoTypes)
* .build();
* String type = "text/plain";
* String value = "My email is example{@literal @}example.com.";
* ContentItem itemsElement = ContentItem.newBuilder()
* .setType(type)
* .setValue(value)
* .build();
* List&lt;ContentItem&gt; items = Arrays.asList(itemsElement);
* InspectContentResponse response = dlpServiceClient.inspectContent(inspectConfig, items);
* }
* </code>
Expand Down
2 changes: 1 addition & 1 deletion google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/stub/GrpcDlpServiceStub.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public static final GrpcDlpServiceStub create(DlpServiceSettings settings) throw
}

public static final GrpcDlpServiceStub create(ClientContext clientContext) throws IOException {
return new GrpcDlpServiceStub(DlpServiceSettings.defaultBuilder().build(), clientContext);
return new GrpcDlpServiceStub(DlpServiceSettings.newBuilder().build(), clientContext);
}

/**
Expand Down
109 changes: 85 additions & 24 deletions google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/DlpServiceClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,11 @@
import com.google.api.gax.grpc.testing.MockServiceHelper;
import com.google.api.gax.rpc.InvalidArgumentException;
import com.google.longrunning.Operation;
import com.google.privacy.dlp.v2beta1.CloudStorageOptions;
import com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet;
import com.google.privacy.dlp.v2beta1.ContentItem;
import com.google.privacy.dlp.v2beta1.CreateInspectOperationRequest;
import com.google.privacy.dlp.v2beta1.InfoType;
import com.google.privacy.dlp.v2beta1.InspectConfig;
import com.google.privacy.dlp.v2beta1.InspectContentRequest;
import com.google.privacy.dlp.v2beta1.InspectContentResponse;
Expand All @@ -45,7 +48,6 @@
import io.grpc.Status;
import io.grpc.StatusRuntimeException;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.ExecutionException;
Expand Down Expand Up @@ -79,7 +81,7 @@ public static void stopServer() {
public void setUp() throws IOException {
serviceHelper.reset();
DlpServiceSettings settings =
DlpServiceSettings.defaultBuilder()
DlpServiceSettings.newBuilder()
.setTransportProvider(
GrpcTransportProvider.newBuilder()
.setChannelProvider(serviceHelper.createChannelProvider())
Expand All @@ -100,8 +102,14 @@ public void inspectContentTest() {
InspectContentResponse expectedResponse = InspectContentResponse.newBuilder().build();
mockDlpService.addResponse(expectedResponse);

InspectConfig inspectConfig = InspectConfig.newBuilder().build();
List<ContentItem> items = new ArrayList<>();
String name = "EMAIL_ADDRESS";
InfoType infoTypesElement = InfoType.newBuilder().setName(name).build();
List<InfoType> infoTypes = Arrays.asList(infoTypesElement);
InspectConfig inspectConfig = InspectConfig.newBuilder().addAllInfoTypes(infoTypes).build();
String type = "text/plain";
String value = "My email is example@example.com.";
ContentItem itemsElement = ContentItem.newBuilder().setType(type).setValue(value).build();
List<ContentItem> items = Arrays.asList(itemsElement);

InspectContentResponse actualResponse = client.inspectContent(inspectConfig, items);
Assert.assertEquals(expectedResponse, actualResponse);
Expand All @@ -121,8 +129,14 @@ public void inspectContentExceptionTest() throws Exception {
mockDlpService.addException(exception);

try {
InspectConfig inspectConfig = InspectConfig.newBuilder().build();
List<ContentItem> items = new ArrayList<>();
String name = "EMAIL_ADDRESS";
InfoType infoTypesElement = InfoType.newBuilder().setName(name).build();
List<InfoType> infoTypes = Arrays.asList(infoTypesElement);
InspectConfig inspectConfig = InspectConfig.newBuilder().addAllInfoTypes(infoTypes).build();
String type = "text/plain";
String value = "My email is example@example.com.";
ContentItem itemsElement = ContentItem.newBuilder().setType(type).setValue(value).build();
List<ContentItem> items = Arrays.asList(itemsElement);

client.inspectContent(inspectConfig, items);
Assert.fail("No exception raised");
Expand All @@ -137,9 +151,23 @@ public void redactContentTest() {
RedactContentResponse expectedResponse = RedactContentResponse.newBuilder().build();
mockDlpService.addResponse(expectedResponse);

InspectConfig inspectConfig = InspectConfig.newBuilder().build();
List<ContentItem> items = new ArrayList<>();
List<RedactContentRequest.ReplaceConfig> replaceConfigs = new ArrayList<>();
String name = "EMAIL_ADDRESS";
InfoType infoTypesElement = InfoType.newBuilder().setName(name).build();
List<InfoType> infoTypes = Arrays.asList(infoTypesElement);
InspectConfig inspectConfig = InspectConfig.newBuilder().addAllInfoTypes(infoTypes).build();
String type = "text/plain";
String value = "My email is example@example.com.";
ContentItem itemsElement = ContentItem.newBuilder().setType(type).setValue(value).build();
List<ContentItem> items = Arrays.asList(itemsElement);
String name2 = "EMAIL_ADDRESS";
InfoType infoType = InfoType.newBuilder().setName(name2).build();
String replaceWith = "REDACTED";
RedactContentRequest.ReplaceConfig replaceConfigsElement =
RedactContentRequest.ReplaceConfig.newBuilder()
.setInfoType(infoType)
.setReplaceWith(replaceWith)
.build();
List<RedactContentRequest.ReplaceConfig> replaceConfigs = Arrays.asList(replaceConfigsElement);

RedactContentResponse actualResponse =
client.redactContent(inspectConfig, items, replaceConfigs);
Expand All @@ -161,9 +189,24 @@ public void redactContentExceptionTest() throws Exception {
mockDlpService.addException(exception);

try {
InspectConfig inspectConfig = InspectConfig.newBuilder().build();
List<ContentItem> items = new ArrayList<>();
List<RedactContentRequest.ReplaceConfig> replaceConfigs = new ArrayList<>();
String name = "EMAIL_ADDRESS";
InfoType infoTypesElement = InfoType.newBuilder().setName(name).build();
List<InfoType> infoTypes = Arrays.asList(infoTypesElement);
InspectConfig inspectConfig = InspectConfig.newBuilder().addAllInfoTypes(infoTypes).build();
String type = "text/plain";
String value = "My email is example@example.com.";
ContentItem itemsElement = ContentItem.newBuilder().setType(type).setValue(value).build();
List<ContentItem> items = Arrays.asList(itemsElement);
String name2 = "EMAIL_ADDRESS";
InfoType infoType = InfoType.newBuilder().setName(name2).build();
String replaceWith = "REDACTED";
RedactContentRequest.ReplaceConfig replaceConfigsElement =
RedactContentRequest.ReplaceConfig.newBuilder()
.setInfoType(infoType)
.setReplaceWith(replaceWith)
.build();
List<RedactContentRequest.ReplaceConfig> replaceConfigs =
Arrays.asList(replaceConfigsElement);

client.redactContent(inspectConfig, items, replaceConfigs);
Assert.fail("No exception raised");
Expand All @@ -175,9 +218,9 @@ public void redactContentExceptionTest() throws Exception {
@Test
@SuppressWarnings("all")
public void createInspectOperationTest() throws Exception {
ResultName name = ResultName.create("[RESULT]");
ResultName name2 = ResultName.create("[RESULT]");
InspectOperationResult expectedResponse =
InspectOperationResult.newBuilder().setNameWithResultName(name).build();
InspectOperationResult.newBuilder().setNameWithResultName(name2).build();
Operation resultOperation =
Operation.newBuilder()
.setName("createInspectOperationTest")
Expand All @@ -186,8 +229,17 @@ public void createInspectOperationTest() throws Exception {
.build();
mockDlpService.addResponse(resultOperation);

InspectConfig inspectConfig = InspectConfig.newBuilder().build();
StorageConfig storageConfig = StorageConfig.newBuilder().build();
String name = "EMAIL_ADDRESS";
InfoType infoTypesElement = InfoType.newBuilder().setName(name).build();
List<InfoType> infoTypes = Arrays.asList(infoTypesElement);
InspectConfig inspectConfig = InspectConfig.newBuilder().addAllInfoTypes(infoTypes).build();
String url = "gs://example_bucket/example_file.png";
CloudStorageOptions.FileSet fileSet =
CloudStorageOptions.FileSet.newBuilder().setUrl(url).build();
CloudStorageOptions cloudStorageOptions =
CloudStorageOptions.newBuilder().setFileSet(fileSet).build();
StorageConfig storageConfig =
StorageConfig.newBuilder().setCloudStorageOptions(cloudStorageOptions).build();
OutputStorageConfig outputConfig = OutputStorageConfig.newBuilder().build();

InspectOperationResult actualResponse =
Expand All @@ -211,8 +263,17 @@ public void createInspectOperationExceptionTest() throws Exception {
mockDlpService.addException(exception);

try {
InspectConfig inspectConfig = InspectConfig.newBuilder().build();
StorageConfig storageConfig = StorageConfig.newBuilder().build();
String name = "EMAIL_ADDRESS";
InfoType infoTypesElement = InfoType.newBuilder().setName(name).build();
List<InfoType> infoTypes = Arrays.asList(infoTypesElement);
InspectConfig inspectConfig = InspectConfig.newBuilder().addAllInfoTypes(infoTypes).build();
String url = "gs://example_bucket/example_file.png";
CloudStorageOptions.FileSet fileSet =
CloudStorageOptions.FileSet.newBuilder().setUrl(url).build();
CloudStorageOptions cloudStorageOptions =
CloudStorageOptions.newBuilder().setFileSet(fileSet).build();
StorageConfig storageConfig =
StorageConfig.newBuilder().setCloudStorageOptions(cloudStorageOptions).build();
OutputStorageConfig outputConfig = OutputStorageConfig.newBuilder().build();

client.createInspectOperationAsync(inspectConfig, storageConfig, outputConfig).get();
Expand Down Expand Up @@ -268,8 +329,8 @@ public void listInfoTypesTest() {
ListInfoTypesResponse expectedResponse = ListInfoTypesResponse.newBuilder().build();
mockDlpService.addResponse(expectedResponse);

String category = "category50511102";
String languageCode = "languageCode-412800396";
String category = "PII";
String languageCode = "en";

ListInfoTypesResponse actualResponse = client.listInfoTypes(category, languageCode);
Assert.assertEquals(expectedResponse, actualResponse);
Expand All @@ -289,8 +350,8 @@ public void listInfoTypesExceptionTest() throws Exception {
mockDlpService.addException(exception);

try {
String category = "category50511102";
String languageCode = "languageCode-412800396";
String category = "PII";
String languageCode = "en";

client.listInfoTypes(category, languageCode);
Assert.fail("No exception raised");
Expand All @@ -305,7 +366,7 @@ public void listRootCategoriesTest() {
ListRootCategoriesResponse expectedResponse = ListRootCategoriesResponse.newBuilder().build();
mockDlpService.addResponse(expectedResponse);

String languageCode = "languageCode-412800396";
String languageCode = "en";

ListRootCategoriesResponse actualResponse = client.listRootCategories(languageCode);
Assert.assertEquals(expectedResponse, actualResponse);
Expand All @@ -324,7 +385,7 @@ public void listRootCategoriesExceptionTest() throws Exception {
mockDlpService.addException(exception);

try {
String languageCode = "languageCode-412800396";
String languageCode = "en";

client.listRootCategories(languageCode);
Assert.fail("No exception raised");
Expand Down
7 changes: 4 additions & 3 deletions ...orting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
* <pre>
* <code>
* ErrorGroupServiceSettings errorGroupServiceSettings =
* ErrorGroupServiceSettings.defaultBuilder()
* ErrorGroupServiceSettings.newBuilder()
* .setCredentialsProvider(FixedCredentialsProvider.create(myCredentials))
* .build();
* ErrorGroupServiceClient errorGroupServiceClient =
Expand All @@ -88,7 +88,7 @@
* <pre>
* <code>
* ErrorGroupServiceSettings errorGroupServiceSettings =
* ErrorGroupServiceSettings.defaultBuilder()
* ErrorGroupServiceSettings.newBuilder()
* .setTransportProvider(ErrorGroupServiceSettings.defaultGrpcTransportProviderBuilder()
* .setChannelProvider(ErrorGroupServiceSettings.defaultGrpcChannelProviderBuilder()
* .setEndpoint(myEndpoint)
Expand All @@ -108,7 +108,7 @@ public class ErrorGroupServiceClient implements BackgroundResource {

/** Constructs an instance of ErrorGroupServiceClient with default settings. */
public static final ErrorGroupServiceClient create() throws IOException {
return create(ErrorGroupServiceSettings.defaultBuilder().build());
return create(ErrorGroupServiceSettings.newBuilder().build());
}

/**
Expand Down Expand Up @@ -147,6 +147,7 @@ public final ErrorGroupServiceSettings getSettings() {
return settings;
}

@BetaApi
public ErrorGroupServiceStub getStub() {
return stub;
}
Expand Down
6 changes: 4 additions & 2 deletions ...ting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
* <pre>
* <code>
* ErrorGroupServiceSettings.Builder errorGroupServiceSettingsBuilder =
* ErrorGroupServiceSettings.defaultBuilder();
* ErrorGroupServiceSettings.newBuilder();
* errorGroupServiceSettingsBuilder.getGroupSettings().getRetrySettingsBuilder()
* .setTotalTimeout(Duration.ofSeconds(30));
* ErrorGroupServiceSettings errorGroupServiceSettings = errorGroupServiceSettingsBuilder.build();
Expand Down Expand Up @@ -161,6 +161,7 @@ private static String getGapicVersion() {
}

/** Returns a builder for this class with recommended defaults. */
@Deprecated
public static Builder defaultBuilder() {
return Builder.createDefault();
}
Expand All @@ -169,13 +170,14 @@ public static Builder defaultBuilder() {
* Returns a builder for this class with recommended defaults for API methods, and the given
* ClientContext used for executor/transport/credentials.
*/
@Deprecated
public static Builder defaultBuilder(ClientContext clientContext) {
return new Builder(clientContext);
}

/** Returns a new builder for this class. */
public static Builder newBuilder() {
return new Builder();
return Builder.createDefault();
}

/** Returns a new builder for this class. */
Expand Down
7 changes: 4 additions & 3 deletions ...orting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceClient.java
View file
Open in desktop
Loading