From 7203f5405a5a9e5d5923a2a80fdf7e31bbf2f984 Mon Sep 17 00:00:00 2001
From: Fabio Pistolesi <fabio.pistolesi@forgerock.com>
Date: Fri, 13 Feb 2015 16:30:53 +0000
Subject: [PATCH] Same visibility changes as for pluggable backend where it does not break other things

---
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryContainer.java |   35 +++++++++++++++++------------------
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/RootContainer.java  |    8 ++++----
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryContainer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryContainer.java
index 477d891..db03396 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryContainer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryContainer.java
@@ -382,7 +382,7 @@
    * @param rootContainer The root container this entry container is in.
    * @throws ConfigException if a configuration related error occurs.
    */
-  public EntryContainer(DN baseDN, String databasePrefix, Backend<?> backend,
+  EntryContainer(DN baseDN, String databasePrefix, Backend<?> backend,
       LocalDBBackendCfg config, Environment env, RootContainer rootContainer)
           throws ConfigException
   {
@@ -411,8 +411,7 @@
    * @throws DatabaseException If an error occurs in the JE database.
    * @throws ConfigException if a configuration related error occurs.
    */
-  public void open()
-  throws DatabaseException, ConfigException
+  void open() throws DatabaseException, ConfigException
   {
     try
     {
@@ -612,7 +611,7 @@
    * @param attrType The attribute type for which an attribute index is needed.
    * @return The attribute index or null if there is none for that type.
    */
-  public AttributeIndex getAttributeIndex(AttributeType attrType)
+  AttributeIndex getAttributeIndex(AttributeType attrType)
   {
     return attrIndexMap.get(attrType);
   }
@@ -632,7 +631,7 @@
    * @param vlvIndexName The vlv index name for which an vlv index is needed.
    * @return The VLV index or null if there is none with that name.
    */
-  public VLVIndex getVLVIndex(String vlvIndexName)
+  VLVIndex getVLVIndex(String vlvIndexName)
   {
     return vlvIndexMap.get(vlvIndexName);
   }
@@ -696,7 +695,7 @@
    *         the entry does not exist.
    * @throws DatabaseException If an error occurs in the JE database.
    */
-  public long getNumSubordinates(DN entryDN, boolean subtree)
+  long getNumSubordinates(DN entryDN, boolean subtree)
   throws DatabaseException
   {
     EntryID entryID = dn2id.get(null, entryDN, LockMode.DEFAULT);
@@ -732,7 +731,7 @@
    * @throws DatabaseException If an error occurs in the JE database.
    * @throws CanceledOperationException if this operation should be cancelled.
    */
-  public void search(SearchOperation searchOperation)
+  void search(SearchOperation searchOperation)
   throws DirectoryException, DatabaseException, CanceledOperationException
   {
     DN aBaseDN = searchOperation.getBaseDN();
@@ -1219,7 +1218,7 @@
    * @throws DirectoryException
    *           If an error occurs retrieving the entry
    */
-  public Entry getEntry(EntryID entryID) throws DirectoryException
+  Entry getEntry(EntryID entryID) throws DirectoryException
   {
     // Try the entry cache first.
     final EntryCache entryCache = getEntryCache();
@@ -1430,7 +1429,7 @@
    * @throws DatabaseException If an error occurs in the JE database.
    * @throws CanceledOperationException if this operation should be cancelled.
    */
-  public void addEntry(Entry entry, AddOperation addOperation)
+  void addEntry(Entry entry, AddOperation addOperation)
   throws DatabaseException, DirectoryException, CanceledOperationException
   {
     Transaction txn = beginTransaction();
@@ -1587,7 +1586,7 @@
    * @throws DatabaseException If an error occurs in the JE database.
    * @throws CanceledOperationException if this operation should be cancelled.
    */
-  public void deleteEntry(DN entryDN, DeleteOperation deleteOperation)
+  void deleteEntry(DN entryDN, DeleteOperation deleteOperation)
   throws DirectoryException, DatabaseException, CanceledOperationException
   {
     Transaction txn = beginTransaction();
@@ -1864,7 +1863,7 @@
    * @throws  DirectoryException  If a problem occurs while trying to make the
    *                              determination.
    */
-  public boolean entryExists(DN entryDN) throws DirectoryException
+  boolean entryExists(DN entryDN) throws DirectoryException
   {
     // Try the entry cache first.
     EntryCache<?> entryCache = DirectoryServer.getEntryCache();
@@ -1899,7 +1898,7 @@
    *                            the entry.
    * @throws DatabaseException An error occurred during a database operation.
    */
-  public Entry getEntry(DN entryDN)
+  Entry getEntry(DN entryDN)
   throws DatabaseException, DirectoryException
   {
     EntryCache<?> entryCache = DirectoryServer.getEntryCache();
@@ -1960,7 +1959,7 @@
    * @throws DirectoryException If a Directory Server error occurs.
    * @throws CanceledOperationException if this operation should be cancelled.
    */
-  public void replaceEntry(Entry oldEntry, Entry newEntry,
+  void replaceEntry(Entry oldEntry, Entry newEntry,
       ModifyOperation modifyOperation) throws DatabaseException,
       DirectoryException, CanceledOperationException
   {
@@ -2083,7 +2082,7 @@
    *          or abandon the modify DN operation.
    * @throws DatabaseException If an error occurs in the JE database.
    */
-  public void renameEntry(DN currentDN, Entry entry, ModifyDNOperation modifyDNOperation)
+  void renameEntry(DN currentDN, Entry entry, ModifyDNOperation modifyDNOperation)
   throws DatabaseException, DirectoryException, CanceledOperationException
   {
     Transaction txn = beginTransaction();
@@ -2574,7 +2573,7 @@
    * @param newSuffixDN The new DN of the renamed or moved entry.
    * @return The new DN of the subordinate entry.
    */
-  public static DN modDN(DN oldDN, int oldSuffixLen, DN newSuffixDN)
+  static DN modDN(DN oldDN, int oldSuffixLen, DN newSuffixDN)
   {
     int oldDNNumComponents    = oldDN.size();
     int oldDNKeepComponents   = oldDNNumComponents - oldSuffixLen;
@@ -2841,7 +2840,7 @@
    * @throws DatabaseException If an error occurs while removing the entry
    *                           container.
    */
-  public void delete() throws DatabaseException
+  void delete() throws DatabaseException
   {
     List<DatabaseContainer> databases = new ArrayList<DatabaseContainer>();
     listDatabases(databases);
@@ -2881,7 +2880,7 @@
    * @throws DatabaseException If an error occurs while attempting to delete the
    * database.
    */
-  public void deleteDatabase(DatabaseContainer database)
+  void deleteDatabase(DatabaseContainer database)
   throws DatabaseException
   {
     if(database == state)
@@ -3066,7 +3065,7 @@
    * @param dn A DN which is in the scope of the base DN.
    * @return The parent DN, or null if the given DN is the base DN.
    */
-  public DN getParentWithinBase(DN dn)
+  DN getParentWithinBase(DN dn)
   {
     if (dn.equals(baseDN))
     {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/RootContainer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/RootContainer.java
index 4991477..52455b0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/RootContainer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/RootContainer.java
@@ -96,7 +96,7 @@
    * @param backend A reference to the JE back end that is creating this
    *                root container.
    */
-  public RootContainer(Backend<?> backend, LocalDBBackendCfg config)
+  RootContainer(Backend<?> backend, LocalDBBackendCfg config)
   {
     this.backend = backend;
     this.config = config;
@@ -227,7 +227,7 @@
    * @throws ConfigException If an configuration error occurs while opening
    *                         the entry container.
    */
-  public EntryContainer openEntryContainer(DN baseDN, String name)
+  EntryContainer openEntryContainer(DN baseDN, String name)
       throws DatabaseException, ConfigException
   {
     String databasePrefix;
@@ -254,7 +254,7 @@
    * @throws InitializationException If an error occurs while opening the
    *                                 entry container.
    */
-  public void registerEntryContainer(DN baseDN, EntryContainer entryContainer)
+  void registerEntryContainer(DN baseDN, EntryContainer entryContainer)
       throws InitializationException
   {
     EntryContainer ec1 = this.entryContainers.get(baseDN);
@@ -307,7 +307,7 @@
    * @return The entry container that was unregistered or NULL if a entry
    * container for the base DN was not registered.
    */
-  public EntryContainer unregisterEntryContainer(DN baseDN)
+  EntryContainer unregisterEntryContainer(DN baseDN)
   {
     return entryContainers.remove(baseDN);
   }

--
Gitblit v1.10.0