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 2014/10/23 19:10:03 UTC
svn commit: r1633886 - in
/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs:
JobManagerImpl.java Utility.java config/InternalQueueConfiguration.java
deprecated/EventAdminBridge.java
Author: cziegeler
Date: Thu Oct 23 17:10:03 2014
New Revision: 1633886
URL: http://svn.apache.org/r1633886
Log:
SLING-4095 : Clean up code and logging statements
Modified:
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/Utility.java
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfiguration.java
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/deprecated/EventAdminBridge.java
Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java?rev=1633886&r1=1633885&r2=1633886&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java (original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java Thu Oct 23 17:10:03 2014
@@ -175,7 +175,7 @@ public class JobManagerImpl
@Override
public void restart() {
// nothing to do as this is deprecated, let's log a warning
- logger.warn("DEPRECATION-WARNING: Deprecated JobManager.restart() is called.");
+ Utility.logDeprecated(logger, "Deprecated JobManager.restart() is called.");
}
/**
@@ -183,7 +183,7 @@ public class JobManagerImpl
*/
@Override
public boolean isJobProcessingEnabled() {
- logger.warn("DEPRECATION-WARNING: Deprecated JobManager.isJobProcessingEnabled() is called.");
+ Utility.logDeprecated(logger, "Deprecated JobManager.isJobProcessingEnabled() is called.");
return true;
}
@@ -247,7 +247,7 @@ public class JobManagerImpl
public JobsIterator queryJobs(final QueryType type, final String topic,
final long limit,
final Map<String, Object>... templates) {
- logger.warn("DEPRECATION-WARNING: Deprecated JobManager.queryJobs(...) is called.");
+ Utility.logDeprecated(logger, "Deprecated JobManager.queryJobs(...) is called.");
final Collection<Job> list = this.findJobs(type, topic, limit, templates);
final Iterator<Job> iter = list.iterator();
return new JobsIterator() {
@@ -299,7 +299,7 @@ public class JobManagerImpl
@Override
public Event findJob(final String topic, final Map<String, Object> template) {
- logger.warn("DEPRECATION-WARNING: Deprecated JobManager.findJob(...) is called.");
+ Utility.logDeprecated(logger, "Deprecated JobManager.findJob(...) is called.");
final Job job = this.getJob(topic, template);
if ( job != null ) {
return Utility.toEvent(job);
@@ -312,7 +312,7 @@ public class JobManagerImpl
*/
@Override
public boolean removeJob(final String jobId) {
- logger.warn("DEPRECATION-WARNING: Deprecated JobManager.removeJob(...) is called.");
+ Utility.logDeprecated(logger, "Deprecated JobManager.removeJob(...) is called.");
return this.internalRemoveJobById(jobId, false);
}
@@ -376,7 +376,7 @@ public class JobManagerImpl
*/
@Override
public void forceRemoveJob(final String jobId) {
- logger.warn("DEPRECATION-WARNING: Deprecated JobManager.forceRemoveJob(...) is called.");
+ Utility.logDeprecated(logger, "Deprecated JobManager.forceRemoveJob(...) is called.");
this.internalRemoveJobById(jobId, true);
}
@@ -393,7 +393,7 @@ public class JobManagerImpl
*/
@Override
public Job addJob(final String topic, final String name, final Map<String, Object> properties) {
- logger.warn("DEPRECATION-WARNING: Deprecated JobManager.add(String, String, Map) is called.");
+ Utility.logDeprecated(logger, "Deprecated JobManager.add(String, String, Map) is called.");
return this.addJob(topic, name, properties, null);
}
@@ -402,7 +402,7 @@ public class JobManagerImpl
*/
@Override
public Job getJobByName(final String name) {
- logger.warn("DEPRECATION-WARNING: Deprecated JobManager.getJobByName(String) is called.");
+ Utility.logDeprecated(logger, "Deprecated JobManager.getJobByName(String) is called.");
final StringBuilder buf = new StringBuilder(64);
final ResourceResolver resolver = this.configuration.createResourceResolver();
@@ -966,7 +966,7 @@ public class JobManagerImpl
return null;
}
if ( name != null ) {
- logger.info("DEPRECATION-WARNING: Job is using deprecated name feature: {}", Utility.toString(topic, name, properties));
+ Utility.logDeprecated(logger, "Job is using deprecated name feature: " + Utility.toString(topic, name, properties));
}
Job result = this.addJobInteral(topic, name, properties, errors);
if ( result == null && name != null ) {
Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/Utility.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/Utility.java?rev=1633886&r1=1633885&r2=1633886&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/Utility.java (original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/Utility.java Thu Oct 23 17:10:03 2014
@@ -281,4 +281,14 @@ public abstract class Utility {
return children;
}
+ /**
+ * Log a deprecation warning on level info into the log
+ * @param logger The logger to use
+ * @param message The message.
+ */
+ public static void logDeprecated(final Logger logger, final String message) {
+ if ( logger.isInfoEnabled() ) {
+ logger.info("DEPRECATION-WARNING: " + message, new Exception());
+ }
+ }
}
Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfiguration.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfiguration.java?rev=1633886&r1=1633885&r2=1633886&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfiguration.java (original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfiguration.java Thu Oct 23 17:10:03 2014
@@ -30,6 +30,7 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.PropertyUnbounded;
import org.apache.felix.scr.annotations.Service;
import org.apache.sling.commons.osgi.PropertiesUtil;
+import org.apache.sling.event.impl.jobs.Utility;
import org.apache.sling.event.impl.support.TopicMatcher;
import org.apache.sling.event.impl.support.TopicMatcherHelper;
import org.apache.sling.event.jobs.JobUtil;
@@ -229,7 +230,7 @@ public class InternalQueueConfiguration
}
}
if ( type == Type.IGNORE || type == Type.DROP ) {
- logger.warn("DEPRECATION-WARNING: Queue is using deprecated queue type. Ignoring queue {} with type {}", name, type);
+ Utility.logDeprecated(logger, "Queue is using deprecated queue type. Ignoring queue " + name + " with type " + type);
return false;
}
return true;
Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/deprecated/EventAdminBridge.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/deprecated/EventAdminBridge.java?rev=1633886&r1=1633885&r2=1633886&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/deprecated/EventAdminBridge.java (original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/deprecated/EventAdminBridge.java Thu Oct 23 17:10:03 2014
@@ -165,7 +165,7 @@ public class EventAdminBridge
// check for deprecated/unsupported properties
for(final String ignoredProp : IGNORED_CONFIG_PROPERTIES) {
if ( props.containsKey(ignoredProp)) {
- logger.info("DEPRECATION-WARNING: Job {} is using deprecated and ignored property {}", EventUtil.toString(event), ignoredProp);
+ Utility.logDeprecated(logger, "Job " + EventUtil.toString(event) + " is using deprecated and ignored property " + ignoredProp);
props.remove(ignoredProp);
}
}
@@ -185,7 +185,7 @@ public class EventAdminBridge
}
// we ignore remote job events
if ( EventUtil.isLocal(event) ) {
- logger.info("DEPRECATION-WARNING: Received job via deprecated OSGi event {}", EventUtil.toString(event));
+ Utility.logDeprecated(logger, "Received job via deprecated OSGi event " + EventUtil.toString(event));
// check job topic
final String errorMessage = Utility.checkJobTopic(event.getProperty(ResourceHelper.PROPERTY_JOB_TOPIC));
if ( errorMessage == null ) {