diff --git a/dbrepo-analyse-service/Pipfile.lock b/dbrepo-analyse-service/Pipfile.lock
index 7241957fcaf241aaa7c17243037d02a3cc087f4b..c92a071976c86ef7d449ab8468b22bfc800def95 100644
--- a/dbrepo-analyse-service/Pipfile.lock
+++ b/dbrepo-analyse-service/Pipfile.lock
@@ -108,11 +108,11 @@
},
"aiosignal": {
"hashes": [
- "sha256:54cd96e15e1649b75d6c87526a6ff0b6c1b0dd3459f43d9ca11d48c339b68cfc",
- "sha256:f8376fb07dd1e86a584e4fcdec80b36b7f81aac666ebc724e2c090300dd83b17"
+ "sha256:45cde58e409a301715980c2b01d0c28bdde3770d8290b5eb2173759d9acb31a5",
+ "sha256:a8c255c66fafb1e499c9351d0bf32ff2d8a0321595ebac3b93713656d2436f54"
],
- "markers": "python_version >= '3.7'",
- "version": "==1.3.1"
+ "markers": "python_version >= '3.9'",
+ "version": "==1.3.2"
},
"annotated-types": {
"hashes": [
@@ -175,20 +175,20 @@
},
"boto3": {
"hashes": [
- "sha256:21a3b18c3a7fd20e463708fe3fa035983105dc7f3a1c274e1903e1583ab91159",
- "sha256:50dae461ab5fbedfb81b690895d48a918fed0d5fdff37be1c4232770c0dc9712"
+ "sha256:742941b2424c0223d2d94a08c3485462fa7c58d816b62ca80f08e555243acee1",
+ "sha256:d2e95fa06f095b8e0c545dd678c6269d253809b2997c30f5ce8a956c410b4e86"
],
"index": "pypi",
"markers": "python_version >= '3.8'",
- "version": "==1.35.80"
+ "version": "==1.35.81"
},
"botocore": {
"hashes": [
- "sha256:36e589dccb62380abd628b08fecfa2f7c89b99f41ec9fc42c467c94008c0be4a",
- "sha256:b8dfceca58891cb2711bd6455ec4f7159051f3796e0f64adef9bb334f19d8a92"
+ "sha256:564c2478e50179e0b766e6a87e5e0cdd35e1bc37eb375c1cf15511f5dd13600d",
+ "sha256:a7b13bbd959bf2d6f38f681676aab408be01974c46802ab997617b51399239f7"
],
"markers": "python_version >= '3.8'",
- "version": "==1.35.80"
+ "version": "==1.35.81"
},
"certifi": {
"hashes": [
@@ -425,7 +425,7 @@
},
"dbrepo": {
"hashes": [
- "sha256:ffba32d98dedac3f16a874463e82a114b7d060b0099744885d3cf48c7d5b2a9a"
+ "sha256:52b776f5be91b9529c0f8cb1d006824f67e5da2f3d5bad4becc0857229036c19"
],
"path": "./lib/dbrepo-1.6.0.tar.gz"
},
@@ -1625,7 +1625,7 @@
"sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac",
"sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9"
],
- "markers": "python_version >= '3.10'",
+ "markers": "python_version >= '3.8'",
"version": "==2.2.3"
},
"werkzeug": {
@@ -2262,7 +2262,7 @@
"sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac",
"sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9"
],
- "markers": "python_version >= '3.10'",
+ "markers": "python_version >= '3.8'",
"version": "==2.2.3"
},
"wrapt": {
diff --git a/dbrepo-analyse-service/lib/dbrepo-1.6.0.tar.gz b/dbrepo-analyse-service/lib/dbrepo-1.6.0.tar.gz
index 9170083105f5d5abc7e4748abe8d2423f3277503..9e5365baf3dd79d695a606637d225eaf2e72a751 100644
Binary files a/dbrepo-analyse-service/lib/dbrepo-1.6.0.tar.gz and b/dbrepo-analyse-service/lib/dbrepo-1.6.0.tar.gz differ
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/ViewEndpointUnitTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/ViewEndpointUnitTest.java
index b374bfe7aa27adf4980d4dc8156f227a9abd0426..5d33c28a51de128dd101c48aee35525fea2b184b 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/ViewEndpointUnitTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/ViewEndpointUnitTest.java
@@ -25,6 +25,7 @@ import org.springframework.security.test.context.support.WithMockUser;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import java.sql.SQLException;
+import java.time.Instant;
import java.util.List;
import java.util.Map;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ViewEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ViewEndpointUnitTest.java
index 5451efdd7567cff88f27f23f8ad9a8f10a563bbb..7f1855b91ea97ea8f15d34b68f1a13782837324d 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ViewEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ViewEndpointUnitTest.java
@@ -1,6 +1,5 @@
package at.tuwien.endpoints;
-import at.tuwien.test.AbstractUnitTest;
import at.tuwien.api.database.ViewBriefDto;
import at.tuwien.api.database.ViewCreateDto;
import at.tuwien.api.database.ViewDto;
@@ -13,6 +12,7 @@ import at.tuwien.service.AccessService;
import at.tuwien.service.DatabaseService;
import at.tuwien.service.UserService;
import at.tuwien.service.ViewService;
+import at.tuwien.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java b/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java
index a7e7cb7a29bedcac63987df21a055718efa63566..da2c07e7c5dbcafcf2498c34cbc1d058a35927d0 100644
--- a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java
+++ b/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java
@@ -5596,40 +5596,6 @@ public abstract class BaseTest {
.isNullAllowed(true)
.build());
- public final static List<ViewColumnDto> VIEW_5_COLUMNS_DTO = List.of(
- ViewColumnDto.builder()
- .id(29L)
- .ordinalPosition(0)
- .name("location")
- .internalName("location")
- .ordinalPosition(0)
- .columnType(ColumnTypeDto.VARCHAR)
- .size(255L)
- .isNullAllowed(false)
- .build(),
- ViewColumnDto.builder()
- .id(30L)
- .ordinalPosition(1)
- .name("lat")
- .internalName("lat")
- .ordinalPosition(1)
- .columnType(ColumnTypeDto.DECIMAL)
- .size(10L)
- .d(0L)
- .isNullAllowed(true)
- .build(),
- ViewColumnDto.builder()
- .id(31L)
- .ordinalPosition(2)
- .name("lng")
- .internalName("lng")
- .ordinalPosition(2)
- .columnType(ColumnTypeDto.DECIMAL)
- .size(10L)
- .d(0L)
- .isNullAllowed(true)
- .build());
-
public final static Long QUERY_1_RESULT_ID = 1L;
public final static List<Map<String, Object>> QUERY_1_RESULT_DTO = new LinkedList<>(List.of(
new HashMap<>() {{
diff --git a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/utils/EndpointUtils.java b/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/utils/EndpointUtils.java
index ac36a3648bb43f4d8c2480895a2a6dda4636cdc5..a2101bf3abf5ed68b910a55c064cda00aaf4b847 100644
--- a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/utils/EndpointUtils.java
+++ b/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/utils/EndpointUtils.java
@@ -6,13 +6,12 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
import org.springframework.core.type.filter.RegexPatternTypeFilter;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ResponseStatus;
import java.io.File;
import java.io.IOException;
-import java.lang.reflect.Method;
-import java.util.*;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
import java.util.regex.Pattern;
public class EndpointUtils {
diff --git a/dbrepo-search-service/Pipfile.lock b/dbrepo-search-service/Pipfile.lock
index e3c4662d2886e1b3be8ae8fd18ca58720adbdaba..eb09848759a147926fba0ab1e90c0999ac21fa1a 100644
--- a/dbrepo-search-service/Pipfile.lock
+++ b/dbrepo-search-service/Pipfile.lock
@@ -108,11 +108,11 @@
},
"aiosignal": {
"hashes": [
- "sha256:54cd96e15e1649b75d6c87526a6ff0b6c1b0dd3459f43d9ca11d48c339b68cfc",
- "sha256:f8376fb07dd1e86a584e4fcdec80b36b7f81aac666ebc724e2c090300dd83b17"
+ "sha256:45cde58e409a301715980c2b01d0c28bdde3770d8290b5eb2173759d9acb31a5",
+ "sha256:a8c255c66fafb1e499c9351d0bf32ff2d8a0321595ebac3b93713656d2436f54"
],
- "markers": "python_version >= '3.7'",
- "version": "==1.3.1"
+ "markers": "python_version >= '3.9'",
+ "version": "==1.3.2"
},
"annotated-types": {
"hashes": [
@@ -373,7 +373,7 @@
},
"dbrepo": {
"hashes": [
- "sha256:ffba32d98dedac3f16a874463e82a114b7d060b0099744885d3cf48c7d5b2a9a"
+ "sha256:52b776f5be91b9529c0f8cb1d006824f67e5da2f3d5bad4becc0857229036c19"
],
"path": "./lib/dbrepo-1.6.0.tar.gz"
},
diff --git a/dbrepo-search-service/init/Pipfile.lock b/dbrepo-search-service/init/Pipfile.lock
index 9f92191fbaffa2a291ee912f33ad482124a68fa2..69778a8caf8b4c11ffb60269d523904073e1f308 100644
--- a/dbrepo-search-service/init/Pipfile.lock
+++ b/dbrepo-search-service/init/Pipfile.lock
@@ -108,11 +108,11 @@
},
"aiosignal": {
"hashes": [
- "sha256:54cd96e15e1649b75d6c87526a6ff0b6c1b0dd3459f43d9ca11d48c339b68cfc",
- "sha256:f8376fb07dd1e86a584e4fcdec80b36b7f81aac666ebc724e2c090300dd83b17"
+ "sha256:45cde58e409a301715980c2b01d0c28bdde3770d8290b5eb2173759d9acb31a5",
+ "sha256:a8c255c66fafb1e499c9351d0bf32ff2d8a0321595ebac3b93713656d2436f54"
],
- "markers": "python_version >= '3.7'",
- "version": "==1.3.1"
+ "markers": "python_version >= '3.9'",
+ "version": "==1.3.2"
},
"annotated-types": {
"hashes": [
diff --git a/dbrepo-search-service/init/lib/dbrepo-1.6.0.tar.gz b/dbrepo-search-service/init/lib/dbrepo-1.6.0.tar.gz
index 9170083105f5d5abc7e4748abe8d2423f3277503..9e5365baf3dd79d695a606637d225eaf2e72a751 100644
Binary files a/dbrepo-search-service/init/lib/dbrepo-1.6.0.tar.gz and b/dbrepo-search-service/init/lib/dbrepo-1.6.0.tar.gz differ
diff --git a/dbrepo-search-service/lib/dbrepo-1.6.0.tar.gz b/dbrepo-search-service/lib/dbrepo-1.6.0.tar.gz
index 9170083105f5d5abc7e4748abe8d2423f3277503..9e5365baf3dd79d695a606637d225eaf2e72a751 100644
Binary files a/dbrepo-search-service/lib/dbrepo-1.6.0.tar.gz and b/dbrepo-search-service/lib/dbrepo-1.6.0.tar.gz differ