From 23cb1d1297a0807fe827a38a17c54bfe1fd05e2d Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 11 May 2015 14:21:36 +0000
Subject: [PATCH] OPENDJ-1855 Reformat and cleanup pluggable backend code: adjust visibility, findbugs, ucdetector, etc...
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ImportIDSet.java | 8 --------
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/RootContainer.java | 12 +-----------
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/CursorTransformer.java | 4 ++--
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexBuffer.java | 5 -----
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/PersistentCompressedSchema.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ImportRecord.java | 11 +----------
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DataConfig.java | 4 ++--
8 files changed, 8 insertions(+), 40 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/CursorTransformer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/CursorTransformer.java
index edfcb24..b4add9d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/CursorTransformer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/CursorTransformer.java
@@ -188,12 +188,12 @@
* Runtime exception for problems happening during the transformation
*/
@SuppressWarnings("serial")
- public static class TransformationException extends RuntimeException
+ private static class TransformationException extends RuntimeException
{
private final Object originalKey;
private final Object originalValue;
- public TransformationException(Exception e, Object originalKey, Object originalValue)
+ private TransformationException(Exception e, Object originalKey, Object originalValue)
{
super(e);
this.originalKey = originalKey;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DataConfig.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DataConfig.java
index 55ddd4f..55400fe 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DataConfig.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DataConfig.java
@@ -37,10 +37,10 @@
final class DataConfig
{
/** Indicates whether data should be compressed before writing to the storage. */
- private boolean compressed;
+ private final boolean compressed;
/** The configuration to use when encoding entries in the tree. */
- private EntryEncodeConfig encodeConfig;
+ private final EntryEncodeConfig encodeConfig;
/**
* Construct a new DataConfig object with the specified settings.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java
index de912dd..68f02d5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java
@@ -1276,7 +1276,7 @@
* @throws DirectoryException
* If an error occurs retrieving the entry
*/
- Entry getEntry(ReadableTransaction txn, EntryID entryID) throws DirectoryException
+ private Entry getEntry(ReadableTransaction txn, EntryID entryID) throws DirectoryException
{
// Try the entry cache first.
final EntryCache<?> entryCache = getEntryCache();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ImportIDSet.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ImportIDSet.java
index 83047a8..3725947 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ImportIDSet.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ImportIDSet.java
@@ -90,14 +90,6 @@
}
/**
- * @param entryID The entry ID to add to an import ID set.
- * @throws NullPointerException if entryID is null
- */
- void addEntryID(EntryID entryID) {
- addEntryID(entryID.longValue());
- }
-
- /**
* @param entryID The {@link EntryID} to add to an import ID set.
*/
void addEntryID(long entryID)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ImportRecord.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ImportRecord.java
index c6777bb..17fbd08 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ImportRecord.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ImportRecord.java
@@ -51,15 +51,6 @@
return new ImportRecord(key, indexID);
}
- static ImportRecord fromBufferAndIndexID(byte[] buffer, int indexID)
- {
- int offSet = readOffset(buffer, 0);
- offSet += REC_OVERHEAD + LONG_SIZE;
- int keyLength = readInt(buffer, offSet);
- ByteString key = ByteString.wrap(buffer, INT_SIZE + offSet, keyLength);
- return new ImportRecord(key, indexID);
- }
-
static ImportRecord from(ByteSequence key, int indexID)
{
return new ImportRecord(key, indexID);
@@ -94,7 +85,7 @@
*/
private final int indexID;
- public ImportRecord(ByteSequence key, int indexID)
+ private ImportRecord(ByteSequence key, int indexID)
{
this.key = key;
this.indexID = indexID;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexBuffer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexBuffer.java
index baee8b6..a9bb713 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexBuffer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexBuffer.java
@@ -227,11 +227,6 @@
createOrGetBufferedVLVIndexValues(index).deleteSortKey(sortKey);
}
- void remove(Index index, ByteString key)
- {
- createOrGetBufferedIndexValues(index, key);
- }
-
void remove(Index index, ByteString key, EntryID entryID)
{
createOrGetBufferedIndexValues(index, key).deleteEntryID(entryID);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/PersistentCompressedSchema.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/PersistentCompressedSchema.java
index 1adb6a9..719b4be 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/PersistentCompressedSchema.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/PersistentCompressedSchema.java
@@ -69,7 +69,7 @@
private static final TreeName ocTreeName = new TreeName("compressed_schema", DB_NAME_OC);
/** The storage in which the trees are held. */
- private Storage storage;
+ private final Storage storage;
private final ByteStringBuilder storeAttributeWriterBuffer = new ByteStringBuilder();
private final ASN1Writer storeAttributeWriter = ASN1.getWriter(storeAttributeWriterBuffer);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/RootContainer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/RootContainer.java
index dae6e62..cce1941 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/RootContainer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/RootContainer.java
@@ -606,16 +606,6 @@
}
/**
- * Get the backend configuration used by this root container.
- *
- * @return The backend configuration used by this root container.
- */
- PluggableBackendCfg getConfiguration()
- {
- return config;
- }
-
- /**
* Get the total number of entries in this root container.
*
* @return The number of entries in this root container
@@ -698,7 +688,7 @@
* @param operation the current operation
* @throws DirectoryException if resources are in short supply
*/
- public void checkForEnoughResources(Operation operation) throws DirectoryException
+ void checkForEnoughResources(Operation operation) throws DirectoryException
{
StorageStatus status = storage.getStorageStatus();
if (status.isUnusable()
--
Gitblit v1.10.0