Removing devtools from package, refreshing tests

Author: garrettjonesgoogle

gcloud-java-cloudtrace/pom.xml

@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>gcloud-java-pom</artifactId>
-    <version>0.2.8-SNAPSHOT</version>
+    <version>0.2.9-SNAPSHOT</version>
   </parent>
   <properties>
     <site.installationModule>gcloud-java-cloudtrace</site.installationModule>

…s/cloudtrace/spi/v1/TraceServiceApi.java …d/cloudtrace/spi/v1/TraceServiceApi.javagcloud-java-cloudtrace/src/main/java/com/google/cloud/devtools/cloudtrace/spi/v1/TraceServiceApi.java renamed to gcloud-java-cloudtrace/src/main/java/com/google/cloud/cloudtrace/spi/v1/TraceServiceApi.java gcloud-java-cloudtrace/src/main/java/com/google/cloud/devtools/cloudtrace/spi/v1/TraceServiceApi.java renamed to gcloud-java-cloudtrace/src/main/java/com/google/cloud/cloudtrace/spi/v1/TraceServiceApi.java

@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.cloud.devtools.cloudtrace.spi.v1;
+package com.google.cloud.cloudtrace.spi.v1;
 
 import com.google.api.gax.core.PageAccessor;
 import com.google.api.gax.grpc.ApiCallable;
@@ -45,8 +45,8 @@
  * <code>
  * try (TraceServiceApi traceServiceApi = TraceServiceApi.create()) {
  *   String projectId = "";
- *   String traceId = "";
- *   Trace response = traceServiceApi.getTrace(projectId, traceId);
+ *   Traces traces = Traces.newBuilder().build();
+ *   traceServiceApi.patchTraces(projectId, traces);
  * }
  * </code>
  * </pre>
