[Git][java-team/libdsiutils-java][upstream] New upstream version 2.6.15

Pierre Gruet gitlab at salsa.debian.org
Sun Nov 29 22:51:46 GMT 2020



Pierre Gruet pushed to branch upstream at Debian Java Maintainers / libdsiutils-java


Commits:
9a41c558 by Pierre Gruet at 2020-11-29T22:15:21+01:00
New upstream version 2.6.15
- - - - -


18 changed files:

- CHANGES
- build.properties
- build.xml
- ivy.xml
- src/it/unimi/dsi/big/util/ImmutableExternalPrefixMap.java
- src/it/unimi/dsi/bits/LongArrayBitVector.java
- src/it/unimi/dsi/bits/TransformationStrategies.java
- src/it/unimi/dsi/util/ImmutableExternalPrefixMap.java
- src/it/unimi/dsi/util/Properties.java
- test/it/unimi/dsi/big/util/ImmutableBinaryTrieTest.java
- test/it/unimi/dsi/big/util/LiterallySignedStringMapTest.java
- test/it/unimi/dsi/big/util/ShiftAddXorSignedStringMapTest.java
- test/it/unimi/dsi/bits/BitVectorTestCase.java
- test/it/unimi/dsi/io/ByteDiskQueueTest.java
- test/it/unimi/dsi/parser/BulletParserTest.java
- test/it/unimi/dsi/parser/callback/LinkExtractorTest.java
- test/it/unimi/dsi/util/CircularCharArrayBufferTest.java
- test/it/unimi/dsi/util/ImmutableBinaryTrieTest.java


Changes:

=====================================
CHANGES
=====================================
@@ -1,3 +1,9 @@
+2.6.15
+
+- Removed (almost) unused dependencies.
+
+- Upgraded to newest versions of Apache Commons.
+
 2.6.14
 
 - Reinstated 12-bit OutputBitStream tables (mistakenly removed).


=====================================
build.properties
=====================================
@@ -1,4 +1,4 @@
-version=2.6.14
+version=2.6.15
 
 build.sysclasspath=ignore
 
@@ -22,9 +22,9 @@ jsap.apiurl=http://www.martiansoftware.com/jsap/doc/javadoc/
 junit.apiurl=https://junit.org/junit4/javadoc/latest/
 log4j.apiurl=http://logging.apache.org/log4j/1.2/apidocs/
 slf4j.apiurl=http://www.slf4j.org/apidocs/
-commons-configuration.apiurl=http://commons.apache.org/proper/commons-configuration/javadocs/v1.10/apidocs/
+commons-configuration2.apiurl=https://commons.apache.org/proper/commons-configuration/apidocs/
 commons-io.apiurl=http://commons.apache.org/proper/commons-io/javadocs/api-release/
-commons-lang.apiurl=http://commons.apache.org/proper/commons-lang/javadocs/api-release/
-commons-collections.apiurl=http://commons.apache.org/proper/commons-collections/apidocs/
-commons-math3.apiurl=http://commons.apache.org/proper/commons-math/apidocs/
+commons-lang3.apiurl=http://commons.apache.org/proper/commons-lang/javadocs/api-release/
+commons-collections4.apiurl=https://commons.apache.org/proper/commons-collections/javadocs/api-4.4/
+commons-math3.apiurl=https://commons.apache.org/proper/commons-math/javadocs/api-3.6.1/
 guava.apiurl=https://guava.dev/releases/26.0-jre/api/docs/


=====================================
build.xml
=====================================
@@ -141,7 +141,6 @@
 		<mkdir dir="${docs}"/>
 		<mkdir dir="${dist}"/>
 		<mkdir dir="${reports}"/>
-		<mkdir dir="${coverage}"/>
 		<mkdir dir="${dist}/lib"/>
 		<symlink link="${dist}/javadoc" resource="../${docs}" overwrite="true"/>
 	</target>
@@ -203,9 +202,9 @@
 			<link href="${log4j.apiurl}"/>
 			<link href="${guava.apiurl}"/>
 			<link href="${commons-io.apiurl}"/>
-			<link href="${commons-lang.apiurl}"/>
-			<link href="${commons-configuration.apiurl}"/>
-			<link href="${commons-collections.apiurl}"/>
+			<link href="${commons-lang3.apiurl}"/>
+			<link href="${commons-configuration2.apiurl}"/>
+			<link href="${commons-collections4.apiurl}"/>
 			<link href="${commons-math3.apiurl}"/>
 		</javadoc>
 	</target>
