Use @ServiceRanking component property type annotation in e4.core.tests

HannesWell · HannesWell · commit be8938540661 · 2024-10-14T22:14:08.000+02:00
diff --git a/runtime/tests/org.eclipse.e4.core.javax.tests/.settings/org.eclipse.pde.ds.annotations.prefs b/runtime/tests/org.eclipse.e4.core.javax.tests/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -1,4 +1,4 @@
-dsVersion=V1_3
+dsVersion=V1_4
 eclipse.preferences.version=1
 enabled=true
 generateBundleActivationPolicyLazy=true
diff --git a/runtime/tests/org.eclipse.e4.core.javax.tests/META-INF/MANIFEST.MF b/runtime/tests/org.eclipse.e4.core.javax.tests/META-INF/MANIFEST.MF
@@ -26,6 +26,7 @@ Import-Package: javax.annotation;version="[1.3.0,2.0.0)",
  org.junit.runners;version="[4.13.0,5.0.0)",
  org.osgi.framework;version="[1.10.0,2.0.0)",
  org.osgi.service.component;version="1.3.0",
+ org.osgi.service.component.propertytypes;version="[1.4.0,2.0.0)",
  org.osgi.service.event;version="1.3.0",
  org.osgi.util.tracker;version="[1.5.0,2.0.0)"
 Export-Package: org.eclipse.e4.core.internal.tests;x-internal:=true,
diff --git a/runtime/tests/org.eclipse.e4.core.javax.tests/src/org/eclipse/e4/core/internal/tests/contexts/AddContextFunction.java b/runtime/tests/org.eclipse.e4.core.javax.tests/src/org/eclipse/e4/core/internal/tests/contexts/AddContextFunction.java
@@ -23,7 +23,7 @@
 /**
  * A function provided as a declarative service. See OSGI-INF/adder.xml.
  */
