You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2017/02/28 14:13:26 UTC
svn commit: r1784740 - in
/sling/trunk/contrib/commons/mom/jobs/it-services/src/main/java/org/apache/sling/jobs/it/services:
AsyncJobConsumer.java FullySyncJob.java JobManagerTestComponent.java
Author: cziegeler
Date: Tue Feb 28 14:13:25 2017
New Revision: 1784740
URL: http://svn.apache.org/viewvc?rev=1784740&view=rev
Log:
SLING-6574 : Remove unnecessary dependency to Guava
Modified:
sling/trunk/contrib/commons/mom/jobs/it-services/src/main/java/org/apache/sling/jobs/it/services/AsyncJobConsumer.java
sling/trunk/contrib/commons/mom/jobs/it-services/src/main/java/org/apache/sling/jobs/it/services/FullySyncJob.java
sling/trunk/contrib/commons/mom/jobs/it-services/src/main/java/org/apache/sling/jobs/it/services/JobManagerTestComponent.java
Modified: sling/trunk/contrib/commons/mom/jobs/it-services/src/main/java/org/apache/sling/jobs/it/services/AsyncJobConsumer.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/commons/mom/jobs/it-services/src/main/java/org/apache/sling/jobs/it/services/AsyncJobConsumer.java?rev=1784740&r1=1784739&r2=1784740&view=diff
==============================================================================
--- sling/trunk/contrib/commons/mom/jobs/it-services/src/main/java/org/apache/sling/jobs/it/services/AsyncJobConsumer.java (original)
+++ sling/trunk/contrib/commons/mom/jobs/it-services/src/main/java/org/apache/sling/jobs/it/services/AsyncJobConsumer.java Tue Feb 28 14:13:25 2017
@@ -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.
Modified: sling/trunk/contrib/commons/mom/jobs/it-services/src/main/java/org/apache/sling/jobs/it/services/FullySyncJob.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/commons/mom/jobs/it-services/src/main/java/org/apache/sling/jobs/it/services/FullySyncJob.java?rev=1784740&r1=1784739&r2=1784740&view=diff
==============================================================================
--- sling/trunk/contrib/commons/mom/jobs/it-services/src/main/java/org/apache/sling/jobs/it/services/FullySyncJob.java (original)
+++ sling/trunk/contrib/commons/mom/jobs/it-services/src/main/java/org/apache/sling/jobs/it/services/FullySyncJob.java Tue Feb 28 14:13:25 2017
@@ -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)
Modified: sling/trunk/contrib/commons/mom/jobs/it-services/src/main/java/org/apache/sling/jobs/it/services/JobManagerTestComponent.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/commons/mom/jobs/it-services/src/main/java/org/apache/sling/jobs/it/services/JobManagerTestComponent.java?rev=1784740&r1=1784739&r2=1784740&view=diff
==============================================================================
--- sling/trunk/contrib/commons/mom/jobs/it-services/src/main/java/org/apache/sling/jobs/it/services/JobManagerTestComponent.java (original)
+++ sling/trunk/contrib/commons/mom/jobs/it-services/src/main/java/org/apache/sling/jobs/it/services/JobManagerTestComponent.java Tue Feb 28 14:13:25 2017
@@ -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());
}