svn commit: r1570173 - in /sling/trunk/contrib/extensions/replication/src: main/java/org/apache/sling/replication/queue/impl/jobhandling/ test/java/org/apache/sling/replication/queue/impl/jobhandling/

[tommaso]

Author: tommaso
Date: Thu Feb 20 12:45:50 2014
New Revision: 1570173

URL: http://svn.apache.org/r1570173
Log:
SLING-3404 - logging job id instead of the job itself

Modified:
    
sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingReplicationQueue.java
    
sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingReplicationQueueTest.java

Modified: 
sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingReplicationQueue.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingReplicationQueue.java?rev=1570173&r1=1570172&r2=1570173&view=diff
==============================================================================
--- 
sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingReplicationQueue.java
 (original)
+++ 
sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingReplicationQueue.java
 Thu Feb 20 12:45:50 2014
@@ -69,7 +69,7 @@ public class JobHandlingReplicationQueue
 
             Job job = jobManager.createJob(topic).properties(properties).add();
             if (log.isInfoEnabled()) {
-                log.info("job added {}", job);
+                log.info("job {} added", job.getId());
             }
         } catch (Exception e) {
             if (log.isErrorEnabled()) {

Modified: 
sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingReplicationQueueTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingReplicationQueueTest.java?rev=1570173&r1=1570172&r2=1570173&view=diff
==============================================================================
--- 
sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingReplicationQueueTest.java
 (original)
+++ 
sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingReplicationQueueTest.java
 Thu Feb 20 12:45:50 2014
@@ -47,6 +47,10 @@ public class JobHandlingReplicationQueue
     public void testPackageAddition() throws Exception {
         JobManager jobManager = mock(JobManager.class);
         JobBuilder builder = mock(JobBuilder.class);
+        when(builder.properties(any(Map.class))).thenReturn(builder);
+        Job job = mock(Job.class);
+        when(job.getId()).thenReturn("id-123");
+        when(builder.add()).thenReturn(job);
         String topic = JobHandlingReplicationQueue.REPLICATION_QUEUE_TOPIC + 
"/aname";
         when(jobManager.createJob(topic)).thenReturn(builder);
         when(jobManager.findJobs(JobManager.QueryType.ALL, topic, 
-1)).thenReturn(Collections.<Job>emptySet());
@@ -61,6 +65,10 @@ public class JobHandlingReplicationQueue
     public void testPackageAdditionAndStatusCheck() throws Exception {
         JobManager jobManager = mock(JobManager.class);
         JobBuilder builder = mock(JobBuilder.class);
+        when(builder.properties(any(Map.class))).thenReturn(builder);
+        Job job = mock(Job.class);
+        when(job.getId()).thenReturn("id-123");
+        when(builder.add()).thenReturn(job);
         String topic = JobHandlingReplicationQueue.REPLICATION_QUEUE_TOPIC + 
"/aname";
         when(jobManager.createJob(topic)).thenReturn(builder);
         when(jobManager.findJobs(JobManager.QueryType.ALL, topic, 
-1)).thenReturn(Collections.<Job>emptySet());