-revert previous changes

Author: MohitAndroid

androidblebeaconwrapperlib/src/main/java/com/androidblebeaconwrapperlib/beacon/BeaconHelper.java

@@ -33,20 +33,9 @@ public class BeaconHelper<T> {
     private boolean isOnlyBeaconStuff;
     private List<IBeacon> iBeacons;
 
-    private BeaconHelper(Activity context) {
+    public BeaconHelper(Activity context) {
         this.context = context;
-    }
-
-    public static BeaconHelper getInstance(Activity context) {
-        return new BeaconHelper(context);
-    }
-
-    public void startBeaconUpdates(List<T> data, long timeInterval, BeaconResultListener beaconResultListener) {
-        this.isOnlyBeaconStuff = false;
-        this.beaconResultListener = beaconResultListener;
-        this.data = data;
-
-        beaconKeySerializer =  BeaconKeySerializer.getInstance();
+        beaconKeySerializer = new BeaconKeySerializer();
         beaconResultEntities = new ArrayList<>();
         bluetoothManager =
                 (BluetoothManager) context.getSystemService(Context.BLUETOOTH_SERVICE);
@@ -55,8 +44,15 @@ public void startBeaconUpdates(List<T> data, long timeInterval, BeaconResultList
         oldKeys = new ArrayList<>();
         newKeys = new ArrayList<>();
         mHandler = new Handler();
+        iBeacons = new ArrayList<>();
         timer = new Timer();
+        isOnlyBeaconStuff = false;
+    }
 
+    public void startBeaconUpdates(List<T> data, long timeInterval, BeaconResultListener beaconResultListener) {
+        this.isOnlyBeaconStuff = false;
+        this.beaconResultListener = beaconResultListener;
+        this.data = data;
         try {
             String validationErrorMsg = checkValidation();
             if (!TextUtils.isEmpty(validationErrorMsg)) {
@@ -92,14 +88,6 @@ public void run() {
     public void startBeaconUpdates(long timeInterval, BeaconListener beaconListener) {
         this.isOnlyBeaconStuff = true;
         this.beaconListener = beaconListener;
-
-        bluetoothManager =
-                (BluetoothManager) context.getSystemService(Context.BLUETOOTH_SERVICE);
-        mBluetoothAdapter = bluetoothManager.getAdapter();
-        mHandler = new Handler();
-        iBeacons = new ArrayList<>();
-        timer = new Timer();
-
         try {
             String validationErrorMsg = checkValidation();
             if (!TextUtils.isEmpty(validationErrorMsg)) {
@@ -190,7 +178,7 @@ public void run() {
             };
 
     private void getOnlyBeaconData(IBeacon iBeacon) {
-        try {
+        try{
             boolean isAdd = true;
             for (int i = 0; i < iBeacons.size(); i++) {
                 if (iBeacons.get(i).getBluetoothAddress().equals(iBeacon.getBluetoothAddress())) {
@@ -207,7 +195,7 @@ private void getOnlyBeaconData(IBeacon iBeacon) {
             if (isAdd) {
                 iBeacons.add(iBeacon);
             }
-        } catch (Exception e) {
+        }catch (Exception e){
             displayBeaconError(e.getMessage());
         }
 
@@ -261,7 +249,6 @@ private void getBeaconFilteredData(IBeacon iBeacon) {
     private void displayError(String msg) {
         this.beaconResultListener.onError(msg);
     }
-
     private void displayBeaconError(String msg) {
         this.beaconListener.onError(msg);
     }

androidblebeaconwrapperlib/src/main/java/com/androidblebeaconwrapperlib/beacon/BeaconKeySerializer.java

@@ -9,14 +9,10 @@
 public class BeaconKeySerializer {
     List<FieldTypeEntity> fieldTypeEntities;
 
-    private BeaconKeySerializer() {
+    public BeaconKeySerializer() {
         fieldTypeEntities = new ArrayList<>();
     }
 
-    public static BeaconKeySerializer getInstance(){
-        return new BeaconKeySerializer();
-    }
-
     public List<FieldTypeEntity> getBeaconAnnotationDetails(Object object) throws BeaconKeySerializeException {
         try {
             if (object == null) {

androidblebeaconwrapperlib/src/main/java/com/androidblebeaconwrapperlib/beaconwrapper/BLEBeaconWrapper.java

@@ -32,12 +32,11 @@ public class BLEBeaconWrapper<T> {
 
     public BLEBeaconWrapper(Activity context) {
         this.context = context;
-        networkManager = NetworkManager.getInstance();
-        parserListClass = ParserListClass.getInstance();
-        beaconHelper = BeaconHelper.getInstance(this.context);
+        networkManager = new NetworkManager();
+        parserListClass = new ParserListClass();
+        beaconHelper = new BeaconHelper(this.context);
     }
 
-
     public void getBeaconData(String url, Class<T> t, Map<String, String> headerData,
                               long timeInterval, BleBeaconListener<T> tBleBeaconListener) {
 
@@ -119,7 +118,7 @@ public void onError(String errorMsg) {
     }
 
     private void BeaconOnlyWrapper() {
-        beaconHelper.startBeaconUpdates(timeInterval, new BeaconListener() {
+        beaconHelper.startBeaconUpdates( timeInterval, new BeaconListener() {
             @Override
             public void onResult(List<IBeacon> beaconResultEntities) {
                 tBeaconListener.onResult(beaconResultEntities);

androidblebeaconwrapperlib/src/main/java/com/androidblebeaconwrapperlib/network/NetworkManager.java

@@ -20,11 +20,7 @@
 public class NetworkManager {
 
 
-    private NetworkManager() {
-    }
-
-    public static NetworkManager getInstance(){
-        return new NetworkManager();
+    public NetworkManager() {
     }
 
     public void getRequest(String baseUrl, Map<String, String> headerData,

androidblebeaconwrapperlib/src/main/java/com/androidblebeaconwrapperlib/parse/ParserListClass.java

@@ -26,18 +26,19 @@ public class ParserListClass<T> {
     private static final String JSON_OBJECT = "jsonObject";
     private static final String JSON_ARRAY = "jsonArray";
     private int count = 0;
+    private List<T> parableObjects;
     private String jsonString;
     private FilterListener<T> filterListener;
 
-    private ParserListClass() {
+    public ParserListClass() {
+        rootFields = new ArrayList<>();
+        count = 0;
+        gson = new Gson();
+        parableObjects = new ArrayList<>();
     }
 
-    public static ParserListClass getInstance(){
-        return new ParserListClass();
-    }
 
     private void setFields() throws ParseFilterException {
-        rootFields = new ArrayList<>();
         try {
             for (Field field : t.getDeclaredFields()) {
                 field.setAccessible(true);
@@ -79,9 +80,6 @@ public void parseData(Class<T> t, String jsonString, FilterListener<T> filterLis
             this.filterListener = filterListener;
             this.jsonString = jsonString;
 
-            count = 0;
-            gson = new Gson();
-
             if (!TextUtils.isEmpty(this.jsonString) && this.t != null &&
                     this.filterListener != null) {
                 setFields();