This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jobs-it-services.git
commit 126eaa1078fb1de584e271ece435faa0c763104c Author: Carsten Ziegeler <[email protected]> AuthorDate: Tue Feb 28 14:13:25 2017 +0000 SLING-6574 : Remove unnecessary dependency to Guava git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1784740 13f79535-47bb-0310-9956-ffa450edef68 --- .../sling/jobs/it/services/AsyncJobConsumer.java | 26 +++++++++++++++++----- .../sling/jobs/it/services/FullySyncJob.java | 15 +++++++++---- .../jobs/it/services/JobManagerTestComponent.java | 16 ++++++------- 3 files changed, 39 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/apache/sling/jobs/it/services/AsyncJobConsumer.java b/src/main/java/org/apache/sling/jobs/it/services/AsyncJobConsumer.java index 99d22f1..f714bc0 100644 --- a/src/main/java/org/apache/sling/jobs/it/services/AsyncJobConsumer.java +++ b/src/main/java/org/apache/sling/jobs/it/services/AsyncJobConsumer.java @@ -19,14 +19,28 @@ package org.apache.sling.jobs.it.services; -import org.apache.felix.scr.annotations.*; -import org.apache.sling.jobs.*; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import java.util.Map; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; import javax.annotation.Nonnull; -import java.util.Map; -import java.util.concurrent.*; + +import org.apache.felix.scr.annotations.Activate; +import org.apache.felix.scr.annotations.Component; +import org.apache.felix.scr.annotations.Deactivate; +import org.apache.felix.scr.annotations.Properties; +import org.apache.felix.scr.annotations.Property; +import org.apache.felix.scr.annotations.Service; +import org.apache.sling.jobs.Job; +import org.apache.sling.jobs.JobCallback; +import org.apache.sling.jobs.JobConsumer; +import org.apache.sling.jobs.JobUpdate; +import org.apache.sling.jobs.JobUpdateListener; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This job consumer consumes jobs from the job subsystem. It accepts the jobs into a queue and uses a thread pool to drain the queue. diff --git a/src/main/java/org/apache/sling/jobs/it/services/FullySyncJob.java b/src/main/java/org/apache/sling/jobs/it/services/FullySyncJob.java index 0221ff6..2addd4c 100644 --- a/src/main/java/org/apache/sling/jobs/it/services/FullySyncJob.java +++ b/src/main/java/org/apache/sling/jobs/it/services/FullySyncJob.java @@ -19,13 +19,20 @@ package org.apache.sling.jobs.it.services; -import org.apache.felix.scr.annotations.*; -import org.apache.sling.jobs.*; +import javax.annotation.Nonnull; + +import org.apache.felix.scr.annotations.Component; +import org.apache.felix.scr.annotations.Properties; +import org.apache.felix.scr.annotations.Property; +import org.apache.felix.scr.annotations.Service; +import org.apache.sling.jobs.Job; +import org.apache.sling.jobs.JobCallback; +import org.apache.sling.jobs.JobConsumer; +import org.apache.sling.jobs.JobUpdate; +import org.apache.sling.jobs.JobUpdateListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.annotation.Nonnull; - /** */ @Component(immediate = true) diff --git a/src/main/java/org/apache/sling/jobs/it/services/JobManagerTestComponent.java b/src/main/java/org/apache/sling/jobs/it/services/JobManagerTestComponent.java index ffba8ac..850843a 100644 --- a/src/main/java/org/apache/sling/jobs/it/services/JobManagerTestComponent.java +++ b/src/main/java/org/apache/sling/jobs/it/services/JobManagerTestComponent.java @@ -20,7 +20,11 @@ package org.apache.sling.jobs.it.services; -import com.google.common.collect.ImmutableMap; +import static org.junit.Assert.assertNotNull; + +import java.util.Collections; +import java.util.Map; + import org.apache.felix.scr.annotations.Activate; import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.Deactivate; @@ -31,10 +35,6 @@ import org.apache.sling.jobs.Types; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Map; - -import static org.junit.Assert.*; - /** */ @Component(immediate = true) @@ -50,14 +50,14 @@ public class JobManagerTestComponent { public void activate(Map<String,Object> props) { for( int i = 0; i < 10; i++) { Job job = jobManager.newJobBuilder(Types.jobQueue(TOPIC), Types.jobType(AsyncJobConsumer.JOB_TYPE)).addProperties( - ImmutableMap.of("jobtest", (Object) "jobtest")).add(); + Collections.singletonMap("jobtest", (Object) "jobtest")).add(); assertNotNull(job); LOGGER.info("Started Job {} ", job.getId()); } // then start 10 sync jobs. for( int i = 0; i < 10; i++) { - Job job = jobManager.newJobBuilder(Types.jobQueue(TOPIC), Types.jobType(FullySyncJob.JOB_TYPE)).addProperties( - ImmutableMap.of("jobtest", (Object) "jobtest")).add(); + Job job = jobManager.newJobBuilder(Types.jobQueue(TOPIC), Types.jobType(FullySyncJob.JOB_TYPE)) + .addProperties(Collections.singletonMap("jobtest", (Object) "jobtest")).add(); assertNotNull(job); LOGGER.info("Started Job {} ", job.getId()); } -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
