refac:rename list<String> urlStrategy to urlStrategyDomains

MahdiZTD · MahdiZTD · commit fa72ebd8bcb8 · 2024-05-30T17:09:02.000+02:00
diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/ActivityHandler.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/ActivityHandler.java
@@ -951,7 +951,7 @@ public void run() {
 
         IActivityPackageSender packageHandlerActivitySender =
                 new ActivityPackageSender(
-                        adjustConfig.urlStrategy,
+                        adjustConfig.urlStrategyDomains,
                         adjustConfig.useSubdomains,
                         adjustConfig.basePath,
                         adjustConfig.gdprPath,
@@ -967,7 +967,7 @@ public void run() {
 
         IActivityPackageSender attributionHandlerActivitySender =
                 new ActivityPackageSender(
-                        adjustConfig.urlStrategy,
+                        adjustConfig.urlStrategyDomains,
                         adjustConfig.useSubdomains,
                         adjustConfig.basePath,
                         adjustConfig.gdprPath,
@@ -983,7 +983,7 @@ public void run() {
 
         IActivityPackageSender sdkClickHandlerActivitySender =
                 new ActivityPackageSender(
-                        adjustConfig.urlStrategy,
+                        adjustConfig.urlStrategyDomains,
                         adjustConfig.useSubdomains,
                         adjustConfig.basePath,
                         adjustConfig.gdprPath,
@@ -999,7 +999,7 @@ public void run() {
 
         IActivityPackageSender purchaseVerificationHandlerActivitySender =
                 new ActivityPackageSender(
-                        adjustConfig.urlStrategy,
+                        adjustConfig.urlStrategyDomains,
                         adjustConfig.useSubdomains,
                         adjustConfig.basePath,
                         adjustConfig.gdprPath,
diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/AdjustConfig.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/AdjustConfig.java
@@ -35,7 +35,7 @@ public class AdjustConfig {
     String externalDeviceId;
     boolean preinstallTrackingEnabled;
     Boolean needsCost;
-    List<String> urlStrategy;
+    List<String> urlStrategyDomains;
     boolean useSubdomains;
     boolean isDataResidency;
     String preinstallFilePath;
@@ -164,7 +164,7 @@ public void setUrlStrategy(List<String> domains, boolean useSubdomains, boolean
             logger.error("Invalid url strategy");
             return;
         }
-        this.urlStrategy = domains;
+        this.urlStrategyDomains = domains;
         this.useSubdomains = useSubdomains;
         this.isDataResidency = isDataResidency;
     }
@@ -285,8 +285,8 @@ public Boolean getNeedsCost() {
         return needsCost;
     }
 
-    public List<String> getUrlStrategy() {
-        return urlStrategy;
+    public List<String> getUrlStrategyDomains() {
+        return urlStrategyDomains;
     }
 
     public String getPreinstallFilePath() {
diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/network/ActivityPackageSender.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/network/ActivityPackageSender.java
@@ -55,7 +55,7 @@ public class ActivityPackageSender implements IActivityPackageSender {
     private IConnectionOptions connectionOptions;
     private Context context;
 
-    public ActivityPackageSender(final List<String> adjustUrlStrategy,
+    public ActivityPackageSender(final List<String> urlStrategyDomains,
                                  final boolean useSubdomains,
                                  final String basePath,
                                  final String gdprPath,
@@ -78,7 +78,7 @@ public ActivityPackageSender(final List<String> adjustUrlStrategy,
                 AdjustFactory.getGdprUrl(),
                 AdjustFactory.getSubscriptionUrl(),
                 AdjustFactory.getPurchaseVerificationUrl(),
-                adjustUrlStrategy,
+                urlStrategyDomains,
                 useSubdomains);
         httpsURLConnectionProvider = AdjustFactory.getHttpsURLConnectionProvider();
         connectionOptions = AdjustFactory.getConnectionOptions();
diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/network/UrlStrategy.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/network/UrlStrategy.java
@@ -22,7 +22,7 @@ public class UrlStrategy {
     private static final String SUBSCRIPTION_URL_WORLD = "https://subscription.adjust.world";
     private static final String PURCHASE_VERIFICATION_URL_WORLD = "https://ssrv.adjust.world";
 
-    private final List<String> adjustUrlStrategy;
+    private final List<String> urlStrategyDomains;
     private final boolean useSubdomains;
 
     private final String baseUrlOverwrite;
@@ -43,10 +43,10 @@ public UrlStrategy(final String baseUrlOverwrite,
                        final String gdprUrlOverwrite,
                        final String subscriptionUrlOverwrite,
                        final String purchaseVerificationUrlOverwrite,
-                       final List<String> adjustUrlStrategy,
+                       final List<String> urlStrategyDomains,
                        final boolean useSubdomains)
     {
-        this.adjustUrlStrategy = adjustUrlStrategy;
+        this.urlStrategyDomains = urlStrategyDomains;
         this.useSubdomains = useSubdomains;
 
         this.baseUrlOverwrite = baseUrlOverwrite;
@@ -139,66 +139,66 @@ public String targetUrlByActivityKind(final ActivityKind activityKind) {
 
     private List<String> baseUrlChoices() {
 
-        if (adjustUrlStrategy == null || adjustUrlStrategy.isEmpty()) {
+        if (urlStrategyDomains == null || urlStrategyDomains.isEmpty()) {
             return Arrays.asList(BASE_URL,  BASE_URL_WORLD);
         }
         if (useSubdomains) {
             List<String> baseUrls = new ArrayList<>();
-            for (String url : adjustUrlStrategy) {
+            for (String url : urlStrategyDomains) {
                 baseUrls.add(String.format(BASE_URL_FORMAT, url));
             }
             return baseUrls;
         }else {
             List<String> baseUrls = new ArrayList<>();
-            for (String url : adjustUrlStrategy) {
+            for (String url : urlStrategyDomains) {
                 baseUrls.add(String.format(BASE_URL_NO_SUB_DOMAIN_FORMAT, url));
             }
             return baseUrls;
         }
     }
     private List<String> gdprUrlChoices() {
-        if (adjustUrlStrategy == null || adjustUrlStrategy.isEmpty()) {
+        if (urlStrategyDomains == null || urlStrategyDomains.isEmpty()) {
             return Arrays.asList(GDPR_URL,  GDPR_URL_WORLD);
         }
         List<String> baseUrls = new ArrayList<>();
         if (useSubdomains) {
-            for (String url : adjustUrlStrategy) {
+            for (String url : urlStrategyDomains) {
                 baseUrls.add(String.format(GDPR_URL_FORMAT, url));
             }
         }else {
-            for (String url : adjustUrlStrategy) {
+            for (String url : urlStrategyDomains) {
                 baseUrls.add(String.format(BASE_URL_NO_SUB_DOMAIN_FORMAT, url));
             }
         }
         return baseUrls;
     }
     private List<String> subscriptionUrlChoices() {
-        if (adjustUrlStrategy == null || adjustUrlStrategy.isEmpty()) {
+        if (urlStrategyDomains == null || urlStrategyDomains.isEmpty()) {
             return Arrays.asList(SUBSCRIPTION_URL,  SUBSCRIPTION_URL_WORLD);
         }
         List<String> baseUrls = new ArrayList<>();
         if (useSubdomains) {
-            for (String url : adjustUrlStrategy) {
+            for (String url : urlStrategyDomains) {
                 baseUrls.add(String.format(SUBSCRIPTION_URL_FORMAT, url));
             }
         }else {
-            for (String url : adjustUrlStrategy) {
+            for (String url : urlStrategyDomains) {
                 baseUrls.add(String.format(BASE_URL_NO_SUB_DOMAIN_FORMAT, url));
             }
         }
         return baseUrls;
     }
     private List<String> purchaseVerificationUrlChoices() {
-        if (adjustUrlStrategy == null || adjustUrlStrategy.isEmpty()) {
+        if (urlStrategyDomains == null || urlStrategyDomains.isEmpty()) {
             return Arrays.asList(PURCHASE_VERIFICATION_URL, PURCHASE_VERIFICATION_URL_WORLD);
         }
         List<String> baseUrls = new ArrayList<>();
         if (useSubdomains){
-            for (String url : adjustUrlStrategy) {
+            for (String url : urlStrategyDomains) {
                 baseUrls.add(String.format(PURCHASE_VERIFICATION_URL_FORMAT, url));
             }
         }else {
-            for (String url : adjustUrlStrategy) {
+            for (String url : urlStrategyDomains) {
                 baseUrls.add(String.format(BASE_URL_NO_SUB_DOMAIN_FORMAT, url));
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public class UrlStrategy {`
`22`	`22`	`private static final String SUBSCRIPTION_URL_WORLD = "https://subscription.adjust.world";`
`23`	`23`	`private static final String PURCHASE_VERIFICATION_URL_WORLD = "https://ssrv.adjust.world";`
`24`	`24`
`25`		`- private final List<String> adjustUrlStrategy;`
	`25`	`+ private final List<String> urlStrategyDomains;`
`26`	`26`	`private final boolean useSubdomains;`
`27`	`27`
`28`	`28`	`private final String baseUrlOverwrite;`
`@@ -43,10 +43,10 @@ public UrlStrategy(final String baseUrlOverwrite,`
`43`	`43`	`final String gdprUrlOverwrite,`
`44`	`44`	`final String subscriptionUrlOverwrite,`
`45`	`45`	`final String purchaseVerificationUrlOverwrite,`
`46`		`- final List<String> adjustUrlStrategy,`
	`46`	`+ final List<String> urlStrategyDomains,`
`47`	`47`	`final boolean useSubdomains)`
`48`	`48`	`{`
`49`		`- this.adjustUrlStrategy = adjustUrlStrategy;`
	`49`	`+ this.urlStrategyDomains = urlStrategyDomains;`
`50`	`50`	`this.useSubdomains = useSubdomains;`
`51`	`51`
`52`	`52`	`this.baseUrlOverwrite = baseUrlOverwrite;`
`@@ -139,66 +139,66 @@ public String targetUrlByActivityKind(final ActivityKind activityKind) {`
`139`	`139`
`140`	`140`	`private List<String> baseUrlChoices() {`
`141`	`141`
`142`		`- if (adjustUrlStrategy == null \|\| adjustUrlStrategy.isEmpty()) {`
	`142`	`+ if (urlStrategyDomains == null \|\| urlStrategyDomains.isEmpty()) {`
`143`	`143`	`return Arrays.asList(BASE_URL, BASE_URL_WORLD);`
`144`	`144`	`}`
`145`	`145`	`if (useSubdomains) {`
`146`	`146`	`List<String> baseUrls = new ArrayList<>();`
`147`		`- for (String url : adjustUrlStrategy) {`
	`147`	`+ for (String url : urlStrategyDomains) {`
`148`	`148`	`baseUrls.add(String.format(BASE_URL_FORMAT, url));`
`149`	`149`	`}`
`150`	`150`	`return baseUrls;`
`151`	`151`	`}else {`
`152`	`152`	`List<String> baseUrls = new ArrayList<>();`
`153`		`- for (String url : adjustUrlStrategy) {`
	`153`	`+ for (String url : urlStrategyDomains) {`
`154`	`154`	`baseUrls.add(String.format(BASE_URL_NO_SUB_DOMAIN_FORMAT, url));`
`155`	`155`	`}`
`156`	`156`	`return baseUrls;`
`157`	`157`	`}`
`158`	`158`	`}`
`159`	`159`	`private List<String> gdprUrlChoices() {`
`160`		`- if (adjustUrlStrategy == null \|\| adjustUrlStrategy.isEmpty()) {`
	`160`	`+ if (urlStrategyDomains == null \|\| urlStrategyDomains.isEmpty()) {`
`161`	`161`	`return Arrays.asList(GDPR_URL, GDPR_URL_WORLD);`
`162`	`162`	`}`
`163`	`163`	`List<String> baseUrls = new ArrayList<>();`
`164`	`164`	`if (useSubdomains) {`
`165`		`- for (String url : adjustUrlStrategy) {`
	`165`	`+ for (String url : urlStrategyDomains) {`
`166`	`166`	`baseUrls.add(String.format(GDPR_URL_FORMAT, url));`
`167`	`167`	`}`
`168`	`168`	`}else {`
`169`		`- for (String url : adjustUrlStrategy) {`
	`169`	`+ for (String url : urlStrategyDomains) {`
`170`	`170`	`baseUrls.add(String.format(BASE_URL_NO_SUB_DOMAIN_FORMAT, url));`
`171`	`171`	`}`
`172`	`172`	`}`
`173`	`173`	`return baseUrls;`
`174`	`174`	`}`
`175`	`175`	`private List<String> subscriptionUrlChoices() {`
`176`		`- if (adjustUrlStrategy == null \|\| adjustUrlStrategy.isEmpty()) {`
	`176`	`+ if (urlStrategyDomains == null \|\| urlStrategyDomains.isEmpty()) {`
`177`	`177`	`return Arrays.asList(SUBSCRIPTION_URL, SUBSCRIPTION_URL_WORLD);`
`178`	`178`	`}`
`179`	`179`	`List<String> baseUrls = new ArrayList<>();`
`180`	`180`	`if (useSubdomains) {`
`181`		`- for (String url : adjustUrlStrategy) {`
	`181`	`+ for (String url : urlStrategyDomains) {`
`182`	`182`	`baseUrls.add(String.format(SUBSCRIPTION_URL_FORMAT, url));`
`183`	`183`	`}`
`184`	`184`	`}else {`
`185`		`- for (String url : adjustUrlStrategy) {`
	`185`	`+ for (String url : urlStrategyDomains) {`
`186`	`186`	`baseUrls.add(String.format(BASE_URL_NO_SUB_DOMAIN_FORMAT, url));`
`187`	`187`	`}`
`188`	`188`	`}`
`189`	`189`	`return baseUrls;`
`190`	`190`	`}`
`191`	`191`	`private List<String> purchaseVerificationUrlChoices() {`
`192`		`- if (adjustUrlStrategy == null \|\| adjustUrlStrategy.isEmpty()) {`
	`192`	`+ if (urlStrategyDomains == null \|\| urlStrategyDomains.isEmpty()) {`
`193`	`193`	`return Arrays.asList(PURCHASE_VERIFICATION_URL, PURCHASE_VERIFICATION_URL_WORLD);`
`194`	`194`	`}`
`195`	`195`	`List<String> baseUrls = new ArrayList<>();`
`196`	`196`	`if (useSubdomains){`
`197`		`- for (String url : adjustUrlStrategy) {`
	`197`	`+ for (String url : urlStrategyDomains) {`
`198`	`198`	`baseUrls.add(String.format(PURCHASE_VERIFICATION_URL_FORMAT, url));`
`199`	`199`	`}`
`200`	`200`	`}else {`
`201`		`- for (String url : adjustUrlStrategy) {`
	`201`	`+ for (String url : urlStrategyDomains) {`
`202`	`202`	`baseUrls.add(String.format(BASE_URL_NO_SUB_DOMAIN_FORMAT, url));`
`203`	`203`	`}`
`204`	`204`	`}`