Skip to content

Commit eb0217a

Browse files
authored
Merge branch 'master' into autosynth-dlp
2 parents bfc8844 + 97e004f commit eb0217a

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

google-cloud-clients/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/ConfigClientTest.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import com.google.api.gax.rpc.InvalidArgumentException;
2828
import com.google.api.resourcenames.ResourceName;
2929
import com.google.common.collect.Lists;
30+
import com.google.logging.v2.BillingName;
3031
import com.google.logging.v2.CreateExclusionRequest;
3132
import com.google.logging.v2.CreateSinkRequest;
3233
import com.google.logging.v2.DeleteExclusionRequest;
@@ -158,7 +159,7 @@ public void listSinksExceptionTest() throws Exception {
158159
@SuppressWarnings("all")
159160
public void getSinkTest() {
160161
String name = "name3373707";
161-
ResourceName destination = ProjectName.of("[PROJECT]");
162+
ResourceName destination = BillingName.of("[BILLING_ACCOUNT]");
162163
String filter = "filter-1274492040";
163164
String writerIdentity = "writerIdentity775638794";
164165
boolean includeChildren = true;
@@ -208,7 +209,7 @@ public void getSinkExceptionTest() throws Exception {
208209
@SuppressWarnings("all")
209210
public void createSinkTest() {
210211
String name = "name3373707";
211-
ResourceName destination = ProjectName.of("[PROJECT]");
212+
ResourceName destination = BillingName.of("[BILLING_ACCOUNT]");
212213
String filter = "filter-1274492040";
213214
String writerIdentity = "writerIdentity775638794";
214215
boolean includeChildren = true;
@@ -261,7 +262,7 @@ public void createSinkExceptionTest() throws Exception {
261262
@SuppressWarnings("all")
262263
public void updateSinkTest() {
263264
String name = "name3373707";
264-
ResourceName destination = ProjectName.of("[PROJECT]");
265+
ResourceName destination = BillingName.of("[BILLING_ACCOUNT]");
265266
String filter = "filter-1274492040";
266267
String writerIdentity = "writerIdentity775638794";
267268
boolean includeChildren = true;
@@ -317,7 +318,7 @@ public void updateSinkExceptionTest() throws Exception {
317318
@SuppressWarnings("all")
318319
public void updateSinkTest2() {
319320
String name = "name3373707";
320-
ResourceName destination = ProjectName.of("[PROJECT]");
321+
ResourceName destination = BillingName.of("[BILLING_ACCOUNT]");
321322
String filter = "filter-1274492040";
322323
String writerIdentity = "writerIdentity775638794";
323324
boolean includeChildren = true;

google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/PublisherSnippets.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import com.google.pubsub.v1.ProjectTopicName;
3737
import com.google.pubsub.v1.PubsubMessage;
3838
import java.io.FileInputStream;
39+
import java.util.concurrent.Executors;
3940
import java.util.concurrent.TimeUnit;
4041
import org.threeten.bp.Duration;
4142

@@ -62,7 +63,7 @@ public void onSuccess(String messageId) {
6263
public void onFailure(Throwable t) {
6364
System.out.println("failed to publish: " + t);
6465
}
65-
});
66+
}, Executors.newSingleThreadExecutor());
6667
return messageIdFuture;
6768
}
6869

0 commit comments

Comments
 (0)