You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2014/04/27 03:04:20 UTC
svn commit: r1590332 - in
/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins:
processor/PluginCache.java util/PluginManager.java util/PluginRegistry.java
Author: mattsicker
Date: Sun Apr 27 01:04:20 2014
New Revision: 1590332
URL: http://svn.apache.org/r1590332
Log:
Rename methods in PluginRegistry.
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginCache.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginManager.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginRegistry.java
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginCache.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginCache.java?rev=1590332&r1=1590331&r2=1590332&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginCache.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginCache.java Sun Apr 27 01:04:20 2014
@@ -43,7 +43,7 @@ public class PluginCache {
* @return plugin mapping of names to plugin entries.
*/
public ConcurrentMap<String, PluginEntry> getCategory(final String category) {
- return pluginCategories.get(category);
+ return pluginCategories.getCategory(category);
}
/**
@@ -55,8 +55,8 @@ public class PluginCache {
public void writeCache(final OutputStream os) throws IOException {
final DataOutputStream out = new DataOutputStream(new BufferedOutputStream(os));
try {
- out.writeInt(pluginCategories.size());
- for (final Map.Entry<String, ConcurrentMap<String, PluginEntry>> category : pluginCategories.entrySet()) {
+ out.writeInt(pluginCategories.getCategoryCount());
+ for (final Map.Entry<String, ConcurrentMap<String, PluginEntry>> category : pluginCategories.getCategories()) {
out.writeUTF(category.getKey());
final Map<String, PluginEntry> m = category.getValue();
out.writeInt(m.size());
@@ -89,7 +89,7 @@ public class PluginCache {
final int count = in.readInt();
for (int i = 0; i < count; i++) {
final String category = in.readUTF();
- final ConcurrentMap<String, PluginEntry> m = pluginCategories.get(category);
+ final ConcurrentMap<String, PluginEntry> m = pluginCategories.getCategory(category);
final int entries = in.readInt();
for (int j = 0; j < entries; j++) {
final PluginEntry entry = new PluginEntry();
@@ -114,6 +114,6 @@ public class PluginCache {
* @return number of plugin categories in cache.
*/
public int size() {
- return pluginCategories.size();
+ return pluginCategories.getCategoryCount();
}
}
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginManager.java?rev=1590332&r1=1590331&r2=1590332&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginManager.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginManager.java Sun Apr 27 01:04:20 2014
@@ -145,8 +145,8 @@ public class PluginManager {
*/
@SuppressWarnings({ "unchecked", "rawtypes" })
public void collectPlugins(boolean preLoad, final String pkgs) {
- if (pluginTypeMap.containsKey(category)) {
- plugins = pluginTypeMap.get(category);
+ if (pluginTypeMap.hasCategory(category)) {
+ plugins = pluginTypeMap.getCategory(category);
preLoad = false;
}
final long start = System.nanoTime();
@@ -159,7 +159,7 @@ public class PluginManager {
final PluginRegistry<PluginType<?>> map = decode(classLoader);
if (map != null) {
pluginTypeMap = map;
- plugins = map.get(category);
+ plugins = map.getCategory(category);
} else {
LOGGER.warn("Plugin preloads not available from class loader {}", classLoader);
}
@@ -181,7 +181,7 @@ public class PluginManager {
for (final Class<?> clazz : resolver.getClasses()) {
final Plugin plugin = clazz.getAnnotation(Plugin.class);
final String pluginCategory = plugin.category();
- final Map<String, PluginType<?>> map = pluginTypeMap.get(pluginCategory);
+ final Map<String, PluginType<?>> map = pluginTypeMap.getCategory(pluginCategory);
String type = plugin.elementType().equals(Plugin.EMPTY) ? plugin.name() : plugin.elementType();
PluginType pluginType = new PluginType(clazz, type, plugin.printObject(), plugin.deferChildren());
map.put(plugin.name().toLowerCase(), pluginType);
@@ -195,7 +195,7 @@ public class PluginManager {
}
}
long elapsed = System.nanoTime() - start;
- plugins = pluginTypeMap.get(category);
+ plugins = pluginTypeMap.getCategory(category);
final StringBuilder sb = new StringBuilder("Generated plugins in ");
DecimalFormat numFormat = new DecimalFormat("#0");
final long seconds = elapsed / NANOS_PER_SECOND;
@@ -235,7 +235,7 @@ public class PluginManager {
for (int j = 0; j < count; ++j) {
final String category = dis.readUTF();
final int entries = dis.readInt();
- final Map<String, PluginType<?>> types = map.get(category);
+ final Map<String, PluginType<?>> types = map.getCategory(category);
for (int i = 0; i < entries; ++i) {
final String key = dis.readUTF();
final String className = dis.readUTF();
@@ -277,8 +277,8 @@ public class PluginManager {
try {
final DataOutputStream dos = new DataOutputStream(new BufferedOutputStream(new FileOutputStream(fileName)));
try {
- dos.writeInt(map.size());
- for (final Map.Entry<String, ConcurrentMap<String, PluginType<?>>> outer : map.entrySet()) {
+ dos.writeInt(map.getCategoryCount());
+ for (final Map.Entry<String, ConcurrentMap<String, PluginType<?>>> outer : map.getCategories()) {
dos.writeUTF(outer.getKey());
dos.writeInt(outer.getValue().size());
for (final Map.Entry<String, PluginType<?>> entry : outer.getValue().entrySet()) {
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginRegistry.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginRegistry.java?rev=1590332&r1=1590331&r2=1590332&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginRegistry.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginRegistry.java Sun Apr 27 01:04:20 2014
@@ -32,7 +32,7 @@ public class PluginRegistry<T extends Se
private final ConcurrentMap<String, ConcurrentMap<String, T>> categories =
new ConcurrentHashMap<String, ConcurrentMap<String, T>>();
- public ConcurrentMap<String, T> get(final String category) {
+ public ConcurrentMap<String, T> getCategory(final String category) {
if (category == null) {
throw new IllegalArgumentException("Category name cannot be null.");
}
@@ -41,7 +41,7 @@ public class PluginRegistry<T extends Se
return categories.get(key);
}
- public int size() {
+ public int getCategoryCount() {
return categories.size();
}
@@ -53,11 +53,11 @@ public class PluginRegistry<T extends Se
categories.clear();
}
- public boolean containsKey(final String key) {
+ public boolean hasCategory(final String key) {
return categories.containsKey(key);
}
- public Set<Map.Entry<String, ConcurrentMap<String, T>>> entrySet() {
+ public Set<Map.Entry<String, ConcurrentMap<String, T>>> getCategories() {
return categories.entrySet();
}
}