separate package for backup API

scotta451 · Jun 10, 2016 · 2a022d1 · 2a022d1
1 parent 39a49d8
commit 2a022d1
Show file tree

Hide file tree

Showing 16 changed files with 21 additions and 22 deletions.
diff --git a/compress/src/main/java/jetbrains/exodus/util/CompressBackupUtil.java b/compress/src/main/java/jetbrains/exodus/util/CompressBackupUtil.java
@@ -15,9 +15,9 @@
  */
 package jetbrains.exodus.util;
 
-import jetbrains.exodus.BackupStrategy;
-import jetbrains.exodus.Backupable;
 import jetbrains.exodus.ExodusException;
+import jetbrains.exodus.backup.BackupStrategy;
+import jetbrains.exodus.backup.Backupable;
 import org.apache.commons.compress.archivers.ArchiveOutputStream;
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;

diff --git a/...store/src/main/java/jetbrains/exodus/entitystore/PersistentEntityStoreBackupStrategy.java b/...store/src/main/java/jetbrains/exodus/entitystore/PersistentEntityStoreBackupStrategy.java
@@ -15,7 +15,7 @@
  */
 package jetbrains.exodus.entitystore;
 
-import jetbrains.exodus.BackupStrategy;
+import jetbrains.exodus.backup.BackupStrategy;
 import jetbrains.exodus.log.LogUtil;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/entity-store/src/main/java/jetbrains/exodus/entitystore/PersistentEntityStoreImpl.java b/entity-store/src/main/java/jetbrains/exodus/entitystore/PersistentEntityStoreImpl.java
@@ -16,6 +16,7 @@
 package jetbrains.exodus.entitystore;
 
 import jetbrains.exodus.*;
+import jetbrains.exodus.backup.BackupStrategy;
 import jetbrains.exodus.bindings.*;
 import jetbrains.exodus.core.dataStructures.ConcurrentObjectCache;
 import jetbrains.exodus.core.dataStructures.Pair;

diff --git a/entity-store/src/main/java/jetbrains/exodus/entitystore/VFSBlobVault.java b/entity-store/src/main/java/jetbrains/exodus/entitystore/VFSBlobVault.java
@@ -15,7 +15,7 @@
  */
 package jetbrains.exodus.entitystore;
 
-import jetbrains.exodus.BackupStrategy;
+import jetbrains.exodus.backup.BackupStrategy;
 import jetbrains.exodus.bindings.IntegerBinding;
 import jetbrains.exodus.bindings.LongBinding;
 import jetbrains.exodus.core.dataStructures.hash.*;

diff --git a/entity-store/src/test/java/jetbrains/exodus/entitystore/BackupTests.java b/entity-store/src/test/java/jetbrains/exodus/entitystore/BackupTests.java
@@ -15,14 +15,14 @@
  */
 package jetbrains.exodus.entitystore;
 
-import jetbrains.exodus.BackupStrategy;
-import jetbrains.exodus.Backupable;
 import jetbrains.exodus.TestUtil;
+import jetbrains.exodus.backup.BackupBean;
+import jetbrains.exodus.backup.BackupStrategy;
+import jetbrains.exodus.backup.Backupable;
 import jetbrains.exodus.core.execution.Job;
 import jetbrains.exodus.core.execution.JobProcessor;
 import jetbrains.exodus.core.execution.JobProcessorExceptionHandler;
 import jetbrains.exodus.core.execution.ThreadJobProcessor;
-import jetbrains.exodus.util.BackupBean;
 import jetbrains.exodus.util.CompressBackupUtil;
 import jetbrains.exodus.util.IOUtil;
 import jetbrains.exodus.util.Random;

diff --git a/entity-store/src/test/java/jetbrains/exodus/entitystore/BlobVaultTests.java b/entity-store/src/test/java/jetbrains/exodus/entitystore/BlobVaultTests.java
@@ -15,7 +15,7 @@
  */
 package jetbrains.exodus.entitystore;
 
-import jetbrains.exodus.BackupStrategy;
+import jetbrains.exodus.backup.BackupStrategy;
 import org.junit.Assert;
 
 import java.io.ByteArrayInputStream;

diff --git a/environment/src/main/java/jetbrains/exodus/env/EnvironmentBackupStrategyImpl.java b/environment/src/main/java/jetbrains/exodus/env/EnvironmentBackupStrategyImpl.java
@@ -15,7 +15,7 @@
  */
 package jetbrains.exodus.env;
 
-import jetbrains.exodus.BackupStrategy;
+import jetbrains.exodus.backup.BackupStrategy;
 import jetbrains.exodus.log.LogUtil;
 import jetbrains.exodus.util.IOUtil;
 import org.jetbrains.annotations.NotNull;

diff --git a/environment/src/main/java/jetbrains/exodus/env/EnvironmentImpl.java b/environment/src/main/java/jetbrains/exodus/env/EnvironmentImpl.java
@@ -15,9 +15,9 @@
  */
 package jetbrains.exodus.env;
 
-import jetbrains.exodus.BackupStrategy;
 import jetbrains.exodus.ConfigSettingChangeListener;
 import jetbrains.exodus.ExodusException;
