Resource DTO

src/main/java/com/wechi/adweb/bridge/exception/BadRequestException.java

@@ -12,10 +12,6 @@ public class BadRequestException extends Exception {
 
     private OpenAPIRequest apiRequest;
 
-    public BadRequestException() {
-        super();
-    }
-
     public BadRequestException(OpenAPIRequest<?> apiRequest) {
         this.apiRequest = apiRequest;
     }

src/main/java/com/wechi/adweb/bridge/google/analytics/controller/GAController.java

@@ -1,6 +1,5 @@
 package com.wechi.adweb.bridge.google.analytics.controller;
 
-import com.google.gson.Gson;
 import com.wechi.adweb.bridge.common.APIStatus;
 import com.wechi.adweb.bridge.common.BaseController;
 import com.wechi.adweb.bridge.common.OpenAPIRequest;
@@ -14,6 +13,7 @@ import com.wechi.adweb.bridge.google.analytics.dto.report.ReportType;
 import com.wechi.adweb.bridge.google.analytics.dto.report.data.GAReportDataDTO;
 import com.wechi.adweb.bridge.google.analytics.service.GAAdminService;
 import com.wechi.adweb.bridge.google.analytics.service.GADataService;
+import com.wechi.adweb.bridge.util.JsonUtils;
 
 import io.swagger.v3.oas.annotations.Operation;
 
@@ -38,8 +38,6 @@ public class GAController extends BaseController {
 
     @Autowired private GAAdminService gaAdminService;
 
-    private final Gson gson = new Gson();
-
     @PostMapping("/accounts/list")
     @ResponseBody
     public OpenAPIResponse<List<GAAccountDTO>> listGAAccounts() throws DataException {
@@ -55,16 +53,16 @@ public class GAController extends BaseController {
                 .build();
     }
 
-    @Operation(summary = "List the properties under a GA account name.")
+    @Operation(summary = "List the properties under a GA account resource name.")
     @PostMapping("/properties/list")
     @ResponseBody
     public OpenAPIResponse<List<GAPropertyDTO>> listGAProperties(
             @RequestBody OpenAPIRequest<String> apiRequest)
             throws BadRequestException, DataException {
         long start = System.currentTimeMillis();
-        log.info("****** listGAProperties() ****** apiRequest = {}", gson.toJson(apiRequest));
+        log.info("****** listGAProperties() ****** apiRequest = {}", JsonUtils.toJson(apiRequest));
 
-        // 1. Validates request parameters - GA account name.
+        // 1. Validates request parameters - GA account resource name.
         if (StringUtils.isEmpty(apiRequest.getData())) {
             throw new BadRequestException(apiRequest);
         }
@@ -72,7 +70,7 @@ public class GAController extends BaseController {
         // 2. Executes the API request.
         List<GAPropertyDTO> gaProperties =
                 gaAdminService.listGAProperties(
-                        GAAccountDTO.getResourceName(apiRequest.getData()), false);
+                        GAAccountDTO.toResourceName(apiRequest.getData()), false);
         log.info(
                 "****** listGAProperties() ****** duration = {} seconds", getElapsedSeconds(start));
         return OpenAPIResponse.<List<GAPropertyDTO>>builder()
@@ -87,12 +85,12 @@ public class GAController extends BaseController {
             @RequestBody OpenAPIRequest<GAReportRequestDTO> apiRequest)
             throws BadRequestException, DataException {
         long start = System.currentTimeMillis();
-        log.info("****** getGAReport() ****** apiRequest = {}", gson.toJson(apiRequest));
+        log.info("****** getGAReport() ****** apiRequest = {}", JsonUtils.toJson(apiRequest));
         GAReportRequestDTO reportRequest = apiRequest.getData();
 
         // 1. Validates request parameters.
         if (Objects.isNull(reportRequest)
-                || StringUtils.isEmpty(reportRequest.getPropertyName())
+                || StringUtils.isEmpty(reportRequest.getPropertyResourceName())
                 || Objects.isNull(reportRequest.getReportType())
                 || StringUtils.isEmpty(reportRequest.getStartDate())
                 || StringUtils.isEmpty(reportRequest.getEndDate())

src/main/java/com/wechi/adweb/bridge/google/analytics/dto/GAAccountDTO.java

@@ -1,7 +1,11 @@
 package com.wechi.adweb.bridge.google.analytics.dto;
 
-import lombok.Builder;
+import com.wechi.adweb.bridge.google.common.ResourceDTO;
+
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.SuperBuilder;
 
 import org.apache.commons.lang3.StringUtils;
 
@@ -9,20 +13,16 @@ import org.apache.commons.lang3.StringUtils;
  * @author wfansh
  */
 @Data
-@Builder
-public class GAAccountDTO {
-
-    private String id;
-
-    private String name;
-
-    private String displayName;
+@SuperBuilder
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+public class GAAccountDTO extends ResourceDTO {
 
     private long createTime;
 
     private long updateTime;
 
-    public static String getResourceName(String idOrName) {
-        return StringUtils.isNumeric(idOrName) ? "accounts/" + idOrName : idOrName;
+    public static String toResourceName(String id) {
+        return StringUtils.isNumeric(id) ? "accounts" + RESOURCE_NAME_SPLITTER + id : id;
     }
 }

src/main/java/com/wechi/adweb/bridge/google/analytics/dto/GADataStreamDTO.java

@@ -1,20 +1,20 @@
 package com.wechi.adweb.bridge.google.analytics.dto;
 
-import lombok.Builder;
+import com.wechi.adweb.bridge.google.common.ResourceDTO;
+
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.SuperBuilder;
 
 /**
  * @author wfansh
  */
 @Data
-@Builder
-public class GADataStreamDTO {
-
-    private String id;
-
-    private String name;
-
-    private String displayName;
+@SuperBuilder
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+public class GADataStreamDTO extends ResourceDTO {
 
     private String property;
 

src/main/java/com/wechi/adweb/bridge/google/analytics/dto/GAPropertyDTO.java

@@ -1,7 +1,11 @@
 package com.wechi.adweb.bridge.google.analytics.dto;
 
-import lombok.Builder;
+import com.wechi.adweb.bridge.google.common.ResourceDTO;
+
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.SuperBuilder;
 
 import java.util.List;
 
@@ -9,14 +13,10 @@ import java.util.List;
  * @author wfansh
  */
 @Data
-@Builder
-public class GAPropertyDTO {
-
-    private String id;
-
-    private String name;
-
-    private String displayName;
+@SuperBuilder
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+public class GAPropertyDTO extends ResourceDTO {
 
     private String propertyType;
 

src/main/java/com/wechi/adweb/bridge/google/analytics/dto/report/GAReportRequestDTO.java

@@ -10,7 +10,7 @@ import java.util.List;
 @Data
 public class GAReportRequestDTO {
 
-    private String propertyName;
+    private String propertyResourceName;
 
     private ReportType reportType;
 

src/main/java/com/wechi/adweb/bridge/google/analytics/service/GAAdminService.java

@@ -1,16 +1,17 @@
 package com.wechi.adweb.bridge.google.analytics.service;
 
+import static com.wechi.adweb.bridge.google.common.ResourceDTO.parseId;
+
 import com.google.analytics.admin.v1beta.*;
 import com.google.api.client.util.Lists;
 import com.google.api.gax.core.FixedCredentialsProvider;
 import com.google.auth.oauth2.GoogleCredentials;
-import com.google.common.base.Splitter;
-import com.google.gson.Gson;
 import com.google.protobuf.util.JsonFormat;
 import com.wechi.adweb.bridge.exception.DataException;
 import com.wechi.adweb.bridge.google.analytics.dto.GAAccountDTO;
 import com.wechi.adweb.bridge.google.analytics.dto.GADataStreamDTO;
 import com.wechi.adweb.bridge.google.analytics.dto.GAPropertyDTO;
+import com.wechi.adweb.bridge.util.JsonUtils;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -38,8 +39,6 @@ public class GAAdminService {
 
     private AnalyticsAdminServiceSettings adminServiceSettings;
 
-    private final Gson gson = new Gson();
-
     @PostConstruct
     private void init() throws IOException {
         GoogleCredentials credentials =
@@ -63,7 +62,7 @@ public class GAAdminService {
                 GAAccountDTO gaAccount =
                         GAAccountDTO.builder()
                                 .id(parseId(account.getName()))
-                                .name(account.getName())
+                                .resourceName(account.getName())
                                 .displayName(account.getDisplayName())
                                 .createTime(account.getCreateTime().getSeconds())
                                 .updateTime(account.getUpdateTime().getSeconds())
@@ -73,7 +72,7 @@ public class GAAdminService {
                 gaAccounts.add(gaAccount);
             }
 
-            log.info("listGAAccounts : {}", gson.toJson(gaAccounts));
+            log.info("listGAAccounts : {}", JsonUtils.toJson(gaAccounts));
             return gaAccounts;
         } catch (IOException e) {
             log.error(e.getMessage());
@@ -81,23 +80,25 @@ public class GAAdminService {
         }
     }
 
-    public List<GAPropertyDTO> listGAProperties(String accountName, boolean withDataStreams)
+    public List<GAPropertyDTO> listGAProperties(String accountResourceName, boolean withDataStreams)
             throws DataException {
         List<GAPropertyDTO> gaProperties = Lists.newArrayList();
         try (AnalyticsAdminServiceClient analyticsAdminServiceClient =
                 AnalyticsAdminServiceClient.create(adminServiceSettings)) {
-            // Initializes the list request with account name filter.
+            // Initializes the list request with account resource name filter.
             // See
             // https://developers.google.com/analytics/devguides/config/admin/v1/rest/v1beta/properties/list#http-request
             ListPropertiesRequest request =
-                    ListPropertiesRequest.newBuilder().setFilter("ancestor:" + accountName).build();
+                    ListPropertiesRequest.newBuilder()
+                            .setFilter("ancestor:" + accountResourceName)
+                            .build();
 
             for (Property property :
                     analyticsAdminServiceClient.listProperties(request).iterateAll()) {
                 GAPropertyDTO gaProperty =
                         GAPropertyDTO.builder()
                                 .id(parseId(property.getName()))
-                                .name(property.getName())
+                                .resourceName(property.getName())
                                 .displayName(property.getDisplayName())
                                 .propertyType(property.getPropertyType().toString())
                                 .account(property.getAccount())
@@ -122,13 +123,16 @@ public class GAAdminService {
             // Distinct by property name.
             gaProperties =
                     gaProperties.stream()
-                            .collect(Collectors.groupingBy(GAPropertyDTO::getName))
+                            .collect(Collectors.groupingBy(GAPropertyDTO::getResourceName))
                             .values()
                             .stream()
                             .map(values -> values.get(0))
                             .toList();
 
-            log.info("listGAProperties for {} : {}", accountName, gson.toJson(gaProperties));
+            log.info(
+                    "listGAProperties for {} : {}",
+                    accountResourceName,
+                    JsonUtils.toJson(gaProperties));
             return gaProperties;
         } catch (IOException e) {
             log.error(e.getMessage());
@@ -136,22 +140,23 @@ public class GAAdminService {
         }
     }
 
-    public List<GADataStreamDTO> listGADataStreams(String propertyName) throws DataException {
+    public List<GADataStreamDTO> listGADataStreams(String propertyResourceName)
+            throws DataException {
         List<GADataStreamDTO> gaDataStreams = Lists.newArrayList();
         try (AnalyticsAdminServiceClient analyticsAdminServiceClient =
                 AnalyticsAdminServiceClient.create(adminServiceSettings)) {
             // Initializes the list request with parent property.
             ListDataStreamsRequest request =
-                    ListDataStreamsRequest.newBuilder().setParent(propertyName).build();
+                    ListDataStreamsRequest.newBuilder().setParent(propertyResourceName).build();
 
             for (DataStream dataStream :
                     analyticsAdminServiceClient.listDataStreams(request).iterateAll()) {
                 GADataStreamDTO gaDataStream =
                         GADataStreamDTO.builder()
                                 .id(parseId(dataStream.getName()))
-                                .name(dataStream.getName())
+                                .resourceName(dataStream.getName())
                                 .displayName(dataStream.getDisplayName())
-                                .property(propertyName)
+                                .property(propertyResourceName)
                                 .streamMeasurementId(
                                         dataStream.getWebStreamData().getMeasurementId())
                                 .streamDefaultUrl(dataStream.getWebStreamData().getDefaultUri())
@@ -161,7 +166,10 @@ public class GAAdminService {
                 gaDataStreams.add(gaDataStream);
             }
 
-            log.info("listGADataStreams for {} : {}", propertyName, gson.toJson(gaDataStreams));
+            log.info(
+                    "listGADataStreams for {} : {}",
+                    propertyResourceName,
+                    JsonUtils.toJson(gaDataStreams));
             return gaDataStreams;
         } catch (IOException e) {
             log.error(e.getMessage());
@@ -170,13 +178,13 @@ public class GAAdminService {
     }
 
     public GADataStreamDTO createGAPropertyWithDataStream(
-            String accountName, String displayName, String url) throws DataException {
+            String accountResourceName, String displayName, String url) throws DataException {
         try (AnalyticsAdminServiceClient analyticsAdminServiceClient =
                 AnalyticsAdminServiceClient.create(adminServiceSettings)) {
             // 1. Creates the property.
             Property property =
                     Property.newBuilder()
-                            .setParent(accountName)
+                            .setParent(accountResourceName)
                             .setDisplayName(displayName)
                             .setTimeZone(DEFAULT_TIMEZONE)
                             .build();
@@ -199,7 +207,7 @@ public class GAAdminService {
             GADataStreamDTO gaDataStream =
                     GADataStreamDTO.builder()
                             .id(parseId(createdDataStream.getName()))
-                            .name(createdDataStream.getName())
+                            .resourceName(createdDataStream.getName())
                             .displayName(createdDataStream.getDisplayName())
                             .property(createdProperty.getName())
                             .streamMeasurementId(
@@ -213,10 +221,4 @@ public class GAAdminService {
             throw new DataException(e);
         }
     }
-
-    /** Parses GA ID from the resource name. */
-    private static String parseId(String name) {
-        List<String> parts = Splitter.on('/').splitToList(name);
-        return parts.size() == 2 ? parts.get(1) : null;
-    }
 }

src/main/java/com/wechi/adweb/bridge/google/analytics/service/GADataService.java

@@ -5,12 +5,12 @@ import static com.wechi.adweb.bridge.google.analytics.dto.report.GAReportRequest
 import com.google.analytics.data.v1beta.*;
 import com.google.api.gax.core.FixedCredentialsProvider;
 import com.google.auth.oauth2.GoogleCredentials;
-import com.google.gson.Gson;
 import com.wechi.adweb.bridge.exception.DataException;
 import com.wechi.adweb.bridge.google.analytics.dto.report.GAReportRequestDTO;
 import com.wechi.adweb.bridge.google.analytics.dto.report.ReportType;
 import com.wechi.adweb.bridge.google.analytics.dto.report.data.*;
 
+import com.wechi.adweb.bridge.util.JsonUtils;
 import lombok.extern.slf4j.Slf4j;
 
 import org.apache.commons.lang3.BooleanUtils;
@@ -40,8 +40,6 @@ public class GADataService {
 
     private BetaAnalyticsDataSettings dataSettings;
 
-    private final Gson gson = new Gson();
-
     @PostConstruct
     private void init() throws IOException {
         GoogleCredentials credentials =
@@ -106,7 +104,7 @@ public class GADataService {
 
             RunReportRequest.Builder request =
                     RunReportRequest.newBuilder()
-                            .setProperty(reportRequest.getPropertyName())
+                            .setProperty(reportRequest.getPropertyResourceName())
                             .addAllDimensions(dimensions)
                             .addAllMetrics(metrics)
                             .addDateRanges(dateRange)
@@ -122,7 +120,10 @@ public class GADataService {
             // Converts and returns.
             List<? extends GAReportDataDTO> report =
                     toReport(response.getRowsList(), reportRequest);
-            log.info("Report type = {} - {}", reportRequest.getReportType(), gson.toJson(report));
+            log.info(
+                    "Report type = {} - {}",
+                    reportRequest.getReportType(),
+                    JsonUtils.toJson(report));
             return report;
         } catch (IOException e) {
             log.error(e.getMessage());

src/main/java/com/wechi/adweb/bridge/google/common/ResourceDTO.java

@@ -0,0 +1,31 @@
+package com.wechi.adweb.bridge.google.common;
+
+import com.google.common.base.Splitter;
+
+import lombok.Data;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author wfansh
+ */
+@Data
+@SuperBuilder
+public abstract class ResourceDTO implements Serializable {
+
+    protected static final char RESOURCE_NAME_SPLITTER = '/';
+
+    private String id;
+
+    private String resourceName;
+
+    private String displayName;
+
+    /** Parses ID from the resource name. */
+    public static String parseId(String resourceName) {
+        List<String> parts = Splitter.on(RESOURCE_NAME_SPLITTER).splitToList(resourceName);
+        return parts.size() == 2 ? parts.get(1) : null;
+    }
+}

src/main/java/com/wechi/adweb/bridge/google/gtm/dto/GTMAccountDTO.java

@@ -1,20 +1,20 @@
 package com.wechi.adweb.bridge.google.gtm.dto;
 
-import lombok.Builder;
+import com.wechi.adweb.bridge.google.common.ResourceDTO;
+
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.SuperBuilder;
 
 /**
  * @author wfansh
  */
 @Data
-@Builder
-public class GTMAccountDTO {
-
-    private String id;
-
-    private String name;
-
-    private String displayName;
+@SuperBuilder
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+public class GTMAccountDTO extends ResourceDTO {
 
     private boolean supportUserPermissions;
 

src/main/java/com/wechi/adweb/bridge/google/gtm/service/GTMService.java

@@ -8,9 +8,9 @@ import com.google.api.services.tagmanager.TagManagerScopes;
 import com.google.api.services.tagmanager.model.Account;
 import com.google.auth.http.HttpCredentialsAdapter;
 import com.google.auth.oauth2.GoogleCredentials;
-import com.google.gson.Gson;
 import com.wechi.adweb.bridge.exception.DataException;
 import com.wechi.adweb.bridge.google.gtm.dto.GTMAccountDTO;
+import com.wechi.adweb.bridge.util.JsonUtils;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -35,8 +35,6 @@ public class GTMService {
 
     private TagManager tagManager;
 
-    private final Gson gson = new Gson();
-
     @PostConstruct
     private void init() throws GeneralSecurityException, IOException {
         // Service account authorization;
@@ -62,7 +60,7 @@ public class GTMService {
                 GTMAccountDTO gtmAccount =
                         GTMAccountDTO.builder()
                                 .id(account.getAccountId())
-                                .name(account.getPath())
+                                .resourceName(account.getPath())
                                 .displayName(account.getName())
                                 .supportUserPermissions(
                                         account.getFeatures().getSupportUserPermissions())
@@ -74,7 +72,7 @@ public class GTMService {
                 gtmAccounts.add(gtmAccount);
             }
 
-            log.info("listGTMAccounts : {}", gson.toJson(gtmAccounts));
+            log.info("listGTMAccounts : {}", JsonUtils.toJson(gtmAccounts));
             return gtmAccounts;
         } catch (IOException e) {
             log.error(e.getMessage());

src/main/java/com/wechi/adweb/bridge/util/JsonUtils.java

@@ -0,0 +1,33 @@
+package com.wechi.adweb.bridge.util;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @author wfansh
+ */
+@Slf4j
+public class JsonUtils {
+
+    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+
+    public static String toJson(Object object) {
+        try {
+            return OBJECT_MAPPER.writeValueAsString(object);
+        } catch (JsonProcessingException e) {
+            log.error(e.getMessage(), e);
+            return null;
+        }
+    }
+
+    public <T> T fromJson(String json, Class<T> clazz) {
+        try {
+            return OBJECT_MAPPER.readValue(json, clazz);
+        } catch (JsonProcessingException e) {
+            log.error(e.getMessage(), e);
+            return null;
+        }
+    }
+}

src/test/java/com/wechi/adweb/bridge/google/analytics/GAServiceTests.java

@@ -2,12 +2,12 @@ package com.wechi.adweb.bridge.google.analytics;
 
 import static com.wechi.adweb.bridge.google.analytics.dto.report.ReportConstant.*;
 
-import com.google.gson.Gson;
 import com.wechi.adweb.bridge.exception.DataException;
 import com.wechi.adweb.bridge.google.analytics.dto.report.GAReportRequestDTO;
 import com.wechi.adweb.bridge.google.analytics.dto.report.ReportType;
 import com.wechi.adweb.bridge.google.analytics.service.GAAdminService;
 import com.wechi.adweb.bridge.google.analytics.service.GADataService;
+import com.wechi.adweb.bridge.util.JsonUtils;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,49 +21,48 @@ public class GAServiceTests {
     @Autowired private GAAdminService gaAdminService;
     @Autowired private GADataService gaDataService;
 
-    private final String propertyName = "properties/457183952";
+    private final String propertyResourceName = "properties/457183952";
     private final String startDate = "2023-10-01";
     private final String endDate = "2024-10-01";
-    private final Gson gson = new Gson();
 
     @Test
     void runReport() throws DataException {
 
         // 1. Country chart.
         GAReportRequestDTO reportRequest = new GAReportRequestDTO();
-        reportRequest.setPropertyName(propertyName);
+        reportRequest.setPropertyResourceName(propertyResourceName);
         reportRequest.setReportType(ReportType.ADWEB_COUNTRY_CHART);
         reportRequest.setStartDate(startDate);
         reportRequest.setEndDate(endDate);
-        System.out.println(gson.toJson(gaDataService.runReport(reportRequest)));
+        System.out.println(JsonUtils.toJson(gaDataService.runReport(reportRequest)));
 
         // 2. Session source medium view.
         reportRequest = new GAReportRequestDTO();
-        reportRequest.setPropertyName(propertyName);
+        reportRequest.setPropertyResourceName(propertyResourceName);
         reportRequest.setReportType(ReportType.ADWEB_SESSION_SOURCE_MEDIUM_VIEW);
         reportRequest.setStartDate(startDate);
         reportRequest.setEndDate(endDate);
-        System.out.println(gson.toJson(gaDataService.runReport(reportRequest)));
+        System.out.println(JsonUtils.toJson(gaDataService.runReport(reportRequest)));
 
         // 3. Page path view.
         reportRequest = new GAReportRequestDTO();
-        reportRequest.setPropertyName(propertyName);
+        reportRequest.setPropertyResourceName(propertyResourceName);
         reportRequest.setReportType(ReportType.ADWEB_PAGE_PATH_VIEW);
         reportRequest.setStartDate(startDate);
         reportRequest.setEndDate(endDate);
-        System.out.println(gson.toJson(gaDataService.runReport(reportRequest)));
+        System.out.println(JsonUtils.toJson(gaDataService.runReport(reportRequest)));
 
         // 4. Date view.
         reportRequest = new GAReportRequestDTO();
-        reportRequest.setPropertyName(propertyName);
+        reportRequest.setPropertyResourceName(propertyResourceName);
         reportRequest.setReportType(ReportType.ADWEB_DATE_VIEW);
         reportRequest.setStartDate(startDate);
         reportRequest.setEndDate(endDate);
-        System.out.println(gson.toJson(gaDataService.runReport(reportRequest)));
+        System.out.println(JsonUtils.toJson(gaDataService.runReport(reportRequest)));
 
         // 5. Custom report.
         reportRequest = new GAReportRequestDTO();
-        reportRequest.setPropertyName(propertyName);
+        reportRequest.setPropertyResourceName(propertyResourceName);
         reportRequest.setReportType(ReportType.ADWEB_CUSTOM_REPORT);
         reportRequest.setStartDate(startDate);
         reportRequest.setEndDate(endDate);
@@ -78,6 +77,6 @@ public class GAServiceTests {
         reportRequest.setOrderByType(GAReportRequestDTO.OrderByType.METRICS);
         reportRequest.setDimensions(List.of(DIMENSION_DATE));
         reportRequest.setOrderByDesc(true);
-        System.out.println(gson.toJson(gaDataService.runReport(reportRequest)));
+        System.out.println(JsonUtils.toJson(gaDataService.runReport(reportRequest)));
     }
 }