From 0d227f35438ac4ea0d4b38adb99bc4d2f00a7b0d Mon Sep 17 00:00:00 2001 From: Viktor Lofgren Date: Wed, 17 Jul 2024 13:32:13 +0200 Subject: [PATCH] (cleanup) Remove next-prime library only used in tests --- code/libraries/btree/build.gradle | 1 - .../BTreeReaderRejectRetainWithIndexTest.java | 1 - ...reeReaderRejectRetainWithoutIndexTest.java | 1 - .../nu/marginalia/btree}/NextPrimeUtil.java | 2 +- code/libraries/next-prime/build.gradle | 27 ----------------- code/libraries/next-prime/readme.md | 4 --- .../nu/marginalia/util/NextPrimeUtilTest.java | 29 ------------------- settings.gradle | 1 - 8 files changed, 1 insertion(+), 65 deletions(-) rename code/libraries/{next-prime/java/nu/marginalia/util => btree/test/nu/marginalia/btree}/NextPrimeUtil.java (96%) delete mode 100644 code/libraries/next-prime/build.gradle delete mode 100644 code/libraries/next-prime/readme.md delete mode 100644 code/libraries/next-prime/test/nu/marginalia/util/NextPrimeUtilTest.java diff --git a/code/libraries/btree/build.gradle b/code/libraries/btree/build.gradle index bdfb803d..39479864 100644 --- a/code/libraries/btree/build.gradle +++ b/code/libraries/btree/build.gradle @@ -12,7 +12,6 @@ apply from: "$rootProject.projectDir/srcsets.gradle" dependencies { implementation project(':code:libraries:array') - implementation project(':code:libraries:next-prime') implementation libs.bundles.slf4j diff --git a/code/libraries/btree/test/nu/marginalia/btree/BTreeReaderRejectRetainWithIndexTest.java b/code/libraries/btree/test/nu/marginalia/btree/BTreeReaderRejectRetainWithIndexTest.java index d847e3ad..b4bad4c1 100644 --- a/code/libraries/btree/test/nu/marginalia/btree/BTreeReaderRejectRetainWithIndexTest.java +++ b/code/libraries/btree/test/nu/marginalia/btree/BTreeReaderRejectRetainWithIndexTest.java @@ -4,7 +4,6 @@ import nu.marginalia.array.LongArray; import nu.marginalia.array.page.LongQueryBuffer; import nu.marginalia.btree.model.BTreeBlockSize; import nu.marginalia.btree.model.BTreeContext; -import nu.marginalia.util.NextPrimeUtil; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/code/libraries/btree/test/nu/marginalia/btree/BTreeReaderRejectRetainWithoutIndexTest.java b/code/libraries/btree/test/nu/marginalia/btree/BTreeReaderRejectRetainWithoutIndexTest.java index db8d9460..c64658d5 100644 --- a/code/libraries/btree/test/nu/marginalia/btree/BTreeReaderRejectRetainWithoutIndexTest.java +++ b/code/libraries/btree/test/nu/marginalia/btree/BTreeReaderRejectRetainWithoutIndexTest.java @@ -4,7 +4,6 @@ import nu.marginalia.array.LongArray; import nu.marginalia.array.page.LongQueryBuffer; import nu.marginalia.btree.model.BTreeBlockSize; import nu.marginalia.btree.model.BTreeContext; -import nu.marginalia.util.NextPrimeUtil; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/code/libraries/next-prime/java/nu/marginalia/util/NextPrimeUtil.java b/code/libraries/btree/test/nu/marginalia/btree/NextPrimeUtil.java similarity index 96% rename from code/libraries/next-prime/java/nu/marginalia/util/NextPrimeUtil.java rename to code/libraries/btree/test/nu/marginalia/btree/NextPrimeUtil.java index 183344b7..656f912e 100644 --- a/code/libraries/next-prime/java/nu/marginalia/util/NextPrimeUtil.java +++ b/code/libraries/btree/test/nu/marginalia/btree/NextPrimeUtil.java @@ -1,4 +1,4 @@ -package nu.marginalia.util; +package nu.marginalia.btree; public class NextPrimeUtil { diff --git a/code/libraries/next-prime/build.gradle b/code/libraries/next-prime/build.gradle deleted file mode 100644 index 425d2c12..00000000 --- a/code/libraries/next-prime/build.gradle +++ /dev/null @@ -1,27 +0,0 @@ -plugins { - id 'java' -} - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(rootProject.ext.jvmVersion)) - } -} - -apply from: "$rootProject.projectDir/srcsets.gradle" - -dependencies { - implementation libs.bundles.slf4j - - implementation libs.notnull - - implementation libs.fastutil - - testImplementation libs.bundles.slf4j.test - testImplementation libs.bundles.junit - testImplementation libs.mockito -} - -test { - useJUnitPlatform() -} diff --git a/code/libraries/next-prime/readme.md b/code/libraries/next-prime/readme.md deleted file mode 100644 index a6b2a134..00000000 --- a/code/libraries/next-prime/readme.md +++ /dev/null @@ -1,4 +0,0 @@ -# Next Prime Util - -This is a brute force prime sieve. If finding many (or large) primes quickly -is important to you, don't use code like this. \ No newline at end of file diff --git a/code/libraries/next-prime/test/nu/marginalia/util/NextPrimeUtilTest.java b/code/libraries/next-prime/test/nu/marginalia/util/NextPrimeUtilTest.java deleted file mode 100644 index 381490cf..00000000 --- a/code/libraries/next-prime/test/nu/marginalia/util/NextPrimeUtilTest.java +++ /dev/null @@ -1,29 +0,0 @@ -package nu.marginalia.util; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - -class NextPrimeUtilTest { - - @Test - void isPrime() { - Assertions.assertTrue(NextPrimeUtil.isPrime(1)); - Assertions.assertTrue(NextPrimeUtil.isPrime(2)); - Assertions.assertTrue(NextPrimeUtil.isPrime(3)); - Assertions.assertFalse(NextPrimeUtil.isPrime(4)); - Assertions.assertTrue(NextPrimeUtil.isPrime(5)); - Assertions.assertFalse(NextPrimeUtil.isPrime(6)); - Assertions.assertTrue(NextPrimeUtil.isPrime(7)); - Assertions.assertFalse(NextPrimeUtil.isPrime(8)); - Assertions.assertFalse(NextPrimeUtil.isPrime(9)); - Assertions.assertFalse(NextPrimeUtil.isPrime(10)); - Assertions.assertTrue(NextPrimeUtil.isPrime(11)); - } - - @Test - void nextPrime() { - System.out.println(NextPrimeUtil.nextPrime(1L<<31, -1)); - System.out.println(NextPrimeUtil.nextPrime(1L<<31, 1)); - - } -} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 3d710034..d25e4978 100644 --- a/settings.gradle +++ b/settings.gradle @@ -43,7 +43,6 @@ include 'code:libraries:btree' include 'code:libraries:easy-lsh' include 'code:libraries:guarded-regex' include 'code:libraries:random-write-funnel' -include 'code:libraries:next-prime' include 'code:libraries:blocking-thread-pool' include 'code:libraries:braille-block-punch-cards' include 'code:libraries:language-processing'