CompoundByteIterable moved to openAPI; CompoundByteIteratorBase made …

…public and moved to openAPI as well
scotta451 · Jun 2, 2016 · acdc200 · acdc200
1 parent 2bc7bfb
commit acdc200
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 23 deletions.
diff --git a/entity-store/src/main/java/jetbrains/exodus/entitystore/PersistentEntityStoreImpl.java b/entity-store/src/main/java/jetbrains/exodus/entitystore/PersistentEntityStoreImpl.java
@@ -32,7 +32,6 @@
 import jetbrains.exodus.entitystore.metadata.IndexField;
 import jetbrains.exodus.entitystore.tables.*;
 import jetbrains.exodus.env.*;
-import jetbrains.exodus.log.CompoundByteIterable;
 import jetbrains.exodus.log.CompressedUnsignedLongByteIterable;
 import jetbrains.exodus.management.Statistics;
 import jetbrains.exodus.util.ByteArraySizedInputStream;

diff --git a/environment/src/main/java/jetbrains/exodus/log/ByteIterableWithAddress.java b/environment/src/main/java/jetbrains/exodus/log/ByteIterableWithAddress.java
@@ -17,6 +17,7 @@
 
 import jetbrains.exodus.ByteIterable;
 import jetbrains.exodus.ByteIterator;
+import jetbrains.exodus.CompoundByteIteratorBase;
 import jetbrains.exodus.bindings.LongBinding;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/environment/src/main/java/jetbrains/exodus/log/DataIterator.java b/environment/src/main/java/jetbrains/exodus/log/DataIterator.java
@@ -17,6 +17,7 @@
 
 import jetbrains.exodus.ArrayByteIterable;
 import jetbrains.exodus.ByteIterator;
+import jetbrains.exodus.CompoundByteIteratorBase;
 import jetbrains.exodus.ExodusException;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/environment/src/main/java/jetbrains/exodus/tree/btree/BTreeDupMutable.java b/environment/src/main/java/jetbrains/exodus/tree/btree/BTreeDupMutable.java
@@ -16,6 +16,7 @@
 package jetbrains.exodus.tree.btree;
 
 import jetbrains.exodus.ByteIterable;
+import jetbrains.exodus.CompoundByteIterable;
 import jetbrains.exodus.log.*;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/environment/src/main/java/jetbrains/exodus/tree/btree/BTreeMutable.java b/environment/src/main/java/jetbrains/exodus/tree/btree/BTreeMutable.java
@@ -17,6 +17,7 @@
 
 import jetbrains.exodus.ByteIterable;
 import jetbrains.exodus.ByteIterator;
+import jetbrains.exodus.CompoundByteIterable;
 import jetbrains.exodus.ExodusException;
 import jetbrains.exodus.bindings.LongBinding;
 import jetbrains.exodus.log.*;

diff --git a/environment/src/main/java/jetbrains/exodus/tree/btree/BasePageMutable.java b/environment/src/main/java/jetbrains/exodus/tree/btree/BasePageMutable.java
@@ -17,6 +17,7 @@
 
 import jetbrains.exodus.ByteIterable;
 import jetbrains.exodus.ByteIterator;
+import jetbrains.exodus.CompoundByteIterable;
 import jetbrains.exodus.ExodusException;
 import jetbrains.exodus.bindings.CompressedUnsignedLongArrayByteIterable;
 import jetbrains.exodus.log.*;

diff --git a/environment/src/main/java/jetbrains/exodus/tree/btree/DupLeafNodeMutable.java b/environment/src/main/java/jetbrains/exodus/tree/btree/DupLeafNodeMutable.java
@@ -16,7 +16,7 @@
 package jetbrains.exodus.tree.btree;
 
 import jetbrains.exodus.ByteIterable;
-import jetbrains.exodus.log.CompoundByteIterable;
+import jetbrains.exodus.CompoundByteIterable;
 import jetbrains.exodus.log.CompressedUnsignedLongByteIterable;
 import jetbrains.exodus.log.Loggable;
 import jetbrains.exodus.log.LoggableToWrite;

