googleapis · chingor13 · Mar 22, 2021 · Oct 15, 2020 · Feb 27, 2021 · Feb 27, 2021
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>com.google.analytics</groupId>
       <artifactId>google-analytics-data</artifactId>
-      <version>0.6.0</version>
+      <version>0.7.0</version>
     </dependency>
 
     <dependency>

diff --git a/samples/snippets/src/main/java/com/example/analytics/QuickstartJsonCredentialsSample.java b/samples/snippets/src/main/java/com/example/analytics/QuickstartJsonCredentialsSample.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.analytics;
+
+/* Google Analytics Data API sample quickstart application.
+
+This application demonstrates the usage of the Analytics Data API using
+service account credentials from a JSON file downloaded from
+the Google Cloud Console.
+
+Before you start the application, please review the comments starting with
+"TODO(developer)" and update the code to use correct values.
+
+To run this sample using Maven:
+  cd java-analytics-data/samples/snippets
+  mvn compile
+  mvn exec:java -Dexec.mainClass="com.example.analytics.QuickstartJsonCredentialsSample"
+ */
+
+// [START analyticsdata_json_credentials_quickstart]
+import com.google.analytics.data.v1beta.BetaAnalyticsDataClient;
+import com.google.analytics.data.v1beta.BetaAnalyticsDataSettings;
+import com.google.analytics.data.v1beta.DateRange;
+import com.google.analytics.data.v1beta.Dimension;
+import com.google.analytics.data.v1beta.Metric;
+import com.google.analytics.data.v1beta.Row;
+import com.google.analytics.data.v1beta.RunReportRequest;
+import com.google.analytics.data.v1beta.RunReportResponse;
+import com.google.api.gax.core.FixedCredentialsProvider;
+import com.google.auth.oauth2.GoogleCredentials;
+import java.io.FileInputStream;
+
+public class QuickstartJsonCredentialsSample {
+
+  public static void main(String... args) throws Exception {
+    /**
+     * TODO(developer): Replace this variable with your Google Analytics 4 property ID before
+     * running the sample.
+     */
+    String propertyId = "YOUR-GA4-PROPERTY-ID";
+
+    /** TODO(developer): Replace this variable with a valid path to the credentials.json file
+     * for your service account downloaded from the Cloud Console.
+     */
+    String credentialsJsonPath = "/path/to/credentials.json";
+    sampleRunReport(propertyId, credentialsJsonPath);
+  }
+
+  // This is an example snippet that calls the Google Analytics Data API and runs a simple report
+  // on the provided GA4 property id.
+  static void sampleRunReport(String propertyId, String credentialsJsonPath) throws Exception {
+    // [START analyticsdata_json_credentials_initialize]
+    // Explicitly use service account credentials by specifying
+    // the private key file.
+    GoogleCredentials credentials = GoogleCredentials
+        .fromStream(new FileInputStream(credentialsJsonPath));
+
+    BetaAnalyticsDataSettings betaAnalyticsDataSettings =
+        BetaAnalyticsDataSettings.newBuilder()
+            .setCredentialsProvider(FixedCredentialsProvider.create(credentials))
+            .build();
+
+    try (BetaAnalyticsDataClient analyticsData =
+        BetaAnalyticsDataClient.create(betaAnalyticsDataSettings)) {
+      // [END analyticsdata_json_credentials_initialize]
+
+      // [START analyticsdata_json_credentials_run_report]
+      RunReportRequest request = RunReportRequest.newBuilder()
+          .setProperty("properties/" + propertyId)
+          .addDimensions(
+              Dimension.newBuilder().setName("city"))
+          .addMetrics(Metric.newBuilder().setName("activeUsers"))
+          .addDateRanges(
+              DateRange.newBuilder().setStartDate("2020-03-31").setEndDate("today")).build();
+
+      // Make the request.
+      RunReportResponse response = analyticsData.runReport(request);
+      // [END analyticsdata_json_credentials_run_report]
+
+      // [START analyticsdata_json_credentials_print_report]
+      System.out.println("Report result:");
+      // Iterate through every row of the API response.
+      for (Row row : response.getRowsList()) {
+        System.out.printf("%s, %s%n", row.getDimensionValues(0).getValue(),
+            row.getMetricValues(0).getValue());
+      }
+      // [END analyticsdata_json_credentials_print_report]
+    }
+  }
+}
+// [END analyticsdata_json_credentials_quickstart]
+
diff --git a/samples/snippets/src/main/java/com/example/analytics/QuickstartSample.java b/samples/snippets/src/main/java/com/example/analytics/QuickstartSample.java
@@ -16,82 +16,76 @@
 
 package com.example.analytics;
 
