From 83f86f11c27378d650c3bfc7e55397687062edbc Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 22 Apr 2016 14:23:28 +0000
Subject: [PATCH] Improvements suggested by UCDetector: remove dead code, add final keywords, change visibilities
---
opendj-server-legacy/src/main/java/org/opends/server/api/DITCacheMap.java | 55 +++----------------------------------------------------
1 files changed, 3 insertions(+), 52 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/DITCacheMap.java b/opendj-server-legacy/src/main/java/org/opends/server/api/DITCacheMap.java
index ed646bb..757e1a0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/DITCacheMap.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/DITCacheMap.java
@@ -78,10 +78,7 @@
{
/** Node DN. */
DN dn;
- /**
- * Storage object or null if this node exist
- * only to support the DIT like structuring.
- */
+ /** Storage object or null if this node exist only to support the DIT like structuring. */
T element;
/** Parent. */
Node<T> parent;
@@ -92,18 +89,10 @@
/** Previous sibling. */
Node<T> previous;
- /** {@inheritDoc} */
@Override
public String toString()
{
- if (element != null)
- {
- return "node(" + element + ")";
- }
- else
- {
- return "glue";
- }
+ return element != null ? "node(" + element + ")" : "glue";
}
}
@@ -118,38 +107,24 @@
{
}
- /**
- * Constructs a new DITCacheMap from a given Map.
- * @param m existing Map to construct new
- * DITCacheMap from.
- */
- public DITCacheMap(Map<? extends DN, ? extends T> m)
- {
- this.putAll(m);
- }
-
- /** {@inheritDoc} */
@Override
public int size()
{
return size;
}
- /** {@inheritDoc} */
@Override
public boolean isEmpty()
{
return ditCacheMap.isEmpty();
}
- /** {@inheritDoc} */
@Override
public boolean containsKey(Object key)
{
return get(key) != null;
}
- /** {@inheritDoc} */
@Override
public boolean containsValue(Object value)
{
@@ -163,7 +138,6 @@
return false;
}
- /** {@inheritDoc} */
@Override
public T get(Object key)
{
@@ -181,7 +155,6 @@
return new DITSubtreeSet(key);
}
- /** {@inheritDoc} */
@Override
public T put(DN key, T value)
{
@@ -248,7 +221,6 @@
return null;
}
- /** {@inheritDoc} */
@Override
public T remove(Object key)
{
@@ -280,8 +252,6 @@
return returnValue;
}
-
-
/**
* Remove references to a node after it has been removed.
* @param node The node which has just been removed.
@@ -344,8 +314,6 @@
}
}
-
-
/**
* Returns {@code true} if there are stored objects subordinate to subtree DN.
* @param key subtree DN.
@@ -356,8 +324,6 @@
return ditCacheMap.containsKey(key);
}
-
-
/**
* Removes a set of stored objects subordinate to subtree DN.
* @param key subtree DN.
@@ -380,8 +346,6 @@
return false;
}
-
-
/**
* Iterate through detached subtree counting and collecting any elements.
*
@@ -422,9 +386,6 @@
ditCacheMap.remove(node.dn);
}
-
-
- /** {@inheritDoc} */
@Override
public void putAll(Map<? extends DN, ? extends T> m)
{
@@ -434,7 +395,6 @@
}
}
- /** {@inheritDoc} */
@Override
public void clear()
{
@@ -442,7 +402,6 @@
size = 0;
}
- /** {@inheritDoc} */
@Override
public Set<Entry<DN, T>> entrySet()
{
@@ -469,7 +428,6 @@
hasNext = false;
}
- /** {@inheritDoc} */
@Override
public boolean hasNext()
{
@@ -492,7 +450,6 @@
return false;
}
- /** {@inheritDoc} */
@Override
public Entry<DN, T> next()
{
@@ -518,7 +475,6 @@
throw new NoSuchElementException();
}
- /** {@inheritDoc} */
@Override
public void remove()
{
@@ -557,14 +513,12 @@
}
}
- /** {@inheritDoc} */
@Override
public int size()
{
return DITCacheMap.this.size();
}
- /** {@inheritDoc} */
@Override
public Iterator<Entry<DN, T>> iterator()
{
@@ -590,21 +544,18 @@
this.value = value;
}
- /** {@inheritDoc} */
@Override
public DN getKey()
{
return key;
}
- /** {@inheritDoc} */
@Override
public T getValue()
{
return value;
}
- /** {@inheritDoc} */
@Override
public T setValue(T value)
{
@@ -751,7 +702,7 @@
@Override
public boolean isEmpty()
{
- return !(new SubtreeSetIterator(this.key).hasNext());
+ return !new SubtreeSetIterator(this.key).hasNext();
}
@Override
--
Gitblit v1.10.0