cosmetic: use dedicated constants/annotations for service ranking
diff --git a/core/src/test/java/org/apache/sling/testing/mock/osgi/OsgiMetadataUtilTest.java b/core/src/test/java/org/apache/sling/testing/mock/osgi/OsgiMetadataUtilTest.java
index 2462874..a1d64f7 100644
--- a/core/src/test/java/org/apache/sling/testing/mock/osgi/OsgiMetadataUtilTest.java
+++ b/core/src/test/java/org/apache/sling/testing/mock/osgi/OsgiMetadataUtilTest.java
@@ -49,7 +49,7 @@
Map<String, Object> props = metadata.getProperties();
assertEquals(3, props.size());
- assertEquals(5000, props.get("service.ranking"));
+ assertEquals(5000, props.get(Constants.SERVICE_RANKING));
assertEquals("The Apache Software Foundation", props.get(Constants.SERVICE_VENDOR));
assertArrayEquals(new String[] { "org.apache.sling.api.resource.Resource", "org.apache.sling.api.resource.ResourceResolver" },
(String[])props.get("adaptables"));
diff --git a/test-services/src/main/java/org/apache/sling/testing/mock/osgi/testsvc/osgiserviceutil/RankedServiceFive.java b/test-services/src/main/java/org/apache/sling/testing/mock/osgi/testsvc/osgiserviceutil/RankedServiceFive.java
index 8938eca..ea90c0c 100644
--- a/test-services/src/main/java/org/apache/sling/testing/mock/osgi/testsvc/osgiserviceutil/RankedServiceFive.java
+++ b/test-services/src/main/java/org/apache/sling/testing/mock/osgi/testsvc/osgiserviceutil/RankedServiceFive.java
@@ -20,6 +20,7 @@
import java.util.Map;
+import org.osgi.framework.Constants;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.propertytypes.ServiceRanking;
@@ -32,7 +33,7 @@
@Activate
public void activate(Map<String, Object> properties) {
- this.ranking = (Integer) properties.get("service.ranking");
+ this.ranking = (Integer)properties.get(Constants.SERVICE_RANKING);
}
@Override
diff --git a/test-services/src/main/java/org/apache/sling/testing/mock/osgi/testsvc/osgiserviceutil/RankedServiceTen.java b/test-services/src/main/java/org/apache/sling/testing/mock/osgi/testsvc/osgiserviceutil/RankedServiceTen.java
index 850eec6..38ee86d 100644
--- a/test-services/src/main/java/org/apache/sling/testing/mock/osgi/testsvc/osgiserviceutil/RankedServiceTen.java
+++ b/test-services/src/main/java/org/apache/sling/testing/mock/osgi/testsvc/osgiserviceutil/RankedServiceTen.java
@@ -20,6 +20,7 @@
import java.util.Map;
+import org.osgi.framework.Constants;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.propertytypes.ServiceRanking;
@@ -32,7 +33,7 @@
@Activate
public void activate(Map<String, Object> properties) {
- this.ranking = (Integer) properties.get("service.ranking");
+ this.ranking = (Integer)properties.get(Constants.SERVICE_RANKING);
}
@Override
diff --git a/test-services/src/main/java/org/apache/sling/testing/mock/osgi/testsvc/osgiserviceutil/Service1.java b/test-services/src/main/java/org/apache/sling/testing/mock/osgi/testsvc/osgiserviceutil/Service1.java
index e7424b0..ce2aae0 100644
--- a/test-services/src/main/java/org/apache/sling/testing/mock/osgi/testsvc/osgiserviceutil/Service1.java
+++ b/test-services/src/main/java/org/apache/sling/testing/mock/osgi/testsvc/osgiserviceutil/Service1.java
@@ -18,11 +18,11 @@
*/
package org.apache.sling.testing.mock.osgi.testsvc.osgiserviceutil;
-import org.osgi.framework.Constants;
import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.propertytypes.ServiceRanking;
-@Component(service = ServiceInterface1.class,
- property = Constants.SERVICE_RANKING + ":Integer=100")
+@Component(service = ServiceInterface1.class)
+@ServiceRanking(100)
public class Service1 implements ServiceInterface1 {
// dummy interface
diff --git a/test-services/src/main/java/org/apache/sling/testing/mock/osgi/testsvc/osgiserviceutil/Service2.java b/test-services/src/main/java/org/apache/sling/testing/mock/osgi/testsvc/osgiserviceutil/Service2.java
index b93987a..329e2b1 100644
--- a/test-services/src/main/java/org/apache/sling/testing/mock/osgi/testsvc/osgiserviceutil/Service2.java
+++ b/test-services/src/main/java/org/apache/sling/testing/mock/osgi/testsvc/osgiserviceutil/Service2.java
@@ -18,11 +18,11 @@
*/
package org.apache.sling.testing.mock.osgi.testsvc.osgiserviceutil;
-import org.osgi.framework.Constants;
import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.propertytypes.ServiceRanking;
-@Component(service = { ServiceInterface2.class, ServiceInterface3.class },
- property = Constants.SERVICE_RANKING + ":Integer=200")
+@Component(service = { ServiceInterface2.class, ServiceInterface3.class })
+@ServiceRanking(200)
public class Service2 implements ServiceInterface2, ServiceInterface3 {
// dummy interface
