Author: cziegeler
Date: Sat Oct 22 12:42:51 2016
New Revision: 1766186
URL: http://svn.apache.org/viewvc?rev=1766186&view=rev
Log:
Sync with master branch
Modified:
felix/trunk/configadmin-1.8.x/src/main/java/org/apache/felix/cm/NotCachablePersistenceManager.java
felix/trunk/configadmin-1.8.x/src/main/java/org/apache/felix/cm/PersistenceManager.java
felix/trunk/configadmin-1.8.x/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java
felix/trunk/configadmin-1.8.x/src/main/java/org/apache/felix/cm/impl/ConfigurationImpl.java
Modified:
felix/trunk/configadmin-1.8.x/src/main/java/org/apache/felix/cm/NotCachablePersistenceManager.java
URL:
http://svn.apache.org/viewvc/felix/trunk/configadmin-1.8.x/src/main/java/org/apache/felix/cm/NotCachablePersistenceManager.java?rev=1766186&r1=1766185&r2=1766186&view=diff
==============================================================================
---
felix/trunk/configadmin-1.8.x/src/main/java/org/apache/felix/cm/NotCachablePersistenceManager.java
(original)
+++
felix/trunk/configadmin-1.8.x/src/main/java/org/apache/felix/cm/NotCachablePersistenceManager.java
Sat Oct 22 12:42:51 2016
@@ -18,6 +18,7 @@
*/
package org.apache.felix.cm;
+import aQute.bnd.annotation.ConsumerType;
/**
* <code>NotCachablePersistenceManager</code> is a marker interface which
@@ -33,6 +34,7 @@ package org.apache.felix.cm;
*
* @since 1.1
*/
+@ConsumerType
public interface NotCachablePersistenceManager extends PersistenceManager
{
}
Modified:
felix/trunk/configadmin-1.8.x/src/main/java/org/apache/felix/cm/PersistenceManager.java
URL:
http://svn.apache.org/viewvc/felix/trunk/configadmin-1.8.x/src/main/java/org/apache/felix/cm/PersistenceManager.java?rev=1766186&r1=1766185&r2=1766186&view=diff
==============================================================================
---
felix/trunk/configadmin-1.8.x/src/main/java/org/apache/felix/cm/PersistenceManager.java
(original)
+++
felix/trunk/configadmin-1.8.x/src/main/java/org/apache/felix/cm/PersistenceManager.java
Sat Oct 22 12:42:51 2016
@@ -23,6 +23,8 @@ import java.io.IOException;
import java.util.Dictionary;
import java.util.Enumeration;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* The <code>PersistenceManager</code> interface defines the API to be
@@ -48,6 +50,7 @@ import java.util.Enumeration;
* used. If no pesistence manager service has been registered, the platfrom
* file system based implementation is used.
*/
+@ConsumerType
public interface PersistenceManager
{
Modified:
felix/trunk/configadmin-1.8.x/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java
URL:
http://svn.apache.org/viewvc/felix/trunk/configadmin-1.8.x/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java?rev=1766186&r1=1766185&r2=1766186&view=diff
==============================================================================
---
felix/trunk/configadmin-1.8.x/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java
(original)
+++
felix/trunk/configadmin-1.8.x/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java
Sat Oct 22 12:42:51 2016
@@ -126,7 +126,8 @@ public class ConfigurationAdapter implem
* @throws IOException
* @see
org.apache.felix.cm.impl.ConfigurationImpl#update(java.util.Dictionary)
*/
- public void update( Dictionary properties ) throws IOException
+ @Override
+ public void update( Dictionary<String, ?> properties ) throws IOException
{
delegatee.getConfigurationManager().log( LogService.LOG_DEBUG,
"update(properties={0})", new Object[]
{ properties } );
@@ -137,7 +138,8 @@ public class ConfigurationAdapter implem
}
- public Dictionary getProperties()
+ @Override
+ public Dictionary<String, Object> getProperties()
{
//delegatee.getConfigurationManager().log( LogService.LOG_DEBUG,
"getProperties()", ( Throwable ) null );
Modified:
felix/trunk/configadmin-1.8.x/src/main/java/org/apache/felix/cm/impl/ConfigurationImpl.java
URL:
http://svn.apache.org/viewvc/felix/trunk/configadmin-1.8.x/src/main/java/org/apache/felix/cm/impl/ConfigurationImpl.java?rev=1766186&r1=1766185&r2=1766186&view=diff
==============================================================================
---
felix/trunk/configadmin-1.8.x/src/main/java/org/apache/felix/cm/impl/ConfigurationImpl.java
(original)
+++
felix/trunk/configadmin-1.8.x/src/main/java/org/apache/felix/cm/impl/ConfigurationImpl.java
Sat Oct 22 12:42:51 2016
@@ -142,7 +142,7 @@ public class ConfigurationImpl extends C
ConfigurationImpl( ConfigurationManager configurationManager,
PersistenceManager persistenceManager,
- Dictionary properties )
+ Dictionary<String, Object> properties )
{
super( configurationManager, persistenceManager, ( String )
properties.remove( Constants.SERVICE_PID ) );
@@ -315,7 +315,7 @@ public class ConfigurationImpl extends C
* <code>true</code> if a deep copy is to be returned.
* @return the configuration properties
*/
- public Dictionary getProperties( boolean deepCopy )
+ public Dictionary<String, Object> getProperties( boolean deepCopy )
{
// no properties yet
if ( properties == null )
@@ -343,7 +343,7 @@ public class ConfigurationImpl extends C
// read configuration from persistence (again)
if ( localPersistenceManager.exists( getPidString() ) )
{
- Dictionary properties = localPersistenceManager.load(
getPidString() );
+ Dictionary<String, Object> properties =
localPersistenceManager.load( getPidString() );
// ensure serviceReference pid
String servicePid = ( String ) properties.get(
Constants.SERVICE_PID );
@@ -365,7 +365,7 @@ public class ConfigurationImpl extends C
/**
* @see org.osgi.service.cm.Configuration#update(java.util.Dictionary)
*/
- public void update( Dictionary properties ) throws IOException
+ public void update( Dictionary<String, ?> properties ) throws IOException
{
PersistenceManager localPersistenceManager = getPersistenceManager();
if ( localPersistenceManager != null )
@@ -459,7 +459,7 @@ public class ConfigurationImpl extends C
*/
private void storeNewConfiguration() throws IOException
{
- Dictionary props = new Hashtable();
+ Dictionary<String, Object> props = new Hashtable<String, Object>();
setAutoProperties( props, true );
props.put( CONFIGURATION_NEW, Boolean.TRUE );
getPersistenceManager().store( getPidString(), props );
@@ -503,12 +503,12 @@ public class ConfigurationImpl extends C
// we don't need a deep copy, since we are not modifying
// any value in the dictionary itself. we are just adding
// properties to it, which are required for storing
- Dictionary props = getProperties( false );
+ Dictionary<String, Object> props = getProperties( false );
// if this is a new configuration, we just use an empty Dictionary
if ( props == null )
{
- props = new Hashtable();
+ props = new Hashtable<String, Object>();
// add automatic properties including the bundle location (if
// statically bound)
@@ -559,7 +559,7 @@ public class ConfigurationImpl extends C
}
- private void configureFromPersistence( Dictionary properties )
+ private void configureFromPersistence( Dictionary<String, Object>
properties )
{
// if the this is not an empty/new configuration, accept the properties
// otherwise just set the properties field to null
@@ -573,7 +573,7 @@ public class ConfigurationImpl extends C
}
}
- private void configure( final Dictionary properties )
+ private void configure( final Dictionary<String, Object> properties )
{
final CaseInsensitiveDictionary newProperties;
if ( properties == null )
@@ -604,7 +604,7 @@ public class ConfigurationImpl extends C
}
- void setAutoProperties( Dictionary properties, boolean withBundleLocation )
+ void setAutoProperties( Dictionary<String, Object> properties, boolean
withBundleLocation )
{
// set pid and factory pid in the properties
replaceProperty( properties, Constants.SERVICE_PID, getPidString() );
@@ -622,7 +622,7 @@ public class ConfigurationImpl extends C
}
- static void setAutoProperties( Dictionary properties, String pid, String
factoryPid )
+ static void setAutoProperties( Dictionary<String, Object> properties,
String pid, String factoryPid )
{
replaceProperty( properties, Constants.SERVICE_PID, pid );
replaceProperty( properties, ConfigurationAdmin.SERVICE_FACTORYPID,
factoryPid );
