WIP

dbrepo-upload-service/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.12</version>
+        <version>3.3.5</version>
     </parent>
 
     <groupId>at.tuwien</groupId>
@@ -24,11 +24,11 @@
 
     <properties>
         <java.version>17</java.version>
-        <spring-cloud.version>4.0.2</spring-cloud.version>
+        <spring-cloud.version>4.1.4</spring-cloud.version>
         <mapstruct.version>1.5.5.Final</mapstruct.version>
         <rabbitmq.version>5.20.0</rabbitmq.version>
         <jackson-datatype.version>2.15.0</jackson-datatype.version>
-        <commons-io.version>2.15.0</commons-io.version>
+        <commons-io.version>2.17.0</commons-io.version>
         <commons-validator.version>1.8.0</commons-validator.version>
         <guava.version>33.0.0-jre</guava.version>
         <jacoco.version>0.8.12</jacoco.version>

dbrepo-upload-service/src/main/resources/application.yml

@@ -2,11 +2,6 @@ application:
   title: DBRepo
   version: '@project.version@'
 spring:
-  datasource:
-    url: "jdbc:mariadb://${METADATA_HOST:metadata-db}:${METADATA_PORT:3306}/${METADATA_DB:dbrepo}${METADATA_JDBC_EXTRA_ARGS}"
-    driver-class-name: org.mariadb.jdbc.Driver
-    username: "${METADATA_USERNAME:root}"
-    password: "${METADATA_DB_PASSWORD:dbrepo}"
   jpa:
     show-sql: false
     open-in-view: false
@@ -16,13 +11,7 @@ spring:
         jdbc:
           time_zone: UTC
   application:
-    name: metadata-service
-  rabbitmq:
-    host: "${BROKER_HOST:broker-service}"
-    virtual-host: "${BROKER_VIRTUALHOST:dbrepo}"
-    username: "${BROKER_USERNAME:admin}"
-    password: "${BROKER_PASSWORD:admin}"
-    port: ${BROKER_PORT:5672}
+    name: upload-service
   main:
     banner-mode: off
 management:
@@ -47,38 +36,3 @@ logging:
     root: warn
     at.tuwien.: "${LOG_LEVEL:info}"
     org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
-dbrepo:
-  repository-name: "${REPOSITORY_NAME:Database Repository}"
-  base-url: "${BASE_URL:http://localhost}"
-  admin-email: "${ADMIN_EMAIL:noreply@example.com}"
-  deleted-record: "${DELETED_RECORD:persistent}"
-  granularity: "${GRANULARITY:YYYY-MM-DDThh:mm:ssZ}"
-  exchangeName: "${BROKER_EXCHANGE_NAME:dbrepo}"
-  queueName: "${BROKER_QUEUE_NAME:dbrepo}"
-  connectionTimeout: "${SPARQL_CONNECTION_TIMEOUT:10000}"
-  s3:
-    accessKeyId: "${S3_ACCESS_KEY_ID:seaweedfsadmin}"
-    secretAccessKey: "${S3_SECRET_ACCESS_KEY:seaweedfsadmin}"
-    bucket: "${S3_BUCKET:dbrepo}"
-  system:
-    username: "${SYSTEM_USERNAME:admin}"
-    password: "${SYSTEM_PASSWORD:admin}"
-  endpoints:
-    analyseService: "${ANALYSE_SERVICE_ENDPOINT:http://analyse-service:8080}"
-    searchService: "${SEARCH_SERVICE_ENDPOINT:http://search-service:8080}"
-    dataService: "${DATA_SERVICE_ENDPOINT:http://data-service:8080}"
-    brokerService: "${BROKER_SERVICE_ENDPOINT:http://broker-service:15672}"
-    authService: "${AUTH_SERVICE_ENDPOINT:http://auth-service:8080}"
-    storageService: "${S3_ENDPOINT:http://storage-service:9000}"
-    rorService: "${ROR_ENDPOINT:https://api.ror.org}"
-    crossRefService: "${CROSSREF_ENDPOINT:http://data.crossref.org}"
-  pid:
-    base: "${BASE_URL:http://localhost}/pid/"
-  jwt:
-    public_key: "${JWT_PUBKEY:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB}"
-  keycloak:
-    username: "${AUTH_SERVICE_ADMIN:admin}"
-    password: "${AUTH_SERVICE_ADMIN_PASSWORD:admin}"
-    client: "${AUTH_SERVICE_CLIENT:dbrepo-client}"
-    clientSecret: "${AUTH_SERVICE_CLIENT_SECRET:MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}"
-  website: "${BASE_URL:http://localhost}"

dbrepo-upload-service/src/test/resources/application.properties

@@ -4,15 +4,8 @@ spring.profiles.active=local,junit
 # disable discovery
 spring.cloud.discovery.enabled=false
 
-# internal datasource
-spring.datasource.url=jdbc:h2:mem:testdb;DB_CLOSE_ON_EXIT=FALSE;INIT=CREATE SCHEMA IF NOT EXISTS DBREPO;NON_KEYWORDS=value
-spring.datasource.driverClassName=org.h2.Driver
-spring.datasource.username=sa
-spring.datasource.password=password
-spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
-spring.sql.init.mode=always
-spring.sql.init.schema-locations=classpath*:init/schema.sql
-spring.jpa.hibernate.ddl-auto=create
+# disable datasource
+spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration
 
 # logging
 logging.level.root=error