-/* This application demonstrates the usage of the Analytics Data API using
- service account credentials. For more information on service accounts, see
- https://cloud.google.com/iam/docs/understanding-service-accounts
+/* Google Analytics Data API sample quickstart application.
 
- The following document provides instructions on setting service account
- credentials for your application:
- https://cloud.google.com/docs/authentication/production
+This application demonstrates the usage of the Analytics Data API using service account credentials.
 
- In a nutshell, you need to:
+Before you start the application, please review the comments starting with
+"TODO(developer)" and update the code to use correct values.
 
- 1. Create a service account and download the key JSON file.
- https://cloud.google.com/docs/authentication/production#creating_a_service_account
-
- 2. Provide service account credentials using one of the following options:
- - set the GOOGLE_APPLICATION_CREDENTIALS environment variable, the API
- client will use the value of this variable to find the service account key
- JSON file.
-
- https://cloud.google.com/docs/authentication/production#setting_the_environment_variable
-
- OR
-
- - manually pass the path to the service account key JSON file to the API client
- by specifying the keyFilename parameter in the constructor.
- https://cloud.google.com/docs/authentication/production#passing_the_path_to_the_service_account_key_in_code
-
- To run this sample using Maven:
-   cd java-analytics-data/samples/snippets
-   mvn compile
-   mvn exec:java -Dexec.mainClass="QuickstartSample"
+To run this sample using Maven:
+  cd java-analytics-data/samples/snippets
+  mvn compile
+  mvn exec:java -Dexec.mainClass="com.example.analytics.QuickstartSample"
  */
 
