commit 474474bb6b6b20238ee227151e0d60a02437cea2
author Fedor Kudasov <kudasov@google.com> Fri Apr 05 03:11:11 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Apr 05 03:11:11 2019 -0700
tree 05e86490474c269f0343f46942412f4622772c50
parent a4773d15d3cdd16cb47ad9babbeebcfef4f2fbb6
parent c4ee3da00ba966bdfaae4062646b513881d1cc01

Refactor RunnablesExecutor
am: c4ee3da00b

Change-Id: I96761e9e9c54180326b31546e218473c9efc9029

src/main/java/com/android/apksig/internal/apk/ApkSigningBlockUtils.java

diff --git a/src/main/java/com/android/apksig/internal/apk/ApkSigningBlockUtils.java b/src/main/java/com/android/apksig/internal/apk/ApkSigningBlockUtils.java
index d63a125..cfa9844 100644
--- a/src/main/java/com/android/apksig/internal/apk/ApkSigningBlockUtils.java
+++ b/src/main/java/com/android/apksig/internal/apk/ApkSigningBlockUtils.java
@@ -65,11 +65,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ForkJoinPool;
-import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 

src/main/java/com/android/apksig/util/RunnablesExecutor.java

diff --git a/src/main/java/com/android/apksig/util/RunnablesExecutor.java b/src/main/java/com/android/apksig/util/RunnablesExecutor.java
index 04ec1d8..4215810 100644
--- a/src/main/java/com/android/apksig/util/RunnablesExecutor.java
+++ b/src/main/java/com/android/apksig/util/RunnablesExecutor.java
@@ -17,7 +17,7 @@
 package com.android.apksig.util;
 
 public interface RunnablesExecutor {
-    RunnablesExecutor SINGLE_THREADED = p -> p.getRunnable().run();
+    RunnablesExecutor SINGLE_THREADED = p -> p.createRunnable().run();
 
     void execute(RunnablesProvider provider);
 }

src/main/java/com/android/apksig/util/RunnablesProvider.java

diff --git a/src/main/java/com/android/apksig/util/RunnablesProvider.java b/src/main/java/com/android/apksig/util/RunnablesProvider.java
index 5b7bad2..f96dcfe 100644
--- a/src/main/java/com/android/apksig/util/RunnablesProvider.java
+++ b/src/main/java/com/android/apksig/util/RunnablesProvider.java
@@ -17,5 +17,5 @@
 package com.android.apksig.util;
 
 public interface RunnablesProvider {
-    Runnable getRunnable();
+    Runnable createRunnable();
 }

src/test/java/com/android/apksig/internal/apk/ApkSigningBlockUtilsTest.java

diff --git a/src/test/java/com/android/apksig/internal/apk/ApkSigningBlockUtilsTest.java b/src/test/java/com/android/apksig/internal/apk/ApkSigningBlockUtilsTest.java
index 7eb7c9b..1ee3466 100644
--- a/src/test/java/com/android/apksig/internal/apk/ApkSigningBlockUtilsTest.java
+++ b/src/test/java/com/android/apksig/internal/apk/ApkSigningBlockUtilsTest.java
@@ -101,7 +101,7 @@
                     List<Future<?>> jobs = new ArrayList<>(jobCount);
 
                     for (int i = 0; i < jobCount; i++) {
-                        jobs.add(forkJoinPool.submit(provider.getRunnable()));
+                        jobs.add(forkJoinPool.submit(provider.createRunnable()));
                     }
 
                     try {