@@ -94,10 +94,10 @@ public class TraceServiceApi implements AutoCloseable {
   private final ScheduledExecutorService executor;
   private final List<AutoCloseable> closeables = new ArrayList<>();
 
+  private final ApiCallable<PatchTracesRequest, Empty> patchTracesCallable;
+  private final ApiCallable<GetTraceRequest, Trace> getTraceCallable;
   private final ApiCallable<ListTracesRequest, ListTracesResponse> listTracesCallable;
   private final ApiCallable<ListTracesRequest, PageAccessor<Trace>> listTracesPagedCallable;
-  private final ApiCallable<GetTraceRequest, Trace> getTraceCallable;
-  private final ApiCallable<PatchTracesRequest, Empty> patchTracesCallable;
 
   public final TraceServiceSettings getSettings() {
     return settings;
@@ -129,14 +129,14 @@ protected TraceServiceApi(TraceServiceSettings settings) throws IOException {
     this.executor = settings.getExecutorProvider().getOrBuildExecutor();
     this.channel = settings.getChannelProvider().getOrBuildChannel(this.executor);
 
+    this.patchTracesCallable =
+        ApiCallable.create(settings.patchTracesSettings(), this.channel, this.executor);
+    this.getTraceCallable =
+        ApiCallable.create(settings.getTraceSettings(), this.channel, this.executor);
     this.listTracesCallable =
         ApiCallable.create(settings.listTracesSettings(), this.channel, this.executor);
     this.listTracesPagedCallable =
         ApiCallable.createPagedVariant(settings.listTracesSettings(), this.channel, this.executor);
-    this.getTraceCallable =
-        ApiCallable.create(settings.getTraceSettings(), this.channel, this.executor);
-    this.patchTracesCallable =
-        ApiCallable.create(settings.patchTracesSettings(), this.channel, this.executor);
 
     if (settings.getChannelProvider().shouldAutoClose()) {
       closeables.add(
@@ -160,101 +160,84 @@ public void close() throws IOException {
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Returns of a list of traces that match the specified filter conditions.
+   * Sends new traces to Cloud Trace or updates existing traces. If the ID of
+   * a trace that you send matches that of an existing trace, any fields
+   * in the existing trace and its spans are overwritten by the provided values,
+   * and any new fields provided are merged with the existing trace data. If the
+   * ID does not match, a new trace is created.
    *
    * Sample code:
    * <pre><code>
    * try (TraceServiceApi traceServiceApi = TraceServiceApi.create()) {
    *   String projectId = "";
-   *   for (Trace element : traceServiceApi.listTraces(projectId)) {
-   *     // doThingsWith(element);
-   *   }
+   *   Traces traces = Traces.newBuilder().build();
+   *   traceServiceApi.patchTraces(projectId, traces);
    * }
    * </code></pre>
    *
    * @param projectId ID of the Cloud project where the trace data is stored.
+   * @param traces The body of the message.
    * @throws com.google.api.gax.grpc.ApiException if the remote call fails
    */
-  public final PageAccessor<Trace> listTraces(String projectId) {
-    ListTracesRequest request = ListTracesRequest.newBuilder().setProjectId(projectId).build();
-    return listTraces(request);
+  public final void patchTraces(String projectId, Traces traces) {
+    PatchTracesRequest request =
+        PatchTracesRequest.newBuilder().setProjectId(projectId).setTraces(traces).build();
+    patchTraces(request);
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Returns of a list of traces that match the specified filter conditions.
+   * Sends new traces to Cloud Trace or updates existing traces. If the ID of
+   * a trace that you send matches that of an existing trace, any fields
+   * in the existing trace and its spans are overwritten by the provided values,
+   * and any new fields provided are merged with the existing trace data. If the
+   * ID does not match, a new trace is created.
    *
    * Sample code:
    * <pre><code>
    * try (TraceServiceApi traceServiceApi = TraceServiceApi.create()) {
    *   String projectId = "";
-   *   ListTracesRequest request = ListTracesRequest.newBuilder()
+   *   Traces traces = Traces.newBuilder().build();
+   *   PatchTracesRequest request = PatchTracesRequest.newBuilder()
    *     .setProjectId(projectId)
+   *     .setTraces(traces)
    *     .build();
-   *   for (Trace element : traceServiceApi.listTraces(request)) {
-   *     // doThingsWith(element);
-   *   }
+   *   traceServiceApi.patchTraces(request);
    * }
    * </code></pre>
    *
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.grpc.ApiException if the remote call fails
    */
-  public final PageAccessor<Trace> listTraces(ListTracesRequest request) {
-    return listTracesPagedCallable().call(request);
+  public final void patchTraces(PatchTracesRequest request) {
+    patchTracesCallable().call(request);
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Returns of a list of traces that match the specified filter conditions.
+   * Sends new traces to Cloud Trace or updates existing traces. If the ID of
+   * a trace that you send matches that of an existing trace, any fields
+   * in the existing trace and its spans are overwritten by the provided values,
+   * and any new fields provided are merged with the existing trace data. If the
+   * ID does not match, a new trace is created.
    *
    * Sample code:
    * <pre><code>
    * try (TraceServiceApi traceServiceApi = TraceServiceApi.create()) {
    *   String projectId = "";
-   *   ListTracesRequest request = ListTracesRequest.newBuilder()
+   *   Traces traces = Traces.newBuilder().build();
+   *   PatchTracesRequest request = PatchTracesRequest.newBuilder()
    *     .setProjectId(projectId)
+   *     .setTraces(traces)
    *     .build();
-   *   ListenableFuture&lt;PageAccessor&lt;Trace&gt;&gt; future = traceServiceApi.listTracesPagedCallable().futureCall(request);
+   *   ListenableFuture&lt;Void&gt; future = traceServiceApi.patchTracesCallable().futureCall(request);
    *   // Do something
-   *   for (Trace element : future.get()) {
-   *     // doThingsWith(element);
-   *   }
-   * }
-   * </code></pre>
-   */
-  public final ApiCallable<ListTracesRequest, PageAccessor<Trace>> listTracesPagedCallable() {
-    return listTracesPagedCallable;
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Returns of a list of traces that match the specified filter conditions.
-   *
-   * Sample code:
-   * <pre><code>
-   * try (TraceServiceApi traceServiceApi = TraceServiceApi.create()) {
-   *   String projectId = "";
-   *   ListTracesRequest request = ListTracesRequest.newBuilder()
-   *     .setProjectId(projectId)
-   *     .build();
-   *   while (true) {
-   *     ListTracesResponse response = traceServiceApi.listTracesCallable().call(request);
-   *     for (Trace element : response.getTracesList()) {
-   *       // doThingsWith(element);
-   *     }
-   *     String nextPageToken = response.getNextPageToken();
-   *     if (!Strings.isNullOrEmpty(nextPageToken)) {
-   *       request = request.toBuilder().setPageToken(nextPageToken).build();
-   *     } else {
-   *       break;
-   *     }
-   *   }
+   *   future.get();
    * }
    * </code></pre>
    */
-  public final ApiCallable<ListTracesRequest, ListTracesResponse> listTracesCallable() {
-    return listTracesCallable;
+  public final ApiCallable<PatchTracesRequest, Empty> patchTracesCallable() {
+    return patchTracesCallable;
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
@@ -329,84 +312,101 @@ public final ApiCallable<GetTraceRequest, Trace> getTraceCallable() {
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Sends new traces to Cloud Trace or updates existing traces. If the ID of
-   * a trace that you send matches that of an existing trace, any fields
-   * in the existing trace and its spans are overwritten by the provided values,
-   * and any new fields provided are merged with the existing trace data. If the
-   * ID does not match, a new trace is created.
+   * Returns of a list of traces that match the specified filter conditions.
    *
    * Sample code:
    * <pre><code>
    * try (TraceServiceApi traceServiceApi = TraceServiceApi.create()) {
    *   String projectId = "";
-   *   Traces traces = Traces.newBuilder().build();
-   *   traceServiceApi.patchTraces(projectId, traces);
+   *   for (Trace element : traceServiceApi.listTraces(projectId)) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * </code></pre>
    *
    * @param projectId ID of the Cloud project where the trace data is stored.
-   * @param traces The body of the message.
    * @throws com.google.api.gax.grpc.ApiException if the remote call fails
    */
-  public final void patchTraces(String projectId, Traces traces) {
-    PatchTracesRequest request =
-        PatchTracesRequest.newBuilder().setProjectId(projectId).setTraces(traces).build();
-    patchTraces(request);
+  public final PageAccessor<Trace> listTraces(String projectId) {
+    ListTracesRequest request = ListTracesRequest.newBuilder().setProjectId(projectId).build();
+    return listTraces(request);
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Sends new traces to Cloud Trace or updates existing traces. If the ID of
-   * a trace that you send matches that of an existing trace, any fields
-   * in the existing trace and its spans are overwritten by the provided values,
-   * and any new fields provided are merged with the existing trace data. If the
-   * ID does not match, a new trace is created.
+   * Returns of a list of traces that match the specified filter conditions.
    *
    * Sample code:
    * <pre><code>
    * try (TraceServiceApi traceServiceApi = TraceServiceApi.create()) {
    *   String projectId = "";
-   *   Traces traces = Traces.newBuilder().build();
-   *   PatchTracesRequest request = PatchTracesRequest.newBuilder()
+   *   ListTracesRequest request = ListTracesRequest.newBuilder()
    *     .setProjectId(projectId)
-   *     .setTraces(traces)
    *     .build();
-   *   traceServiceApi.patchTraces(request);
+   *   for (Trace element : traceServiceApi.listTraces(request)) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * </code></pre>
    *
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.grpc.ApiException if the remote call fails
    */
-  public final void patchTraces(PatchTracesRequest request) {
-    patchTracesCallable().call(request);
+  public final PageAccessor<Trace> listTraces(ListTracesRequest request) {
+    return listTracesPagedCallable().call(request);
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Sends new traces to Cloud Trace or updates existing traces. If the ID of
-   * a trace that you send matches that of an existing trace, any fields
-   * in the existing trace and its spans are overwritten by the provided values,
-   * and any new fields provided are merged with the existing trace data. If the
-   * ID does not match, a new trace is created.
+   * Returns of a list of traces that match the specified filter conditions.
    *
    * Sample code:
    * <pre><code>
    * try (TraceServiceApi traceServiceApi = TraceServiceApi.create()) {
    *   String projectId = "";
-   *   Traces traces = Traces.newBuilder().build();
-   *   PatchTracesRequest request = PatchTracesRequest.newBuilder()
+   *   ListTracesRequest request = ListTracesRequest.newBuilder()
    *     .setProjectId(projectId)
-   *     .setTraces(traces)
    *     .build();
-   *   ListenableFuture&lt;Void&gt; future = traceServiceApi.patchTracesCallable().futureCall(request);
+   *   ListenableFuture&lt;PageAccessor&lt;Trace&gt;&gt; future = traceServiceApi.listTracesPagedCallable().futureCall(request);
    *   // Do something
-   *   future.get();
+   *   for (Trace element : future.get()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * </code></pre>
    */
-  public final ApiCallable<PatchTracesRequest, Empty> patchTracesCallable() {
-    return patchTracesCallable;
+  public final ApiCallable<ListTracesRequest, PageAccessor<Trace>> listTracesPagedCallable() {
+    return listTracesPagedCallable;
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Returns of a list of traces that match the specified filter conditions.
+   *
+   * Sample code:
+   * <pre><code>
+   * try (TraceServiceApi traceServiceApi = TraceServiceApi.create()) {
+   *   String projectId = "";
+   *   ListTracesRequest request = ListTracesRequest.newBuilder()
+   *     .setProjectId(projectId)
+   *     .build();
+   *   while (true) {
+   *     ListTracesResponse response = traceServiceApi.listTracesCallable().call(request);
+   *     for (Trace element : response.getTracesList()) {
+   *       // doThingsWith(element);
+   *     }
+   *     String nextPageToken = response.getNextPageToken();
+   *     if (!Strings.isNullOrEmpty(nextPageToken)) {
+   *       request = request.toBuilder().setPageToken(nextPageToken).build();
+   *     } else {
+   *       break;
+   *     }
+   *   }
+   * }
+   * </code></pre>
+   */
+  public final ApiCallable<ListTracesRequest, ListTracesResponse> listTracesCallable() {
+    return listTracesCallable;
   }
 
   /**