Skip to content

Commit bec6a20

Browse files
DannemannDannemann
committed
Refactoring.
1 parent 1d3bdb1 commit bec6a20

File tree

12 files changed

+67
-52
lines changed

12 files changed

+67
-52
lines changed

src/main/java/com/dannemann/stringcompressor/BulkCompressor.java renamed to src/main/java/com/dannemann/stringcompressor/bulk/BulkCompressor.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
package com.dannemann.stringcompressor;
1+
package com.dannemann.stringcompressor.bulk;
22

3+
import com.dannemann.stringcompressor.AsciiCompressor;
34
import com.dannemann.stringcompressor.util.TriConsumer;
45

56
import java.util.List;
@@ -40,7 +41,7 @@ public void bulkCompress(final byte[][] source, final int destinationStart, fina
4041
destination[i] = compressed;
4142
if (callback != null)
4243
callback.accept(adjustedIndex, string, compressed);
43-
if (!compressor.preserveOriginal)
44+
if (!compressor.isPreserveOriginal())
4445
source[adjustedIndex] = null;
4546
});
4647
}
@@ -57,7 +58,7 @@ public void bulkCompress(final String[] source, final int destinationStart, fina
5758
destination[i] = compressed;
5859
if (callback != null)
5960
callback.accept(adjustedIndex, string, compressed);
60-
if (!compressor.preserveOriginal)
61+
if (!compressor.isPreserveOriginal())
6162
source[adjustedIndex] = null;
6263
});
6364
}
@@ -74,7 +75,7 @@ public void bulkCompress(final List<String> source, final int destinationStart,
7475
destination[i] = compressed;
7576
if (callback != null)
7677
callback.accept(adjustedIndex, string, compressed);
77-
if (!compressor.preserveOriginal)
78+
if (!compressor.isPreserveOriginal())
7879
source.set(adjustedIndex, null);
7980
});
8081
}

src/main/java/com/dannemann/stringcompressor/ManagedBulkCompressor.java renamed to src/main/java/com/dannemann/stringcompressor/bulk/ManagedBulkCompressor.java

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
package com.dannemann.stringcompressor;
1+
package com.dannemann.stringcompressor.bulk;
22

3+
import com.dannemann.stringcompressor.AsciiCompressor;
34
import com.dannemann.stringcompressor.exception.BulkCompressionException;
45
import com.dannemann.stringcompressor.util.TriConsumer;
56

@@ -62,14 +63,4 @@ public int getCurrentIndex() {
6263
return currentIndex;
6364
}
6465

65-
// Unsafe methods. Can cause confusion.
66-
67-
static void compressAndAddAll(AsciiCompressor compressor, byte[][] destination, String[] source) {
68-
new ManagedBulkCompressor(compressor, destination).compressAndAddAll(source);
69-
}
70-
71-
static void compressAndAddAll(AsciiCompressor compressor, byte[][] destination, List<String> source) {
72-
new ManagedBulkCompressor(compressor, destination).compressAndAddAll(source);
73-
}
74-
7566
}

src/main/java/com/dannemann/stringcompressor/BaseBinarySearch.java renamed to src/main/java/com/dannemann/stringcompressor/search/BaseBinarySearch.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.dannemann.stringcompressor;
1+
package com.dannemann.stringcompressor.search;
22

