From 49ac2ab45700631ab569750ebeb5c2bb14edf3cb Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Fri, 4 Apr 2025 09:01:35 +0200
Subject: [PATCH] Optimized imports
Signed-off-by: Martin Weise <martin.weise@tuwien.ac.at>
---
.../src/main/java/at/tuwien/config/KeycloakConfig.java | 1 -
.../services/src/main/java/at/tuwien/config/RabbitConfig.java | 3 ---
.../src/main/java/at/tuwien/gateway/KeycloakGateway.java | 4 ----
.../at/tuwien/gateway/impl/MetadataServiceGatewayImpl.java | 2 +-
.../src/main/java/at/tuwien/service/StorageService.java | 1 -
.../at/tuwien/service/impl/ContainerServiceMariaDbImpl.java | 2 +-
.../main/java/at/ac/tuwien/ifs/dbrepo/core/test/BaseTest.java | 1 -
7 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/config/KeycloakConfig.java b/dbrepo-data-service/services/src/main/java/at/tuwien/config/KeycloakConfig.java
index 57183b8767..c38d84cef5 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/config/KeycloakConfig.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/config/KeycloakConfig.java
@@ -5,7 +5,6 @@ import org.keycloak.admin.client.Keycloak;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import org.springframework.web.client.RestTemplate;
@Getter
@Configuration
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/config/RabbitConfig.java b/dbrepo-data-service/services/src/main/java/at/tuwien/config/RabbitConfig.java
index 3cdff97a17..880d7d7f21 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/config/RabbitConfig.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/config/RabbitConfig.java
@@ -3,9 +3,6 @@ package at.tuwien.config;
import at.tuwien.listener.DefaultListener;
import lombok.Getter;
import lombok.extern.log4j.Log4j2;
-import org.springframework.amqp.core.AcknowledgeMode;
-import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
-import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
import org.springframework.amqp.rabbit.connection.ConnectionFactory;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer;
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/KeycloakGateway.java b/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/KeycloakGateway.java
index 5b23d7c367..1c78e068fd 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/KeycloakGateway.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/KeycloakGateway.java
@@ -1,10 +1,6 @@
package at.tuwien.gateway;
import at.ac.tuwien.ifs.dbrepo.core.api.keycloak.TokenDto;
-import at.ac.tuwien.ifs.dbrepo.core.exception.AccountNotSetupException;
-import at.ac.tuwien.ifs.dbrepo.core.exception.AuthServiceConnectionException;
-import at.ac.tuwien.ifs.dbrepo.core.exception.CredentialsInvalidException;
-import at.ac.tuwien.ifs.dbrepo.core.exception.NotAllowedException;
import org.springframework.security.authentication.BadCredentialsException;
public interface KeycloakGateway {
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/impl/MetadataServiceGatewayImpl.java b/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/impl/MetadataServiceGatewayImpl.java
index 959ad34e5d..267786fc63 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/impl/MetadataServiceGatewayImpl.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/impl/MetadataServiceGatewayImpl.java
@@ -7,8 +7,8 @@ import at.ac.tuwien.ifs.dbrepo.core.api.database.ViewDto;
import at.ac.tuwien.ifs.dbrepo.core.api.database.table.TableDto;
import at.ac.tuwien.ifs.dbrepo.core.api.identifier.IdentifierBriefDto;
import at.ac.tuwien.ifs.dbrepo.core.api.user.UserDto;
-import at.tuwien.config.GatewayConfig;
import at.ac.tuwien.ifs.dbrepo.core.exception.*;
+import at.tuwien.config.GatewayConfig;
import at.tuwien.gateway.MetadataServiceGateway;
import at.tuwien.mapper.MetadataMapper;
import jakarta.validation.constraints.NotNull;
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/StorageService.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/StorageService.java
index 0e126e27a6..a254a5c1be 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/StorageService.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/StorageService.java
@@ -9,7 +9,6 @@ import org.apache.spark.sql.Dataset;
import org.apache.spark.sql.Row;
import java.io.InputStream;
-import java.time.Instant;
import java.util.List;
public interface StorageService {
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/ContainerServiceMariaDbImpl.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/ContainerServiceMariaDbImpl.java
index ff14b7329d..887f72ccd2 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/ContainerServiceMariaDbImpl.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/ContainerServiceMariaDbImpl.java
@@ -4,9 +4,9 @@ import at.ac.tuwien.ifs.dbrepo.core.api.container.ContainerDto;
import at.ac.tuwien.ifs.dbrepo.core.api.database.DatabaseDto;
import at.ac.tuwien.ifs.dbrepo.core.api.database.internal.CreateDatabaseDto;
import at.ac.tuwien.ifs.dbrepo.core.api.user.UserBriefDto;
-import at.tuwien.config.RabbitConfig;
import at.ac.tuwien.ifs.dbrepo.core.exception.DatabaseMalformedException;
import at.ac.tuwien.ifs.dbrepo.core.exception.QueryStoreCreateException;
+import at.tuwien.config.RabbitConfig;
import at.tuwien.mapper.MariaDbMapper;
import at.tuwien.service.ContainerService;
import com.mchange.v2.c3p0.ComboPooledDataSource;
diff --git a/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/core/test/BaseTest.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/core/test/BaseTest.java
index 5209b40ce4..b26e623cef 100644
--- a/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/core/test/BaseTest.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/core/test/BaseTest.java
@@ -42,7 +42,6 @@ import at.ac.tuwien.ifs.dbrepo.core.api.orcid.person.name.OrcidNameDto;
import at.ac.tuwien.ifs.dbrepo.core.api.orcid.person.name.OrcidValueDto;
import at.ac.tuwien.ifs.dbrepo.core.api.semantics.*;
import at.ac.tuwien.ifs.dbrepo.core.api.user.*;
-import at.ac.tuwien.ifs.dbrepo.core.api.user.UserAttributesDto;
import at.ac.tuwien.ifs.dbrepo.core.api.user.internal.UpdateUserPasswordDto;
import at.ac.tuwien.ifs.dbrepo.core.entity.container.Container;
import at.ac.tuwien.ifs.dbrepo.core.entity.container.image.ContainerImage;
--
GitLab