You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2014/08/25 17:50:48 UTC
git commit: [KARAF-3182] Upgrade to Felix EventAdmin 1.4.0
Repository: karaf
Updated Branches:
refs/heads/master 9aa297375 -> 6416c0cca
[KARAF-3182] Upgrade to Felix EventAdmin 1.4.0
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/6416c0cc
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/6416c0cc
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/6416c0cc
Branch: refs/heads/master
Commit: 6416c0cca884d58cd50c21f9b45a8f1eed446fab
Parents: 9aa2973
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Mon Aug 25 17:49:57 2014 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Mon Aug 25 17:49:57 2014 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
.../felix/eventadmin/impl/Configuration.java | 26 ++++++++++++++------
.../eventadmin/impl/handler/EventAdminImpl.java | 4 +--
3 files changed, 21 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/6416c0cc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b3183f8..d68721d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,7 +168,7 @@
<felix.webconsole.version>4.2.0</felix.webconsole.version>
<felix.webconsole.api.version>3.1.2</felix.webconsole.api.version>
<felix.metatype.version>1.0.10</felix.metatype.version>
- <felix.eventadmin.version>1.3.2</felix.eventadmin.version>
+ <felix.eventadmin.version>1.4.0</felix.eventadmin.version>
<felix.eventadmin.webconsole.plugin.version>1.1.0</felix.eventadmin.webconsole.plugin.version>
<felix.obr.version>1.0.2</felix.obr.version>
<felix.scr.version>1.8.2</felix.scr.version>
http://git-wip-us.apache.org/repos/asf/karaf/blob/6416c0cc/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java
----------------------------------------------------------------------
diff --git a/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java b/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java
index ccc722d..b9c4f25 100644
--- a/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java
+++ b/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java
@@ -19,14 +19,22 @@
package org.apache.felix.eventadmin.impl;
-import java.util.*;
-
-import org.apache.felix.eventadmin.impl.adapter.*;
+import java.util.Dictionary;
+import java.util.Hashtable;
+import java.util.StringTokenizer;
+
+import org.apache.felix.eventadmin.impl.adapter.AbstractAdapter;
+import org.apache.felix.eventadmin.impl.adapter.BundleEventAdapter;
+import org.apache.felix.eventadmin.impl.adapter.FrameworkEventAdapter;
+import org.apache.felix.eventadmin.impl.adapter.LogEventAdapter;
+import org.apache.felix.eventadmin.impl.adapter.ServiceEventAdapter;
import org.apache.felix.eventadmin.impl.handler.EventAdminImpl;
import org.apache.felix.eventadmin.impl.security.SecureEventAdminFactory;
import org.apache.felix.eventadmin.impl.tasks.DefaultThreadPool;
import org.apache.felix.eventadmin.impl.util.LogWrapper;
-import org.osgi.framework.*;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceRegistration;
import org.osgi.service.cm.ConfigurationException;
import org.osgi.service.cm.ManagedService;
import org.osgi.service.event.EventAdmin;
@@ -165,7 +173,7 @@ public class Configuration
interfaceNames = new String[] {ManagedService.class.getName(), MetaTypeProvider.class.getName()};
service = enhancedService;
}
- Dictionary props = new Hashtable();
+ Dictionary<String, Object> props = new Hashtable<String, Object>();
props.put( Constants.SERVICE_PID, PID );
m_managedServiceReg = m_bundleContext.registerService( interfaceNames, service, props );
}
@@ -176,13 +184,14 @@ public class Configuration
}
}
- void updateFromConfigAdmin(final Dictionary config)
+ void updateFromConfigAdmin(final Dictionary<String, ?> config)
{
// do this in the background as we don't want to stop
// the config admin
new Thread()
{
+ @Override
public void run()
{
synchronized ( Configuration.this )
@@ -199,7 +208,7 @@ public class Configuration
/**
* Configures this instance.
*/
- void configure( Dictionary config )
+ void configure( Dictionary<String, ?> config )
{
if ( config == null )
{
@@ -428,7 +437,8 @@ public class Configuration
{
return new ManagedService()
{
- public void updated( Dictionary properties ) throws ConfigurationException
+ @Override
+ public void updated( Dictionary<String, ?> properties ) throws ConfigurationException
{
updateFromConfigAdmin(properties);
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/6416c0cc/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/EventAdminImpl.java
----------------------------------------------------------------------
diff --git a/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/EventAdminImpl.java b/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/EventAdminImpl.java
index 5020c49..1277842 100644
--- a/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/EventAdminImpl.java
+++ b/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/EventAdminImpl.java
@@ -125,14 +125,14 @@ public class EventAdminImpl implements EventAdmin
}
if (needTimeStamp || needSubject) {
String[] names = event.getPropertyNames();
- HashMap map = new HashMap(names.length + 1);
+ HashMap<String, Object> map = new HashMap<String, Object>(names.length + 1);
for (int i = 0; i < names.length; i++) {
if (!EventConstants.EVENT_TOPIC.equals(names[i])) {
map.put(names[i], event.getProperty(names[i]));
}
}
if (needTimeStamp) {
- map.put(EventConstants.TIMESTAMP, new Long(System.currentTimeMillis()));
+ map.put(EventConstants.TIMESTAMP, System.currentTimeMillis());
}
if (needSubject) {
map.put(SUBJECT, subject);