commit d7344bb15781ff2b9b823b1e97565026d5dea0f1
author Christian Schneider <cschneid@adobe.com> Fri Oct 19 00:02:39 2018 +0200
committer Christian Schneider <cschneid@adobe.com> Fri Oct 19 00:02:39 2018 +0200
tree 5a6254fe9c1b2b65f584a448d917d0044bb80987
parent 9cdfe6572ec3e7f51ed316b88ceba84c46654070

ARIES-1846 - Allow import of clusterinfo services

topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/local/FilterHelper.java

diff --git a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/local/FilterHelper.java b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/local/FilterHelper.java
index 60fad01..bf22558 100644
--- a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/local/FilterHelper.java
+++ b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/importer/local/FilterHelper.java
@@ -58,6 +58,10 @@
         if (className == null) {
             return true;
         }
+        
+        if (className.startsWith("org.osgi.service.clusterinfo")) {
+        	return false;
+        }
 
         for (String p : SYSTEM_PACKAGES) {
             if (className.startsWith(p)) {

topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/importer/local/FilterHelperTest.java

diff --git a/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/importer/local/FilterHelperTest.java b/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/importer/local/FilterHelperTest.java
index ec642da..5f19c9d 100644
--- a/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/importer/local/FilterHelperTest.java
+++ b/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/importer/local/FilterHelperTest.java
@@ -18,11 +18,21 @@
  */
 package org.apache.aries.rsa.topologymanager.importer.local;
 
-import org.apache.aries.rsa.topologymanager.importer.local.FilterHelper;
+import static org.apache.aries.rsa.topologymanager.importer.local.FilterHelper.isClassExcluded;
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.assertThat;
+
 import org.junit.Assert;
 import org.junit.Test;
+import org.osgi.service.cm.ConfigurationAdmin;
 
 public class FilterHelperTest {
+	
+	@Test
+	public void testIgnore() { 
+		assertThat(isClassExcluded(ConfigurationAdmin.class.getName()), equalTo(true));
+		assertThat(isClassExcluded("org.osgi.service.clusterinfo.NodeStatus"), equalTo(false));
+	}
 
     @Test
     public void testClass()  {