You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2021/08/12 13:10:23 UTC
[sling-org-apache-sling-event] 07/08: style
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-event.git
commit 3a2b006503da9596bc54cb422fc24caf19b14273
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Aug 12 14:57:38 2021 +0200
style
---
.../java/org/apache/sling/event/it/AbstractJobHandlingIT.java | 10 +++++-----
.../java/org/apache/sling/event/it/AbstractMaxParallelIT.java | 8 ++++----
src/test/java/org/apache/sling/event/it/ChaosIT.java | 8 ++++----
src/test/java/org/apache/sling/event/it/JobsTestSupport.java | 2 +-
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/test/java/org/apache/sling/event/it/AbstractJobHandlingIT.java b/src/test/java/org/apache/sling/event/it/AbstractJobHandlingIT.java
index 37ef291..76d514f 100644
--- a/src/test/java/org/apache/sling/event/it/AbstractJobHandlingIT.java
+++ b/src/test/java/org/apache/sling/event/it/AbstractJobHandlingIT.java
@@ -68,7 +68,7 @@ public abstract class AbstractJobHandlingIT extends JobsTestSupport {
final EventHandler handler) {
final Dictionary<String, Object> props = new Hashtable<>();
props.put(EventConstants.EVENT_TOPIC, topic);
- final ServiceRegistration<EventHandler> reg = this.bc.registerService(EventHandler.class,
+ final ServiceRegistration<EventHandler> reg = this.bundleContext.registerService(EventHandler.class,
handler, props);
this.registrations.add(reg);
return reg;
@@ -77,7 +77,7 @@ public abstract class AbstractJobHandlingIT extends JobsTestSupport {
protected long getConsumerChangeCount() {
long result = -1;
try {
- final Collection<ServiceReference<PropertyProvider>> refs = this.bc.getServiceReferences(PropertyProvider.class, "(changeCount=*)");
+ final Collection<ServiceReference<PropertyProvider>> refs = this.bundleContext.getServiceReferences(PropertyProvider.class, "(changeCount=*)");
log.info("GetConsumerChangeCount refs.size = {}", refs.size());
if ( !refs.isEmpty() ) {
result = refs.stream().mapToLong(r -> (Long) r.getProperty("changeCount")).max().getAsLong();
@@ -117,7 +117,7 @@ public abstract class AbstractJobHandlingIT extends JobsTestSupport {
long cc = this.getConsumerChangeCount();
final Dictionary<String, Object> props = new Hashtable<>();
props.put(JobConsumer.PROPERTY_TOPICS, topic);
- final ServiceRegistration<JobConsumer> reg = this.bc.registerService(JobConsumer.class,
+ final ServiceRegistration<JobConsumer> reg = this.bundleContext.registerService(JobConsumer.class,
handler, props);
this.registrations.add(reg);
log.info("registered JobConsumer for topic {} and changecount={}",topic, cc);
@@ -128,7 +128,7 @@ public abstract class AbstractJobHandlingIT extends JobsTestSupport {
protected void registerTopologyListener() {
final Dictionary<String, Object> props = new Hashtable<>();
- final ServiceRegistration<TopologyEventListener> reg = this.bc.registerService(TopologyEventListener.class,
+ final ServiceRegistration<TopologyEventListener> reg = this.bundleContext.registerService(TopologyEventListener.class,
new TopologyEventListener() {
@Override
@@ -148,7 +148,7 @@ public abstract class AbstractJobHandlingIT extends JobsTestSupport {
long cc = this.getConsumerChangeCount();
final Dictionary<String, Object> props = new Hashtable<>();
props.put(JobConsumer.PROPERTY_TOPICS, topic);
- final ServiceRegistration<JobExecutor> reg = this.bc.registerService(JobExecutor.class,
+ final ServiceRegistration<JobExecutor> reg = this.bundleContext.registerService(JobExecutor.class,
handler, props);
this.registrations.add(reg);
this.waitConsumerChangeCount(cc + 1);
diff --git a/src/test/java/org/apache/sling/event/it/AbstractMaxParallelIT.java b/src/test/java/org/apache/sling/event/it/AbstractMaxParallelIT.java
index b8afedf..d91a1b3 100644
--- a/src/test/java/org/apache/sling/event/it/AbstractMaxParallelIT.java
+++ b/src/test/java/org/apache/sling/event/it/AbstractMaxParallelIT.java
@@ -152,7 +152,7 @@ public abstract class AbstractMaxParallelIT extends AbstractJobHandlingIT {
final AtomicLong finishedThreads, long duration) {
final List<TopologyView> views = new ArrayList<>();
// register topology listener
- final ServiceRegistration<TopologyEventListener> reg = this.bc.registerService(TopologyEventListener.class, new TopologyEventListener() {
+ final ServiceRegistration<TopologyEventListener> reg = this.bundleContext.registerService(TopologyEventListener.class, new TopologyEventListener() {
@Override
public void handleTopologyEvent(final TopologyEvent event) {
@@ -168,17 +168,17 @@ public abstract class AbstractMaxParallelIT extends AbstractJobHandlingIT {
final TopologyView view = views.get(0);
try {
- final Collection<ServiceReference<TopologyEventListener>> refs = this.bc.getServiceReferences(TopologyEventListener.class, null);
+ final Collection<ServiceReference<TopologyEventListener>> refs = this.bundleContext.getServiceReferences(TopologyEventListener.class, null);
assertNotNull(refs);
assertFalse(refs.isEmpty());
TopologyEventListener found = null;
for(final ServiceReference<TopologyEventListener> ref : refs) {
- final TopologyEventListener listener = this.bc.getService(ref);
+ final TopologyEventListener listener = this.bundleContext.getService(ref);
if ( listener != null && listener.getClass().getName().equals("org.apache.sling.event.impl.jobs.config.TopologyHandler") ) {
found = listener;
break;
}
- bc.ungetService(ref);
+ bundleContext.ungetService(ref);
}
assertNotNull(found);
final TopologyEventListener tel = found;
diff --git a/src/test/java/org/apache/sling/event/it/ChaosIT.java b/src/test/java/org/apache/sling/event/it/ChaosIT.java
index bdbf656..6f6a410 100644
--- a/src/test/java/org/apache/sling/event/it/ChaosIT.java
+++ b/src/test/java/org/apache/sling/event/it/ChaosIT.java
@@ -231,7 +231,7 @@ public class ChaosIT extends AbstractJobHandlingIT {
final AtomicLong finishedThreads) {
final List<TopologyView> views = new ArrayList<>();
// register topology listener
- final ServiceRegistration<TopologyEventListener> reg = this.bc.registerService(TopologyEventListener.class, new TopologyEventListener() {
+ final ServiceRegistration<TopologyEventListener> reg = this.bundleContext.registerService(TopologyEventListener.class, new TopologyEventListener() {
@Override
public void handleTopologyEvent(final TopologyEvent event) {
@@ -247,17 +247,17 @@ public class ChaosIT extends AbstractJobHandlingIT {
final TopologyView view = views.get(0);
try {
- final Collection<ServiceReference<TopologyEventListener>> refs = this.bc.getServiceReferences(TopologyEventListener.class, null);
+ final Collection<ServiceReference<TopologyEventListener>> refs = this.bundleContext.getServiceReferences(TopologyEventListener.class, null);
assertNotNull(refs);
assertFalse(refs.isEmpty());
TopologyEventListener found = null;
for(final ServiceReference<TopologyEventListener> ref : refs) {
- final TopologyEventListener listener = this.bc.getService(ref);
+ final TopologyEventListener listener = this.bundleContext.getService(ref);
if ( listener != null && listener.getClass().getName().equals("org.apache.sling.event.impl.jobs.config.TopologyHandler") ) {
found = listener;
break;
}
- bc.ungetService(ref);
+ bundleContext.ungetService(ref);
}
assertNotNull(found);
final TopologyEventListener tel = found;
diff --git a/src/test/java/org/apache/sling/event/it/JobsTestSupport.java b/src/test/java/org/apache/sling/event/it/JobsTestSupport.java
index 5414d64..9edff88 100644
--- a/src/test/java/org/apache/sling/event/it/JobsTestSupport.java
+++ b/src/test/java/org/apache/sling/event/it/JobsTestSupport.java
@@ -54,7 +54,7 @@ public abstract class JobsTestSupport extends TestSupport {
protected ConfigurationAdmin configAdmin;
@Inject
- protected BundleContext bc;
+ protected BundleContext bundleContext;
@Inject
protected JobManager jobManager;