svn commit: r1778983 - in /felix/trunk/osgi-r7/configurator/src: main/java/org/apache/felix/configurator/impl/ConfigUtil.java test/java/org/apache/felix/configurator/impl/ConfigUtilTest.java

[cz...@apache.org]

Author: cziegeler
Date: Mon Jan 16 08:10:28 2017
New Revision: 1778983

URL: http://svn.apache.org/viewvc?rev=1778983&view=rev
Log:
Update to latest config admin changes

Modified:
    felix/trunk/osgi-r7/configurator/src/main/java/org/apache/felix/configurator/impl/ConfigUtil.java
    felix/trunk/osgi-r7/configurator/src/test/java/org/apache/felix/configurator/impl/ConfigUtilTest.java

Modified: felix/trunk/osgi-r7/configurator/src/main/java/org/apache/felix/configurator/impl/ConfigUtil.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/configurator/src/main/java/org/apache/felix/configurator/impl/ConfigUtil.java?rev=1778983&r1=1778982&r2=1778983&view=diff
==============================================================================
--- felix/trunk/osgi-r7/configurator/src/main/java/org/apache/felix/configurator/impl/ConfigUtil.java (original)
+++ felix/trunk/osgi-r7/configurator/src/main/java/org/apache/felix/configurator/impl/ConfigUtil.java Mon Jan 16 08:10:28 2017
@@ -52,7 +52,7 @@ public abstract class ConfigUtil {
     public static Configuration getOrCreateConfiguration(final ConfigurationAdmin ca,
             final String pid,
             final boolean createIfNeeded)
-    throws IOException, InvalidSyntaxException {
+                    throws IOException, InvalidSyntaxException {
         final String filter = "(" + Constants.SERVICE_PID + "=" + encode(pid) + ")";
         final Configuration[] configs = ca.listConfigurations(filter);
         if (configs != null && configs.length > 0) {
@@ -62,7 +62,7 @@ public abstract class ConfigUtil {
             return null;
         }
 
-        final int pos = pid.indexOf('#');
+        final int pos = pid.indexOf('~');
         if ( pos != -1 ) {
             final String factoryPid = pid.substring(0, pos);
             final String alias = pid.substring(pos + 1);

Modified: felix/trunk/osgi-r7/configurator/src/test/java/org/apache/felix/configurator/impl/ConfigUtilTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/configurator/src/test/java/org/apache/felix/configurator/impl/ConfigUtilTest.java?rev=1778983&r1=1778982&r2=1778983&view=diff
==============================================================================
--- felix/trunk/osgi-r7/configurator/src/test/java/org/apache/felix/configurator/impl/ConfigUtilTest.java (original)
+++ felix/trunk/osgi-r7/configurator/src/test/java/org/apache/felix/configurator/impl/ConfigUtilTest.java Mon Jan 16 08:10:28 2017
@@ -72,7 +72,7 @@ public class ConfigUtilTest {
     }
 
     @Test public void testGetFactoryNoCreate() throws Exception {
-        final String pid = "a.b#alias";
+        final String pid = "a.b~name";
         final ConfigurationAdmin ca = mock(ConfigurationAdmin.class);
         when(ca.listConfigurations(getFilterString(pid))).thenReturn(null);
         assertNull(ConfigUtil.getOrCreateConfiguration(ca, pid, false));
@@ -81,21 +81,21 @@ public class ConfigUtilTest {
     }
 
     @Test public void testGetFactoryCreate() throws Exception {
-        final String pid = "a.b#alias";
+        final String pid = "a.b~name";
         final Configuration cfg = mock(Configuration.class);
         when(cfg.getPid()).thenReturn(pid);
 
         final ConfigurationAdmin ca = mock(ConfigurationAdmin.class);
         when(ca.listConfigurations(getFilterString(pid))).thenReturn(null);
-        when(ca.getFactoryConfiguration("a.b", "alias", "?")).thenReturn(cfg);
+        when(ca.getFactoryConfiguration("a.b", "name", "?")).thenReturn(cfg);
         assertEquals(cfg, ConfigUtil.getOrCreateConfiguration(ca, pid, true));
         verify(ca).listConfigurations(getFilterString(pid));
-        verify(ca).getFactoryConfiguration("a.b", "alias", "?");
+        verify(ca).getFactoryConfiguration("a.b", "name", "?");
         verifyNoMoreInteractions(ca);
     }
 
     @Test public void testGetFactoryAvailable() throws Exception {
-        final String pid = "a.b#alias";
+        final String pid = "a.b~name";
         final Configuration cfg = mock(Configuration.class);
         when(cfg.getPid()).thenReturn(pid);