From 7bb9a26096b6c7ccab52b2e923ae270283f2a3d2 Mon Sep 17 00:00:00 2001
From: Roberto E. Escobar
Date: Mon, 26 Aug 2013 13:34:34 -0700
Subject: refinement: Improve result set API
Remove getList method.
Remove getIterable method.
Since resultSet is already an Iterable object,
these methods are not needed.
Add size and isEmpty methods for convenience.
Change-Id: I34160b3acaad391949ff9da0e81afa95f4532677
---
.../META-INF/MANIFEST.MF | 5 ++---
.../org/eclipse/osee/executor/admin/WorkUtility.java | 17 +++++++++--------
2 files changed, 11 insertions(+), 11 deletions(-)
(limited to 'plugins/org.eclipse.osee.executor.admin')
diff --git a/plugins/org.eclipse.osee.executor.admin/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.executor.admin/META-INF/MANIFEST.MF
index 3d76d2f4b63..27a7fd1b6b2 100644
--- a/plugins/org.eclipse.osee.executor.admin/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.executor.admin/META-INF/MANIFEST.MF
@@ -6,9 +6,8 @@ Bundle-Version: 0.14.0.qualifier
Bundle-Vendor: Eclipse Open System Engineering Environment
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.eclipse.osee.executor.admin
-Import-Package: com.google.common.collect,
- com.google.common.util.concurrent,
- org.eclipse.osee.event,
+Import-Package: org.eclipse.osee.event,
org.eclipse.osee.logger
Service-Component: OSGI-INF/*.xml
Bundle-ActivationPolicy: lazy
+Require-Bundle: com.google.guava;bundle-version="[11.0.0,15.0.0)"
diff --git a/plugins/org.eclipse.osee.executor.admin/src/org/eclipse/osee/executor/admin/WorkUtility.java b/plugins/org.eclipse.osee.executor.admin/src/org/eclipse/osee/executor/admin/WorkUtility.java
index e6ec8886dd8..42f2e1933b3 100644
--- a/plugins/org.eclipse.osee.executor.admin/src/org/eclipse/osee/executor/admin/WorkUtility.java
+++ b/plugins/org.eclipse.osee.executor.admin/src/org/eclipse/osee/executor/admin/WorkUtility.java
@@ -17,6 +17,7 @@ import java.util.List;
import java.util.concurrent.Callable;
import java.util.concurrent.Future;
import org.eclipse.osee.executor.admin.internal.ExecutorAdminImpl;
+import com.google.common.collect.Iterables;
/**
* @author Roberto E. Escobar
@@ -35,11 +36,11 @@ public final class WorkUtility {
}
- public static List>> partitionWork(Collection work, PartitionFactory factory) throws Exception {
+ public static List>> partitionWork(Iterable work, PartitionFactory factory) throws Exception {
List>> callables = new LinkedList>>();
-
- if (!work.isEmpty()) {
- int partitionSize = Math.max(1, work.size() / NUM_PARTITIONS);
+ int size = Iterables.size(work);
+ if (size > 0) {
+ int partitionSize = Math.max(1, size / NUM_PARTITIONS);
List subList = new LinkedList();
@@ -65,19 +66,19 @@ public final class WorkUtility {
return callables;
}
- public static List>> partitionAndScheduleWork(ExecutorAdmin executorAdmin, PartitionFactory factory, Collection items) throws Exception {
+ public static List>> partitionAndScheduleWork(ExecutorAdmin executorAdmin, PartitionFactory factory, Iterable items) throws Exception {
return partitionAndScheduleWork(executorAdmin, ExecutorAdminImpl.DEFAULT_EXECUTOR, factory, items, null);
}
- public static List>> partitionAndScheduleWork(ExecutorAdmin executorAdmin, PartitionFactory factory, Collection items, ExecutionCallback> callback) throws Exception {
+ public static List>> partitionAndScheduleWork(ExecutorAdmin executorAdmin, PartitionFactory factory, Iterable items, ExecutionCallback> callback) throws Exception {
return partitionAndScheduleWork(executorAdmin, ExecutorAdminImpl.DEFAULT_EXECUTOR, factory, items, callback);
}
- public static List>> partitionAndScheduleWork(ExecutorAdmin executorAdmin, String executorId, PartitionFactory factory, Collection items) throws Exception {
+ public static List>> partitionAndScheduleWork(ExecutorAdmin executorAdmin, String executorId, PartitionFactory factory, Iterable items) throws Exception {
return partitionAndScheduleWork(executorAdmin, executorId, factory, items, null);
}
- public static List>> partitionAndScheduleWork(ExecutorAdmin executorAdmin, String executorId, PartitionFactory factory, Collection items, ExecutionCallback> callback) throws Exception {
+ public static List>> partitionAndScheduleWork(ExecutorAdmin executorAdmin, String executorId, PartitionFactory factory, Iterable items, ExecutionCallback> callback) throws Exception {
List>> futures = new LinkedList>>();
List>> callables = partitionWork(items, factory);
if (!callables.isEmpty()) {
--
cgit v1.2.3