+import jetbrains.exodus.backup.BackupStrategy;
 import jetbrains.exodus.core.dataStructures.ConcurrentLongObjectCache;
 import jetbrains.exodus.core.dataStructures.LongObjectCacheBase;
 import jetbrains.exodus.core.dataStructures.ObjectCacheBase;

diff --git a/openAPI/src/main/java/jetbrains/exodus/ArrayByteIterable.java b/openAPI/src/main/java/jetbrains/exodus/ArrayByteIterable.java
@@ -165,7 +165,7 @@ public int getOffset() {
     }
 
     @SuppressWarnings({"NonConstantFieldWithUpperCaseName"})
-    private static final class EmptyIterable extends ArrayByteIterable {
+    public static final class EmptyIterable extends ArrayByteIterable {
 
         public final Iterator ITERATOR = new Iterator(0);
 

diff --git a/...ava/jetbrains/exodus/util/BackupBean.java → ...a/jetbrains/exodus/backup/BackupBean.java b/...ava/jetbrains/exodus/util/BackupBean.java → ...a/jetbrains/exodus/backup/BackupBean.java
@@ -13,10 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package jetbrains.exodus.util;
+package jetbrains.exodus.backup;
 
-import jetbrains.exodus.BackupStrategy;
-import jetbrains.exodus.Backupable;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;

diff --git a/...java/jetbrains/exodus/BackupStrategy.java → ...tbrains/exodus/backup/BackupStrategy.java b/...java/jetbrains/exodus/BackupStrategy.java → ...tbrains/exodus/backup/BackupStrategy.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package jetbrains.exodus;
+package jetbrains.exodus.backup;
 
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
 import java.util.Collections;
 
 /**
- * Describes how a backup file should be cooked by {@link jetbrains.exodus.util.BackupBean}. Only listed by
+ * Describes how a backup file should be cooked by {@link BackupBean}. Only listed by
  * {@link #listFiles()} and accepted by {@link #acceptFile(File)} files are put into backup file with defined
  * pre- ({@link #beforeBackup()}) and postprocessing ({@link #afterBackup()}).
  */
@@ -54,7 +54,7 @@ public void afterBackup() throws Exception {
     }
 
     /**
-     * Can be used to interrupt backup process. After each processed file, {@link jetbrains.exodus.util.BackupBean}
+     * Can be used to interrupt backup process. After each processed file, {@link BackupBean}
      * checks if backup procedure should be interrupted.
      *
      * @return true if backup should be interrupted.

diff --git a/...ain/java/jetbrains/exodus/Backupable.java → ...a/jetbrains/exodus/backup/Backupable.java b/...ain/java/jetbrains/exodus/Backupable.java → ...a/jetbrains/exodus/backup/Backupable.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package jetbrains.exodus;
+package jetbrains.exodus.backup;
 
 /**
  * Something that can be backed up. {@link jetbrains.exodus.env.Environment},

diff --git a/openAPI/src/main/java/jetbrains/exodus/entitystore/BlobVault.java b/openAPI/src/main/java/jetbrains/exodus/entitystore/BlobVault.java
@@ -15,7 +15,7 @@
  */
 package jetbrains.exodus.entitystore;
 
-import jetbrains.exodus.Backupable;
+import jetbrains.exodus.backup.Backupable;
 import jetbrains.exodus.core.dataStructures.SoftLongObjectCache;
 import jetbrains.exodus.core.dataStructures.hash.LongHashMap;
 import jetbrains.exodus.core.dataStructures.hash.LongSet;

diff --git a/openAPI/src/main/java/jetbrains/exodus/entitystore/FileSystemBlobVaultOld.java b/openAPI/src/main/java/jetbrains/exodus/entitystore/FileSystemBlobVaultOld.java
@@ -15,7 +15,7 @@
  */
 package jetbrains.exodus.entitystore;
 
-import jetbrains.exodus.BackupStrategy;
+import jetbrains.exodus.backup.BackupStrategy;
 import jetbrains.exodus.core.dataStructures.hash.*;
 import jetbrains.exodus.core.execution.Job;
 import jetbrains.exodus.env.Environment;

diff --git a/openAPI/src/main/java/jetbrains/exodus/entitystore/PersistentEntityStore.java b/openAPI/src/main/java/jetbrains/exodus/entitystore/PersistentEntityStore.java
@@ -15,7 +15,7 @@
  */
 package jetbrains.exodus.entitystore;
 
-import jetbrains.exodus.Backupable;
+import jetbrains.exodus.backup.Backupable;
 import jetbrains.exodus.bindings.ComparableBinding;
 import jetbrains.exodus.core.execution.MultiThreadDelegatingJobProcessor;
 import jetbrains.exodus.env.Environment;

diff --git a/openAPI/src/main/java/jetbrains/exodus/env/Environment.java b/openAPI/src/main/java/jetbrains/exodus/env/Environment.java
@@ -15,7 +15,7 @@
  */
 package jetbrains.exodus.env;
 
-import jetbrains.exodus.Backupable;
+import jetbrains.exodus.backup.Backupable;
 import jetbrains.exodus.management.Statistics;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;