diff --git a/environment/src/main/java/jetbrains/exodus/tree/patricia/MutableNode.java b/environment/src/main/java/jetbrains/exodus/tree/patricia/MutableNode.java
@@ -15,10 +15,7 @@
  */
 package jetbrains.exodus.tree.patricia;
 
-import jetbrains.exodus.ArrayByteIterable;
-import jetbrains.exodus.ByteIterable;
-import jetbrains.exodus.ByteIterableBase;
-import jetbrains.exodus.ByteIterator;
+import jetbrains.exodus.*;
 import jetbrains.exodus.bindings.CompressedUnsignedLongArrayByteIterable;
 import jetbrains.exodus.bindings.LongBinding;
 import jetbrains.exodus.log.*;

diff --git a/environment/src/main/java/jetbrains/exodus/tree/patricia/PatriciaTreeWithDuplicates.java b/environment/src/main/java/jetbrains/exodus/tree/patricia/PatriciaTreeWithDuplicates.java
@@ -17,7 +17,7 @@
 
 import jetbrains.exodus.ArrayByteIterable;
 import jetbrains.exodus.ByteIterable;
-import jetbrains.exodus.log.CompoundByteIterable;
+import jetbrains.exodus.CompoundByteIterable;
 import jetbrains.exodus.log.CompressedUnsignedLongByteIterable;
 import jetbrains.exodus.log.Log;
 import jetbrains.exodus.log.SingleByteIterable;

diff --git a/environment/src/test/java/jetbrains/exodus/log/LoggableTests.java b/environment/src/test/java/jetbrains/exodus/log/LoggableTests.java
@@ -15,10 +15,7 @@
  */
 package jetbrains.exodus.log;
 
-import jetbrains.exodus.ArrayByteIterable;
-import jetbrains.exodus.ByteIterable;
-import jetbrains.exodus.ByteIterableBase;
-import jetbrains.exodus.ByteIterator;
+import jetbrains.exodus.*;
 import jetbrains.exodus.util.Random;
 import org.junit.Assert;
 import org.junit.Test;

diff --git a/...ains/exodus/log/CompoundByteIterable.java → ...etbrains/exodus/CompoundByteIterable.java b/...ains/exodus/log/CompoundByteIterable.java → ...etbrains/exodus/CompoundByteIterable.java
@@ -13,12 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package jetbrains.exodus.log;
-
-import jetbrains.exodus.ByteIterable;
-import jetbrains.exodus.ByteIterableBase;
-import jetbrains.exodus.ByteIterator;
-import jetbrains.exodus.ExodusException;
+package jetbrains.exodus;
 
 public class CompoundByteIterable extends ByteIterableBase {
 

diff --git a/.../exodus/log/CompoundByteIteratorBase.java → ...ains/exodus/CompoundByteIteratorBase.java b/.../exodus/log/CompoundByteIteratorBase.java → ...ains/exodus/CompoundByteIteratorBase.java
@@ -13,14 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package jetbrains.exodus.log;
+package jetbrains.exodus;
 
-import jetbrains.exodus.ByteIterable;
-import jetbrains.exodus.ByteIterator;
-import jetbrains.exodus.ExodusException;
 import org.jetbrains.annotations.NotNull;
 
-abstract class CompoundByteIteratorBase implements ByteIterator {
+public abstract class CompoundByteIteratorBase implements ByteIterator {
 
     @NotNull
     private ByteIterator current;

diff --git a/vfs/src/main/java/jetbrains/exodus/vfs/Cluster.java b/vfs/src/main/java/jetbrains/exodus/vfs/Cluster.java
@@ -17,7 +17,6 @@
 
 import jetbrains.exodus.*;
 import jetbrains.exodus.bindings.IntegerBinding;
-import jetbrains.exodus.log.CompoundByteIterable;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;