Skip to content

Commit b1e9793

Browse files
averikitschlesv
authored andcommitted
samples: update shared config (#2443)
* update shared config * Update to 1.0.13 * lint * Fix linting * lint * fix imports Co-authored-by: Les Vogel <[email protected]>
1 parent bd07453 commit b1e9793

27 files changed

+13
-141
lines changed

translate/snippets/src/main/java/com/example/translate/BatchTranslateText.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import com.google.cloud.translate.v3.LocationName;
2828
import com.google.cloud.translate.v3.OutputConfig;
2929
import com.google.cloud.translate.v3.TranslationServiceClient;
30-
3130
import java.io.IOException;
3231
import java.util.concurrent.ExecutionException;
3332
import java.util.concurrent.TimeUnit;
@@ -54,7 +53,7 @@ public static void batchTranslateText(
5453
String targetLanguage,
5554
String inputUri,
5655
String outputUri)
57-
throws IOException, ExecutionException, InterruptedException, TimeoutException {
56+
throws IOException, ExecutionException, InterruptedException, TimeoutException {
5857

5958
// Initialize client that will be used to send requests. This client only needs to be created
6059
// once, and can be reused for multiple requests. After completing all of your requests, call

translate/snippets/src/main/java/com/example/translate/BatchTranslateTextWithGlossary.java

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import com.google.cloud.translate.v3.OutputConfig;
3030
import com.google.cloud.translate.v3.TranslateTextGlossaryConfig;
3131
import com.google.cloud.translate.v3.TranslationServiceClient;
32-
3332
import java.io.IOException;
3433
import java.util.concurrent.ExecutionException;
3534
import java.util.concurrent.TimeUnit;

translate/snippets/src/main/java/com/example/translate/BatchTranslateTextWithGlossaryAndModel.java

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import com.google.cloud.translate.v3.OutputConfig;
3030
import com.google.cloud.translate.v3.TranslateTextGlossaryConfig;
3131
import com.google.cloud.translate.v3.TranslationServiceClient;
32-
3332
import java.io.IOException;
3433
import java.util.concurrent.ExecutionException;
3534
import java.util.concurrent.TimeUnit;

translate/snippets/src/main/java/com/example/translate/BatchTranslateTextWithModel.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import com.google.cloud.translate.v3.LocationName;
2828
import com.google.cloud.translate.v3.OutputConfig;
2929
import com.google.cloud.translate.v3.TranslationServiceClient;
30-
3130
import java.io.IOException;
3231
import java.util.concurrent.ExecutionException;
3332
import java.util.concurrent.TimeUnit;
@@ -57,7 +56,7 @@ public static void batchTranslateTextWithModel(
5756
String inputUri,
5857
String outputUri,
5958
String modelId)
60-
throws IOException, ExecutionException, InterruptedException, TimeoutException {
59+
throws IOException, ExecutionException, InterruptedException, TimeoutException {
6160

6261
// Initialize client that will be used to send requests. This client only needs to be created
6362
// once, and can be reused for multiple requests. After completing all of your requests, call

translate/snippets/src/main/java/com/example/translate/CreateGlossary.java

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import com.google.cloud.translate.v3.GlossaryName;
2727
import com.google.cloud.translate.v3.LocationName;
2828
import com.google.cloud.translate.v3.TranslationServiceClient;
29-
3029
import java.io.IOException;
3130
import java.util.ArrayList;
3231
import java.util.List;

translate/snippets/src/main/java/com/example/translate/DeleteGlossary.java

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import com.google.cloud.translate.v3.DeleteGlossaryResponse;
2424
import com.google.cloud.translate.v3.GlossaryName;
2525
import com.google.cloud.translate.v3.TranslationServiceClient;
26-
2726
import java.io.IOException;
2827
import java.util.concurrent.ExecutionException;
2928

translate/snippets/src/main/java/com/example/translate/DetectLanguage.java

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import com.google.cloud.translate.v3.DetectedLanguage;
2323
import com.google.cloud.translate.v3.LocationName;
2424
import com.google.cloud.translate.v3.TranslationServiceClient;
25-
2625
import java.io.IOException;
2726

2827
public class DetectLanguage {

translate/snippets/src/main/java/com/example/translate/GetGlossary.java

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import com.google.cloud.translate.v3.Glossary;
2222
import com.google.cloud.translate.v3.GlossaryName;
2323
import com.google.cloud.translate.v3.TranslationServiceClient;
24-
2524
import java.io.IOException;
2625

2726
public class GetGlossary {

translate/snippets/src/main/java/com/example/translate/GetSupportedLanguages.java

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import com.google.cloud.translate.v3.SupportedLanguage;
2323
import com.google.cloud.translate.v3.SupportedLanguages;
2424
import com.google.cloud.translate.v3.TranslationServiceClient;
25-
2625
import java.io.IOException;
2726

2827
public class GetSupportedLanguages {

translate/snippets/src/main/java/com/example/translate/GetSupportedLanguagesForTarget.java

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import com.google.cloud.translate.v3.SupportedLanguage;
2323
import com.google.cloud.translate.v3.SupportedLanguages;
2424
import com.google.cloud.translate.v3.TranslationServiceClient;
25-
2625
import java.io.IOException;
2726

2827
public class GetSupportedLanguagesForTarget {

translate/snippets/src/main/java/com/example/translate/ListGlossaries.java

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import com.google.cloud.translate.v3.ListGlossariesRequest;
2222
import com.google.cloud.translate.v3.LocationName;
2323
import com.google.cloud.translate.v3.TranslationServiceClient;
24-
2524
import java.io.IOException;
2625

2726
public class ListGlossaries {

translate/snippets/src/main/java/com/example/translate/QuickstartSample.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,7 @@ public static void main(String... args) throws Exception {
3434
// Translates some text into Russian
3535
Translation translation =
3636
translate.translate(
37-
text,
38-
TranslateOption.sourceLanguage("en"),
39-
TranslateOption.targetLanguage("ru"));
40-
37+
text, TranslateOption.sourceLanguage("en"), TranslateOption.targetLanguage("ru"));
4138

4239
System.out.printf("Text: %s%n", text);
4340
System.out.printf("Translation: %s%n", translation.getTranslatedText());

translate/snippets/src/main/java/com/example/translate/TranslateText.java

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import com.google.cloud.translate.v3.TranslateTextResponse;
2323
import com.google.cloud.translate.v3.Translation;
2424
import com.google.cloud.translate.v3.TranslationServiceClient;
25-
2625
import java.io.IOException;
2726

2827
public class TranslateText {

translate/snippets/src/main/java/com/example/translate/TranslateTextWithGlossary.java

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import com.google.cloud.translate.v3.TranslateTextResponse;
2525
import com.google.cloud.translate.v3.Translation;
2626
import com.google.cloud.translate.v3.TranslationServiceClient;
27-
2827
import java.io.IOException;
2928

3029
public class TranslateTextWithGlossary {

translate/snippets/src/main/java/com/example/translate/TranslateTextWithGlossaryAndModel.java

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import com.google.cloud.translate.v3.TranslateTextResponse;
2525
import com.google.cloud.translate.v3.Translation;
2626
import com.google.cloud.translate.v3.TranslationServiceClient;
27-
2827
import java.io.IOException;
2928

3029
public class TranslateTextWithGlossaryAndModel {

translate/snippets/src/main/java/com/example/translate/TranslateTextWithModel.java

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import com.google.cloud.translate.v3.TranslateTextResponse;
2323
import com.google.cloud.translate.v3.Translation;
2424
import com.google.cloud.translate.v3.TranslationServiceClient;
25-
2625
import java.io.IOException;
2726

2827
public class TranslateTextWithModel {

translate/snippets/src/test/java/com/example/translate/BatchTranslateTextTests.java

+2-5
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,12 @@
2323
import com.google.cloud.storage.Blob;
2424
import com.google.cloud.storage.Storage;
2525
import com.google.cloud.storage.StorageOptions;
26-
2726
import java.io.ByteArrayOutputStream;
2827
import java.io.IOException;
2928
import java.io.PrintStream;
3029
import java.util.UUID;
3130
import java.util.concurrent.ExecutionException;
3231
import java.util.concurrent.TimeoutException;
33-
3432
import org.junit.After;
3533
import org.junit.Before;
3634
import org.junit.BeforeClass;
@@ -46,7 +44,7 @@ public class BatchTranslateTextTests {
4644
private static final String INPUT_URI = "gs://cloud-samples-data/translation/text.txt";
4745
private static final String PREFIX = "BATCH_TRANSLATION_OUTPUT/";
4846
private static final String OUTPUT_URI =
49-
String.format("gs://%s/%s%s/", PROJECT_ID, PREFIX, UUID.randomUUID());
47+
String.format("gs://%s/%s%s/", PROJECT_ID, PREFIX, UUID.randomUUID());
5048

5149
private ByteArrayOutputStream bout;
5250
private PrintStream out;
@@ -105,8 +103,7 @@ public void tearDown() {
105103
@Test
106104
public void testBatchTranslateText()
107105
throws InterruptedException, ExecutionException, IOException, TimeoutException {
108-
BatchTranslateText.batchTranslateText(
109-
PROJECT_ID, "en", "es", INPUT_URI, OUTPUT_URI);
106+
BatchTranslateText.batchTranslateText(PROJECT_ID, "en", "es", INPUT_URI, OUTPUT_URI);
110107
String got = bout.toString();
111108
assertThat(got).contains("Total Characters: 13");
112109
}

translate/snippets/src/test/java/com/example/translate/BatchTranslateTextWithGlossaryAndModelTests.java

+2-22
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,10 @@
1919
import static com.google.common.truth.Truth.assertThat;
2020
import static junit.framework.TestCase.assertNotNull;
2121

22-
import com.google.api.gax.longrunning.OperationFuture;
2322
import com.google.api.gax.paging.Page;
2423
import com.google.cloud.storage.Blob;
2524
import com.google.cloud.storage.Storage;
2625
import com.google.cloud.storage.StorageOptions;
27-
import com.google.cloud.translate.v3.CreateGlossaryMetadata;
28-
import com.google.cloud.translate.v3.CreateGlossaryRequest;
29-
import com.google.cloud.translate.v3.DeleteGlossaryMetadata;
30-
import com.google.cloud.translate.v3.DeleteGlossaryRequest;
31-
import com.google.cloud.translate.v3.DeleteGlossaryResponse;
32-
import com.google.cloud.translate.v3.GcsSource;
33-
import com.google.cloud.translate.v3.Glossary;
34-
import com.google.cloud.translate.v3.GlossaryInputConfig;
35-
import com.google.cloud.translate.v3.GlossaryName;
36-
import com.google.cloud.translate.v3.LocationName;
37-
import com.google.cloud.translate.v3.TranslationServiceClient;
38-
3926
import java.io.ByteArrayOutputStream;
4027
import java.io.IOException;
4128
import java.io.PrintStream;
@@ -44,7 +31,6 @@
4431
import java.util.UUID;
4532
import java.util.concurrent.ExecutionException;
4633
import java.util.concurrent.TimeoutException;
47-
4834
import org.junit.After;
4935
import org.junit.Before;
5036
import org.junit.BeforeClass;
@@ -66,7 +52,7 @@ public class BatchTranslateTextWithGlossaryAndModelTests {
6652
"gs://cloud-samples-data/translation/glossary_ja.csv";
6753
private static final String PREFIX = "BATCH_TRANSLATION_OUTPUT/";
6854
private static final String OUTPUT_URI =
69-
String.format("gs://%s/%s%s/", PROJECT_ID, PREFIX, UUID.randomUUID());
55+
String.format("gs://%s/%s%s/", PROJECT_ID, PREFIX, UUID.randomUUID());
7056

7157
private ByteArrayOutputStream bout;
7258
private PrintStream out;
@@ -136,13 +122,7 @@ public void tearDown() throws InterruptedException, ExecutionException, IOExcept
136122
public void testBatchTranslateTextWithGlossaryAndModel()
137123
throws InterruptedException, ExecutionException, IOException, TimeoutException {
138124
BatchTranslateTextWithGlossaryAndModel.batchTranslateTextWithGlossaryAndModel(
139-
PROJECT_ID,
140-
"en",
141-
"ja",
142-
INPUT_URI,
143-
OUTPUT_URI,
144-
GLOSSARY_ID,
145-
MODEL_ID);
125+
PROJECT_ID, "en", "ja", INPUT_URI, OUTPUT_URI, GLOSSARY_ID, MODEL_ID);
146126
String got = bout.toString();
147127
assertThat(got).contains("Total Characters: 25");
148128
}

translate/snippets/src/test/java/com/example/translate/BatchTranslateTextWithGlossaryTests.java

+2-21
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,10 @@
1919
import static com.google.common.truth.Truth.assertThat;
2020
import static junit.framework.TestCase.assertNotNull;
2121

22-
import com.google.api.gax.longrunning.OperationFuture;
2322
import com.google.api.gax.paging.Page;
2423
import com.google.cloud.storage.Blob;
2524
import com.google.cloud.storage.Storage;
2625
import com.google.cloud.storage.StorageOptions;
27-
import com.google.cloud.translate.v3.CreateGlossaryMetadata;
28-
import com.google.cloud.translate.v3.CreateGlossaryRequest;
29-
import com.google.cloud.translate.v3.DeleteGlossaryMetadata;
30-
import com.google.cloud.translate.v3.DeleteGlossaryRequest;
31-
import com.google.cloud.translate.v3.DeleteGlossaryResponse;
32-
import com.google.cloud.translate.v3.GcsSource;
33-
import com.google.cloud.translate.v3.Glossary;
34-
import com.google.cloud.translate.v3.GlossaryInputConfig;
35-
import com.google.cloud.translate.v3.GlossaryName;
36-
import com.google.cloud.translate.v3.LocationName;
37-
import com.google.cloud.translate.v3.TranslationServiceClient;
38-
3926
import java.io.ByteArrayOutputStream;
4027
import java.io.IOException;
4128
import java.io.PrintStream;
@@ -44,7 +31,6 @@
4431
import java.util.UUID;
4532
import java.util.concurrent.ExecutionException;
4633
import java.util.concurrent.TimeoutException;
47-
4834
import org.junit.After;
4935
import org.junit.Before;
5036
import org.junit.BeforeClass;
@@ -65,7 +51,7 @@ public class BatchTranslateTextWithGlossaryTests {
6551
String.format("test_%s", UUID.randomUUID().toString().replace("-", "_").substring(0, 26));
6652
private static final String PREFIX = "BATCH_TRANSLATION_OUTPUT/";
6753
private static final String OUTPUT_URI =
68-
String.format("gs://%s/%s%s/", PROJECT_ID, PREFIX, UUID.randomUUID());
54+
String.format("gs://%s/%s%s/", PROJECT_ID, PREFIX, UUID.randomUUID());
6955

7056
private ByteArrayOutputStream bout;
7157
private PrintStream out;
@@ -136,12 +122,7 @@ public void tearDown() throws InterruptedException, ExecutionException, IOExcept
136122
public void testBatchTranslateTextWithGlossary()
137123
throws InterruptedException, ExecutionException, IOException, TimeoutException {
138124
BatchTranslateTextWithGlossary.batchTranslateTextWithGlossary(
139-
PROJECT_ID,
140-
"en",
141-
"ja",
142-
INPUT_URI,
143-
OUTPUT_URI,
144-
GLOSSARY_ID);
125+
PROJECT_ID, "en", "ja", INPUT_URI, OUTPUT_URI, GLOSSARY_ID);
145126
String got = bout.toString();
146127
assertThat(got).contains("Total Characters: 9");
147128
}

translate/snippets/src/test/java/com/example/translate/BatchTranslateTextWithModelTests.java

+2-9
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import static junit.framework.TestCase.assertNotNull;
2121

2222
import com.google.api.gax.paging.Page;
23-
2423
import com.google.cloud.storage.Blob;
2524
import com.google.cloud.storage.Storage;
2625
import com.google.cloud.storage.StorageOptions;
@@ -30,7 +29,6 @@
3029
import java.util.UUID;
3130
import java.util.concurrent.ExecutionException;
3231
import java.util.concurrent.TimeoutException;
33-
3432
import org.junit.After;
3533
import org.junit.Before;
3634
import org.junit.BeforeClass;
@@ -48,7 +46,7 @@ public class BatchTranslateTextWithModelTests {
4846
private static final String MODEL_ID = "TRL2188848820815848149";
4947
private static final String PREFIX = "BATCH_TRANSLATION_OUTPUT/";
5048
private static final String OUTPUT_URI =
51-
String.format("gs://%s/%s%s/", PROJECT_ID, PREFIX, UUID.randomUUID());
49+
String.format("gs://%s/%s%s/", PROJECT_ID, PREFIX, UUID.randomUUID());
5250

5351
private ByteArrayOutputStream bout;
5452
private PrintStream out;
@@ -108,12 +106,7 @@ public void tearDown() {
108106
public void testBatchTranslateTextWithModel()
109107
throws InterruptedException, ExecutionException, IOException, TimeoutException {
110108
BatchTranslateTextWithModel.batchTranslateTextWithModel(
111-
PROJECT_ID,
112-
"en",
113-
"ja",
114-
INPUT_URI,
115-
OUTPUT_URI,
116-
MODEL_ID);
109+
PROJECT_ID, "en", "ja", INPUT_URI, OUTPUT_URI, MODEL_ID);
117110
String got = bout.toString();
118111
assertThat(got).contains("Total Characters: 15");
119112
}

translate/snippets/src/test/java/com/example/translate/CreateGlossaryTests.java

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import java.util.List;
2727
import java.util.UUID;
2828
import java.util.concurrent.ExecutionException;
29-
3029
import org.junit.After;
3130
import org.junit.Before;
3231
import org.junit.BeforeClass;

translate/snippets/src/test/java/com/example/translate/DeleteGlossaryTests.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import java.util.List;
2727
import java.util.UUID;
2828
import java.util.concurrent.ExecutionException;
29-
3029
import org.junit.After;
3130
import org.junit.Before;
3231
import org.junit.BeforeClass;
@@ -81,8 +80,7 @@ public void tearDown() {
8180
}
8281

8382
@Test
84-
public void testDeleteGlossary()
85-
throws InterruptedException, ExecutionException, IOException {
83+
public void testDeleteGlossary() throws InterruptedException, ExecutionException, IOException {
8684
DeleteGlossary.deleteGlossary(PROJECT_ID, GLOSSARY_ID);
8785
String got = bout.toString();
8886
assertThat(got).contains("us-central1");

translate/snippets/src/test/java/com/example/translate/GetGlossaryTests.java

-14
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,13 @@
1919
import static com.google.common.truth.Truth.assertThat;
2020
import static junit.framework.TestCase.assertNotNull;
2121

22-
import com.google.api.gax.longrunning.OperationFuture;
23-
import com.google.cloud.translate.v3.CreateGlossaryMetadata;
24-
import com.google.cloud.translate.v3.CreateGlossaryRequest;
25-
import com.google.cloud.translate.v3.DeleteGlossaryMetadata;
26-
import com.google.cloud.translate.v3.DeleteGlossaryRequest;
27-
import com.google.cloud.translate.v3.DeleteGlossaryResponse;
28-
import com.google.cloud.translate.v3.GcsSource;
29-
import com.google.cloud.translate.v3.Glossary;
30-
import com.google.cloud.translate.v3.GlossaryInputConfig;
31-
import com.google.cloud.translate.v3.GlossaryName;
32-
import com.google.cloud.translate.v3.LocationName;
33-
import com.google.cloud.translate.v3.TranslationServiceClient;
34-
3522
import java.io.ByteArrayOutputStream;
3623
import java.io.IOException;
3724
import java.io.PrintStream;
3825
import java.util.ArrayList;
3926
import java.util.List;
4027
import java.util.UUID;
4128
import java.util.concurrent.ExecutionException;
42-
4329
import org.junit.After;
4430
import org.junit.Before;
4531
import org.junit.BeforeClass;

0 commit comments

Comments
 (0)