Skip to content

Remove unused or replacable dependencies #3759

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Remove unused or replacable dependencies #3759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
36098e0
remove unused or replacable dependencies
thoniTUB Jul 1, 2025
00b883a
§fix missed usages
thoniTUB Jul 1, 2025
7045230
add back transitively used commons-io
thoniTUB Jul 1, 2025
7b965dd
removes and replaces unused powerlibraries dependency
awildturtok Jul 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 6 additions & 25 deletions backend/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,16 +147,6 @@
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-parameter-names</artifactId>
</dependency>
<dependency>
<groupId>com.github.power-libraries</groupId>
<artifactId>iopower</artifactId>
<version>1.1.3</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.18.0</version>
</dependency>
<dependency>
<groupId>com.univocity</groupId>
<artifactId>univocity-parsers</artifactId>
Expand Down Expand Up @@ -269,25 +259,10 @@
<artifactId>xodus-crypto</artifactId>
<version>1.3.232</version>
</dependency>
<dependency>
<groupId>com.tomgibara.bits</groupId>
<artifactId>bits</artifactId>
<version>2.1.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-smile</artifactId>
</dependency>
<dependency>
<groupId>com.zigurs.karlis.utils</groupId>
<artifactId>magicsort</artifactId>
<version>0.2</version>
</dependency>
<dependency>
<groupId>com.jakewharton.byteunits</groupId>
<artifactId>byteunits</artifactId>
<version>0.9.1</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
Expand Down Expand Up @@ -336,6 +311,12 @@
<artifactId>poi-ooxml</artifactId>
<version>${apache-poi.version}</version>
</dependency>
<dependency>
<!-- Used by org.apache.poi.xssf.usermodel.XSSFWorkbook.newPackage -->
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.18.0</version>
</dependency>
<dependency>
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-hadoop</artifactId>
Expand Down
3 changes: 1 addition & 2 deletions backend/src/main/java/com/bakdata/conquery/commands/MigrateCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.github.powerlibraries.io.In;
import groovy.lang.GroovyShell;
import groovy.lang.Script;
import groovy.lang.Tuple;
Expand Down Expand Up @@ -128,7 +127,7 @@ protected void run(io.dropwizard.core.setup.Environment environment, Namespace n
config.setScriptBaseClass(MigrationScriptFactory.class.getName());
final GroovyShell groovy = new GroovyShell(config);

final MigrationScriptFactory factory = (MigrationScriptFactory) groovy.parse(In.file((File) namespace.get("script")).readAll());
final MigrationScriptFactory factory = (MigrationScriptFactory) groovy.parse(namespace.<File>get("script"));

final Function4<String, String, JsonNode, JsonNode, Tuple<JsonNode>> migrator = factory.run();

Expand Down
8 changes: 4 additions & 4 deletions backend/src/main/java/com/bakdata/conquery/commands/PreprocessorCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
import java.util.concurrent.TimeUnit;
import java.util.function.Predicate;
import java.util.zip.GZIPInputStream;
import jakarta.validation.ValidationException;
import jakarta.validation.Validator;

import com.bakdata.conquery.ConqueryConstants;
import com.bakdata.conquery.io.jackson.Jackson;
Expand All @@ -30,10 +32,7 @@
import com.bakdata.conquery.util.io.LogUtil;
import com.bakdata.conquery.util.io.ProgressBar;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.jakewharton.byteunits.BinaryByteUnit;
import io.dropwizard.core.setup.Environment;
import jakarta.validation.ValidationException;
import jakarta.validation.Validator;
import lombok.SneakyThrows;
import lombok.experimental.FieldNameConstants;
import lombok.extern.slf4j.Slf4j;
Expand All @@ -44,6 +43,7 @@
import net.sourceforge.argparse4j.inf.ArgumentGroup;
import net.sourceforge.argparse4j.inf.Namespace;
import net.sourceforge.argparse4j.inf.Subparser;
import org.apache.commons.io.FileUtils;
import org.jetbrains.annotations.NotNull;

@Slf4j
Expand Down Expand Up @@ -260,7 +260,7 @@ private void preprocessJobs(Collection<PreprocessingJob> jobs, int buckets, Conq
.mapToLong(PreprocessingJob::estimateTotalCsvSizeBytes)
.sum();

log.info("Required to preprocess {} in total", BinaryByteUnit.format(totalSize));
log.info("Required to preprocess {} in total", FileUtils.byteCountToDisplaySize(totalSize));
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@awildturtok wäre für mich okay:

import com.jakewharton.byteunits.BinaryByteUnit
import io.dropwizard.util.DataSize
import org.apache.commons.io.FileUtils

def size = 12334556789L
println BinaryByteUnit.format(size)
println DataSize.bytes(size).toString()
println FileUtils.byteCountToDisplaySize(size)

// Prints
11,5 GiB
12334556789 bytes
11 GB

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Jap!


final ProgressBar totalProgress = new ProgressBar(totalSize);

Expand Down
4 changes: 2 additions & 2 deletions backend/src/main/java/com/bakdata/conquery/io/storage/xodus/stores/CachedStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
import com.github.benmanes.caffeine.cache.LoadingCache;
import com.github.benmanes.caffeine.cache.stats.StatsCounter;
import com.google.common.base.Stopwatch;
import com.jakewharton.byteunits.BinaryByteUnit;
import lombok.RequiredArgsConstructor;
import lombok.ToString;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FileUtils;

@RequiredArgsConstructor
@Slf4j
Expand Down Expand Up @@ -178,7 +178,7 @@ public void loadData() {
}
}
});
log.debug("\tloaded store {}: {} entries, {} within {}", this, count, BinaryByteUnit.format(totalSize.sum()), timer.stop());
log.debug("\tloaded store {}: {} entries, {} within {}", this, count, FileUtils.byteCountToDisplaySize(totalSize.sum()), timer.stop());
}

