refactoring managers

Author: ergashev

probetools/src/main/java/com/ebr163/probetools/Router.java

@@ -9,9 +9,9 @@
 import com.ebr163.probetools.manager.BaseManager;
 import com.ebr163.probetools.manager.DBManager;
 import com.ebr163.probetools.manager.IndexManager;
+import com.ebr163.probetools.manager.ManagerFactory;
 import com.ebr163.probetools.manager.PreferencesManager;
 import com.ebr163.probetools.manager.TransitionManager;
-import com.ebr163.probetools.manager.util.ManagerFactory;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -21,7 +21,7 @@
 
 import fi.iki.elonen.NanoHTTPD;
 
-public class Router {
+public final class Router {
 
     private Map<Class<? extends BaseManager>, BaseManager> managers = new HashMap<>();
     private ManagerFactory managerFactory;

probetools/src/main/java/com/ebr163/probetools/manager/AssetsManager.java

@@ -10,12 +10,12 @@
 
 import static fi.iki.elonen.NanoHTTPD.newChunkedResponse;
 
-public class AssetsManager extends BaseManager {
+public final class AssetsManager extends BaseManager {
 
     private final AssetManager assets;
     private final MimeTypeMap mymeTypesMap;
 
-    public AssetsManager(AssetManager assets) {
+    AssetsManager(AssetManager assets) {
         this.assets = assets;
         mymeTypesMap = MimeTypeMap.getSingleton();
     }
@@ -29,7 +29,7 @@ public NanoHTTPD.Response asset(NanoHTTPD.IHTTPSession session) throws Exception
         }
     }
 
-    public NanoHTTPD.Response assetByPath(String path) throws IOException {
+    NanoHTTPD.Response assetByPath(String path) throws IOException {
         final InputStream is = assets.open(path);
         return newChunkedResponse(NanoHTTPD.Response.Status.OK, getMymeType(path), is);
     }

probetools/src/main/java/com/ebr163/probetools/manager/DBManager.java

@@ -18,15 +18,15 @@
 
 import static fi.iki.elonen.NanoHTTPD.newChunkedResponse;
 
-public class DBManager extends TransitionManager {
+public final class DBManager extends TransitionManager {
 
     private static final String TABLE = "table";
     private static final String TITLE = "title";
     private static final String COLUMN = "column";
     private static final String DATA = "data";
     private String currentDatabase;
 
-    public DBManager(Context context) {
+    DBManager(Context context) {
         this.context = context;
     }
 

probetools/src/main/java/com/ebr163/probetools/manager/HttpInterceptManager.java

@@ -4,7 +4,8 @@
  * Created by mac1 on 02.11.16.
  */
 
-public class HttpInterceptManager extends BaseManager {
-
+final class HttpInterceptManager extends BaseManager {
 
+    HttpInterceptManager() {
+    }
 }

probetools/src/main/java/com/ebr163/probetools/manager/IndexManager.java

@@ -8,7 +8,10 @@
  * Created by mac1 on 02.11.16.
  */
 
-public class IndexManager extends TransitionManager {
+public final class IndexManager extends TransitionManager {
+
+    IndexManager() {
+    }
 
     @Override
     public NanoHTTPD.Response transition(NanoHTTPD.IHTTPSession session) {

…betools/manager/util/ManagerFactory.java …3/probetools/manager/ManagerFactory.javaprobetools/src/main/java/com/ebr163/probetools/manager/util/ManagerFactory.java renamed to probetools/src/main/java/com/ebr163/probetools/manager/ManagerFactory.java probetools/src/main/java/com/ebr163/probetools/manager/util/ManagerFactory.java renamed to probetools/src/main/java/com/ebr163/probetools/manager/ManagerFactory.java

@@ -1,20 +1,12 @@
-package com.ebr163.probetools.manager.util;
+package com.ebr163.probetools.manager;
 
 import android.content.Context;
 
-import com.ebr163.probetools.manager.AssetsManager;
-import com.ebr163.probetools.manager.BaseManager;
-import com.ebr163.probetools.manager.DBManager;
-import com.ebr163.probetools.manager.HttpInterceptManager;
-import com.ebr163.probetools.manager.IndexManager;
-import com.ebr163.probetools.manager.PreferencesManager;
-import com.ebr163.probetools.manager.TransitionManager;
-
 /**
  * Created by mac1 on 02.11.16.
  */
 
-public class ManagerFactory {
+public final class ManagerFactory {
 
     public <T> T build(Context context, Class<T> manager) {
         return (T) create(context, manager);

probetools/src/main/java/com/ebr163/probetools/manager/PreferencesManager.java

@@ -11,7 +11,7 @@
 
 import fi.iki.elonen.NanoHTTPD;
 
-public class PreferencesManager extends TransitionManager {
+public final class PreferencesManager extends TransitionManager {
 
     public NanoHTTPD.Response loadAllPreferences(NanoHTTPD.IHTTPSession session) throws JSONException {
         Map<String, ?> params = getRouter().getPreferences().getAll();