- Minor Refactor.

- Improve class scoping.

Author: android10

build.gradle

@@ -23,11 +23,6 @@ allprojects {
   }
 }
 
-task wrapper(type: Wrapper) {
-  description 'Creates the gradle wrapper.'
-  gradleVersion '2.12'
-}
-
 task runDomainUnitTests(dependsOn: [':domain:test']) {
   description 'Run unit tests for the domain layer.'
 }

data/src/main/java/com/fernandocejas/android10/sample/data/cache/FileManager.java

@@ -32,7 +32,7 @@
 public class FileManager {
 
   @Inject
-  public FileManager() {}
+  FileManager() {}
 
   /**
    * Writes a file to Disk.
@@ -41,7 +41,7 @@ public FileManager() {}
    *
    * @param file The file to write to Disk.
    */
-  public void writeToFile(File file, String fileContent) {
+  void writeToFile(File file, String fileContent) {
     if (!file.exists()) {
       try {
         FileWriter writer = new FileWriter(file);
@@ -61,15 +61,15 @@ public void writeToFile(File file, String fileContent) {
    * @param file The file to read from.
    * @return A string with the content of the file.
    */
-  public String readFileContent(File file) {
+  String readFileContent(File file) {
     StringBuilder fileContentBuilder = new StringBuilder();
     if (file.exists()) {
       String stringLine;
       try {
         FileReader fileReader = new FileReader(file);
         BufferedReader bufferedReader = new BufferedReader(fileReader);
         while ((stringLine = bufferedReader.readLine()) != null) {
-          fileContentBuilder.append(stringLine + "\n");
+          fileContentBuilder.append(stringLine).append("\n");
         }
         bufferedReader.close();
         fileReader.close();
@@ -87,7 +87,7 @@ public String readFileContent(File file) {
    * @param file The file to check existence.
    * @return true if this file exists, false otherwise.
    */
-  public boolean exists(File file) {
+  boolean exists(File file) {
     return file.exists();
   }
 
@@ -98,7 +98,7 @@ public boolean exists(File file) {
    *
    * @param directory The directory which its content will be deleted.
    */
-  public boolean clearDirectory(File directory) {
+  boolean clearDirectory(File directory) {
     boolean result = false;
     if (directory.exists()) {
       for (File file : directory.listFiles()) {
@@ -116,7 +116,7 @@ public boolean clearDirectory(File directory) {
    * @param key A string for the key that will be used to retrieve the value in the future.
    * @param value A long representing the value to be inserted.
    */
-  public void writeToPreferences(Context context, String preferenceFileName, String key,
+  void writeToPreferences(Context context, String preferenceFileName, String key,
       long value) {
 
     SharedPreferences sharedPreferences = context.getSharedPreferences(preferenceFileName,
@@ -134,7 +134,7 @@ public void writeToPreferences(Context context, String preferenceFileName, Strin
    * @param key A key that will be used to retrieve the value from the preference file.
    * @return A long representing the value retrieved from the preferences file.
    */
-  public long getFromPreferences(Context context, String preferenceFileName, String key) {
+  long getFromPreferences(Context context, String preferenceFileName, String key) {
     SharedPreferences sharedPreferences = context.getSharedPreferences(preferenceFileName,
         Context.MODE_PRIVATE);
     return sharedPreferences.getLong(key, 0);

data/src/main/java/com/fernandocejas/android10/sample/data/cache/UserCacheImpl.java

@@ -51,7 +51,7 @@ public class UserCacheImpl implements UserCache {
    * @param fileManager {@link FileManager} for saving serialized objects to the file system.
    */
   @Inject
-  public UserCacheImpl(Context context, JsonSerializer userCacheSerializer,
+  UserCacheImpl(Context context, JsonSerializer userCacheSerializer,
       FileManager fileManager, ThreadExecutor executor) {
     if (context == null || userCacheSerializer == null || fileManager == null || executor == null) {
       throw new IllegalArgumentException("Invalid null parameter");
@@ -91,8 +91,8 @@ public UserCacheImpl(Context context, JsonSerializer userCacheSerializer,
   }
 
   @Override public boolean isCached(int userId) {
-    File userEntitiyFile = this.buildFile(userId);
-    return this.fileManager.exists(userEntitiyFile);
+    final File userEntityFile = this.buildFile(userId);
+    return this.fileManager.exists(userEntityFile);
   }
 
   @Override public boolean isExpired() {
@@ -119,7 +119,7 @@ public UserCacheImpl(Context context, JsonSerializer userCacheSerializer,
    * @return A valid file.
    */
   private File buildFile(int userId) {
-    StringBuilder fileNameBuilder = new StringBuilder();
+    final StringBuilder fileNameBuilder = new StringBuilder();
     fileNameBuilder.append(this.cacheDir.getPath());
     fileNameBuilder.append(File.separator);
     fileNameBuilder.append(DEFAULT_FILE_NAME);

data/src/main/java/com/fernandocejas/android10/sample/data/cache/serializer/JsonSerializer.java

@@ -29,16 +29,15 @@ public class JsonSerializer {
   private final Gson gson = new Gson();
 
   @Inject
-  public JsonSerializer() {}
+  JsonSerializer() {}
 
   /**
    * Serialize an object to Json.
    *
    * @param userEntity {@link UserEntity} to serialize.
    */
   public String serialize(UserEntity userEntity) {
-    String jsonString = gson.toJson(userEntity, UserEntity.class);
-    return jsonString;
+    return gson.toJson(userEntity, UserEntity.class);
   }
 
   /**
@@ -48,7 +47,6 @@ public String serialize(UserEntity userEntity) {
    * @return {@link UserEntity}
    */
   public UserEntity deserialize(String jsonString) {
-    UserEntity userEntity = gson.fromJson(jsonString, UserEntity.class);
-    return userEntity;
+    return gson.fromJson(jsonString, UserEntity.class);
   }
 }

data/src/main/java/com/fernandocejas/android10/sample/data/entity/mapper/UserEntityDataMapper.java

@@ -31,7 +31,7 @@
 public class UserEntityDataMapper {
 
   @Inject
-  public UserEntityDataMapper() {}
+  UserEntityDataMapper() {}
 
   /**
    * Transform a {@link UserEntity} into an {@link User}.
@@ -49,7 +49,6 @@ public User transform(UserEntity userEntity) {
       user.setFollowers(userEntity.getFollowers());
       user.setEmail(userEntity.getEmail());
     }
-
     return user;
   }
 
@@ -60,15 +59,13 @@ public User transform(UserEntity userEntity) {
    * @return {@link User} if valid {@link UserEntity} otherwise null.
    */
   public List<User> transform(Collection<UserEntity> userEntityCollection) {
-    List<User> userList = new ArrayList<>(20);
-    User user;
+    final List<User> userList = new ArrayList<>(20);
     for (UserEntity userEntity : userEntityCollection) {
-      user = transform(userEntity);
+      final User user = transform(userEntity);
       if (user != null) {
         userList.add(user);
       }
     }
-
     return userList;
   }
 }

data/src/main/java/com/fernandocejas/android10/sample/data/entity/mapper/UserEntityJsonMapper.java

@@ -43,14 +43,8 @@ public UserEntityJsonMapper() {
    * @throws com.google.gson.JsonSyntaxException if the json string is not a valid json structure.
    */
   public UserEntity transformUserEntity(String userJsonResponse) throws JsonSyntaxException {
-    try {
-      Type userEntityType = new TypeToken<UserEntity>() {}.getType();
-      UserEntity userEntity = this.gson.fromJson(userJsonResponse, userEntityType);
-
-      return userEntity;
-    } catch (JsonSyntaxException jsonException) {
-      throw jsonException;
-    }
+    final Type userEntityType = new TypeToken<UserEntity>() {}.getType();
+    return this.gson.fromJson(userJsonResponse, userEntityType);
   }
 
   /**
@@ -62,15 +56,7 @@ public UserEntity transformUserEntity(String userJsonResponse) throws JsonSyntax
    */
   public List<UserEntity> transformUserEntityCollection(String userListJsonResponse)
       throws JsonSyntaxException {
-
-    List<UserEntity> userEntityCollection;
-    try {
-      Type listOfUserEntityType = new TypeToken<List<UserEntity>>() {}.getType();
-      userEntityCollection = this.gson.fromJson(userListJsonResponse, listOfUserEntityType);
-
-      return userEntityCollection;
-    } catch (JsonSyntaxException jsonException) {
-      throw jsonException;
-    }
+    final Type listOfUserEntityType = new TypeToken<List<UserEntity>>() {}.getType();
+    return this.gson.fromJson(userListJsonResponse, listOfUserEntityType);
   }
 }

data/src/main/java/com/fernandocejas/android10/sample/data/exception/NetworkConnectionException.java

@@ -24,14 +24,6 @@ public NetworkConnectionException() {
     super();
   }
 
-  public NetworkConnectionException(final String message) {
-    super(message);
-  }
-
-  public NetworkConnectionException(final String message, final Throwable cause) {
-    super(message, cause);
-  }
-
   public NetworkConnectionException(final Throwable cause) {
     super(cause);
   }

data/src/main/java/com/fernandocejas/android10/sample/data/exception/RepositoryErrorBundle.java

@@ -20,11 +20,11 @@
 /**
  * Wrapper around Exceptions used to manage errors in the repository.
  */
-public class RepositoryErrorBundle implements ErrorBundle {
+class RepositoryErrorBundle implements ErrorBundle {
 
   private final Exception exception;
 
-  public RepositoryErrorBundle(Exception exception) {
+  RepositoryErrorBundle(Exception exception) {
     this.exception = exception;
   }
 

data/src/main/java/com/fernandocejas/android10/sample/data/exception/UserNotFoundException.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -19,20 +19,7 @@
  * Exception throw by the application when a User search can't return a valid result.
  */
 public class UserNotFoundException extends Exception {
-
   public UserNotFoundException() {
     super();
   }
-
-  public UserNotFoundException(final String message) {
-    super(message);
-  }
-
-  public UserNotFoundException(final String message, final Throwable cause) {
-    super(message, cause);
-  }
-
-  public UserNotFoundException(final Throwable cause) {
-    super(cause);
-  }
 }

data/src/main/java/com/fernandocejas/android10/sample/data/executor/JobExecutor.java

@@ -15,8 +15,8 @@
  */
 package com.fernandocejas.android10.sample.data.executor;
 
+import android.support.annotation.NonNull;
 import com.fernandocejas.android10.sample.domain.executor.ThreadExecutor;
-import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -29,43 +29,23 @@
  */
 @Singleton
 public class JobExecutor implements ThreadExecutor {
-
-  private static final int INITIAL_POOL_SIZE = 3;
-  private static final int MAX_POOL_SIZE = 5;
-
-  // Sets the amount of time an idle thread waits before terminating
-  private static final int KEEP_ALIVE_TIME = 10;
-
-  // Sets the Time Unit to seconds
-  private static final TimeUnit KEEP_ALIVE_TIME_UNIT = TimeUnit.SECONDS;
-
-  private final BlockingQueue<Runnable> workQueue;
-
   private final ThreadPoolExecutor threadPoolExecutor;
 
-  private final ThreadFactory threadFactory;
-
   @Inject
-  public JobExecutor() {
-    this.workQueue = new LinkedBlockingQueue<>();
-    this.threadFactory = new JobThreadFactory();
-    this.threadPoolExecutor = new ThreadPoolExecutor(INITIAL_POOL_SIZE, MAX_POOL_SIZE,
-        KEEP_ALIVE_TIME, KEEP_ALIVE_TIME_UNIT, this.workQueue, this.threadFactory);
+  JobExecutor() {
+    this.threadPoolExecutor = new ThreadPoolExecutor(3, 5, 10, TimeUnit.SECONDS,
+        new LinkedBlockingQueue<>(), new JobThreadFactory());
   }
 
-  @Override public void execute(Runnable runnable) {
-    if (runnable == null) {
-      throw new IllegalArgumentException("Runnable to execute cannot be null");
-    }
+  @Override public void execute(@NonNull Runnable runnable) {
     this.threadPoolExecutor.execute(runnable);
   }
 
   private static class JobThreadFactory implements ThreadFactory {
-    private static final String THREAD_NAME = "android_";
     private int counter = 0;
 
-    @Override public Thread newThread(Runnable runnable) {
-      return new Thread(runnable, THREAD_NAME + counter++);
+    @Override public Thread newThread(@NonNull Runnable runnable) {
+      return new Thread(runnable, "android_" + counter++);
     }
   }
 }

data/src/main/java/com/fernandocejas/android10/sample/data/net/ApiConnection.java

@@ -29,7 +29,7 @@
  * Implements {@link java.util.concurrent.Callable} so when executed asynchronously can
  * return a value.
  */
-public class ApiConnection implements Callable<String> {
+class ApiConnection implements Callable<String> {
 
   private static final String CONTENT_TYPE_LABEL = "Content-Type";
   private static final String CONTENT_TYPE_VALUE_JSON = "application/json; charset=utf-8";
@@ -41,7 +41,7 @@ private ApiConnection(String url) throws MalformedURLException {
     this.url = new URL(url);
   }
 
-  public static ApiConnection createGET(String url) throws MalformedURLException {
+  static ApiConnection createGET(String url) throws MalformedURLException {
     return new ApiConnection(url);
   }
 
@@ -52,7 +52,7 @@ public static ApiConnection createGET(String url) throws MalformedURLException {
    * @return A string response
    */
   @Nullable
-  public String requestSyncCall() {
+  String requestSyncCall() {
     connectToApi();
     return response;
   }

data/src/main/java/com/fernandocejas/android10/sample/data/repository/UserDataRepository.java

@@ -41,7 +41,7 @@ public class UserDataRepository implements UserRepository {
    * @param userEntityDataMapper {@link UserEntityDataMapper}.
    */
   @Inject
-  public UserDataRepository(UserDataStoreFactory dataStoreFactory,
+  UserDataRepository(UserDataStoreFactory dataStoreFactory,
       UserEntityDataMapper userEntityDataMapper) {
     this.userDataStoreFactory = dataStoreFactory;
     this.userEntityDataMapper = userEntityDataMapper;

data/src/main/java/com/fernandocejas/android10/sample/data/repository/datasource/UserDataStoreFactory.java

@@ -34,7 +34,7 @@ public class UserDataStoreFactory {
   private final UserCache userCache;
 
   @Inject
-  public UserDataStoreFactory(@NonNull Context context, @NonNull UserCache userCache) {
+  UserDataStoreFactory(@NonNull Context context, @NonNull UserCache userCache) {
     this.context = context.getApplicationContext();
     this.userCache = userCache;
   }

domain/src/main/java/com/fernandocejas/android10/sample/domain/User.java

@@ -77,7 +77,7 @@ public void setFollowers(int followers) {
   }
 
   @Override public String toString() {
-    StringBuilder stringBuilder = new StringBuilder();
+    final StringBuilder stringBuilder = new StringBuilder();
 
     stringBuilder.append("***** User Details *****\n");
     stringBuilder.append("id=" + this.getUserId() + "\n");

domain/src/main/java/com/fernandocejas/android10/sample/domain/interactor/GetUserList.java

@@ -31,7 +31,7 @@ public class GetUserList extends UseCase {
   private final UserRepository userRepository;
 
   @Inject
-  public GetUserList(UserRepository userRepository, ThreadExecutor threadExecutor,
+  GetUserList(UserRepository userRepository, ThreadExecutor threadExecutor,
       PostExecutionThread postExecutionThread) {
     super(threadExecutor, postExecutionThread);
     this.userRepository = userRepository;