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 2013/05/16 17:10:24 UTC
svn commit: r1483402 - in /sling/trunk/bundles/extensions/event/src:
main/java/org/apache/sling/event/impl/jobs/jmx/
test/java/org/apache/sling/event/impl/jobs/jmx/
Author: cziegeler
Date: Thu May 16 15:10:24 2013
New Revision: 1483402
URL: http://svn.apache.org/r1483402
Log:
SLING-2868 : Improve and cleanup implementation : remove unused code from beans
Modified:
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/jmx/QueueMBeanImpl.java
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/jmx/QueuesMBeanImpl.java
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/impl/jobs/jmx/QueuesMBeanImplTest.java
Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/jmx/QueueMBeanImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/jmx/QueueMBeanImpl.java?rev=1483402&r1=1483401&r2=1483402&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/jmx/QueueMBeanImpl.java (original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/jmx/QueueMBeanImpl.java Thu May 16 15:10:24 2013
@@ -21,37 +21,30 @@ import org.apache.sling.event.jobs.Queue
import org.apache.sling.event.jobs.Statistics;
/**
- * An MBean that provides statistics from
+ * An MBean that provides statistics from
*/
public class QueueMBeanImpl extends AbstractJobStatistics {
- private Queue queue;
- private Statistics emptyStatistics = new EmptyStatistics();
+ private final String name;
- public QueueMBeanImpl(Queue queue) {
- this.queue = queue;
- }
-
- public void notifyUpdate(Queue queue) {
- // TODO Auto-generated method stub
-
- }
-
- public void notifyRemove() {
- // TODO Auto-generated method stub
+ private final Statistics statistics;
+ public QueueMBeanImpl(Queue queue) {
+ this.name = queue.getName();
+ if (queue instanceof Statistics) {
+ this.statistics = (Statistics) queue;
+ } else {
+ this.statistics = new EmptyStatistics();
+ }
}
@Override
protected Statistics getStatistics() {
- if (queue instanceof Statistics) {
- return (Statistics) queue;
- }
- return emptyStatistics;
+ return this.statistics;
}
+ @Override
public String getName() {
- return queue.getName();
+ return name;
}
-
}
Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/jmx/QueuesMBeanImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/jmx/QueuesMBeanImpl.java?rev=1483402&r1=1483401&r2=1483402&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/jmx/QueuesMBeanImpl.java (original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/jmx/QueuesMBeanImpl.java Thu May 16 15:10:24 2013
@@ -44,7 +44,6 @@ import org.apache.sling.event.jobs.jmx.S
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.component.ComponentContext;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventConstants;
import org.osgi.service.event.EventHandler;
@@ -87,13 +86,13 @@ public class QueuesMBeanImpl extends Sta
}
@Activate
- public void activate(ComponentContext componentContext) {
- bundleContext = componentContext.getBundleContext();
+ public void activate(final BundleContext bc) {
+ bundleContext = bc;
}
@Deactivate
- public void deactivate(ComponentContext componentContext) {
-
+ public void deactivate() {
+ bundleContext = null;
}
@Override
@@ -114,13 +113,11 @@ public class QueuesMBeanImpl extends Sta
QueueMBeanHolder queueMBeanHolder = queues.get(e.getQueue().getName());
if (queueMBeanHolder != null) {
String[] oldQueue = getQueueNames();
- queueMBeanHolder.queueMBean.notifyUpdate(e.getQueue());
names = null;
this.sendNotification(new AttributeChangeNotification(this,
sequence.incrementAndGet(), System.currentTimeMillis(),
"Queue " + e.getQueue().getName() + " updated ",
"queueNames", "String[]", oldQueue, getQueueNames()));
-
}
}
@@ -166,7 +163,7 @@ public class QueuesMBeanImpl extends Sta
createProperties(
"jmx.objectname","org.apache.sling:type=queues,name="+queue.getName(),
Constants.SERVICE_DESCRIPTION, "QueueMBean for queue "+queue.getName(),
- Constants.SERVICE_VENDOR,"Apache"));
+ Constants.SERVICE_VENDOR, "The Apache Software Foundation"));
QueueMBeanHolder queueMBeanHolder = new QueueMBeanHolder(
queue.getName(), queueMBean, serviceRegistration);
queues.put(queueMBeanHolder.name, queueMBeanHolder);
@@ -182,7 +179,6 @@ public class QueuesMBeanImpl extends Sta
}
private void remove(QueueMBeanHolder queueMBeanHolder) {
- queueMBeanHolder.queueMBean.notifyRemove();
queueMBeanHolder.registration.unregister();
queues.remove(queueMBeanHolder.name);
}
Modified: sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/impl/jobs/jmx/QueuesMBeanImplTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/impl/jobs/jmx/QueuesMBeanImplTest.java?rev=1483402&r1=1483401&r2=1483402&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/impl/jobs/jmx/QueuesMBeanImplTest.java (original)
+++ sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/impl/jobs/jmx/QueuesMBeanImplTest.java Thu May 16 15:10:24 2013
@@ -61,7 +61,7 @@ public class QueuesMBeanImplTest {
public void setup() throws NoSuchFieldException {
mbean = new QueuesMBeanImpl();
Mockito.when(componentContext.getBundleContext()).thenReturn(bundleContext);
- mbean.activate(componentContext);
+ mbean.activate(componentContext.getBundleContext());
}