Skip to content

Commit 0de401c

Browse files
michaelbausormichaelbausor
authored
---
yaml --- r: 8017 b: refs/heads/tswast-patch-1 c: fb68318 h: refs/heads/master i: 8015: 1418476
1 parent 86a8c90 commit 0de401c

30 files changed

Lines changed: 135 additions & 54 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
5757
refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
5858
refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
5959
refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
60-
refs/heads/tswast-patch-1: 4e080f17884661cf8e60ab930ca72483d68d5b69
60+
refs/heads/tswast-patch-1: fb68318321a2a6bf96730aafe42751f6f155c09c
6161
refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b

‎branches/tswast-patch-1/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TableDataWriteChannel.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import com.google.cloud.RestorableState;
2323
import com.google.cloud.RetryHelper;
2424
import com.google.cloud.WriteChannel;
25-
import com.google.common.base.MoreObjects;
2625

26+
import java.util.List;
2727
import java.util.Objects;
2828
import java.util.concurrent.Callable;
2929

@@ -149,8 +149,10 @@ public boolean equals(Object obj) {
149149
}
150150

151151
@Override
152-
protected MoreObjects.ToStringHelper toStringHelper() {
153-
return super.toStringHelper().add("job", job);
152+
protected List<ValueHolder> toStringHelper() {
153+
List<ValueHolder> valueList = super.toStringHelper();
154+
valueList.add(ValueHolder.create("job", job));
155+
return valueList;
154156
}
155157
}
156158
}

‎branches/tswast-patch-1/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileAttributes.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818

1919
import com.google.cloud.storage.Acl;
2020
import com.google.common.base.Optional;
21-
import com.google.common.collect.ImmutableMap;
2221

2322
import java.nio.file.attribute.BasicFileAttributes;
2423
import java.util.List;
24+
import java.util.Map;
2525

2626
/**
2727
* Interface for attributes on a Cloud Storage file or pseudo-directory.
@@ -75,5 +75,5 @@ public interface CloudStorageFileAttributes extends BasicFileAttributes {
7575
*
7676
* @see "https://developers.google.com/storage/docs/reference-headers#contentdisposition"
7777
*/
78-
ImmutableMap<String, String> userMetadata();
78+
Map<String, String> userMetadata();
7979
}

