Fix service ranking in PushStreamInputContentHandler

Signed-off-by: Mark Hoffmann <m.hoffmann@data-in-motion.biz>
geckoprojects-org · Mar 27, 2024 · 5aa8af5 · 5aa8af5
1 parent fa90854
commit 5aa8af5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/org.gecko.emf.mongo/src/org/gecko/emf/mongo/collection/EMFCursorInputContentHandler.java b/org.gecko.emf.mongo/src/org/gecko/emf/mongo/collection/EMFCursorInputContentHandler.java
@@ -10,8 +10,8 @@
 import org.gecko.emf.mongo.Options;
 import org.gecko.emf.mongo.UncachedInputContentHandler;
 import org.osgi.annotation.bundle.Capability;
-import org.osgi.framework.Constants;
 import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.propertytypes.ServiceRanking;
 
 import com.mongodb.client.FindIterable;
 
@@ -26,7 +26,8 @@
 		version = "2.0",
 		attribute = "type=default"
 		)
-@Component(name="EIteratorInputContentHandler", service=InputContentHandler.class, property = {Constants.SERVICE_RANKING + ":Integer=20"})
+@Component(name="EIteratorInputContentHandler", service=InputContentHandler.class)
+@ServiceRanking(20)
 public class EMFCursorInputContentHandler extends UncachedInputContentHandler {
 
 	/* (non-Javadoc)

diff --git a/org.gecko.emf.mongo/src/org/gecko/emf/mongo/pushstream/PushStreamInputContentHandler.java b/org.gecko.emf.mongo/src/org/gecko/emf/mongo/pushstream/PushStreamInputContentHandler.java
@@ -22,8 +22,8 @@
 import org.gecko.emf.pushstream.CustomPushStreamProvider;
 import org.gecko.emf.pushstream.PushStreamFactory;
 import org.osgi.annotation.bundle.Capability;
-import org.osgi.framework.Constants;
 import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.propertytypes.ServiceRanking;
 import org.osgi.util.pushstream.PushEventSource;
 import org.osgi.util.pushstream.PushStreamProvider;
 
@@ -34,7 +34,8 @@
  * @author Mark Hoffmann
  * @since 23.11.2017
  */
-@Component(name="PushStreamInputContentHandler", service=InputContentHandler.class, property = {Constants.SERVICE_RANKING + "=10"})
+@Component(name="PushStreamInputContentHandler", service=InputContentHandler.class)
+@ServiceRanking(10)
 @Capability(
 		namespace = Keywords.CAPABILITY_EXTENSION_NAMESPACE,
 		name = "pushstream",