From 1a6a2ea381d3461cf14357d8fd166c8a252c119e Mon Sep 17 00:00:00 2001
From: Arif Burak Demiray <burakdemiray09@hotmail.com>
Date: Tue, 21 Nov 2023 09:44:13 +0300
Subject: [PATCH] refactor: deprecate also the usage func location

---
 CHANGELOG.md                                                  | 1 +
 sdk-java/src/main/java/ly/count/sdk/java/Usage.java           | 1 +
 .../src/main/java/ly/count/sdk/java/internal/SessionImpl.java | 4 +++-
 .../java/ly/count/sdk/java/internal/SessionImplTests.java     | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 753a09211..dbf7b6a42 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 * Fixed a bug where setting organization of the user would not work.
 
 * Deprecated "Countly::backendMode()" call, use "Countly::backendM" instead via "instance()" call.
+* Deprecated "Usage::addLocation(double, double)" call, use "Countly::location::setLocation" instead via "instance()" call.
 * The following methods are deprecated from the "UserEditor" interface:
   * "commit()" instead use "Countly::userProfile::save" via "instance()" call
   * "pushUnique(String, Object)" instead use "Countly::userProfile::pushUnique" via "instance()" call
diff --git a/sdk-java/src/main/java/ly/count/sdk/java/Usage.java b/sdk-java/src/main/java/ly/count/sdk/java/Usage.java
index 125b28952..cbbc61df9 100644
--- a/sdk-java/src/main/java/ly/count/sdk/java/Usage.java
+++ b/sdk-java/src/main/java/ly/count/sdk/java/Usage.java
@@ -87,6 +87,7 @@ public interface Usage {
      * @param latitude geographical latitude of the user
      * @param longitude geographical longitude of the user
      * @return this instance for method chaining.
+     * @deprecated use {@link Countly#location()} via "instance()" call
      */
     Usage addLocation(double latitude, double longitude);
 
diff --git a/sdk-java/src/main/java/ly/count/sdk/java/internal/SessionImpl.java b/sdk-java/src/main/java/ly/count/sdk/java/internal/SessionImpl.java
index 106a09505..d234fab4e 100644
--- a/sdk-java/src/main/java/ly/count/sdk/java/internal/SessionImpl.java
+++ b/sdk-java/src/main/java/ly/count/sdk/java/internal/SessionImpl.java
@@ -10,6 +10,7 @@
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
+import ly.count.sdk.java.Countly;
 import ly.count.sdk.java.Event;
 import ly.count.sdk.java.Session;
 import ly.count.sdk.java.Usage;
@@ -354,7 +355,8 @@ public Session addLocation(double latitude, double longitude) {
             L.i("[SessionImpl] addLocation: Skipping event - feature is not enabled");
             return this;
         }
-        return (Session) addParam("location", latitude + "," + longitude);
+        Countly.instance().location().setLocation(null, null, latitude + "," + longitude, null);
+        return this;
     }
 
     public View view(String name, boolean start) {
diff --git a/sdk-java/src/test/java/ly/count/sdk/java/internal/SessionImplTests.java b/sdk-java/src/test/java/ly/count/sdk/java/internal/SessionImplTests.java
index 4d6857310..a6a274097 100644
--- a/sdk-java/src/test/java/ly/count/sdk/java/internal/SessionImplTests.java
+++ b/sdk-java/src/test/java/ly/count/sdk/java/internal/SessionImplTests.java
@@ -435,7 +435,7 @@ private void addLocation_base(Config config, Object expected) {
         SessionImpl session = (SessionImpl) Countly.session();
         session.addLocation(1.0, 2.0);
 
-        Assert.assertEquals(expected, session.params.get("location"));
+        Assert.assertEquals(expected, TestUtils.getCurrentRQ()[0].get("location"));
     }
 
     /**