You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2022/12/16 14:07:25 UTC
[jackrabbit-filevault] branch JCRVLT-670B updated: JCRVLT-670: remove use String cache, getting rid of commons-collections dependency
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch JCRVLT-670B
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git
The following commit(s) were added to refs/heads/JCRVLT-670B by this push:
new b65e1675 JCRVLT-670: remove use String cache, getting rid of commons-collections dependency
b65e1675 is described below
commit b65e16755354313d8fc60dc72363fd9de5c60d18
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Fri Dec 16 15:07:14 2022 +0100
JCRVLT-670: remove use String cache, getting rid of commons-collections dependency
---
.../org/apache/jackrabbit/vault/fs/impl/AggregateImpl.java | 7 +++----
.../jackrabbit/vault/fs/impl/AggregateManagerImpl.java | 14 --------------
2 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/AggregateImpl.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/AggregateImpl.java
index 262f8f1f..e09609d3 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/AggregateImpl.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/AggregateImpl.java
@@ -27,7 +27,6 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Set;
-import javax.jcr.Binary;
import javax.jcr.Node;
import javax.jcr.NodeIterator;
import javax.jcr.Property;
@@ -504,7 +503,7 @@ public class AggregateImpl implements Aggregate {
if (includes == null) {
includes = new HashSet<String>();
}
- includes.add(mgr.cacheString(relPath));
+ includes.add(relPath);
if (!node.isSame(getNode())) {
// ensure that parent nodes are included
include(node.getParent(), null);
@@ -548,7 +547,7 @@ public class AggregateImpl implements Aggregate {
}
// ensure that parent node is included as well
include(parent, null);
- includes.add(mgr.cacheString(relPath));
+ includes.add(relPath);
if (prop.getType() == PropertyType.BINARY) {
boolean includeBinary = true;
if (useBinaryReferences) {
@@ -583,7 +582,7 @@ public class AggregateImpl implements Aggregate {
if (idx > 0) {
String pfx = name.substring(0, idx);
if (!prefixes.contains(pfx)) {
- prefixes.add(mgr.cacheString(pfx));
+ prefixes.add(pfx);
}
}
}
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/AggregateManagerImpl.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/AggregateManagerImpl.java
index 9da58a40..d9b38079 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/AggregateManagerImpl.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/AggregateManagerImpl.java
@@ -39,8 +39,6 @@ import javax.jcr.nodetype.NodeDefinition;
import javax.jcr.nodetype.NodeType;
import javax.jcr.nodetype.PropertyDefinition;
-import org.apache.commons.collections.map.ReferenceMap;
-import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.vault.fs.api.AggregateManager;
import org.apache.jackrabbit.vault.fs.api.Aggregator;
import org.apache.jackrabbit.vault.fs.api.ArtifactHandler;
@@ -129,8 +127,6 @@ public class AggregateManagerImpl implements AggregateManager {
*/
private final Set<String> nodeTypes = new HashSet<String>();
- private final Map<String, String> nameCache = new ReferenceMap(ReferenceMap.WEAK, ReferenceMap.WEAK);
-
/**
* config
*/
@@ -334,16 +330,6 @@ public class AggregateManagerImpl implements AggregateManager {
return session.getNamespaceURI(prefix);
}
- public String cacheString(String string) {
- String ret = nameCache.get(string);
- if (ret == null) {
- // create copy to keep retained size minimal
- ret = new String(string);
- nameCache.put(ret, ret);
- }
- return ret;
- }
-
public void startTracking(ProgressTrackerListener pTracker) {
tracker = new AggregatorTracker(pTracker);
}