@Override
Expand Down
8 changes: 4 additions & 4 deletions backend/src/main/java/com/bakdata/conquery/util/VersionInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.bakdata.conquery.util;

import java.io.BufferedReader;
import java.io.InputStream;
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.List;
Expand All @@ -9,10 +9,10 @@
import java.util.TreeMap;

import com.bakdata.conquery.apiv1.frontend.VersionContainer;
import com.github.powerlibraries.io.In;
import lombok.Getter;
import lombok.ToString;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils;

@ToString
@Getter
Expand All @@ -22,7 +22,7 @@ public class VersionInfo {
public final static VersionInfo INSTANCE = new VersionInfo();

private ZonedDateTime buildTime;
private String projectVersion;
private final String projectVersion;

/**
* Form backend id -> version
Expand All @@ -34,7 +34,7 @@ public class VersionInfo {
private VersionInfo() {
try {
Properties properties = new Properties();
try (BufferedReader in = In.resource("/git.properties").withUTF8().asReader()) {
try (InputStream in = IOUtils.resourceToURL("/git.properties").openStream()) {
properties.load(in);
}

Expand Down
4 changes: 1 addition & 3 deletions backend/src/main/java/com/bakdata/conquery/util/io/ClassPathHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
import java.net.URLConnection;
import java.net.URLStreamHandler;

import com.github.powerlibraries.io.In;

public class ClassPathHandler extends URLStreamHandler {
@Override
protected URLConnection openConnection(URL u) throws IOException {
Expand All @@ -25,7 +23,7 @@ public InputStream getInputStream() throws IOException {
if (resource == null) {
throw new FileNotFoundException(getURL().toString());
}
return In.resource(resource).asStream();
return resource.openStream();
}
};
}
Expand Down
4 changes: 2 additions & 2 deletions backend/src/test/java/com/bakdata/conquery/integration/DownloadLinkGeneration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import com.bakdata.conquery.apiv1.execution.ResultAsset;
import com.bakdata.conquery.apiv1.query.Query;
import com.bakdata.conquery.integration.common.IntegrationUtils;
import com.bakdata.conquery.integration.common.LoadingUtil;
import com.bakdata.conquery.integration.json.ConqueryTestSpec;
import com.bakdata.conquery.integration.json.JsonIntegrationTest;
import com.bakdata.conquery.integration.json.QueryTest;
Expand All @@ -23,7 +24,6 @@
import com.bakdata.conquery.models.query.DistributedExecutionManager;
import com.bakdata.conquery.models.query.ManagedQuery;
import com.bakdata.conquery.util.support.StandaloneSupport;
import com.github.powerlibraries.io.In;
import lombok.extern.slf4j.Slf4j;

@Slf4j
Expand All @@ -35,7 +35,7 @@ public void execute(StandaloneSupport conquery) throws Exception {

final User user = new User("testU", "testU", storage);

final InputStream testJson = In.resource("/tests/query/SIMPLE_TREECONCEPT_QUERY/SIMPLE_TREECONCEPT_Query.test.json").withUTF8().asStream();
final InputStream testJson = LoadingUtil.openResource("/tests/query/SIMPLE_TREECONCEPT_QUERY/SIMPLE_TREECONCEPT_Query.test.json");
final QueryTest test = (QueryTest) new JsonIntegrationTest(testJson).getTestSpec();

storage.updateUser(user);
Expand Down
13 changes: 13 additions & 0 deletions backend/src/test/java/com/bakdata/conquery/integration/common/LoadingUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
Expand Down Expand Up @@ -59,9 +60,11 @@
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.univocity.parsers.csv.CsvParser;
import lombok.NonNull;
import lombok.SneakyThrows;
import lombok.experimental.UtilityClass;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.assertj.core.description.LazyTextDescription;

@Slf4j
Expand Down Expand Up @@ -414,4 +417,14 @@ public static void updateMatchingStats(@NonNull StandaloneSupport support) {
post.close();
}

@SneakyThrows
public static InputStream openResource(String path) {
return IOUtils.resourceToURL(path).openStream();
}

@SneakyThrows
public static String readResource(String path) {
return IOUtils.resourceToString(path, StandardCharsets.UTF_8);
}

}
7 changes: 2 additions & 5 deletions backend/src/test/java/com/bakdata/conquery/integration/common/ResourceFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,10 @@
import java.io.IOException;
import java.io.InputStream;

import org.apache.commons.lang3.StringUtils;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
import com.github.powerlibraries.io.In;

import lombok.Getter;
import org.apache.commons.lang3.StringUtils;

public class ResourceFile {
@Getter(onMethod_=@JsonValue)
Expand All @@ -31,6 +28,6 @@ public String getName() {
}

public InputStream stream() throws IOException {
return In.resource(path).asStream();
return LoadingUtil.openResource(path);
}
}
9 changes: 4 additions & 5 deletions backend/src/test/java/com/bakdata/conquery/integration/json/AbstractQueryEngineTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Locale;
import java.util.Map;
Expand All @@ -30,8 +31,8 @@
import com.bakdata.conquery.resources.hierarchies.HierarchyHelper;
import com.bakdata.conquery.util.support.StandaloneSupport;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.github.powerlibraries.io.In;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils;

@Slf4j
public abstract class AbstractQueryEngineTest extends ConqueryTestSpec {
Expand Down Expand Up @@ -72,11 +73,9 @@ public void executeTest(StandaloneSupport standaloneSupport) throws IOException
.acceptLanguage(Locale.ENGLISH)
.get();

List<String> actual = In.stream(((InputStream) csvResponse.getEntity())).readLines();
List<String> actual = IOUtils.readLines((InputStream) csvResponse.getEntity(), StandardCharsets.UTF_8);

ResourceFile expectedCsv = getExpectedCsv();

List<String> expected = In.stream(expectedCsv.stream()).readLines();
List<String> expected = IOUtils.readLines(getExpectedCsv().stream(), StandardCharsets.UTF_8);

assertThat(actual).as("Results for %s are not as expected.", this)
.containsExactlyInAnyOrderElementsOf(expected);
Expand Down
9 changes: 4 additions & 5 deletions backend/src/test/java/com/bakdata/conquery/integration/json/FormTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.github.powerlibraries.io.In;
import com.univocity.parsers.csv.CsvWriter;
import io.dropwizard.validation.ValidationMethod;
import lombok.Getter;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils;

@Slf4j
@Getter
Expand Down Expand Up @@ -133,12 +133,11 @@ private <F extends ManagedForm<?> & SingleTableResult> void checkSingleResult(F

writer.close();

assertThat(In.stream(new ByteArrayInputStream(output.toByteArray())).withUTF8().readLines())

assertThat(IOUtils.readLines(new ByteArrayInputStream(output.toByteArray()), StandardCharsets.UTF_8))
.as("Checking result " + managedForm.getLabelWithoutAutoLabelSuffix())
.containsExactlyInAnyOrderElementsOf(
In.stream(expectedCsv.values().iterator().next().stream())
.withUTF8()
.readLines()
IOUtils.readLines(expectedCsv.values().iterator().next().stream(), StandardCharsets.UTF_8)
);
}

Expand Down
4 changes: 2 additions & 2 deletions backend/src/test/java/com/bakdata/conquery/integration/tests/AdminEndpointTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

import java.util.List;

import com.bakdata.conquery.integration.common.LoadingUtil;
import com.bakdata.conquery.integration.tests.EndpointTestHelper.EndPoint;
import com.bakdata.conquery.util.support.TestConquery;
import com.github.powerlibraries.io.In;
import io.dropwizard.jersey.DropwizardResourceConfig;

/**
Expand All @@ -18,7 +18,7 @@ public class AdminEndpointTest implements ProgrammaticIntegrationTest {

@Override
public void execute(String name, TestConquery testConquery) throws Exception {
List<EndPoint> expectedEndpoints = READER.readValue(In.resource("/tests/endpoints/adminEndpointInfo.json").asStream());
List<EndPoint> expectedEndpoints = READER.readValue(LoadingUtil.openResource("/tests/endpoints/adminEndpointInfo.json"));

DropwizardResourceConfig jerseyConfig = testConquery.getStandaloneCommand().getManagerNode().getAdmin().getJerseyConfig();

Expand Down
14 changes: 7 additions & 7 deletions backend/src/test/java/com/bakdata/conquery/integration/tests/AdminUIEndpointTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package com.bakdata.conquery.integration.tests;

import com.bakdata.conquery.integration.tests.EndpointTestHelper.EndPoint;
import com.bakdata.conquery.util.support.TestConquery;
import com.github.powerlibraries.io.In;
import io.dropwizard.jersey.DropwizardResourceConfig;
import static com.bakdata.conquery.integration.tests.EndpointTestHelper.READER;
import static org.assertj.core.api.Assertions.assertThat;

import java.util.List;

import static com.bakdata.conquery.integration.tests.EndpointTestHelper.READER;
import static org.assertj.core.api.Assertions.assertThat;
import com.bakdata.conquery.integration.common.LoadingUtil;
import com.bakdata.conquery.integration.tests.EndpointTestHelper.EndPoint;
import com.bakdata.conquery.util.support.TestConquery;
import io.dropwizard.jersey.DropwizardResourceConfig;

/**
* This test assures, that we do not lose endpoints by accident, while there are
Expand All @@ -18,7 +18,7 @@ public class AdminUIEndpointTest implements ProgrammaticIntegrationTest {

@Override
public void execute(String name, TestConquery testConquery) throws Exception {
List<EndPoint> expectedEndpoints = READER.readValue(In.resource("/tests/endpoints/adminUIEndpointInfo.json").asStream());
List<EndPoint> expectedEndpoints = READER.readValue(LoadingUtil.openResource("/tests/endpoints/adminUIEndpointInfo.json"));

DropwizardResourceConfig jerseyConfig = testConquery.getStandaloneCommand().getManagerNode().getAdmin().getJerseyConfigUI();

Expand Down
Loading
Loading