33
/**
44
* @see FourBitBinarySearch

src/main/java/com/dannemann/stringcompressor/FiveBitBinarySearch.java renamed to src/main/java/com/dannemann/stringcompressor/search/FiveBitBinarySearch.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
package com.dannemann.stringcompressor;
1+
package com.dannemann.stringcompressor.search;
2+
3+
import com.dannemann.stringcompressor.FiveBitAsciiCompressor;
24

35
import static com.dannemann.stringcompressor.FiveBitAsciiCompressor.DEFAULT_5BIT_CHARSET;
46

src/main/java/com/dannemann/stringcompressor/FourBitBinarySearch.java renamed to src/main/java/com/dannemann/stringcompressor/search/FourBitBinarySearch.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
package com.dannemann.stringcompressor;
1+
package com.dannemann.stringcompressor.search;
2+
3+
import com.dannemann.stringcompressor.FourBitAsciiCompressor;
24

35
import static com.dannemann.stringcompressor.FourBitAsciiCompressor.DEFAULT_4BIT_CHARSET;
46

src/main/java/com/dannemann/stringcompressor/SixBitBinarySearch.java renamed to src/main/java/com/dannemann/stringcompressor/search/SixBitBinarySearch.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
package com.dannemann.stringcompressor;
1+
package com.dannemann.stringcompressor.search;
2+
3+
import com.dannemann.stringcompressor.SixBitAsciiCompressor;
24

35
import static com.dannemann.stringcompressor.SixBitAsciiCompressor.DEFAULT_6BIT_CHARSET;
46

‎src/test/java/com/dannemann/stringcompressor/BaseTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/**
1515
* @author Jean Dannemann Carone
1616
*/
17-
abstract class BaseTest {
17+
public abstract class BaseTest {
1818

1919
protected static final Random RANDOM = new Random();
2020

src/test/java/com/dannemann/stringcompressor/BulkCompressorTest.java renamed to src/test/java/com/dannemann/stringcompressor/bulk/BulkCompressorTest.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
package com.dannemann.stringcompressor;
1+
package com.dannemann.stringcompressor.bulk;
22

3+
import com.dannemann.stringcompressor.BaseTest;
4+
import com.dannemann.stringcompressor.FiveBitAsciiCompressor;
5+
import com.dannemann.stringcompressor.FourBitAsciiCompressor;
6+
import com.dannemann.stringcompressor.SixBitAsciiCompressor;
37
import org.junit.jupiter.api.Test;
48

59
import java.util.ArrayList;

src/test/java/com/dannemann/stringcompressor/ManagedBulkCompressorTest.java renamed to src/test/java/com/dannemann/stringcompressor/bulk/ManagedBulkCompressorTest.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
package com.dannemann.stringcompressor;
1+
package com.dannemann.stringcompressor.bulk;
22

3+
import com.dannemann.stringcompressor.BaseTest;
4+
import com.dannemann.stringcompressor.FiveBitAsciiCompressor;
5+
import com.dannemann.stringcompressor.FourBitAsciiCompressor;
6+
import com.dannemann.stringcompressor.SixBitAsciiCompressor;
37
import org.junit.jupiter.api.Test;
48

59
import java.util.ArrayList;

src/test/java/com/dannemann/stringcompressor/FiveBitBinarySearchTest.java renamed to src/test/java/com/dannemann/stringcompressor/search/FiveBitBinarySearchTest.java

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
package com.dannemann.stringcompressor;
1+
package com.dannemann.stringcompressor.search;
22

3+
import com.dannemann.stringcompressor.BaseTest;
4+
import com.dannemann.stringcompressor.FiveBitAsciiCompressor;
5+
import com.dannemann.stringcompressor.bulk.ManagedBulkCompressor;
36
import org.junit.jupiter.api.RepeatedTest;
47
import org.junit.jupiter.api.Test;
58

@@ -27,8 +30,8 @@ void searchSmallStringsTest() {
2730
for (int i = 0; i <= 30_000; i++) {
2831
final List<String> source = generateRandomUniqueOrderedStringList(500, length, length + 1, DEFAULT_5BIT_CHARSET);
2932
final byte[][] destination = new byte[700][];
30-
ManagedBulkCompressor.compressAndAddAll(COMPRESSOR, destination, source);
3133
final FiveBitBinarySearch bs = new FiveBitBinarySearch(destination, false);
34+
new ManagedBulkCompressor(COMPRESSOR, destination).compressAndAddAll(source);
3235
for (int j = 0, len = source.size(); j < len; j++)
3336
assertEquals(j, bs.search(getBytes(source.get(j))));
3437
}
@@ -38,8 +41,8 @@ void searchSmallStringsTest() {
3841
void searchBigArrayTest() {
3942
final List<String> source = generateRandomUniqueOrderedStringList(2_000_000, 0, 100, DEFAULT_5BIT_CHARSET);
4043
final byte[][] destination = new byte[4_000_000][];
41-
ManagedBulkCompressor.compressAndAddAll(COMPRESSOR, destination, source);
4244
final FiveBitBinarySearch bs = new FiveBitBinarySearch(destination, false);
45+
new ManagedBulkCompressor(COMPRESSOR, destination).compressAndAddAll(source);
4346
for (int i = 0, len = source.size(); i < len; i++)
4447
assertEquals(i, bs.search(getBytes(source.get(i))));
4548
}
@@ -48,8 +51,8 @@ void searchBigArrayTest() {
4851
void searchBigStringsTest() {
4952
final List<String> source = generateRandomUniqueOrderedStringList(50_000, 4500, 5000, DEFAULT_5BIT_CHARSET);
5053
final byte[][] destination = new byte[70_000][];
51-
ManagedBulkCompressor.compressAndAddAll(COMPRESSOR, destination, source);
5254
final FiveBitBinarySearch bs = new FiveBitBinarySearch(destination, false);
55+
new ManagedBulkCompressor(COMPRESSOR, destination).compressAndAddAll(source);
5356
for (int i = 0, len = source.size(); i < len; i++)
5457
assertEquals(i, bs.search(getBytes(source.get(i))));
5558
}
@@ -72,11 +75,11 @@ void searchBigStringsTest() {
7275
private static final String NULL_REF = null;
7376

7477
static {
75-
ManagedBulkCompressor.compressAndAddAll(COMPRESSOR, COMPRESSED_EMPTY_WORD, EMPTY_WORD_ARRAY);
76-
ManagedBulkCompressor.compressAndAddAll(COMPRESSOR, COMPRESSED_WORD, WORD_ARRAY);
77-
ManagedBulkCompressor.compressAndAddAll(COMPRESSOR, COMPRESSED_TWO_WORDS, TWO_WORDS_ARRAY);
78-
ManagedBulkCompressor.compressAndAddAll(COMPRESSOR, COMPRESSED_WORDS, WORDS_ARRAY);
79-
ManagedBulkCompressor.compressAndAddAll(COMPRESSOR, COMPRESSED_SPECIAL, SPECIAL_ARRAY);
78+
new ManagedBulkCompressor(COMPRESSOR, COMPRESSED_EMPTY_WORD).compressAndAddAll(EMPTY_WORD_ARRAY);
79+
new ManagedBulkCompressor(COMPRESSOR, COMPRESSED_WORD).compressAndAddAll(WORD_ARRAY);
80+
new ManagedBulkCompressor(COMPRESSOR, COMPRESSED_TWO_WORDS).compressAndAddAll(TWO_WORDS_ARRAY);
81+
new ManagedBulkCompressor(COMPRESSOR, COMPRESSED_WORDS).compressAndAddAll(WORDS_ARRAY);
82+
new ManagedBulkCompressor(COMPRESSOR, COMPRESSED_SPECIAL).compressAndAddAll(SPECIAL_ARRAY);
8083
}
8184

8285
static int fiveBitBinarySearch(byte[][] compressedData, String input) {
@@ -179,7 +182,7 @@ public void specialCharactersSearch() {
179182
private static final byte[][] COMPRESSED_CLIENT_DATA = new byte[CLIENT_DATA_ARRAY.length][];
180183

181184
static {
182-
ManagedBulkCompressor.compressAndAddAll(COMPRESSOR, COMPRESSED_CLIENT_DATA, CLIENT_DATA_ARRAY);
185+
new ManagedBulkCompressor(COMPRESSOR, COMPRESSED_CLIENT_DATA).compressAndAddAll(CLIENT_DATA_ARRAY);
183186
}
184187

185188
@Test

0 commit comments

Comments
 (0)