-// [START analytics_data_quickstart]
-
-import com.google.analytics.data.v1alpha.AlphaAnalyticsDataClient;
-import com.google.analytics.data.v1alpha.DateRange;
-import com.google.analytics.data.v1alpha.Dimension;
-import com.google.analytics.data.v1alpha.Entity;
-import com.google.analytics.data.v1alpha.Metric;
-import com.google.analytics.data.v1alpha.Row;
-import com.google.analytics.data.v1alpha.RunReportRequest;
-import com.google.analytics.data.v1alpha.RunReportResponse;
+// [START analyticsdata_quickstart]
+import com.google.analytics.data.v1beta.BetaAnalyticsDataClient;
+import com.google.analytics.data.v1beta.DateRange;
+import com.google.analytics.data.v1beta.Dimension;
+import com.google.analytics.data.v1beta.Metric;
+import com.google.analytics.data.v1beta.Row;
+import com.google.analytics.data.v1beta.RunReportRequest;
+import com.google.analytics.data.v1beta.RunReportResponse;
 
 public class QuickstartSample {
 
+  public static void main(String... args) throws Exception {
+    /**
+     * TODO(developer): Replace this variable with your Google Analytics 4 property ID before
+     * running the sample.
+     */
+    String propertyId = "YOUR-GA4-PROPERTY-ID";
+    sampleRunReport(propertyId);
+  }
+
   // This is an example snippet that calls the Google Analytics Data API and runs a simple report
   // on the provided GA4 property id.
-  static void sampleRunReport(String ga4PropertyId) throws Exception {
-    // Instantiates a client using default credentials.
-    // See https://cloud.google.com/docs/authentication/production for more information
-    // about managing credentials.
-    try (AlphaAnalyticsDataClient analyticsData = AlphaAnalyticsDataClient.create()) {
+  static void sampleRunReport(String propertyId) throws Exception {
+    /**
+     * TODO(developer): Uncomment this variable and replace with your
+     * Google Analytics 4 property ID before running the sample.
+     */
+    // propertyId = "YOUR-GA4-PROPERTY-ID";
+
+    // [START analyticsdata_initialize]
+    // Using a default constructor instructs the client to use the credentials
+    // specified in GOOGLE_APPLICATION_CREDENTIALS environment variable.
+    try (BetaAnalyticsDataClient analyticsData = BetaAnalyticsDataClient.create()) {
+      // [END analyticsdata_initialize]
+
+      // [START analyticsdata_run_report]
       RunReportRequest request = RunReportRequest.newBuilder()
-          .setEntity(Entity.newBuilder().setPropertyId(ga4PropertyId))
+          .setProperty("properties/" + propertyId)
           .addDimensions(
               Dimension.newBuilder().setName("city"))
           .addMetrics(Metric.newBuilder().setName("activeUsers"))
           .addDateRanges(
               DateRange.newBuilder().setStartDate("2020-03-31").setEndDate("today")).build();
 
-      // Make the request
+      // Make the request.
       RunReportResponse response = analyticsData.runReport(request);
+      // [END analyticsdata_run_report]
 
+      // [START analyticsdata_print_report]
       System.out.println("Report result:");
+      // Iterate through every row of the API response.
       for (Row row : response.getRowsList()) {
         System.out.printf("%s, %s%n", row.getDimensionValues(0).getValue(),
             row.getMetricValues(0).getValue());
       }
+      // [END analyticsdata_print_report]
     }
   }
-
-  public static void main(String... args) throws Exception {
-    // TODO(developer): Replace this variable with your GA4 property ID before running the sample.
-    String ga4PropertyId = "GA4 PROPERTY ID";
-    sampleRunReport(ga4PropertyId);
-  }
 }
-
-// [END analytics_data_quickstart]
+// [END analyticsdata_quickstart]
diff --git a/...les/snippets/src/test/java/com/example/analytics/QuickstartJsonCredentialsSampleTest.java b/...les/snippets/src/test/java/com/example/analytics/QuickstartJsonCredentialsSampleTest.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.analytics;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+/**
+ * Tests for quickstart sample.
+ */
+@RunWith(JUnit4.class)
+public class QuickstartJsonCredentialsSampleTest {
+
+  private String ga4PropertyId =
+      System.getProperty("analyticsdata.quickstart.ga4PropertyId", "222596558");
+
+  private String credentialsJsonPath = System.getenv("GOOGLE_APPLICATION_CREDENTIALS");
+
+
+  private String runSample(String ga4PropertyId) throws Exception {
+    PrintStream stdOut = System.out;
+    ByteArrayOutputStream bout = new ByteArrayOutputStream();
+    PrintStream out = new PrintStream(bout);
+    System.setOut(out);
+
+    // Run the test using default system credentials.
+    QuickstartJsonCredentialsSample.sampleRunReport(ga4PropertyId, credentialsJsonPath);
+
+    System.setOut(stdOut);
+    return bout.toString();
+  }
+
+  @Test
+  public void testQuickstart() throws Exception {
+    // Act
+    String out = runSample(ga4PropertyId);
+
+    // Assert
+    assertThat(out).contains("Report result:");
+  }
+}
diff --git a/samples/snippets/src/test/java/com/example/analytics/QuickstartSampleTest.java b/samples/snippets/src/test/java/com/example/analytics/QuickstartSampleTest.java
@@ -39,6 +39,7 @@ private String runSample(String ga4PropertyId) throws Exception {
     PrintStream out = new PrintStream(bout);
     System.setOut(out);
 
+    // Run the test using default system credentials.
     QuickstartSample.sampleRunReport(ga4PropertyId);
 
     System.setOut(stdOut);
@@ -53,4 +54,4 @@ public void testQuickstart() throws Exception {
     // Assert
     assertThat(out).contains("Report result:");
   }
-}
+}