@@ -280,7 +279,6 @@
 		<delete dir="${build}"/>
 		<delete dir="${dist}"/>
 		<delete dir="${reports}"/>
-		<delete dir="${coverage}"/>
 		<delete dir="${docs}"/>
 		<delete>
 			<fileset dir="." includes="*.jar"/>


=====================================
ivy.xml
=====================================
@@ -24,9 +24,9 @@
 		<dependency org="ch.qos.logback" name="logback-core" rev="1.2.3" conf="runtime" force="true"/>
 		<dependency org="ch.qos.logback" name="logback-classic" rev="1.2.3" conf="runtime" force="true"/>
 
-		<dependency org="commons-configuration" name="commons-configuration" rev="latest.release"/>
-		<dependency org="commons-io" name="commons-io" rev="latest.release"/>
-		<dependency org="commons-collections" name="commons-collections" rev="latest.release"/>
+		<dependency org="org.apache.commons" name="commons-configuration2" rev="latest.release"/>
 		<dependency org="org.apache.commons" name="commons-math3" rev="latest.release"/>
+		<dependency org="org.apache.commons" name="commons-io" rev="latest.release" conf="test"/>
+		<dependency org="org.apache.commons" name="commons-collections4" rev="latest.release" conf="test"/>
  	</dependencies>
 </ivy-module>


=====================================
src/it/unimi/dsi/big/util/ImmutableExternalPrefixMap.java
=====================================
@@ -37,8 +37,7 @@ import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.zip.GZIPInputStream;
 
-import org.apache.commons.io.IOUtils;
-
+import com.google.common.io.ByteStreams;
 import com.martiansoftware.jsap.FlaggedOption;
 import com.martiansoftware.jsap.JSAP;
 import com.martiansoftware.jsap.JSAPException;
@@ -626,7 +625,7 @@ public class ImmutableExternalPrefixMap extends AbstractPrefixMap implements Ser
 		s.defaultWriteObject();
 		if (selfContained) {
 			final FileInputStream fis = new FileInputStream(tempDumpStreamFilename);
-			IOUtils.copy(fis, s);
+			ByteStreams.copy(fis, s);
 			fis.close();
 		}
 	}