‎branches/tswast-patch-1/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystem.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public final class CloudStorageFileSystem extends FileSystem {
5656
public static final String BASIC_VIEW = "basic";
5757
public static final int BLOCK_SIZE_DEFAULT = 2 * 1024 * 1024;
5858
public static final FileTime FILE_TIME_UNKNOWN = FileTime.fromMillis(0);
59-
public static final ImmutableSet<String> SUPPORTED_VIEWS = ImmutableSet.of(BASIC_VIEW, GCS_VIEW);
59+
public static final Set<String> SUPPORTED_VIEWS = ImmutableSet.of(BASIC_VIEW, GCS_VIEW);
6060

6161
private final CloudStorageFileSystemProvider provider;
6262
private final String bucket;

‎branches/tswast-patch-1/google-cloud-core/src/main/java/com/google/cloud/BaseWriteChannel.java‎

Lines changed: 46 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616

1717
package com.google.cloud;
1818

19-
import com.google.common.base.MoreObjects;
20-
2119
import java.io.IOException;
2220
import java.io.Serializable;
2321
import java.nio.ByteBuffer;
2422
import java.nio.channels.ClosedChannelException;
23+
import java.util.ArrayList;
2524
import java.util.Arrays;
25+
import java.util.List;
2626
import java.util.Objects;
2727

2828
/**
@@ -295,17 +295,54 @@ public boolean equals(Object obj) {
295295
&& this.chunkSize == other.chunkSize;
296296
}
297297

298-
protected MoreObjects.ToStringHelper toStringHelper() {
299-
return MoreObjects.toStringHelper(this)
300-
.add("entity", entity)
301-
.add("uploadId", uploadId)
302-
.add("position", position)
303-
.add("isOpen", isOpen);
298+
protected static final class ValueHolder {
299+
final String name;
300+
final Object value;
301+
302+
private ValueHolder(String name, Object value) {
303+
this.name = name;
304+
this.value = value;
305+
}
306+
307+
public static ValueHolder create(String name, Object value) {
308+
return new ValueHolder(name, value);
309+
}
310+
311+
@Override
312+
public String toString() {
313+
String result = name + "=";
314+
if (value != null && value.getClass().isArray()) {
315+
Object[] objectArray = new Object[]{value};
316+
String arrayString = Arrays.deepToString(objectArray);
317+
result += arrayString.substring(1, arrayString.length() - 1);
318+
} else {
319+
result += value;
320+
}
321+
return result;
322+
}
323+
}
324+
325+
protected List<ValueHolder> toStringHelper() {
326+
List<ValueHolder> valueList = new ArrayList<>();
327+
valueList.add(ValueHolder.create("entity", entity));
328+
valueList.add(ValueHolder.create("uploadId", uploadId));
329+
valueList.add(ValueHolder.create("position", String.valueOf(position)));
330+
valueList.add(ValueHolder.create("isOpen", String.valueOf(isOpen)));
331+
return valueList;
304332
}
305333

306334
@Override
307335
public String toString() {
308-
return toStringHelper().toString();
336+
StringBuilder builder = new StringBuilder();
337+
builder.append(getClass().getSimpleName())
338+
.append('{');
339+
String nextSeparator = "";
340+
for (ValueHolder valueHolder : toStringHelper()) {
341+
builder.append(nextSeparator).append(valueHolder);
342+
nextSeparator = ", ";
343+
}
344+
builder.append('}');
345+
return builder.toString();
309346
}
310347
}
311348
}

‎branches/tswast-patch-1/google-cloud-core/src/main/java/com/google/cloud/MonitoredResourceDescriptor.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import static com.google.common.base.Preconditions.checkNotNull;
2020

21+
import com.google.api.core.ApiFunction;
2122
import com.google.common.base.Function;
2223
import com.google.common.base.MoreObjects;
2324
import com.google.common.collect.Iterables;
@@ -37,9 +38,9 @@
3738
public class MonitoredResourceDescriptor implements Serializable {
3839

3940
private static final long serialVersionUID = -3702077512777687441L;
40-
public static final Function<com.google.api.MonitoredResourceDescriptor,
41+
public static final ApiFunction<com.google.api.MonitoredResourceDescriptor,
4142
MonitoredResourceDescriptor> FROM_PB_FUNCTION =
42-
new Function<com.google.api.MonitoredResourceDescriptor, MonitoredResourceDescriptor>() {
43+
new ApiFunction<com.google.api.MonitoredResourceDescriptor, MonitoredResourceDescriptor>() {
4344
@Override
4445
public MonitoredResourceDescriptor apply(
4546
com.google.api.MonitoredResourceDescriptor pb) {

‎branches/tswast-patch-1/google-cloud-core/src/main/java/com/google/cloud/Policy.java‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import static com.google.common.base.Preconditions.checkArgument;
2020
import static com.google.common.base.Preconditions.checkNotNull;
2121

22+
import com.google.api.core.ApiFunction;
2223
import com.google.common.base.Function;
2324
import com.google.common.base.MoreObjects;
2425
import com.google.common.collect.ImmutableMap;
@@ -57,15 +58,15 @@ public final class Policy implements Serializable {
5758

5859
public abstract static class Marshaller<T> {
5960

60-
protected static final Function<String, Identity> IDENTITY_VALUE_OF_FUNCTION =
61-
new Function<String, Identity>() {
61+
protected static final ApiFunction<String, Identity> IDENTITY_VALUE_OF_FUNCTION =
62+
new ApiFunction<String, Identity>() {
6263
@Override
6364
public Identity apply(String identityPb) {
6465
return Identity.valueOf(identityPb);
6566
}
6667
};
67-
protected static final Function<Identity, String> IDENTITY_STR_VALUE_FUNCTION =
68-
new Function<Identity, String>() {
68+
protected static final ApiFunction<Identity, String> IDENTITY_STR_VALUE_FUNCTION =
69+
new ApiFunction<Identity, String>() {
6970
@Override
7071
public String apply(Identity identity) {
7172
return identity.strValue();
@@ -85,7 +86,12 @@ protected Policy fromPb(com.google.iam.v1.Policy policyPb) {
8586
for (com.google.iam.v1.Binding bindingPb : policyPb.getBindingsList()) {
8687
bindings.put(Role.of(bindingPb.getRole()),
8788
ImmutableSet.copyOf(
88-
Lists.transform(bindingPb.getMembersList(), IDENTITY_VALUE_OF_FUNCTION)));
89+
Lists.transform(bindingPb.getMembersList(), new Function<String, Identity>() {
90+
@Override
91+
public Identity apply(String s) {
92+
return IDENTITY_VALUE_OF_FUNCTION.apply(s);
93+
}
94+
})));
8995
}
9096
return newBuilder()
9197
.setBindings(bindings)
@@ -103,7 +109,12 @@ protected com.google.iam.v1.Policy toPb(Policy policy) {
103109
com.google.iam.v1.Binding.Builder bindingBuilder = com.google.iam.v1.Binding.newBuilder();
104110
bindingBuilder.setRole(binding.getKey().getValue());
105111
bindingBuilder.addAllMembers(
106-
Lists.transform(new ArrayList<>(binding.getValue()), IDENTITY_STR_VALUE_FUNCTION));
112+
Lists.transform(new ArrayList<>(binding.getValue()), new Function<Identity, String>() {
113+
@Override
114+
public String apply(Identity identity) {
115+
return IDENTITY_STR_VALUE_FUNCTION.apply(identity);
116+
}
117+
}));
107118
bindingPbList.add(bindingBuilder.build());
108119
}
109120
policyBuilder.addAllBindings(bindingPbList);

‎branches/tswast-patch-1/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1006,7 +1006,7 @@ public List<String> getDistinctOn() {
10061006
/**
10071007
* Returns the order by clause for this query.
10081008
*/
1009-
public ImmutableList<OrderBy> getOrderBy() {
1009+
public List<OrderBy> getOrderBy() {
10101010
return orderBy;
10111011
}
10121012

‎branches/tswast-patch-1/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorGroupServiceSettings.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import com.google.protobuf.ExperimentalApi;
3737
import io.grpc.Status;
3838
import java.io.IOException;
39+
import java.util.List;
3940
import javax.annotation.Generated;
4041
import org.joda.time.Duration;
4142

@@ -120,7 +121,7 @@ public static String getDefaultEndpoint() {
120121
}
121122

122123
/** Returns the default service scopes. */
123-
public static ImmutableList<String> getDefaultServiceScopes() {
124+
public static List<String> getDefaultServiceScopes() {
124125
return DEFAULT_SERVICE_SCOPES;
125126
}
126127

‎branches/tswast-patch-1/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceSettings.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
import com.google.protobuf.ExperimentalApi;
5252
import io.grpc.Status;
5353
import java.io.IOException;
54+
import java.util.List;
5455
import javax.annotation.Generated;
5556
import org.joda.time.Duration;
5657

@@ -155,7 +156,7 @@ public static String getDefaultEndpoint() {
155156
}
156157

157158
/** Returns the default service scopes. */
158-
public static ImmutableList<String> getDefaultServiceScopes() {
159+
public static List<String> getDefaultServiceScopes() {
159160
return DEFAULT_SERVICE_SCOPES;
160161
}
161162

0 commit comments

Comments
 (0)