---

mziccard · aozarov · commit c8e286644774 · 2016-04-07T09:05:45.000-07:00
yaml --- r: 7185 b: refs/heads/tswast-patch-1 c: a8ec412 h: refs/heads/master i: 7183: adb6391
diff --git a/[refs] b/[refs]
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: 5b4ea320271b7cdd2734415f5d6578530d551cc1
+refs/heads/tswast-patch-1: a8ec412e31e65a5a846c737828f7b17a187f5aeb
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/gcloud-java-core/src/main/java/com/google/gcloud/FieldSelector.java b/branches/tswast-patch-1/gcloud-java-core/src/main/java/com/google/gcloud/FieldSelector.java
@@ -54,7 +54,7 @@ public String apply(FieldSelector fieldSelector) {
         };
 
     private static String selector(List<? extends FieldSelector> required, FieldSelector[] others,
-      String... extraResourceFields) {
+        String... extraResourceFields) {
       Set<String> fieldStrings = Sets.newHashSetWithExpectedSize(required.size() + others.length);
       fieldStrings.addAll(Lists.transform(required, FIELD_TO_STRING_FUNCTION));
       fieldStrings.addAll(Lists.transform(Arrays.asList(others), FIELD_TO_STRING_FUNCTION));
diff --git a/branches/tswast-patch-1/gcloud-java-core/src/main/java/com/google/gcloud/Page.java b/branches/tswast-patch-1/gcloud-java-core/src/main/java/com/google/gcloud/Page.java
@@ -21,17 +21,16 @@
 /**
  * Interface for Google Cloud paginated results.
  *
- * <p>
- * Use {@code Page} to iterate through all values (also in next pages):
+ * <p>Use {@code Page} to iterate through all values (also in next pages):
  * <pre> {@code
  * Page<T> page = ...; // get a Page<T> instance
  * Iterator<T> iterator = page.iterateAll();
  * while (iterator.hasNext()) {
  *   T value = iterator.next();
  *   // do something with value
  * }}</pre>
- * <p>
- * Or handle pagination explicitly:
+ *
+ * <p>Or handle pagination explicitly:
  * <pre> {@code
  * Page<T> page = ...; // get a Page<T> instance
  * while (page != null) {
diff --git a/branches/tswast-patch-1/gcloud-java-core/src/main/java/com/google/gcloud/Restorable.java b/branches/tswast-patch-1/gcloud-java-core/src/main/java/com/google/gcloud/Restorable.java
@@ -19,15 +19,14 @@
 /**
  * Implementation of this interface can persist their state and restore from it.
  *
- * <p>
- * A typical capture usage:
+ * <p>A typical capture usage:
  * <pre> {@code
  * X restorableObj; // X instanceof Restorable<X>
  * RestorableState<X> state = restorableObj.capture();
  * .. persist state
  * }</pre>
  *
- * A typical restore usage:
+ * <p>A typical restore usage:
  * <pre> {@code
  * RestorableState<X> state = ... // read from persistence
  * X restorableObj = state.restore();
diff --git a/branches/tswast-patch-1/gcloud-java-core/src/main/java/com/google/gcloud/RestorableState.java b/branches/tswast-patch-1/gcloud-java-core/src/main/java/com/google/gcloud/RestorableState.java
@@ -20,7 +20,7 @@
  * A common interface for restorable states. Implementations of {@code RestorableState} are capable
  * of saving the state of an object to restore it for later use.
  *
- * Implementations of this class must implement {@link java.io.Serializable} to ensure that the
+ * <p>Implementations of this class must implement {@link java.io.Serializable} to ensure that the
  * state of a the object can be correctly serialized.
  *
  * @param <T> the restored object's type
diff --git a/branches/tswast-patch-1/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/branches/tswast-patch-1/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -100,8 +100,8 @@ public abstract class ServiceOptions<ServiceT extends Service<OptionsT>, Service
   /**
    * A base interface for all {@link HttpTransport} factories.
    *
-   * Implementation must provide a public no-arg constructor. Loading of a factory implementation is
-   * done via {@link java.util.ServiceLoader}.
+   * <p>Implementation must provide a public no-arg constructor. Loading of a factory implementation
+   * is done via {@link java.util.ServiceLoader}.
    */
   public interface HttpTransportFactory {
     HttpTransport create();
@@ -129,7 +129,7 @@ public HttpTransport create() {
    * A class providing access to the current time in milliseconds. This class is mainly used for
    * testing and will be replaced by Java8's {@code java.time.Clock}.
    *
-   * Implementations should implement {@code Serializable} wherever possible and must document
+   * <p>Implementations should implement {@code Serializable} wherever possible and must document
    * whether or not they do support serialization.
    */
   public abstract static class Clock {
@@ -490,7 +490,7 @@ protected static String appEngineProjectId() {
   protected static String serviceAccountProjectId() {
     String project = null;
     String credentialsPath = System.getenv("GOOGLE_APPLICATION_CREDENTIALS");
-    if(credentialsPath != null) {
+    if (credentialsPath != null) {
       try (InputStream credentialsStream = new FileInputStream(credentialsPath)) {
         JSONObject json = new JSONObject(new JSONTokener(credentialsStream));
         project = json.getString("project_id");
@@ -518,9 +518,8 @@ public ServiceRpcT rpc() {
   }
 
   /**
-   * Returns the project id.
-   *
-   * Return value can be null (for services that don't require a project id).
+   * Returns the project id. Return value can be null (for services that don't require a project
+   * id).
    */
   public String projectId() {
     return projectId;
diff --git a/branches/tswast-patch-1/gcloud-java-core/src/main/java/com/google/gcloud/spi/ServiceRpcFactory.java b/branches/tswast-patch-1/gcloud-java-core/src/main/java/com/google/gcloud/spi/ServiceRpcFactory.java
@@ -19,10 +19,8 @@
 import com.google.gcloud.ServiceOptions;
 
 /**
- * A base interface for all service RPC factories.
- *
- * Implementation must provide a public no-arg constructor.
- * Loading of a factory implementation is done via {@link java.util.ServiceLoader}.
+ * A base interface for all service RPC factories. Implementation must provide a public no-arg
+ * constructor. Loading of a factory implementation is done via {@link java.util.ServiceLoader}.
  */
 @SuppressWarnings("rawtypes")
 public interface ServiceRpcFactory<ServiceRpcT, OptionsT extends ServiceOptions> {
diff --git a/branches/tswast-patch-1/gcloud-java-core/src/test/java/com/google/gcloud/BaseWriteChannelTest.java b/branches/tswast-patch-1/gcloud-java-core/src/test/java/com/google/gcloud/BaseWriteChannelTest.java
@@ -82,7 +82,7 @@ protected BaseState.Builder<CustomServiceOptions, Serializable> stateBuilder() {
   }
 
   @Test
-  public void testConstructor() throws IOException {
+  public void testConstructor() {
     assertEquals(null, channel.options());
     assertEquals(ENTITY, channel.entity());
     assertEquals(0, channel.position());
@@ -108,7 +108,7 @@ public void testValidateOpen() throws IOException {
   }
 
   @Test
-  public void testChunkSize() throws IOException {
+  public void testChunkSize() {
     channel.chunkSize(42);
     assertEquals(MIN_CHUNK_SIZE, channel.chunkSize());
     channel.chunkSize(2 * MIN_CHUNK_SIZE);

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`* A common interface for restorable states. Implementations of {@code RestorableState} are capable`
`21`	`21`	`* of saving the state of an object to restore it for later use.`
`22`	`22`	`*`
`23`		`- * Implementations of this class must implement {@link java.io.Serializable} to ensure that the`
	`23`	`+ * <p>Implementations of this class must implement {@link java.io.Serializable} to ensure that the`
`24`	`24`	`* state of a the object can be correctly serialized.`
`25`	`25`	`*`
`26`	`26`	`* @param <T> the restored object's type`