Browse Source

Merge branch 'data-bridge' of wangfan/adweb3-server into master

wangfan 6 months ago
parent
commit
0cb880e3bd

+ 2 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/databridge/dto/google/ResourceDTO.java

@@ -4,6 +4,7 @@ import com.google.common.base.Splitter;
 import com.google.common.collect.Iterables;
 
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
 import java.io.Serializable;
@@ -14,6 +15,7 @@ import java.util.List;
  */
 @Data
 @SuperBuilder
+@NoArgsConstructor
 public abstract class ResourceDTO implements Serializable {
 
     protected static final char RESOURCE_NAME_SPLITTER = '/';

+ 2 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/databridge/dto/google/analytics/GAAccountDTO.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.adweb.databridge.dto.google.analytics;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import lombok.ToString;
 import lombok.experimental.SuperBuilder;
 
@@ -13,6 +14,7 @@ import org.jeecg.modules.adweb.databridge.dto.google.ResourceDTO;
  */
 @Data
 @SuperBuilder
+@NoArgsConstructor
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 public class GAAccountDTO extends ResourceDTO {

+ 2 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/databridge/dto/google/analytics/GADataStreamDTO.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.adweb.databridge.dto.google.analytics;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import lombok.ToString;
 import lombok.experimental.SuperBuilder;
 
@@ -12,6 +13,7 @@ import org.jeecg.modules.adweb.databridge.dto.google.ResourceDTO;
  */
 @Data
 @SuperBuilder
+@NoArgsConstructor
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 public class GADataStreamDTO extends ResourceDTO {

+ 2 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/databridge/dto/google/analytics/GAPropertyDTO.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.adweb.databridge.dto.google.analytics;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import lombok.ToString;
 import lombok.experimental.SuperBuilder;
 
@@ -15,6 +16,7 @@ import java.util.List;
  */
 @Data
 @SuperBuilder
+@NoArgsConstructor
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 public class GAPropertyDTO extends ResourceDTO {

+ 2 - 3
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/databridge/dto/google/gtm/GTMAccountDTO.java

@@ -1,8 +1,6 @@
 package org.jeecg.modules.adweb.databridge.dto.google.gtm;
 
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
+import lombok.*;
 import lombok.experimental.SuperBuilder;
 
 import org.apache.commons.lang3.StringUtils;
@@ -13,6 +11,7 @@ import org.jeecg.modules.adweb.databridge.dto.google.ResourceDTO;
  */
 @Data
 @SuperBuilder
+@NoArgsConstructor
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 public class GTMAccountDTO extends ResourceDTO {

+ 2 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/databridge/dto/google/gtm/GTMContainerDTO.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.adweb.databridge.dto.google.gtm;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import lombok.ToString;
 import lombok.experimental.SuperBuilder;
 
@@ -15,6 +16,7 @@ import java.util.List;
  */
 @Data
 @SuperBuilder
+@NoArgsConstructor
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 public class GTMContainerDTO extends ResourceDTO {

+ 2 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/databridge/dto/google/gtm/GTMTriggerDTO.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.adweb.databridge.dto.google.gtm;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import lombok.ToString;
 import lombok.experimental.SuperBuilder;
 
@@ -12,6 +13,7 @@ import org.jeecg.modules.adweb.databridge.dto.google.ResourceDTO;
  */
 @Data
 @SuperBuilder
+@NoArgsConstructor
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 public class GTMTriggerDTO extends ResourceDTO {

+ 2 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/databridge/dto/google/gtm/GTMVersionDTO.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.adweb.databridge.dto.google.gtm;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import lombok.ToString;
 import lombok.experimental.SuperBuilder;
 
@@ -12,6 +13,7 @@ import org.jeecg.modules.adweb.databridge.dto.google.ResourceDTO;
  */
 @Data
 @SuperBuilder
+@NoArgsConstructor
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 public class GTMVersionDTO extends ResourceDTO {

+ 2 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/databridge/dto/google/gtm/GTMWorkspaceDTO.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.adweb.databridge.dto.google.gtm;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import lombok.ToString;
 import lombok.experimental.SuperBuilder;
 
@@ -12,6 +13,7 @@ import org.jeecg.modules.adweb.databridge.dto.google.ResourceDTO;
  */
 @Data
 @SuperBuilder
+@NoArgsConstructor
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 public class GTMWorkspaceDTO extends ResourceDTO {