=====================================
src/it/unimi/dsi/bits/LongArrayBitVector.java
=====================================
@@ -350,7 +350,10 @@ public class LongArrayBitVector extends AbstractBitVector implements Cloneable,
 
 	@Override
 	public LongArrayBitVector copy(final long from, final long to) {
-		BitVectors.ensureFromTo(length, from, to);
+		if (CHECKS) BitVectors.ensureFromTo(length, from, to);
+		assert from >= 0;
+		assert to >= from;
+		assert to <= length;
 
 		final LongArrayBitVector copy = new LongArrayBitVector(to - from);
 		if ((copy.length = to - from) == 0) return copy;
@@ -429,17 +432,17 @@ public class LongArrayBitVector extends AbstractBitVector implements Cloneable,
 
 	@Override
 	public boolean getBoolean(final long index) {
+		if (CHECKS) ensureRestrictedIndex(index);
 		assert index >= 0;
 		assert index < length;
-		if (CHECKS) ensureRestrictedIndex(index);
 		return (bits[word(index)] & mask(index)) != 0;
 	}
 
 	@Override
 	public boolean set(final long index, final boolean value) {
+		if (CHECKS) ensureRestrictedIndex(index);
 		assert index >= 0;
 		assert index < length;
-		if (CHECKS) ensureRestrictedIndex(index);
 		final int word = word(index);
 		final long mask = mask(index);
 		final boolean oldValue = (bits[word] & mask) != 0;
@@ -449,25 +452,25 @@ public class LongArrayBitVector extends AbstractBitVector implements Cloneable,
 
 	@Override
 	public void set(final long index) {
+		if (CHECKS) ensureRestrictedIndex(index);
 		assert index >= 0;
 		assert index < length;
-		if (CHECKS) ensureRestrictedIndex(index);
 		bits[word(index)] |= mask(index);
 	}
 
 	@Override
 	public void clear(final long index) {
+		if (CHECKS) ensureRestrictedIndex(index);
 		assert index >= 0;
 		assert index < length;
-		if (CHECKS) ensureRestrictedIndex(index);
 		bits[word(index)] &= ~mask(index);
 	}
 
 	@Override
 	public void add(final long index, final boolean value) {
+		if (CHECKS) ensureIndex(index);
 		assert index >= 0;
 		assert index <= length;
-		if (CHECKS) ensureIndex(index);
 		if (length == bits(bits.length)) bits = LongArrays.grow(bits, words(length + 1));
 
 		length++;
@@ -496,9 +499,9 @@ public class LongArrayBitVector extends AbstractBitVector implements Cloneable,
 
 	@Override
 	public boolean removeBoolean(final long index) {
+		if (CHECKS) ensureRestrictedIndex(index);
 		assert index >= 0;
 		assert index < length;
-		if (CHECKS) ensureRestrictedIndex(index);
 		final boolean oldValue = getBoolean(index);
 		final long[] bits = this.bits;
 
@@ -517,8 +520,8 @@ public class LongArrayBitVector extends AbstractBitVector implements Cloneable,
 	@Override
 	public LongArrayBitVector append(final long value, final int width) {
 		if (width == 0) return this;
-		assert width == Long.SIZE || (value & -1L << width) == 0;
 		if (CHECKS) if (width < Long.SIZE && (value & -1L << width) != 0) throw new IllegalArgumentException("The specified value (" + value + ") is larger than the maximum value for the given width (" + width + ")");
+		assert width == Long.SIZE || (value & -1L << width) == 0;
 		final long length = this.length;
 		final int startWord = word(length);
 		final int startBit = bit(length);
@@ -536,10 +539,10 @@ public class LongArrayBitVector extends AbstractBitVector implements Cloneable,
 
 	@Override
 	public long getLong(final long from, final long to) {
+		if (CHECKS) BitVectors.ensureFromTo(length, from, to);
 		assert 0 <= from;
 		assert from <= to;
 		assert to <= length;
-		if (CHECKS) BitVectors.ensureFromTo(length, from, to);
 		final long l = Long.SIZE - (to - from);
 		final int startWord = word(from);
 		final int startBit = bit(from);
@@ -814,8 +817,11 @@ public class LongArrayBitVector extends AbstractBitVector implements Cloneable,
 		@Override
 		public long set(final long index, final long value) {
 			if (width == 0) return 0;
-			if (width != Long.SIZE && value > fullMask) throw new IllegalArgumentException("Value too large: " + value);
-			ensureRestrictedIndex(index);
+			if (CHECKS) if (width != Long.SIZE && value > fullMask) throw new IllegalArgumentException("Value too large: " + value);
+			assert width == Long.SIZE || value <= fullMask;
+			if (CHECKS) ensureRestrictedIndex(index);
+			assert index >= 0;
+			assert index < size64();
 			final long bits[] = bitVector.bits;
 			final long start = index * width;
 			final int startWord = word(start);


=====================================
src/it/unimi/dsi/bits/TransformationStrategies.java
=====================================
@@ -53,6 +53,7 @@ import it.unimi.dsi.lang.MutableString;
  */
 
 
+ at SuppressWarnings("fallthrough")
 public class TransformationStrategies {
 
 	private final static TransformationStrategy<BitVector> IDENTITY = new TransformationStrategy<BitVector>() {


=====================================
src/it/unimi/dsi/util/ImmutableExternalPrefixMap.java
=====================================
@@ -37,8 +37,7 @@ import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.zip.GZIPInputStream;
 
-import org.apache.commons.io.IOUtils;
-
+import com.google.common.io.ByteStreams;
 import com.martiansoftware.jsap.FlaggedOption;
 import com.martiansoftware.jsap.JSAP;
 import com.martiansoftware.jsap.JSAPException;
@@ -667,7 +666,7 @@ public class ImmutableExternalPrefixMap extends AbstractPrefixMap implements Ser
 		s.defaultWriteObject();
 		if (selfContained) {
 			final FileInputStream fis = new FileInputStream(tempDumpStreamFilename);
-			IOUtils.copy(fis, s);
+			ByteStreams.copy(fis, s);
 			fis.close();
 		}
 	}


=====================================
src/it/unimi/dsi/util/Properties.java
=====================================
@@ -23,60 +23,78 @@ package it.unimi.dsi.util;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.io.OutputStreamWriter;
+import java.io.OutputStream;
 import java.io.Serializable;
-import java.io.Writer;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.ConfigurationMap;
-import org.apache.commons.configuration.ConfigurationUtils;
-import org.apache.commons.configuration.PropertiesConfiguration;
-
-import com.google.common.base.Charsets;
-
-/** An extension of {@link org.apache.commons.configuration.PropertiesConfiguration}
- * providing setters for primitive types, a simpler {@linkplain #save(CharSequence) way to save preferences}
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.ConfigurationMap;
+import org.apache.commons.configuration2.ConfigurationUtils;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.io.FileHandler;
+
+/**
+ * An extension of {@link org.apache.commons.configuration2.PropertiesConfiguration} providing
+ * setters for primitive types, a simpler {@linkplain #save(CharSequence) way to save preferences}
  * and transparent handling of {@link java.lang.Enum} lowercased keys.
  *
- * <p>All accessors defined in {@link org.apache.commons.configuration.PropertiesConfiguration} have a
- * polymorphic counterpart taking an {@link java.lang.Enum} instead of a string: {@link java.lang.Enum#name()}
- * <strong>and {@link java.lang.String#toLowerCase()}</strong> are applied before
- * delegating to the corresponding string-based method. (This apparently wierd choice is due to the need to
- * accommodate the upper-case standard for {@link java.lang.Enum} elements and the lower-case standard
- * for property keys.)
+ * <p>
+ * All accessors defined in {@link org.apache.commons.configuration2.PropertiesConfiguration} have a
+ * polymorphic counterpart taking an {@link java.lang.Enum} instead of a string:
+ * {@link java.lang.Enum#name()} <strong>and {@link java.lang.String#toLowerCase()}</strong> are
+ * applied before delegating to the corresponding string-based method. (This apparently wierd choice
+ * is due to the need to accommodate the upper-case standard for {@link java.lang.Enum} elements and
+ * the lower-case standard for property keys.)
  *
- * <p>Additionally, instances of this class can be serialised.
+ * <p>
+ * Additionally, instances of this class can be serialised.
  */
 public class Properties extends PropertiesConfiguration implements Serializable {
-
 	private static final long serialVersionUID = 1L;
+	/** A delimiter mimicking the pre-version 2 list behavior. */
+	private static final DefaultListDelimiterHandler COMMA_LIST_DELIMITER_HANDLER = new DefaultListDelimiterHandler(',');
+	/** A file handler for input/output. */
+	private transient FileHandler fileHandler;
 
 	public Properties() {
 		getLayout().setGlobalSeparator("=");
+		setListDelimiterHandler(COMMA_LIST_DELIMITER_HANDLER);
+		fileHandler = new FileHandler(this);
+		fileHandler.setEncoding(StandardCharsets.UTF_8.toString());
 	}
 
 	public Properties(final String filename) throws ConfigurationException {
-		super(filename);
-		getLayout().setGlobalSeparator("=");
+		this();
+		fileHandler.setFileName(filename);
+		fileHandler.load();
 	}
 
 	public Properties(final File file) throws ConfigurationException {
-		super(file);
-		getLayout().setGlobalSeparator("=");
+		this();
+		fileHandler.setFile(file);
+		fileHandler.load();
 	}
 
 	public Properties(final URL url) throws ConfigurationException {
-		super(url);
-		getLayout().setGlobalSeparator("=");
+		this();
+		fileHandler.setURL(url);
+		fileHandler.load();
+	}
+
+	public Properties(final InputStream inputStream) throws ConfigurationException {
+		this();
+		fileHandler.load(inputStream);
 	}
 
 	/** Saves the configuration to the specified file.
@@ -85,9 +103,28 @@ public class Properties extends PropertiesConfiguration implements Serializable
 	 */
 
 	public void save(final CharSequence filename) throws ConfigurationException, IOException {
-		final Writer w = new OutputStreamWriter(new FileOutputStream(filename.toString()), Charsets.UTF_8);
-		super.save(w);
-		w.close();
+		final FileOutputStream os = new FileOutputStream(filename.toString());
+		fileHandler.save(os);
+		os.close();
+	}
+
+	/**
+	 * Saves the configuration to the specified file.
+	 *
+	 * @param file a file.
+	 */
+
+	public void save(final File file) throws ConfigurationException, IOException {
+		save(file.toString());
+	}
+
+	/**
+	 * Saves the configuration to an output stream.
+	 *
+	 * @param os an output stream.
+	 */
+	public void save(final OutputStream os) throws ConfigurationException {
+		fileHandler.save(os);
 	}
 
 	/** Adds all properties from the given configuration.
@@ -437,8 +474,10 @@ public class Properties extends PropertiesConfiguration implements Serializable
 
 	private void writeObject(final ObjectOutputStream s) throws IOException {
 		s.defaultWriteObject();
+		fileHandler = new FileHandler(this);
+		fileHandler.setEncoding(StandardCharsets.UTF_8.toString());
 		try {
-			save(s);
+			fileHandler.save(s);
 		}
 		catch (final ConfigurationException e) {
 			throw new RuntimeException(e);
@@ -447,8 +486,10 @@ public class Properties extends PropertiesConfiguration implements Serializable
 
 	private void readObject(final ObjectInputStream s) throws IOException, ClassNotFoundException {
 		s.defaultReadObject();
+		fileHandler = new FileHandler(this);
+		fileHandler.setEncoding(StandardCharsets.UTF_8.toString());
 		try {
-			load(s);
+			fileHandler.load(s);
 		}
 		catch (final ConfigurationException e) {
 			throw new RuntimeException(e);


=====================================
test/it/unimi/dsi/big/util/ImmutableBinaryTrieTest.java
=====================================
@@ -50,7 +50,7 @@ public class ImmutableBinaryTrieTest {
 
 	@Test
 	public void testEmptyImmutableBinaryTrie() {
-		testImmutableBinaryTrie(ObjectLists.EMPTY_LIST);
+		testImmutableBinaryTrie(ObjectLists.emptyList());
 	}
 
 	@Test


=====================================
test/it/unimi/dsi/big/util/LiterallySignedStringMapTest.java
=====================================
@@ -112,6 +112,7 @@ public class LiterallySignedStringMapTest {
 		}
 
 		@Override
+		@Deprecated
 		public int size() {
 			return Integer.MAX_VALUE;
 		}


=====================================
test/it/unimi/dsi/big/util/ShiftAddXorSignedStringMapTest.java
=====================================
@@ -89,6 +89,7 @@ public class ShiftAddXorSignedStringMapTest {
 		}
 
 		@Override
+		@Deprecated
 		public int size() {
 			return Integer.MAX_VALUE;
 		}


=====================================
test/it/unimi/dsi/bits/BitVectorTestCase.java
=====================================
@@ -565,6 +565,11 @@ public class BitVectorTestCase {
 		for(int i = 0; i < 60; i++) w.set(i * 3 + 1);
 		w.set(0);
 		assertEquals(w, b);
+
+		b.clear();
+		for (int i = 0; i < 128; i++) b.append(1, 1);
+		assertEquals(128, b.length());
+		for (int i = 0; i < 128; i++) assertTrue(b.getBoolean(i));
 	}
 
 }


=====================================
test/it/unimi/dsi/io/ByteDiskQueueTest.java
=====================================
@@ -128,10 +128,9 @@ public class ByteDiskQueueTest {
 		ByteDiskQueue q = ByteDiskQueue.createNew(queue, bufferSize , true);
 		final ByteArrayList l = new ByteArrayList();
 		final SplitMix64Random random = new SplitMix64Random(0);
-		final long start = System.currentTimeMillis();
 		double threshold = .9;
 
-		while(System.currentTimeMillis() - start < 30000) {
+		for (int r = 10000; r-- != 0;) {
 			assertEquals(l.size(), q.size64());
 			switch(random.nextInt(7)) {
 			case 0:
@@ -183,8 +182,11 @@ public class ByteDiskQueueTest {
 				if (random.nextFloat() < 0.01) q.enlargeBuffer(bufferSize = Math.min(bufferSize + random.nextInt(bufferSize), 1024 * 1024));
 				break;
 			case 6:
-				if (random.nextFloat() < 0.01) {
+				if (random.nextFloat() < 0.005) {
 					q.freeze();
+					// Let's try to unmap to avoid out-of-memory errors
+					System.gc();
+					System.gc();
 					q = ByteDiskQueue.createFromFile(queue, bufferSize, true);
 				}
 				break;


=====================================
test/it/unimi/dsi/parser/BulletParserTest.java
=====================================
@@ -27,11 +27,12 @@ import java.io.IOException;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
 
-import org.apache.commons.io.IOUtils;
 import org.junit.Test;
 
-import com.google.common.base.Charsets;
+import com.google.common.io.ByteStreams;
 
 import it.unimi.dsi.lang.MutableString;
 import it.unimi.dsi.parser.callback.Callback;
@@ -41,9 +42,10 @@ public class BulletParserTest {
 
 	@Test
 	public void testParser() throws FileNotFoundException, IOException {
-		final char[] text = IOUtils.toCharArray(this.getClass().getResourceAsStream("test.data"), Charsets.UTF_8);
+		final char[] text = StandardCharsets.UTF_8.decode(ByteBuffer.wrap(ByteStreams.toByteArray(this.getClass().getResourceAsStream("test.data")))).toString().toCharArray();
 
-		final Callback mockCallback = (Callback)Proxy.newProxyInstance(Callback.class.getClassLoader(), new Class[] { Callback.class },  new InvocationHandler() {
+		final Callback mockCallback = (Callback)Proxy.newProxyInstance(Callback.class.getClassLoader(), new Class<?>[] {
+				Callback.class }, new InvocationHandler() {
 					int call = 0;
 
 					String[] methods = { "configure", "startDocument", "endDocument" };


=====================================
test/it/unimi/dsi/parser/callback/LinkExtractorTest.java
=====================================
@@ -23,11 +23,12 @@ package it.unimi.dsi.parser.callback;
 import static org.junit.Assert.assertEquals;
 
 import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
 
-import org.apache.commons.io.IOUtils;
 import org.junit.Test;
 
-import com.google.common.base.Charsets;
+import com.google.common.io.ByteStreams;
 
 import it.unimi.dsi.fastutil.objects.ObjectLinkedOpenHashSet;
 import it.unimi.dsi.parser.BulletParser;
@@ -36,7 +37,7 @@ public class LinkExtractorTest {
 
 	@Test
 	public void testExtractor() throws IOException {
-		final char[] text = IOUtils.toCharArray(this.getClass().getResourceAsStream("LinkExtractorTest.data"), Charsets.UTF_8);
+		final char[] text = StandardCharsets.UTF_8.decode(ByteBuffer.wrap(ByteStreams.toByteArray(this.getClass().getResourceAsStream("LinkExtractorTest.data")))).toString().toCharArray();
 
 		final BulletParser parser = new BulletParser();
 		final LinkExtractor linkExtractor = new LinkExtractor();


=====================================
test/it/unimi/dsi/util/CircularCharArrayBufferTest.java
=====================================
@@ -25,8 +25,8 @@ import static org.junit.Assert.assertEquals;
 import java.util.Iterator;
 import java.util.Random;
 
-import org.apache.commons.collections.buffer.CircularFifoBuffer;
-import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.collections4.queue.CircularFifoQueue;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.Test;
 
 public class CircularCharArrayBufferTest {
@@ -35,7 +35,7 @@ public class CircularCharArrayBufferTest {
 	static int[] sizes = { 1, 5, 10, 100, 500, 1000 };
 
 	@SuppressWarnings("null")
-	private static void copyInto(final CircularFifoBuffer cfb, final char[] c, final int offset, final int length) {
+	private static void copyInto(final CircularFifoQueue<Character> cfb, final char[] c, final int offset, final int length) {
 		final int howMany = Math.min(length, cfb.size());
 		final Iterator<?> it = cfb.iterator();
 		for (int i = 0; i < howMany; i++)
@@ -46,7 +46,7 @@ public class CircularCharArrayBufferTest {
 	public void testAdd() {
 		for (final int size: sizes) {
 			// System.out.printf("CIRCULAR BUFFER OF SIZE %d: ", size);
-			final CircularFifoBuffer cfb = new CircularFifoBuffer(size);
+			final CircularFifoQueue<Character> cfb = new CircularFifoQueue<>(size);
 			final CircularCharArrayBuffer ccab = new CircularCharArrayBuffer(size);
 			final int times = r.nextInt(50);
 			for (int j = 0; j < times; j++) {


=====================================
test/it/unimi/dsi/util/ImmutableBinaryTrieTest.java
=====================================
@@ -50,7 +50,7 @@ public class ImmutableBinaryTrieTest {
 
 	@Test
 	public void testEmptyImmutableBinaryTrie() {
-		testImmutableBinaryTrie(ObjectLists.EMPTY_LIST);
+		testImmutableBinaryTrie(ObjectLists.emptyList());
 	}
 
 	@Test



View it on GitLab: https://salsa.debian.org/java-team/libdsiutils-java/-/commit/9a41c558367a34a3bf2dbf7ccf9180c0ec114fff

-- 
View it on GitLab: https://salsa.debian.org/java-team/libdsiutils-java/-/commit/9a41c558367a34a3bf2dbf7ccf9180c0ec114fff
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20201129/c1e6d0ff/attachment.html>


More information about the pkg-java-commits mailing list