#21: DefaultCompatibilityFactoryImpl defined as a @component thus ful…

…filling dependency requirement for CompatibilityDaoMongoImpl.
ReliSA · Feb 9, 2020 · ee76a67 · ee76a67
1 parent b36930a
commit ee76a67
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 15 deletions.
diff --git a/core/crce-compatibility-api/pom.xml b/core/crce-compatibility-api/pom.xml
@@ -2,18 +2,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>10</source>
-                    <target>10</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 
     <parent>
         <groupId>cz.zcu.kiv.crce</groupId>
@@ -32,6 +20,24 @@
         <bundle.namespace>${namespace}.compatibility</bundle.namespace>
     </properties>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>10</source>
+                    <target>10</target>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.dependencymanager.annotation</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
     <dependencies>
         <!--CRCE dependencies-->
         <dependency>

diff --git a/...api/src/main/java/cz/zcu/kiv/crce/compatibility/impl/DefaultCompatibilityFactoryImpl.java b/...api/src/main/java/cz/zcu/kiv/crce/compatibility/impl/DefaultCompatibilityFactoryImpl.java
@@ -2,12 +2,14 @@
 
 import cz.zcu.kiv.crce.compatibility.*;
 import cz.zcu.kiv.crce.metadata.type.Version;
+import org.apache.felix.dm.annotation.api.Component;
 
 import java.util.List;
 
 /**
  * Factory which creates default implementations of Compatibility interfaces.
  */
+@Component(provides = {CompatibilityFactory.class})
 public class DefaultCompatibilityFactoryImpl implements CompatibilityFactory {
 
     @Override

diff --git a/...ility-dao-mongodb/src/main/java/cz/zcu/kiv/crce/compatibility/dao/internal/Activator.java b/...ility-dao-mongodb/src/main/java/cz/zcu/kiv/crce/compatibility/dao/internal/Activator.java
@@ -1,5 +1,6 @@
 package cz.zcu.kiv.crce.compatibility.dao.internal;
 
+import cz.zcu.kiv.crce.compatibility.CompatibilityFactory;
 import cz.zcu.kiv.crce.compatibility.dao.CompatibilityDao;
 import org.apache.felix.dm.DependencyActivatorBase;
 import org.apache.felix.dm.DependencyManager;
@@ -37,9 +38,9 @@ public void init(BundleContext context, DependencyManager manager) throws Except
                 .setInterface(s, compatibilityProps)
                 .setFactory(new CompatibilityDaoMongoFactory(), "get")
                 //requires CompatibilityFactory for proper mapping
-//                .add(createServiceDependency().setRequired(false)
-//                        .setService(CompatibilityFactory.class)
-//                )
+                .add(createServiceDependency().setRequired(true)
+                        .setService(CompatibilityFactory.class)
+                )
         );
     }