You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2018/09/27 07:14:08 UTC
svn commit: r1842073 - in
/felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/model:
AbstractState.java Config.java ConfigList.java ReflectionUtil.java State.java
Author: cziegeler
Date: Thu Sep 27 07:14:08 2018
New Revision: 1842073
URL: http://svn.apache.org/viewvc?rev=1842073&view=rev
Log:
FELIX-5945 : Avoid unnecessary reflection
Removed:
felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/model/ReflectionUtil.java
Modified:
felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/model/AbstractState.java
felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/model/Config.java
felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/model/ConfigList.java
felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/model/State.java
Modified: felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/model/AbstractState.java
URL: http://svn.apache.org/viewvc/felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/model/AbstractState.java?rev=1842073&r1=1842072&r2=1842073&view=diff
==============================================================================
--- felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/model/AbstractState.java (original)
+++ felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/model/AbstractState.java Thu Sep 27 07:14:08 2018
@@ -34,7 +34,7 @@ public class AbstractState implements Se
/** Serialization version. */
private static final int VERSION = 1;
- private final Map<String, ConfigList> configurationsByPid = new TreeMap<>();
+ private Map<String, ConfigList> configurationsByPid = new TreeMap<>();
/**
* Serialize the object
@@ -54,13 +54,14 @@ public class AbstractState implements Se
* - read version id
* - deserialize fields
*/
+ @SuppressWarnings("unchecked")
private void readObject(final java.io.ObjectInputStream in)
throws IOException, ClassNotFoundException {
final int version = in.readInt();
if ( version < 1 || version > VERSION ) {
throw new ClassNotFoundException(this.getClass().getName());
}
- ReflectionUtil.setField(this, "configurationsByPid", in.readObject());
+ this.configurationsByPid = (Map<String, ConfigList>) in.readObject();
}
public void add(final Config c) {
Modified: felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/model/Config.java
URL: http://svn.apache.org/viewvc/felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/model/Config.java?rev=1842073&r1=1842072&r2=1842073&view=diff
==============================================================================
--- felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/model/Config.java (original)
+++ felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/model/Config.java Thu Sep 27 07:14:08 2018
@@ -32,19 +32,19 @@ public class Config implements Serializa
private static final int VERSION = 1;
/** The configuration pid */
- private final String pid;
+ private String pid;
/** The configuration ranking */
- private final int ranking;
+ private int ranking;
/** The bundle id. */
- private final long bundleId;
+ private long bundleId;
/** The configuration policy. */
- private final ConfigPolicy policy;
+ private ConfigPolicy policy;
/** The configuration properties. */
- private final Dictionary<String, Object> properties;
+ private Dictionary<String, Object> properties;
/** The index within the list of configurations if several. */
private volatile int index = 0;
@@ -98,11 +98,11 @@ public class Config implements Serializa
if ( version < 1 || version > VERSION ) {
throw new ClassNotFoundException(this.getClass().getName());
}
- ReflectionUtil.setField(this, "pid", in.readObject());
- ReflectionUtil.setField(this, "properties", in.readObject());
- ReflectionUtil.setField(this, "policy", ConfigPolicy.valueOf((String)in.readObject()));
- ReflectionUtil.setField(this, "bundleId", in.readLong());
- ReflectionUtil.setField(this, "ranking", in.readInt());
+ this.pid = (String) in.readObject();
+ this.properties = (Dictionary<String, Object>) in.readObject();
+ this.policy = ConfigPolicy.valueOf((String)in.readObject());
+ this.bundleId = in.readLong();
+ this.ranking = in.readInt();
this.index = in.readInt();
this.state = ConfigState.valueOf((String)in.readObject());
this.files = (List<File>) in.readObject();
Modified: felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/model/ConfigList.java
URL: http://svn.apache.org/viewvc/felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/model/ConfigList.java?rev=1842073&r1=1842072&r2=1842073&view=diff
==============================================================================
--- felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/model/ConfigList.java (original)
+++ felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/model/ConfigList.java Thu Sep 27 07:14:08 2018
@@ -35,7 +35,7 @@ public class ConfigList implements Seria
/** Serialization version. */
private static final int VERSION = 1;
- private final List<Config> configurations = new ArrayList<>();
+ private List<Config> configurations = new ArrayList<>();
/** The change count. */
private volatile long changeCount = -1;
@@ -67,13 +67,14 @@ public class ConfigList implements Seria
* - read version id
* - deserialize fields
*/
+ @SuppressWarnings("unchecked")
private void readObject(final java.io.ObjectInputStream in)
throws IOException, ClassNotFoundException {
final int version = in.readInt();
if ( version < 1 || version > VERSION ) {
throw new ClassNotFoundException(this.getClass().getName());
}
- ReflectionUtil.setField(this, "configurations", in.readObject());
+ this.configurations = (List<Config>) in.readObject();
lastInstalled = (Config) in.readObject();
this.changeCount = in.readLong();
this.hasChanges = in.readBoolean();
Modified: felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/model/State.java
URL: http://svn.apache.org/viewvc/felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/model/State.java?rev=1842073&r1=1842072&r2=1842073&view=diff
==============================================================================
--- felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/model/State.java (original)
+++ felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/model/State.java Thu Sep 27 07:14:08 2018
@@ -39,9 +39,9 @@ public class State extends AbstractState
public static final String FILE_NAME = "state.ser";
- private final Map<Long, Long> bundlesLastModified = new HashMap<>();
+ private Map<Long, Long> bundlesLastModified = new HashMap<>();
- private final Map<Long, Long> bundlesConfigAdminBundleId = new HashMap<>();
+ private Map<Long, Long> bundlesConfigAdminBundleId = new HashMap<>();
private volatile Set<String> initialHashes;
@@ -72,8 +72,8 @@ public class State extends AbstractState
if ( version < 1 || version > VERSION ) {
throw new ClassNotFoundException(this.getClass().getName());
}
- ReflectionUtil.setField(this, "bundlesLastModified", in.readObject());
- ReflectionUtil.setField(this, "bundlesConfigAdminBundleId", in.readObject());
+ this.bundlesLastModified =(Map<Long, Long>) in.readObject();
+ this.bundlesConfigAdminBundleId = (Map<Long, Long>) in.readObject();
initialHashes = (Set<String>) in.readObject();
}