Skip to content

Commit a5f22b9

Browse files
committed
- Improve scoping.
- Refactor. - Get rid of dead code.
1 parent 916c77d commit a5f22b9

28 files changed

+88
-196
lines changed

app/src/main/java/com/fernandocejas/android10/sample/app/core/di/components/ActivityComponent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
*/
3030
@PerActivity
3131
@Component(dependencies = ApplicationComponent.class, modules = ActivityModule.class)
32-
public interface ActivityComponent {
32+
interface ActivityComponent {
3333
//Exposed to sub-graphs.
3434
Activity activity();
3535
}

app/src/main/java/com/fernandocejas/android10/sample/app/core/executor/JobExecutor.java

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package com.fernandocejas.android10.sample.app.core.executor;
1717

18-
import java.util.concurrent.BlockingQueue;
18+
import android.support.annotation.NonNull;
1919
import java.util.concurrent.LinkedBlockingQueue;
2020
import java.util.concurrent.ThreadFactory;
2121
import java.util.concurrent.ThreadPoolExecutor;
@@ -28,43 +28,23 @@
2828
*/
2929
@Singleton
3030
public class JobExecutor implements ThreadExecutor {
31-
32-
private static final int INITIAL_POOL_SIZE = 3;
33-
private static final int MAX_POOL_SIZE = 5;
34-
35-
// Sets the amount of time an idle thread waits before terminating
36-
private static final int KEEP_ALIVE_TIME = 10;
37-
38-
// Sets the Time Unit to seconds
39-
private static final TimeUnit KEEP_ALIVE_TIME_UNIT = TimeUnit.SECONDS;
40-
41-
private final BlockingQueue<Runnable> workQueue;
42-
4331
private final ThreadPoolExecutor threadPoolExecutor;
4432

45-
private final ThreadFactory threadFactory;
46-
4733
@Inject
48-
public JobExecutor() {
49-
this.workQueue = new LinkedBlockingQueue<>();
50-
this.threadFactory = new JobThreadFactory();
51-
this.threadPoolExecutor = new ThreadPoolExecutor(INITIAL_POOL_SIZE, MAX_POOL_SIZE,
52-
KEEP_ALIVE_TIME, KEEP_ALIVE_TIME_UNIT, this.workQueue, this.threadFactory);
34+
JobExecutor() {
35+
this.threadPoolExecutor = new ThreadPoolExecutor(3, 5, 10, TimeUnit.SECONDS,
36+
new LinkedBlockingQueue<>(), new JobThreadFactory());
5337
}
5438

55-
@Override public void execute(Runnable runnable) {
56-
if (runnable == null) {
57-
throw new IllegalArgumentException("Runnable to execute cannot be null");
58-
}
39+
@Override public void execute(@NonNull Runnable runnable) {
5940
this.threadPoolExecutor.execute(runnable);
6041
}
6142

6243
private static class JobThreadFactory implements ThreadFactory {
63-
private static final String THREAD_NAME = "android_";
6444
private int counter = 0;
6545

66-
@Override public Thread newThread(Runnable runnable) {
67-
return new Thread(runnable, THREAD_NAME + counter++);
46+
@Override public Thread newThread(@NonNull Runnable runnable) {
47+
return new Thread(runnable, "android_" + counter++);
6848
}
6949
}
7050
}

app/src/main/java/com/fernandocejas/android10/sample/app/core/executor/UIThread.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package com.fernandocejas.android10.sample.app.core.executor;
1717

18-
import com.fernandocejas.android10.sample.app.core.executor.PostExecutionThread;
1918
import javax.inject.Inject;
2019
import javax.inject.Singleton;
2120
import rx.Scheduler;
@@ -29,7 +28,7 @@
2928
public class UIThread implements PostExecutionThread {
3029

3130
@Inject
32-
public UIThread() {}
31+
UIThread() {}
3332

3433
@Override public Scheduler getScheduler() {
3534
return AndroidSchedulers.mainThread();

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* Implements {@link java.util.concurrent.Callable} so when executed asynchronously can
3030
* return a value.
3131
*/
32-
public class ApiConnection implements Callable<String> {
32+
class ApiConnection implements Callable<String> {
3333

3434
private static final String CONTENT_TYPE_LABEL = "Content-Type";
3535
private static final String CONTENT_TYPE_VALUE_JSON = "application/json; charset=utf-8";
@@ -41,7 +41,7 @@ private ApiConnection(String url) throws MalformedURLException {
4141
this.url = new URL(url);
4242
}
4343

44-
public static ApiConnection createGET(String url) throws MalformedURLException {
44+
static ApiConnection createGET(String url) throws MalformedURLException {
4545
return new ApiConnection(url);
4646
}
4747

@@ -52,7 +52,7 @@ public static ApiConnection createGET(String url) throws MalformedURLException {
5252
* @return A string response
5353
*/
5454
@Nullable
55-
public String requestSyncCall() {
55+
String requestSyncCall() {
5656
connectToApi();
5757
return response;
5858
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public String readFileContent(File file) {
6969
FileReader fileReader = new FileReader(file);
7070
BufferedReader bufferedReader = new BufferedReader(fileReader);
7171
while ((stringLine = bufferedReader.readLine()) != null) {
72-
fileContentBuilder.append(stringLine + "\n");
72+
fileContentBuilder.append(stringLine).append("\n");
7373
}
7474
bufferedReader.close();
7575
fileReader.close();

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,6 @@ public NetworkConnectionException() {
2424
super();
2525
}
2626

27-
public NetworkConnectionException(final String message) {
28-
super(message);
29-
}
30-
31-
public NetworkConnectionException(final String message, final Throwable cause) {
32-
super(message, cause);
33-
}
34-
3527
public NetworkConnectionException(final Throwable cause) {
3628
super(cause);
3729
}

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,16 @@
1515
*/
1616
package com.fernandocejas.android10.sample.app.exception;
1717

18+
import com.fernandocejas.frodo.core.strings.Strings;
19+
1820
/**
1921
* Wrapper around Exceptions used to manage errors in the repository.
2022
*/
21-
public class RepositoryErrorBundle implements ErrorBundle {
23+
class RepositoryErrorBundle implements ErrorBundle {
2224

2325
private final Exception exception;
2426

25-
public RepositoryErrorBundle(Exception exception) {
27+
RepositoryErrorBundle(Exception exception) {
2628
this.exception = exception;
2729
}
2830

@@ -33,7 +35,7 @@ public Exception getException() {
3335

3436
@Override
3537
public String getErrorMessage() {
36-
String message = "";
38+
String message = Strings.EMPTY;
3739
if (this.exception != null) {
3840
message = this.exception.getMessage();
3941
}

app/src/main/java/com/fernandocejas/android10/sample/app/users/GetUserList.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class GetUserList extends UseCase {
3030
private final UserRepository userRepository;
3131

3232
@Inject
33-
public GetUserList(UserRepository userRepository, ThreadExecutor threadExecutor,
33+
GetUserList(UserRepository userRepository, ThreadExecutor threadExecutor,
3434
PostExecutionThread postExecutionThread) {
3535
super(threadExecutor, postExecutionThread);
3636
this.userRepository = userRepository;

app/src/main/java/com/fernandocejas/android10/sample/app/users/User.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ void setFollowers(int followers) {
7777
}
7878

7979
@Override public String toString() {
80-
StringBuilder stringBuilder = new StringBuilder();
80+
final StringBuilder stringBuilder = new StringBuilder();
8181

8282
stringBuilder.append("***** User Details *****\n");
8383
stringBuilder.append("id=" + this.getUserId() + "\n");

app/src/main/java/com/fernandocejas/android10/sample/app/users/UserDataRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class UserDataRepository implements UserRepository {
3636
* @param userEntityDataMapper {@link UserEntityDataMapper}.
3737
*/
3838
@Inject
39-
public UserDataRepository(UserDataStoreFactory dataStoreFactory,
39+
UserDataRepository(UserDataStoreFactory dataStoreFactory,
4040
UserEntityDataMapper userEntityDataMapper) {
4141
this.userDataStoreFactory = dataStoreFactory;
4242
this.userEntityDataMapper = userEntityDataMapper;

0 commit comments

Comments
 (0)