goldcollection
/
muwire
mirror of https://github.com/zlatinb/muwire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rename package so that it won't conflict in the plugin

pull/62/head
Zlatin Balevsky 2021-06-04 18:22:45 +01:00
parent 88f1f381b9
commit 0916e67939
No known key found for this signature in database
GPG Key ID: A72832072D525E41
19 changed files with 45 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/groovy/com/muwire/core/search/SearchIndex.groovy
View File

@ -1,9 +1,9 @@
package com.muwire.core.search package com.muwire.core.search
import com.muwire.core.SplitPattern import com.muwire.core.SplitPattern
import net.metanotion.io.Serializer import net.metanotionz.io.Serializer
import net.metanotion.io.block.BlockFile import net.metanotionz.io.block.BlockFile
import net.metanotion.util.skiplist.SkipList import net.metanotionz.util.skiplist.SkipList
import java.nio.charset.StandardCharsets import java.nio.charset.StandardCharsets

7
core/src/main/java/net/metanotion/io/RAIFile.java → core/src/main/java/net/metanotionz/io/RAIFile.java
View File

@ -26,24 +26,19 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package net.metanotion.io; package net.metanotionz.io;
import com.muwire.core.util.DataUtil; import com.muwire.core.util.DataUtil;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.RandomAccessFile;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.channels.FileChannel; import java.nio.channels.FileChannel;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.OpenOption;
import java.nio.file.StandardOpenOption; import java.nio.file.StandardOpenOption;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set;
public class RAIFile implements RandomAccessInterface { public class RAIFile implements RandomAccessInterface {

2
core/src/main/java/net/metanotion/io/RandomAccessInterface.java → core/src/main/java/net/metanotionz/io/RandomAccessInterface.java
View File

@ -26,7 +26,7 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package net.metanotion.io; package net.metanotionz.io;
import java.io.IOException; import java.io.IOException;

4
core/src/main/java/net/metanotion/io/SerialStreams.java → core/src/main/java/net/metanotionz/io/SerialStreams.java
View File

@ -26,7 +26,7 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package net.metanotion.io; package net.metanotionz.io;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
@ -34,8 +34,6 @@ import java.io.DataInputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.io.IOException; import java.io.IOException;
import net.metanotion.io.Serializer;
public abstract class SerialStreams implements Serializer { public abstract class SerialStreams implements Serializer {
public byte[] getBytes(Object o) { public byte[] getBytes(Object o) {
try { try {

2
core/src/main/java/net/metanotion/io/Serializer.java → core/src/main/java/net/metanotionz/io/Serializer.java
View File

@ -26,7 +26,7 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package net.metanotion.io; package net.metanotionz.io;
public interface Serializer<T> { public interface Serializer<T> {
public byte[] getBytes(T o); public byte[] getBytes(T o);

19
core/src/main/java/net/metanotion/io/block/BlockFile.java → core/src/main/java/net/metanotionz/io/block/BlockFile.java
View File

@ -26,24 +26,23 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package net.metanotion.io.block; package net.metanotionz.io.block;
import java.io.Closeable; import java.io.Closeable;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import net.metanotion.io.RAIFile; import net.metanotionz.io.RAIFile;
import net.metanotion.io.RandomAccessInterface; import net.metanotionz.io.RandomAccessInterface;
import net.metanotion.io.Serializer; import net.metanotionz.io.Serializer;
import net.metanotion.io.data.IntBytes; import net.metanotionz.io.data.IntBytes;
import net.metanotion.io.data.StringBytes; import net.metanotionz.io.data.StringBytes;
import net.metanotion.io.block.index.BSkipList; import net.metanotionz.io.block.index.BSkipList;
import net.metanotion.io.block.index.BSkipSpan; import net.metanotionz.io.block.index.BSkipSpan;
import net.metanotion.util.skiplist.SkipIterator; import net.metanotionz.util.skiplist.SkipIterator;
/** /**
* On-disk format: * On-disk format:

4
core/src/main/java/net/metanotion/io/block/FreeListBlock.java → core/src/main/java/net/metanotionz/io/block/FreeListBlock.java
View File

@ -26,14 +26,14 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package net.metanotion.io.block; package net.metanotionz.io.block;
import java.io.IOException; import java.io.IOException;
import net.i2p.I2PAppContext; import net.i2p.I2PAppContext;
import net.i2p.util.Log; import net.i2p.util.Log;
import net.metanotion.io.RandomAccessInterface; import net.metanotionz.io.RandomAccessInterface;
/** /**
* On-disk format: * On-disk format:

13
core/src/main/java/net/metanotion/io/block/index/BSkipLevels.java → core/src/main/java/net/metanotionz/io/block/index/BSkipLevels.java
View File

@ -26,7 +26,7 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package net.metanotion.io.block.index; package net.metanotionz.io.block.index;
import java.io.IOException; import java.io.IOException;
import java.io.Serializable; import java.io.Serializable;
@ -34,14 +34,11 @@ import java.util.ArrayList;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.TreeSet;
import net.metanotion.io.block.BlockFile; import net.metanotionz.io.block.BlockFile;
import net.metanotion.util.skiplist.SkipList; import net.metanotionz.util.skiplist.SkipList;
import net.metanotion.util.skiplist.SkipLevels; import net.metanotionz.util.skiplist.SkipLevels;
import net.metanotion.util.skiplist.SkipSpan; import net.metanotionz.util.skiplist.SkipSpan;
import net.i2p.util.Log;
/** /**
* On-disk format: * On-disk format:

10
core/src/main/java/net/metanotion/io/block/index/BSkipList.java → core/src/main/java/net/metanotionz/io/block/index/BSkipList.java
View File

@ -26,17 +26,15 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package net.metanotion.io.block.index; package net.metanotionz.io.block.index;
import java.io.Closeable; import java.io.Closeable;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;
import net.metanotion.io.Serializer; import net.metanotionz.io.Serializer;
import net.metanotion.io.block.BlockFile; import net.metanotionz.io.block.BlockFile;
import net.metanotion.util.skiplist.*; import net.metanotionz.util.skiplist.*;
import net.i2p.util.Log;
/** /**
* On-disk format: * On-disk format:

10
core/src/main/java/net/metanotion/io/block/index/BSkipSpan.java → core/src/main/java/net/metanotionz/io/block/index/BSkipSpan.java
View File

@ -26,14 +26,14 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package net.metanotion.io.block.index; package net.metanotionz.io.block.index;
import java.io.IOException; import java.io.IOException;
import net.metanotion.io.Serializer; import net.metanotionz.io.Serializer;
import net.metanotion.io.block.BlockFile; import net.metanotionz.io.block.BlockFile;
import net.metanotion.util.skiplist.SkipList; import net.metanotionz.util.skiplist.SkipList;
import net.metanotion.util.skiplist.SkipSpan; import net.metanotionz.util.skiplist.SkipSpan;
/** /**
* On-disk format: * On-disk format:

4
core/src/main/java/net/metanotion/io/data/IntBytes.java → core/src/main/java/net/metanotionz/io/data/IntBytes.java
View File

@ -26,9 +26,9 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package net.metanotion.io.data; package net.metanotionz.io.data;
import net.metanotion.io.Serializer; import net.metanotionz.io.Serializer;
public class IntBytes implements Serializer { public class IntBytes implements Serializer {
public byte[] getBytes(Object o) { public byte[] getBytes(Object o) {

4
core/src/main/java/net/metanotion/io/data/LongBytes.java → core/src/main/java/net/metanotionz/io/data/LongBytes.java
View File

@ -26,9 +26,9 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package net.metanotion.io.data; package net.metanotionz.io.data;
import net.metanotion.io.Serializer; import net.metanotionz.io.Serializer;
public class LongBytes implements Serializer { public class LongBytes implements Serializer {
public byte[] getBytes(Object o) { public byte[] getBytes(Object o) {

4
core/src/main/java/net/metanotion/io/data/NullBytes.java → core/src/main/java/net/metanotionz/io/data/NullBytes.java
View File

@ -26,9 +26,9 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package net.metanotion.io.data; package net.metanotionz.io.data;
import net.metanotion.io.Serializer; import net.metanotionz.io.Serializer;
public class NullBytes implements Serializer { public class NullBytes implements Serializer {
public byte[] getBytes(Object o) { return null; } public byte[] getBytes(Object o) { return null; }

4
core/src/main/java/net/metanotion/io/data/StringBytes.java → core/src/main/java/net/metanotionz/io/data/StringBytes.java
View File

@ -26,11 +26,11 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package net.metanotion.io.data; package net.metanotionz.io.data;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import net.metanotion.io.Serializer; import net.metanotionz.io.Serializer;
public class StringBytes implements Serializer { public class StringBytes implements Serializer {
public byte[] getBytes(Object o) { public byte[] getBytes(Object o) {

2
core/src/main/java/net/metanotion/util/skiplist/SkipIterator.java → core/src/main/java/net/metanotionz/util/skiplist/SkipIterator.java
View File

@ -26,7 +26,7 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package net.metanotion.util.skiplist; package net.metanotionz.util.skiplist;
import java.util.ListIterator; import java.util.ListIterator;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;

7
core/src/main/java/net/metanotion/util/skiplist/SkipLevels.java → core/src/main/java/net/metanotionz/util/skiplist/SkipLevels.java
View File

@ -26,16 +26,11 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package net.metanotion.util.skiplist; package net.metanotionz.util.skiplist;
import java.io.Flushable; import java.io.Flushable;
import java.io.IOException; import java.io.IOException;
import net.metanotion.io.block.BlockFile;
import net.i2p.I2PAppContext;
import net.i2p.util.Log;
public class SkipLevels<K extends Comparable<? super K>, V> implements Flushable { public class SkipLevels<K extends Comparable<? super K>, V> implements Flushable {
/** We can't have more than 2**32 pages */ /** We can't have more than 2**32 pages */
public static final int MAX_SIZE = 32; public static final int MAX_SIZE = 32;

2
core/src/main/java/net/metanotion/util/skiplist/SkipList.java → core/src/main/java/net/metanotionz/util/skiplist/SkipList.java
View File

@ -26,7 +26,7 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package net.metanotion.util.skiplist; package net.metanotionz.util.skiplist;
import java.io.Flushable; import java.io.Flushable;
import java.io.IOException; import java.io.IOException;

2
core/src/main/java/net/metanotion/util/skiplist/SkipSpan.java → core/src/main/java/net/metanotionz/util/skiplist/SkipSpan.java
View File

@ -26,7 +26,7 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package net.metanotion.util.skiplist; package net.metanotionz.util.skiplist;
import java.io.Flushable; import java.io.Flushable;
import java.io.IOException; import java.io.IOException;

2
core/src/test/groovy/net/metanotion/io/RAIFileTest.groovy → core/src/test/groovy/net/metanotionz/io/RAIFileTest.groovy
View File

@ -1,4 +1,4 @@
package net.metanotion.io package net.metanotionz.io
import org.junit.After import org.junit.After
import org.junit.Before import org.junit.Before