commit
2879336b1c
BIN
1.3.0.tar.gz
Normal file
BIN
1.3.0.tar.gz
Normal file
Binary file not shown.
135
lz4-java-1.3.0-build.patch
Normal file
135
lz4-java-1.3.0-build.patch
Normal file
@ -0,0 +1,135 @@
|
||||
--- lz4-java-1.3.0/build.xml 2014-11-26 20:04:10.000000000 +0100
|
||||
+++ lz4-java-1.3.0/build.xml.build 2015-07-21 15:15:49.041845748 +0200
|
||||
@@ -15,8 +15,7 @@
|
||||
<project name="lz4" default="dist" basedir="."
|
||||
xmlns:cpptasks="antlib:net.sf.antcontrib.cpptasks"
|
||||
xmlns:ivy="antlib:org.apache.ivy.ant"
|
||||
- xmlns:junit4="antlib:com.carrotsearch.junit4"
|
||||
- xmlns:mvn="antlib:org.apache.maven.artifact.ant">
|
||||
+ xmlns:junit4="antlib:com.carrotsearch.junit4">
|
||||
|
||||
<property name="src" location="src"/>
|
||||
<property name="build" location="build"/>
|
||||
@@ -56,8 +55,6 @@
|
||||
</target>
|
||||
|
||||
<target name="-ivy-install" unless="ivy.available">
|
||||
- <mkdir dir="${user.home}/.ant/lib" />
|
||||
- <get src="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.jar.version}/${ivy.jar.name}" dest="${user.home}/.ant/lib/${ivy.jar.name}"/>
|
||||
</target>
|
||||
|
||||
<target name="install-cpptasks" unless="cpptasks.available">
|
||||
@@ -68,10 +65,6 @@
|
||||
</target>
|
||||
|
||||
<target name="install-maven-ant-tasks" unless="maven-ant-tasks.available">
|
||||
- <ivy:cachepath organisation="org.apache.maven" module="maven-ant-tasks" revision="2.1.3"
|
||||
- inline="true" conf="default" transitive="true" pathid="maven-ant-tasks.classpath"/>
|
||||
- <taskdef uri="antlib:org.apache.maven.artifact.ant" resource="org/apache/maven/artifact/ant/antlib.xml" classpathref="maven-ant-tasks.classpath"/>
|
||||
- <property name="maven-ant-tasks.available" value="true"/>
|
||||
</target>
|
||||
|
||||
<target name="install-forbidden-apis" unless="forbidden-apis.available">
|
||||
@@ -83,10 +76,6 @@
|
||||
|
||||
<target name="install-bnd" unless="bnd.available">
|
||||
<!-- using bnd 1.50.0 because more recent versions have broken JAR wrapping -->
|
||||
- <ivy:cachepath organisation="biz.aQute" module="bnd" revision="1.50.0"
|
||||
- inline="true" conf="default" transitive="true" pathid="bnd.classpath"/>
|
||||
- <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="bnd.classpath"/>
|
||||
- <property name="bnd.available" value="true"/>
|
||||
</target>
|
||||
|
||||
<target name="init">
|
||||
@@ -104,9 +93,15 @@
|
||||
<property name="junit4.available" value="true" />
|
||||
</target>
|
||||
|
||||
+ <path id="mvel.classpath">
|
||||
+ <fileset dir="/usr/share/java">
|
||||
+ <include name="mvel.jar"/>
|
||||
+ <include name="objectweb-asm/asm.jar"/>
|
||||
+ <include name="objectweb-asm/asm-util.jar"/>
|
||||
+ </fileset>
|
||||
+ </path>
|
||||
+
|
||||
<target name="generate-sources" depends="init">
|
||||
- <ivy:cachepath organisation="org.mvel" module="mvel2" revision="2.1.5.Final"
|
||||
- inline="true" conf="default" transitive="true" pathid="mvel.classpath"/>
|
||||
<mkdir dir="${build}/java" />
|
||||
<java
|
||||
fork="true"
|
||||
@@ -263,7 +258,9 @@
|
||||
overview="${src}/java/overview.html"
|
||||
packagenames="net.jpountz.lz4,net.jpountz.xxhash"
|
||||
windowtitle="lz4 / xxhash - Java API ${ivy.revision}"
|
||||
- destDir="${build}/docs">
|
||||
+ destDir="${build}/docs"
|
||||
+ encoding="UTF-8"
|
||||
+ additionalparam="-Xdoclint:none">
|
||||
<link href="http://download.oracle.com/javase/6/docs/api/" />
|
||||
<sourcepath>
|
||||
<pathelement location="${src}/java"/>
|
||||
@@ -288,8 +285,12 @@
|
||||
</jar>
|
||||
</target>
|
||||
|
||||
- <target name="bundle" description="makes the JAR a valid OSGi bundle" depends="install-bnd, jar">
|
||||
- <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="bnd.classpath"/>
|
||||
+ <target name="bundle" description="makes the JAR a valid OSGi bundle" depends="jar">
|
||||
+ <taskdef resource="aQute/bnd/ant/taskdef.properties" >
|
||||
+ <classpath>
|
||||
+ <fileset dir="/usr/share/java/aqute-bnd"/>
|
||||
+ </classpath>
|
||||
+ </taskdef>
|
||||
<property name="packages.version" value="${ivy.revision}"/>
|
||||
<!-- We need to remove potential -SNAPSHOT qualifiers as package versions... -->
|
||||
<script language="javascript">
|
||||
@@ -319,7 +320,7 @@
|
||||
|
||||
<target name="dist" description="package" depends="bundle,docs,sources,makepom" />
|
||||
|
||||
- <target name="forbidden-apis" description="check API usage" depends="install-forbidden-apis,compile">
|
||||
+ <target name="forbidden-apis" description="check API usage" depends="compile">
|
||||
<forbidden-apis internalRuntimeForbidden="true" classpathref="forbidden-apis.classpath">
|
||||
<bundledSignatures name="jdk-unsafe-${javac.target}"/>
|
||||
<bundledSignatures name="jdk-deprecated-${javac.target}"/>
|
||||
@@ -337,37 +338,21 @@
|
||||
<attribute name="repositoryid" />
|
||||
<attribute name="repositoryurl" />
|
||||
<sequential>
|
||||
- <mvn:mvn>
|
||||
- <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.4:sign-and-deploy-file" />
|
||||
- <arg value="-Durl=@{repositoryurl}" />
|
||||
- <arg value="-DrepositoryId=@{repositoryid}" />
|
||||
- <arg value="-DpomFile=${dist}/${ivy.module}-${ivy.revision}.pom" />
|
||||
- <arg value="-Dfile=${dist}/${ivy.module}-${ivy.revision}.jar" />
|
||||
- <arg value="-Dfiles=${dist}/${ivy.module}-${ivy.revision}-sources.jar,${dist}/${ivy.module}-${ivy.revision}-javadoc.jar" />
|
||||
- <arg value="-Dclassifiers=sources,javadoc" />
|
||||
- <arg value="-Dtypes=jar,jar" />
|
||||
- <arg value="-Pgpg" />
|
||||
- </mvn:mvn>
|
||||
</sequential>
|
||||
</macrodef>
|
||||
|
||||
<target name="deploy" description="deploy snapshot to snapshot repo" depends="install-maven-ant-tasks">
|
||||
- <property name="skip.jni" value="true" />
|
||||
- <antcall target="-deploy" />
|
||||
</target>
|
||||
|
||||
<target name="-deploy" depends="clean,dist">
|
||||
- <deploy repositoryid="sonatype-nexus-snapshots" repositoryurl="https://oss.sonatype.org/content/repositories/snapshots" />
|
||||
</target>
|
||||
|
||||
<!-- before this, update project version from SNAPSHOT to RELEASE -->
|
||||
<target name="stage" description="deploy to release repo" depends="install-maven-ant-tasks,test,forbidden-apis">
|
||||
- <property name="skip.jni" value="true" />
|
||||
- <antcall target="-stage" />
|
||||
+
|
||||
</target>
|
||||
|
||||
<target name="-stage" depends="clean,dist">
|
||||
- <deploy repositoryid="sonatype-nexus-staging" repositoryurl="https://oss.sonatype.org/service/local/staging/deploy/maven2" />
|
||||
</target>
|
||||
|
||||
</project>
|
||||
301
lz4-java-1.3.0-junit_Assert.patch
Normal file
301
lz4-java-1.3.0-junit_Assert.patch
Normal file
@ -0,0 +1,301 @@
|
||||
diff -Nru lz4-java-1.3.0/src/test/net/jpountz/lz4/LZ4BlockStreamingTest.java lz4-java-1.3.0.junit.Assert/src/test/net/jpountz/lz4/LZ4BlockStreamingTest.java
|
||||
--- lz4-java-1.3.0/src/test/net/jpountz/lz4/LZ4BlockStreamingTest.java 2014-11-26 20:04:10.000000000 +0100
|
||||
+++ lz4-java-1.3.0.junit.Assert/src/test/net/jpountz/lz4/LZ4BlockStreamingTest.java 2016-05-03 17:08:40.285741530 +0200
|
||||
@@ -207,11 +207,11 @@
|
||||
|
||||
final LZ4FastDecompressor decompressor = LZ4Factory.fastestInstance().fastDecompressor();
|
||||
InputStream is = new LZ4BlockInputStream(open(compressed.toByteArray()), decompressor, checksum);
|
||||
- assertFalse(is.markSupported());
|
||||
+ org.junit.Assert.assertFalse(is.markSupported());
|
||||
try {
|
||||
is.mark(1);
|
||||
is.reset();
|
||||
- assertFalse(true);
|
||||
+ org.junit.Assert.assertFalse(true);
|
||||
} catch (IOException e) {
|
||||
// OK
|
||||
}
|
||||
@@ -235,8 +235,8 @@
|
||||
}
|
||||
}
|
||||
is.close();
|
||||
- assertEquals(data.length, read);
|
||||
- assertArrayEquals(data, Arrays.copyOf(restored, read));
|
||||
+ org.junit.Assert.assertEquals(data.length, read);
|
||||
+ org.junit.Assert.assertArrayEquals(data, Arrays.copyOf(restored, read));
|
||||
|
||||
// test skip
|
||||
final int offset = data.length <= 1 ? 0 : randomInt(data.length - 1);
|
||||
@@ -246,17 +246,17 @@
|
||||
read = 0;
|
||||
while (read < offset) {
|
||||
final long skipped = is.skip(offset - read);
|
||||
- assertTrue(skipped >= 0);
|
||||
+ org.junit.Assert.assertTrue(skipped >= 0);
|
||||
read += skipped;
|
||||
}
|
||||
read = 0;
|
||||
while (read < length) {
|
||||
final int r = is.read(restored, read, length - read);
|
||||
- assertTrue(r >= 0);
|
||||
+ org.junit.Assert.assertTrue(r >= 0);
|
||||
read += r;
|
||||
}
|
||||
is.close();
|
||||
- assertArrayEquals(Arrays.copyOfRange(data, offset, offset + length), Arrays.copyOfRange(restored, 0, length));
|
||||
+ org.junit.Assert.assertArrayEquals(Arrays.copyOfRange(data, offset, offset + length), Arrays.copyOfRange(restored, 0, length));
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -288,7 +288,7 @@
|
||||
byte[] actual = new byte[testBytes.length];
|
||||
in.read(actual);
|
||||
|
||||
- assertArrayEquals(testBytes, actual);
|
||||
+ org.junit.Assert.assertArrayEquals(testBytes, actual);
|
||||
|
||||
in.close();
|
||||
in.close();
|
||||
diff -Nru lz4-java-1.3.0/src/test/net/jpountz/lz4/LZ4Test.java lz4-java-1.3.0.junit.Assert/src/test/net/jpountz/lz4/LZ4Test.java
|
||||
--- lz4-java-1.3.0/src/test/net/jpountz/lz4/LZ4Test.java 2014-11-26 20:04:10.000000000 +0100
|
||||
+++ lz4-java-1.3.0.junit.Assert/src/test/net/jpountz/lz4/LZ4Test.java 2016-05-03 17:08:40.290743645 +0200
|
||||
@@ -39,7 +39,7 @@
|
||||
public void testMaxCompressedLength() {
|
||||
final int len = randomBoolean() ? randomInt(16) : randomInt(1 << 30);
|
||||
for (LZ4Compressor compressor : COMPRESSORS) {
|
||||
- assertEquals(LZ4JNI.LZ4_compressBound(len), compressor.maxCompressedLength(len));
|
||||
+ org.junit.Assert.assertEquals(LZ4JNI.LZ4_compressBound(len), compressor.maxCompressedLength(len));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -75,8 +75,8 @@
|
||||
byte[] compressed = getCompressedWorstCase(decompressed);
|
||||
byte[] restored = new byte[decompressed.length];
|
||||
int cpLen = decompressor.decompress(compressed, 0, restored, 0, decompressed.length);
|
||||
- assertEquals(compressed.length, cpLen);
|
||||
- assertArrayEquals(decompressed, restored);
|
||||
+ org.junit.Assert.assertEquals(compressed.length, cpLen);
|
||||
+ org.junit.Assert.assertArrayEquals(decompressed, restored);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -93,8 +93,8 @@
|
||||
byte[] compressed = getCompressedWorstCase(decompressed);
|
||||
byte[] restored = new byte[decompressed.length];
|
||||
int uncpLen = decompressor.decompress(compressed, 0, compressed.length, restored, 0);
|
||||
- assertEquals(decompressed.length, uncpLen);
|
||||
- assertArrayEquals(decompressed, restored);
|
||||
+ org.junit.Assert.assertEquals(decompressed.length, uncpLen);
|
||||
+ org.junit.Assert.assertArrayEquals(decompressed, restored);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -130,8 +130,8 @@
|
||||
final int compressedLen2 = tester.compress(compressor,
|
||||
tester.copyOf(data), off, len,
|
||||
compressed2, 0, compressedLen);
|
||||
- assertEquals(compressedLen, compressedLen2);
|
||||
- assertArrayEquals(
|
||||
+ org.junit.Assert.assertEquals(compressedLen, compressedLen2);
|
||||
+ org.junit.Assert.assertArrayEquals(
|
||||
tester.copyOf(compressed, 0, compressedLen),
|
||||
tester.copyOf(compressed2, 0, compressedLen));
|
||||
|
||||
@@ -141,21 +141,21 @@
|
||||
tester.compress(compressor,
|
||||
tester.copyOf(data), off, len,
|
||||
compressed3, 0, compressedLen - 1);
|
||||
- fail();
|
||||
+ org.junit.Assert.fail();
|
||||
} catch (LZ4Exception e) {
|
||||
// OK
|
||||
}
|
||||
|
||||
// test decompression
|
||||
final T restored = tester.allocate(len);
|
||||
- assertEquals(compressedLen, tester.decompress(decompressor, compressed, 0, restored, 0, len));
|
||||
- assertArrayEquals(Arrays.copyOfRange(data, off, off + len), tester.copyOf(restored, 0, len));
|
||||
+ org.junit.Assert.assertEquals(compressedLen, tester.decompress(decompressor, compressed, 0, restored, 0, len));
|
||||
+ org.junit.Assert.assertArrayEquals(Arrays.copyOfRange(data, off, off + len), tester.copyOf(restored, 0, len));
|
||||
|
||||
if (len > 0) {
|
||||
// dest is too small
|
||||
try {
|
||||
tester.decompress(decompressor, compressed, 0, restored, 0, len - 1);
|
||||
- fail();
|
||||
+ org.junit.Assert.fail();
|
||||
} catch (LZ4Exception e) {
|
||||
// OK
|
||||
}
|
||||
@@ -165,7 +165,7 @@
|
||||
final T restored2 = tester.allocate(len+1);
|
||||
try {
|
||||
final int cpLen = tester.decompress(decompressor, compressed, 0, restored2, 0, len + 1);
|
||||
- fail("compressedLen=" + cpLen);
|
||||
+ org.junit.Assert.fail("compressedLen=" + cpLen);
|
||||
} catch (LZ4Exception e) {
|
||||
// OK
|
||||
}
|
||||
@@ -173,16 +173,16 @@
|
||||
// try decompression when only the size of the compressed buffer is known
|
||||
if (len > 0) {
|
||||
tester.fill(restored, randomByte());
|
||||
- assertEquals(len, tester.decompress(decompressor2, compressed, 0, compressedLen, restored, 0, len));
|
||||
+ org.junit.Assert.assertEquals(len, tester.decompress(decompressor2, compressed, 0, compressedLen, restored, 0, len));
|
||||
tester.fill(restored, randomByte());
|
||||
} else {
|
||||
- assertEquals(0, tester.decompress(decompressor2, compressed, 0, compressedLen, tester.allocate(1), 0, 1));
|
||||
+ org.junit.Assert.assertEquals(0, tester.decompress(decompressor2, compressed, 0, compressedLen, tester.allocate(1), 0, 1));
|
||||
}
|
||||
|
||||
// over-estimated compressed length
|
||||
try {
|
||||
final int decompressedLen = tester.decompress(decompressor2, compressed, 0, compressedLen + 1, tester.allocate(len + 100), 0, len + 100);
|
||||
- fail("decompressedLen=" + decompressedLen);
|
||||
+ org.junit.Assert.fail("decompressedLen=" + decompressedLen);
|
||||
} catch (LZ4Exception e) {
|
||||
// OK
|
||||
}
|
||||
@@ -191,7 +191,7 @@
|
||||
try {
|
||||
final int decompressedLen = tester.decompress(decompressor2, compressed, 0, compressedLen - 1, tester.allocate(len + 100), 0, len + 100);
|
||||
if (!(decompressor2 instanceof LZ4JNISafeDecompressor)) {
|
||||
- fail("decompressedLen=" + decompressedLen);
|
||||
+ org.junit.Assert.fail("decompressedLen=" + decompressedLen);
|
||||
}
|
||||
} catch (LZ4Exception e) {
|
||||
// OK
|
||||
@@ -278,7 +278,7 @@
|
||||
try {
|
||||
// it is invalid to end with a match, should be at least 5 literals
|
||||
decompressor.decompress(invalid, 0, new byte[decompressedLength], 0, decompressedLength);
|
||||
- assertTrue(decompressor.toString(), false);
|
||||
+ org.junit.Assert.assertTrue(decompressor.toString(), false);
|
||||
} catch (LZ4Exception e) {
|
||||
// OK
|
||||
}
|
||||
@@ -288,7 +288,7 @@
|
||||
try {
|
||||
// it is invalid to end with a match, should be at least 5 literals
|
||||
decompressor.decompress(invalid, 0, invalid.length, new byte[20], 0);
|
||||
- assertTrue(false);
|
||||
+ org.junit.Assert.assertTrue(false);
|
||||
} catch (LZ4Exception e) {
|
||||
// OK
|
||||
}
|
||||
@@ -308,7 +308,7 @@
|
||||
try {
|
||||
// it is invalid to end with a match, should be at least 5 literals
|
||||
decompressor.decompress(invalid, 0, new byte[20], 0, 20);
|
||||
- assertTrue(decompressor.toString(), false);
|
||||
+ org.junit.Assert.assertTrue(decompressor.toString(), false);
|
||||
} catch (LZ4Exception e) {
|
||||
// OK
|
||||
}
|
||||
@@ -318,7 +318,7 @@
|
||||
try {
|
||||
// it is invalid to end with a match, should be at least 5 literals
|
||||
decompressor.decompress(invalid, 0, invalid.length, new byte[20], 0);
|
||||
- assertTrue(false);
|
||||
+ org.junit.Assert.assertTrue(false);
|
||||
} catch (LZ4Exception e) {
|
||||
// OK
|
||||
}
|
||||
@@ -333,7 +333,7 @@
|
||||
ByteBuffer out = Tester.BYTE_BUFFER.allocate(100).asReadOnlyBuffer();
|
||||
try {
|
||||
compressor.compress(in, out);
|
||||
- fail();
|
||||
+ org.junit.Assert.fail();
|
||||
} catch (ReadOnlyBufferException e) {
|
||||
// ok
|
||||
}
|
||||
@@ -343,7 +343,7 @@
|
||||
ByteBuffer out = Tester.BYTE_BUFFER.allocate(100).asReadOnlyBuffer();
|
||||
try {
|
||||
decompressor.decompress(in, out);
|
||||
- fail();
|
||||
+ org.junit.Assert.fail();
|
||||
} catch (ReadOnlyBufferException e) {
|
||||
// ok
|
||||
}
|
||||
@@ -354,7 +354,7 @@
|
||||
out.limit(2);
|
||||
try {
|
||||
decompressor.decompress(in, out);
|
||||
- fail();
|
||||
+ org.junit.Assert.fail();
|
||||
} catch (ReadOnlyBufferException e) {
|
||||
// ok
|
||||
}
|
||||
@@ -457,7 +457,7 @@
|
||||
}
|
||||
final Sequence sequence1 = readSequence(expected, off);
|
||||
final Sequence sequence2 = readSequence(actual, off);
|
||||
- assertEquals(message + ", off=" + off + ", decompressedOff=" + decompressedOff, sequence1, sequence2);
|
||||
+ org.junit.Assert.assertEquals(message + ", off=" + off + ", decompressedOff=" + decompressedOff, sequence1, sequence2);
|
||||
off += sequence1.length;
|
||||
decompressedOff += sequence1.literalLen + sequence1.matchLen;
|
||||
}
|
||||
diff -Nru lz4-java-1.3.0/src/test/net/jpountz/xxhash/XXHash32Test.java lz4-java-1.3.0.junit.Assert/src/test/net/jpountz/xxhash/XXHash32Test.java
|
||||
--- lz4-java-1.3.0/src/test/net/jpountz/xxhash/XXHash32Test.java 2014-11-26 20:04:10.000000000 +0100
|
||||
+++ lz4-java-1.3.0.junit.Assert/src/test/net/jpountz/xxhash/XXHash32Test.java 2016-05-03 17:08:40.278738569 +0200
|
||||
@@ -129,12 +129,12 @@
|
||||
final int ref = XXHashFactory.nativeInstance().hash32().hash(buf, off, len, seed);
|
||||
for (XXHash32 hash : INSTANCES) {
|
||||
final int h = hash.hash(buf, off, len, seed);
|
||||
- assertEquals(hash.toString(), ref, h);
|
||||
+ org.junit.Assert.assertEquals(hash.toString(), ref, h);
|
||||
final ByteBuffer copy = copyOf(buf, off, len);
|
||||
final int h2 = hash.hash(copy, off, len, seed);
|
||||
- assertEquals(off, copy.position());
|
||||
- assertEquals(len, copy.remaining());
|
||||
- assertEquals(hash.toString(), ref, h2);
|
||||
+ org.junit.Assert.assertEquals(off, copy.position());
|
||||
+ org.junit.Assert.assertEquals(len, copy.remaining());
|
||||
+ org.junit.Assert.assertEquals(hash.toString(), ref, h2);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -155,8 +155,8 @@
|
||||
hash1.update(bytes, off, len);
|
||||
hash2.update(bytes, off, len);
|
||||
hash3.update(bytes, off, len);
|
||||
- assertEquals(hash2.toString() + " " + totalLen, hash1.getValue(), hash2.getValue());
|
||||
- assertEquals(hash3.toString() + " " + totalLen, hash1.getValue(), hash3.getValue());
|
||||
+ org.junit.Assert.assertEquals(hash2.toString() + " " + totalLen, hash1.getValue(), hash2.getValue());
|
||||
+ org.junit.Assert.assertEquals(hash3.toString() + " " + totalLen, hash1.getValue(), hash3.getValue());
|
||||
totalLen += len;
|
||||
}
|
||||
}
|
||||
diff -Nru lz4-java-1.3.0/src/test/net/jpountz/xxhash/XXHash64Test.java lz4-java-1.3.0.junit.Assert/src/test/net/jpountz/xxhash/XXHash64Test.java
|
||||
--- lz4-java-1.3.0/src/test/net/jpountz/xxhash/XXHash64Test.java 2014-11-26 20:04:10.000000000 +0100
|
||||
+++ lz4-java-1.3.0.junit.Assert/src/test/net/jpountz/xxhash/XXHash64Test.java 2016-05-03 17:08:40.278738569 +0200
|
||||
@@ -134,12 +134,12 @@
|
||||
final long ref = XXHashFactory.nativeInstance().hash64().hash(buf, off, len, seed);
|
||||
for (XXHash64 hash : INSTANCES) {
|
||||
final long h = hash.hash(buf, off, len, seed);
|
||||
- assertEquals(hash.toString(), ref, h);
|
||||
+ org.junit.Assert.assertEquals(hash.toString(), ref, h);
|
||||
final ByteBuffer copy = copyOf(buf, off, len);
|
||||
final long h2 = hash.hash(copy, off, len, seed);
|
||||
- assertEquals(off, copy.position());
|
||||
- assertEquals(len, copy.remaining());
|
||||
- assertEquals(hash.toString(), ref, h2);
|
||||
+ org.junit.Assert.assertEquals(off, copy.position());
|
||||
+ org.junit.Assert.assertEquals(len, copy.remaining());
|
||||
+ org.junit.Assert.assertEquals(hash.toString(), ref, h2);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -160,8 +160,8 @@
|
||||
hash1.update(bytes, off, len);
|
||||
hash2.update(bytes, off, len);
|
||||
hash3.update(bytes, off, len);
|
||||
- assertEquals(hash2.toString() + " " + totalLen, hash1.getValue(), hash2.getValue());
|
||||
- assertEquals(hash3.toString() + " " + totalLen, hash1.getValue(), hash3.getValue());
|
||||
+ org.junit.Assert.assertEquals(hash2.toString() + " " + totalLen, hash1.getValue(), hash2.getValue());
|
||||
+ org.junit.Assert.assertEquals(hash3.toString() + " " + totalLen, hash1.getValue(), hash3.getValue());
|
||||
totalLen += len;
|
||||
}
|
||||
}
|
||||
75
lz4-java.spec
Normal file
75
lz4-java.spec
Normal file
@ -0,0 +1,75 @@
|
||||
%global debug_package %nil
|
||||
%global build_opts -Doffline=true -Divy.mode=local -Divysettings.xml=/etc/ivy/ivysettings.xml -Divy.revision=%{version}
|
||||
Name: lz4-java
|
||||
Version: 1.3.0
|
||||
Release: 1
|
||||
Summary: LZ4 compression for Java
|
||||
License: ASL 2.0 and (BSD and GPLv2+)
|
||||
URL: https://github.com/jpountz/lz4-java
|
||||
Source0: https://github.com/jpountz/lz4-java/archive/%{version}.tar.gz
|
||||
Patch0: lz4-java-1.3.0-build.patch
|
||||
Patch1: lz4-java-1.3.0-junit_Assert.patch
|
||||
BuildRequires: ant ant-junit aqute-bnd cpptasks ivy-local java-devel javapackages-local mvel
|
||||
BuildRequires: objectweb-asm randomizedtesting-junit4-ant bea-stax-api xerces-j2 apache-parent
|
||||
Provides: bundled(lz4) = r122
|
||||
Provides: bundled(libxxhash) = r37
|
||||
%description
|
||||
LZ4 compression for Java, based on Yann Collet's work.
|
||||
This library provides access to two compression methods
|
||||
that both generate a valid LZ4 stream:
|
||||
* fast scan (LZ4):
|
||||
° low memory footprint (~ 16 KB),
|
||||
° very fast (fast scan with skipping heuristics in case the
|
||||
input looks incompressible),
|
||||
° reasonable compression ratio (depending on the
|
||||
redundancy of the input).
|
||||
* high compression (LZ4 HC):
|
||||
° medium memory footprint (~ 256 KB),
|
||||
° rather slow (~ 10 times slower than LZ4),
|
||||
° good compression ratio (depending on the size and
|
||||
the redundancy of the input).
|
||||
The streams produced by those 2 compression algorithms use the
|
||||
same compression format, are very fast to decompress and can be
|
||||
decompressed by the same decompressor instance.
|
||||
|
||||
%package javadoc
|
||||
Summary: Javadoc for %{name}
|
||||
BuildArch: noarch
|
||||
%description javadoc
|
||||
This package contains javadoc for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}
|
||||
find -name '*.dylib' -print -delete
|
||||
find -name '*.so' -print -delete
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
cp -p src/xxhash/LICENSE LICENSE.xxhash
|
||||
cp -p src/lz4/LICENSE lz4_LICENSE
|
||||
echo "Export-Package: net.jpountz.*,!linux.*" >> lz4.bnd
|
||||
sed -i '/packages.version/d' lz4.bnd
|
||||
|
||||
%build
|
||||
ant %build_opts -Divy.pom.version=%{version} jar docs makepom
|
||||
bnd wrap -p lz4.bnd -o dist/lz4-%{version}.jar --version %{version} dist/lz4.jar
|
||||
|
||||
%install
|
||||
%mvn_file net.jpountz.lz4:lz4 lz4
|
||||
%mvn_artifact dist/lz4-%{version}.pom dist/lz4-%{version}.jar
|
||||
%mvn_install -J build/docs
|
||||
%ifnarch %{arm} aarch64 ppc64
|
||||
|
||||
%check
|
||||
ant %build_opts test
|
||||
%endif
|
||||
|
||||
%files -f .mfiles
|
||||
%doc CHANGES.md README.md
|
||||
%license LICENSE.txt LICENSE.xxhash lz4_LICENSE
|
||||
|
||||
%files javadoc -f .mfiles-javadoc
|
||||
%license LICENSE.txt
|
||||
|
||||
%changelog
|
||||
* Tue Aug 25 2020 Jeffery.Gao <gaojianxing@huawei.com> - 1.3.0-1
|
||||
- Package init
|
||||
5
lz4-java.yaml
Normal file
5
lz4-java.yaml
Normal file
@ -0,0 +1,5 @@
|
||||
git_url: https://github.com/jpountz/lz4-java
|
||||
version_control: github
|
||||
src_repo: jpountz/lz4-java
|
||||
tag_prefix: ""
|
||||
seperator: "."
|
||||
Loading…
x
Reference in New Issue
Block a user