(sling-whiteboard) branch master updated: feat(migrate_annotations): add support for configurationPolicy migration from SCR annotations

[kwin]

This is an automated email from the ASF dual-hosted git repository.

kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git


The following commit(s) were added to refs/heads/master by this push:
     new 1404492d feat(migrate_annotations): add support for 
configurationPolicy migration from SCR annotations
1404492d is described below

commit 1404492df12d2c68defda6464adafe76f1830b4c
Author: Konrad Windszus <k...@apache.org>
AuthorDate: Wed May 13 15:00:11 2026 +0200

    feat(migrate_annotations): add support for configurationPolicy migration 
from SCR annotations
---
 .../scripts/migrate_annotations.py                 | 16 ++++++++++
 .../scripts/tests/test_migrate_annotations.py      | 36 ++++++++++++++++++++++
 2 files changed, 52 insertions(+)

diff --git a/skills/osgi-scr-migrator/scripts/migrate_annotations.py 
b/skills/osgi-scr-migrator/scripts/migrate_annotations.py
index 08a5ec30..c9b56c96 100755
--- a/skills/osgi-scr-migrator/scripts/migrate_annotations.py
+++ b/skills/osgi-scr-migrator/scripts/migrate_annotations.py
@@ -881,6 +881,10 @@ class AnnotationMigrator:
         immediate = re.search(r'immediate\s*=\s*(true|false)', annotation)
         name = re.search(r'name\s*=\s*"([^"]*)"', annotation)
         factory = re.search(r'factory\s*=\s*"([^"]*)"', annotation)
+        policy = re.search(
+            r'policy\s*=\s*(?:ConfigurationPolicy\.)?([A-Za-z_][A-Za-z0-9_]*)',
+            annotation
+        )
 
         # Build new annotation
         attrs = []
@@ -891,6 +895,18 @@ class AnnotationMigrator:
             attrs.append(f'immediate = {immediate.group(1)}')
         if factory:
             attrs.append(f'factory = "{factory.group(1)}"')
+        if policy:
+            policy_value = policy.group(1).upper()
+            policy_mapping = {
+                'OPTIONAL': 'OPTIONAL',
+                'REQUIRE': 'REQUIRE',
+                'REQUIRED': 'REQUIRE',
+                'IGNORE': 'IGNORE',
+            }
+            mapped_policy = policy_mapping.get(policy_value)
+            if mapped_policy:
+                attrs.append(f'configurationPolicy = 
ConfigurationPolicy.{mapped_policy}')
+                
self.imports_to_add.add('org.osgi.service.component.annotations.ConfigurationPolicy')
         if service_class is not None:
             if service_class:
                 attrs.append(f'service = {service_class}')
diff --git a/skills/osgi-scr-migrator/scripts/tests/test_migrate_annotations.py 
b/skills/osgi-scr-migrator/scripts/tests/test_migrate_annotations.py
index 9f427771..ceabff43 100644
--- a/skills/osgi-scr-migrator/scripts/tests/test_migrate_annotations.py
+++ b/skills/osgi-scr-migrator/scripts/tests/test_migrate_annotations.py
@@ -743,6 +743,42 @@ public class MyService implements MyInterface {
         self.assertNotIn('@Service', new_content)
         self.assertIn('org.osgi.service.component.annotations.Component', 
new_content)
 
+    def test_component_policy_migrates_to_configuration_policy(self):
+        """Test SCR policy attribute migrates to OSGi configurationPolicy."""
+        content = '''package com.example;
+
+import org.apache.felix.scr.annotations.Component;
+
+@Component(policy = ConfigurationPolicy.REQUIRE)
+public class MyService {
+}
+'''
+        stats = MigrationStats()
+        migrator = AnnotationMigrator(content, Path("test.java"), stats)
+        new_content, changed = migrator.migrate()
+
+        self.assertTrue(changed)
+        self.assertIn('configurationPolicy = ConfigurationPolicy.REQUIRE', 
new_content)
+        
self.assertIn('org.osgi.service.component.annotations.ConfigurationPolicy', 
new_content)
+
+    def test_component_required_policy_alias_maps_to_require(self):
+        """Test legacy REQUIRED value maps to OSGi REQUIRE."""
+        content = '''package com.example;
+
+import org.apache.felix.scr.annotations.Component;
+
+@Component(policy = ConfigurationPolicy.REQUIRED)
+public class MyService {
+}
+'''
+        stats = MigrationStats()
+        migrator = AnnotationMigrator(content, Path("test.java"), stats)
+        new_content, changed = migrator.migrate()
+
+        self.assertTrue(changed)
+        self.assertIn('configurationPolicy = ConfigurationPolicy.REQUIRE', 
new_content)
+        self.assertNotIn('configurationPolicy = ConfigurationPolicy.REQUIRED', 
new_content)
+
     def test_component_with_properties(self):
         """Test component with properties (now uses property type 
annotations)."""
         content = '''package com.example;