You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2021/03/07 18:38:08 UTC
[aries-component-dsl] 03/03: match order
This is an automated email from the ASF dual-hosted git repository.
csierra pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-component-dsl.git
commit a28ae833768581d51c979dbe3ee97627c9a354a6
Author: Carlos Sierra Andrés <ca...@liferay.com>
AuthorDate: Sun Mar 7 19:12:42 2021 +0100
match order
---
.../src/main/java/org/apache/aries/component/dsl/OSGi.java | 9 +++++----
.../aries/component/dsl/internal/ServiceReferenceOSGi.java | 2 +-
.../apache/aries/component/dsl/services/ServiceReferences.java | 6 +++---
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/component-dsl/src/main/java/org/apache/aries/component/dsl/OSGi.java b/component-dsl/src/main/java/org/apache/aries/component/dsl/OSGi.java
index d13185d..b935efa 100644
--- a/component-dsl/src/main/java/org/apache/aries/component/dsl/OSGi.java
+++ b/component-dsl/src/main/java/org/apache/aries/component/dsl/OSGi.java
@@ -534,19 +534,20 @@ public interface OSGi<T> extends OSGiRunnable<T> {
static <T> OSGi<CachingServiceReference<T>> serviceReferences(
Class<T> clazz) {
- return new ServiceReferenceOSGi<>(null, clazz);
+ return serviceReferences(clazz, (String)null);
}
static OSGi<CachingServiceReference<Object>> serviceReferences(
String filterString) {
- return new ServiceReferenceOSGi<>(filterString, null);
+ return serviceReferences(null, filterString);
}
static <T> OSGi<CachingServiceReference<T>> serviceReferences(
Class<T> clazz, String filterString) {
- return new ServiceReferenceOSGi<>(filterString, clazz);
+ return serviceReferences(
+ clazz, filterString, CachingServiceReference::isDirty);
}
static <T> OSGi<CachingServiceReference<T>> serviceReferences(
@@ -554,7 +555,7 @@ public interface OSGi<T> extends OSGiRunnable<T> {
Refresher<? super CachingServiceReference<T>> onModified) {
return refreshWhen(
- serviceReferences(clazz, filterString),
+ new ServiceReferenceOSGi<>(clazz, filterString),
onModified::test);
}
diff --git a/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/ServiceReferenceOSGi.java b/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/ServiceReferenceOSGi.java
index d93904f..998bbae 100644
--- a/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/ServiceReferenceOSGi.java
+++ b/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/ServiceReferenceOSGi.java
@@ -30,7 +30,7 @@ import org.osgi.util.tracker.ServiceTrackerCustomizer;
public class ServiceReferenceOSGi<T>
extends OSGiImpl<CachingServiceReference<T>> {
- public ServiceReferenceOSGi(String filterString, Class<T> clazz) {
+ public ServiceReferenceOSGi(Class<T> clazz, String filterString) {
super((executionContext, op) -> {
ServiceTracker<T, Tracked<T>>
diff --git a/component-dsl/src/main/java/org/apache/aries/component/dsl/services/ServiceReferences.java b/component-dsl/src/main/java/org/apache/aries/component/dsl/services/ServiceReferences.java
index 4dc59d0..cc2886f 100644
--- a/component-dsl/src/main/java/org/apache/aries/component/dsl/services/ServiceReferences.java
+++ b/component-dsl/src/main/java/org/apache/aries/component/dsl/services/ServiceReferences.java
@@ -26,19 +26,19 @@ public interface ServiceReferences {
static <T> OSGi<CachingServiceReference<T>> withUpdate(
Class<T> clazz) {
- return new ServiceReferenceOSGi<>(null, clazz);
+ return new ServiceReferenceOSGi<>(clazz, null);
}
static OSGi<CachingServiceReference<Object>> withUpdate(
String filterString) {
- return new ServiceReferenceOSGi<>(filterString, null);
+ return new ServiceReferenceOSGi<>(null, filterString);
}
static <T> OSGi<CachingServiceReference<T>> withUpdate(
Class<T> clazz, String filterString) {
- return new ServiceReferenceOSGi<>(filterString, clazz);
+ return new ServiceReferenceOSGi<>(clazz, filterString);
}
}