From 6f7918092037be9fcacf391092e958755079bf42 Mon Sep 17 00:00:00 2001
From: Rushdi <rushdi@entgra.io>
Date: Thu, 9 Jun 2022 17:40:09 +0530
Subject: [PATCH] removed unwanted codes

---
 .../api/service/addons/TraccarClientImpl.java     | 15 ++++-----------
 .../src/main/resources/conf/traccar-config.xml    |  2 +-
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/traccar/api/service/addons/TraccarClientImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/traccar/api/service/addons/TraccarClientImpl.java
index 74fedd5dc7..a4602bc3b0 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/traccar/api/service/addons/TraccarClientImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/traccar/api/service/addons/TraccarClientImpl.java
@@ -421,14 +421,13 @@ public class TraccarClientImpl implements TraccarClient {
                     authorizedKey(HttpReportingUtil.trackerUser(), HttpReportingUtil.trackerPassword()),
                     serverUrl(HttpReportingUtil.trackerServer())));
             String result = res.get();
-            log.info("---------res--------" + result);
+            log.info("---------result--------");
             if(result.charAt(0)=='{'){
                 JSONObject obj = new JSONObject(result);
                 if (obj.has("id")){
                     int traccarDeviceId = obj.getInt("id");
                     int deviceId = traccarDevice.getId();
                     log.info("TraccarDeviceId - " + traccarDeviceId);
-                    log.info("DeviceId - " + deviceId);
                     try {
                         TrackerManagementDAOFactory.beginTransaction();
                         trackerDAO.addTrackerDevice(traccarDeviceId, deviceId, tenantId);
@@ -486,6 +485,7 @@ public class TraccarClientImpl implements TraccarClient {
             addDevice(device, tenantId);
         }else{
             //Update Location
+            log.info("Updating Location");
             String method = TraccarHandlerConstants.Methods.GET;
             String url = locationUpdatePort+"/?id="+deviceInfo.getDeviceIdentifier()+
                     "&timestamp="+deviceInfo.getTimestamp()+"&lat="+deviceInfo.getLat()+
@@ -494,7 +494,7 @@ public class TraccarClientImpl implements TraccarClient {
 
             executor.submit(new OkHttpClientThreadPool(url, null, method,
                     authorizedKey(HttpReportingUtil.trackerUser(), HttpReportingUtil.trackerPassword()),
-                    serverUrl(HttpReportingUtil.trackerServer())));
+                    "http://localhost:"));
             //executor.shutdown();
         }
     }
@@ -515,9 +515,6 @@ public class TraccarClientImpl implements TraccarClient {
 
             log.info("------deviceId-----" + deviceId);
             log.info(trackerDeviceInfo);
-            log.info(new Gson().toJson(trackerDeviceInfo));
-            log.info(trackerDeviceInfo.getDeviceId());
-            log.info(trackerDeviceInfo.getTraccarDeviceId());
             if(trackerDeviceInfo!=null){
                 //trackerDevice = new JSONObject(trackerDeviceInfo);
                 int status = trackerDAO.removeTrackerDevice(deviceId, tenantId);
@@ -540,11 +537,7 @@ public class TraccarClientImpl implements TraccarClient {
             TrackerManagementDAOFactory.closeConnection();
         }
 
-        log.info("__________________");
-        log.info(new Gson().toJson(trackerPermissionInfo));
-        log.info(trackerPermissionInfo.get(0));
-        log.info(new Gson().toJson(trackerPermissionInfo.get(0)));
-        log.info("__________________");
+        log.info("--------Disenrolling Device--------");
         //Delete from traccar
         if(trackerDeviceInfo!=null){
             String method = TraccarHandlerConstants.Methods.DELETE;
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/traccar-config.xml b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/traccar-config.xml
index 67de666e5e..3521695b04 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/traccar-config.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/traccar-config.xml
@@ -27,7 +27,7 @@
             <Properties>
                 <Property name="sample-property">sample</Property>
                 <Property name="api-endpoint">http://localhost:</Property>
-                <Property name="default-port">8085</Property>
+                <Property name="default-port"></Property>
                 <Property name="location-update-port">5055</Property>
                 <Property name="authorization">Authorization</Property>
                 <Property name="authorization-key">Basic YWRtaW46YWRtaW4=</Property>