From 664be7d7d84b5c78001d984bd4ab51caa5273b80 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 26 Mar 2015 13:25:27 +0000
Subject: [PATCH] Renamed ReadableStorage and WriteableStorage to ReadableTransaction and WriteableTransaction. Code review: Matthew Swift

---
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VLVIndex.java |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VLVIndex.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VLVIndex.java
index ea2537d..6dd6673 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VLVIndex.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/VLVIndex.java
@@ -54,12 +54,12 @@
 import org.opends.server.admin.std.meta.BackendVLVIndexCfgDefn.Scope;
 import org.opends.server.admin.std.server.BackendVLVIndexCfg;
 import org.opends.server.backends.pluggable.spi.Cursor;
-import org.opends.server.backends.pluggable.spi.ReadableStorage;
+import org.opends.server.backends.pluggable.spi.ReadableTransaction;
 import org.opends.server.backends.pluggable.spi.Storage;
 import org.opends.server.backends.pluggable.spi.StorageRuntimeException;
 import org.opends.server.backends.pluggable.spi.TreeName;
 import org.opends.server.backends.pluggable.spi.WriteOperation;
-import org.opends.server.backends.pluggable.spi.WriteableStorage;
+import org.opends.server.backends.pluggable.spi.WriteableTransaction;
 import org.opends.server.controls.ServerSideSortRequestControl;
 import org.opends.server.controls.VLVRequestControl;
 import org.opends.server.controls.VLVResponseControl;
@@ -133,8 +133,8 @@
    * @throws ConfigException if a error occurs while reading the VLV index
    * configuration
    */
-  VLVIndex(BackendVLVIndexCfg config, State state, Storage storage, EntryContainer entryContainer, WriteableStorage txn)
-      throws StorageRuntimeException, ConfigException
+  VLVIndex(BackendVLVIndexCfg config, State state, Storage storage, EntryContainer entryContainer,
+      WriteableTransaction txn) throws StorageRuntimeException, ConfigException
   {
     super(new TreeName(entryContainer.getDatabasePrefix(), "vlv." + config.getName()));
 
@@ -227,7 +227,7 @@
 
   /** {@inheritDoc} */
   @Override
-  void open(WriteableStorage txn) throws StorageRuntimeException
+  void open(WriteableTransaction txn) throws StorageRuntimeException
   {
     super.open(txn);
 
@@ -397,7 +397,7 @@
    * JE database.
    * @throws DirectoryException If a Directory Server error occurs.
    */
-  private SortValuesSet getSortValuesSet(ReadableStorage txn, long entryID,
+  private SortValuesSet getSortValuesSet(ReadableTransaction txn, long entryID,
       ByteString[] values, AttributeType[] types) throws StorageRuntimeException,
       DirectoryException
   {
@@ -452,7 +452,7 @@
    * JE database.
    * @throws DirectoryException If a Directory Server error occurs.
    */
-  private boolean containsValues(ReadableStorage txn, long entryID, ByteString[] values, AttributeType[] types)
+  private boolean containsValues(ReadableTransaction txn, long entryID, ByteString[] values, AttributeType[] types)
       throws StorageRuntimeException, DirectoryException
   {
     SortValuesSet valuesSet = getSortValuesSet(txn, entryID, values, types);
@@ -486,7 +486,7 @@
    * @throws DirectoryException If a Directory Server
    * error occurs.
    */
-  void updateIndex(WriteableStorage txn, TreeSet<SortValues> addedValues, TreeSet<SortValues> deletedValues)
+  void updateIndex(WriteableTransaction txn, TreeSet<SortValues> addedValues, TreeSet<SortValues> deletedValues)
       throws DirectoryException, StorageRuntimeException
   {
     // Handle cases where nothing is changed early to avoid
@@ -644,7 +644,7 @@
    * @throws DirectoryException If a Directory Server error occurs.
    * @throws StorageRuntimeException If an error occurs in the JE database.
    */
-  EntryIDSet evaluate(ReadableStorage txn,
+  EntryIDSet evaluate(ReadableTransaction txn,
                              SearchOperation searchOperation,
                              ServerSideSortRequestControl sortControl,
                              VLVRequestControl vlvRequest,
@@ -940,7 +940,7 @@
    *                otherwise.
    * @throws StorageRuntimeException If an error occurs in the JE database.
    */
-  synchronized void setTrusted(WriteableStorage txn, boolean trusted)
+  synchronized void setTrusted(WriteableTransaction txn, boolean trusted)
       throws StorageRuntimeException
   {
     this.trusted = trusted;
@@ -1155,7 +1155,7 @@
       storage.write(new WriteOperation()
       {
         @Override
-        public void run(WriteableStorage txn) throws Exception
+        public void run(WriteableTransaction txn) throws Exception
         {
           applyConfigurationChange0(txn, cfg, ccr);
         }
@@ -1168,7 +1168,7 @@
     }
   }
 
-  private synchronized void applyConfigurationChange0(WriteableStorage txn, BackendVLVIndexCfg cfg,
+  private synchronized void applyConfigurationChange0(WriteableTransaction txn, BackendVLVIndexCfg cfg,
       ConfigChangeResult ccr)
   {
     // Update base DN only if changed..
@@ -1373,7 +1373,7 @@
     return sortOrder;
   }
 
-  boolean verifyEntry(ReadableStorage txn, EntryID entryID, Entry entry) throws DirectoryException
+  boolean verifyEntry(ReadableTransaction txn, EntryID entryID, Entry entry) throws DirectoryException
   {
     return shouldInclude(entry) && !containsValues(txn, entryID.longValue(), getSortValues(entry), getSortTypes());
   }

--
Gitblit v1.10.0