-@Component(service = IContextFunction.class, property = "service.context.key:String=sum")
+@Component(service = IContextFunction.class, property = IContextFunction.SERVICE_CONTEXT_KEY + "=sum")
 public class AddContextFunction extends ContextFunction {
 
 	@Override
diff --git a/runtime/tests/org.eclipse.e4.core.javax.tests/src/org/eclipse/e4/core/internal/tests/contexts/inject/TestServiceB.java b/runtime/tests/org.eclipse.e4.core.javax.tests/src/org/eclipse/e4/core/internal/tests/contexts/inject/TestServiceB.java
@@ -1,8 +1,10 @@
 package org.eclipse.e4.core.internal.tests.contexts.inject;
 
 import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.propertytypes.ServiceRanking;
 
-@Component(enabled = false, property = "service.ranking:Integer=5")
+@Component(enabled = false)
+@ServiceRanking(5)
 public class TestServiceB implements TestService, TestOtherService {
 
 }
diff --git a/runtime/tests/org.eclipse.e4.core.javax.tests/src/org/eclipse/e4/core/internal/tests/di/extensions/DisabledServiceB.java b/runtime/tests/org.eclipse.e4.core.javax.tests/src/org/eclipse/e4/core/internal/tests/di/extensions/DisabledServiceB.java
@@ -1,8 +1,10 @@
 package org.eclipse.e4.core.internal.tests.di.extensions;
 
 import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.propertytypes.ServiceRanking;
 
-@Component(name = "DisabledServiceB", enabled = false, property = { "component=disabled", "service.ranking:Integer=5" })
+@Component(name = "DisabledServiceB", enabled = false, property = "component=disabled")
+@ServiceRanking(5)
 public class DisabledServiceB implements TestService {
 
 }
diff --git a/runtime/tests/org.eclipse.e4.core.javax.tests/src/org/eclipse/e4/core/internal/tests/di/extensions/FilterServiceA.java b/runtime/tests/org.eclipse.e4.core.javax.tests/src/org/eclipse/e4/core/internal/tests/di/extensions/FilterServiceA.java
@@ -1,8 +1,10 @@
 package org.eclipse.e4.core.internal.tests.di.extensions;
 
 import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.propertytypes.ServiceRanking;
 
-@Component(property = { "filtervalue=Test", "service.ranking:Integer=1" })
+@Component(property = "filtervalue=Test")
+@ServiceRanking(1)
 public class FilterServiceA implements TestService {
 
 }
diff --git a/runtime/tests/org.eclipse.e4.core.javax.tests/src/org/eclipse/e4/core/internal/tests/di/extensions/SampleServiceA.java b/runtime/tests/org.eclipse.e4.core.javax.tests/src/org/eclipse/e4/core/internal/tests/di/extensions/SampleServiceA.java
@@ -1,8 +1,10 @@
 package org.eclipse.e4.core.internal.tests.di.extensions;
 
 import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.propertytypes.ServiceRanking;
 
-@Component(property = "service.ranking:Integer=50")
+@Component
+@ServiceRanking(50)
 public class SampleServiceA implements TestService {
 
 }
diff --git a/runtime/tests/org.eclipse.e4.core.javax.tests/src/org/eclipse/e4/core/internal/tests/di/extensions/SampleServiceB.java b/runtime/tests/org.eclipse.e4.core.javax.tests/src/org/eclipse/e4/core/internal/tests/di/extensions/SampleServiceB.java
@@ -1,8 +1,10 @@
 package org.eclipse.e4.core.internal.tests.di.extensions;
 
 import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.propertytypes.ServiceRanking;
 
-@Component(property = "service.ranking:Integer=40")
+@Component
+@ServiceRanking(40)
 public class SampleServiceB implements TestService {
 
 }
diff --git a/runtime/tests/org.eclipse.e4.core.tests/.settings/org.eclipse.pde.ds.annotations.prefs b/runtime/tests/org.eclipse.e4.core.tests/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -1,4 +1,4 @@
-dsVersion=V1_3
+dsVersion=V1_4
 eclipse.preferences.version=1
 enabled=true
 generateBundleActivationPolicyLazy=true
diff --git a/runtime/tests/org.eclipse.e4.core.tests/META-INF/MANIFEST.MF b/runtime/tests/org.eclipse.e4.core.tests/META-INF/MANIFEST.MF
@@ -27,6 +27,7 @@ Import-Package: jakarta.annotation;version="[2.1.0,3.0.0)",
  org.junit.runners;version="[4.13.0,5.0.0)",
  org.osgi.framework;version="[1.10.0,2.0.0)",
  org.osgi.service.component;version="1.3.0",
+ org.osgi.service.component.propertytypes;version="[1.4.0,2.0.0)",
  org.osgi.service.event;version="1.3.0",
  org.osgi.util.tracker;version="[1.5.0,2.0.0)"
 DynamicImport-Package: javax.annotation, javax.inject
diff --git a/runtime/tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/contexts/AddContextFunction.java b/runtime/tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/contexts/AddContextFunction.java
@@ -23,7 +23,7 @@
 /**
  * A function provided as a declarative service. See OSGI-INF/adder.xml.
  */
-@Component(service = IContextFunction.class, property = "service.context.key:String=sum")
+@Component(service = IContextFunction.class, property = IContextFunction.SERVICE_CONTEXT_KEY + "=sum")
 public class AddContextFunction extends ContextFunction {
 
 	@Override
diff --git a/runtime/tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/contexts/inject/TestServiceB.java b/runtime/tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/contexts/inject/TestServiceB.java
@@ -1,8 +1,10 @@
 package org.eclipse.e4.core.internal.tests.contexts.inject;
 
 import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.propertytypes.ServiceRanking;
 
-@Component(enabled = false, property = "service.ranking:Integer=5")
+@Component(enabled = false)
+@ServiceRanking(5)
 public class TestServiceB implements TestService, TestOtherService {
 
 }
diff --git a/runtime/tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/di/extensions/DisabledServiceB.java b/runtime/tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/di/extensions/DisabledServiceB.java
@@ -1,8 +1,10 @@
 package org.eclipse.e4.core.internal.tests.di.extensions;
 
 import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.propertytypes.ServiceRanking;
 
-@Component(name = "DisabledServiceB", enabled = false, property = { "component=disabled", "service.ranking:Integer=5" })
+@Component(name = "DisabledServiceB", enabled = false, property = "component=disabled")
+@ServiceRanking(5)
 public class DisabledServiceB implements TestService {
 
 }
diff --git a/runtime/tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/di/extensions/FilterServiceA.java b/runtime/tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/di/extensions/FilterServiceA.java
@@ -1,8 +1,10 @@
 package org.eclipse.e4.core.internal.tests.di.extensions;
 
 import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.propertytypes.ServiceRanking;
 
-@Component(property = { "filtervalue=Test", "service.ranking:Integer=1" })
+@Component(property = { "filtervalue=Test" })
+@ServiceRanking(1)
 public class FilterServiceA implements TestService {
 
 }
diff --git a/runtime/tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/di/extensions/SampleServiceB.java b/runtime/tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/di/extensions/SampleServiceB.java
@@ -1,8 +1,10 @@
 package org.eclipse.e4.core.internal.tests.di.extensions;
 
 import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.propertytypes.ServiceRanking;
 
-@Component(property = "service.ranking:Integer=40")
+@Component
+@ServiceRanking(40)
 public class SampleServiceB implements TestService {
 
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-dsVersion=V1_3`
	`1`	`+dsVersion=V1_4`
`2`	`2`	`eclipse.preferences.version=1`
`3`	`3`	`enabled=true`
`4`	`4`	`generateBundleActivationPolicyLazy=true`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,10 @@`
`1`	`1`	`package org.eclipse.e4.core.internal.tests.contexts.inject;`
`2`	`2`
`3`	`3`	`import org.osgi.service.component.annotations.Component;`
	`4`	`+import org.osgi.service.component.propertytypes.ServiceRanking;`
`4`	`5`
`5`		`-@Component(enabled = false, property = "service.ranking:Integer=5")`
	`6`	`+@Component(enabled = false)`
	`7`	`+@ServiceRanking(5)`
`6`	`8`	`public class TestServiceB implements TestService, TestOtherService {`
`7`	`9`
`8`	`10`	`}`