From e171b05795fd573c036bc5b0019428dd69099281 Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Wed, 23 Nov 2022 15:22:56 +0100
Subject: [PATCH] Native sequence does not work
---
.env.unix.example | 1 -
.env.win.example | 1 -
docker-compose.demo.yml => docker-compose.dbrepo1.yml | 0
docker-compose.dev.yml => docker-compose.dbrepo2.yml | 0
docker-compose.yml | 2 --
fda-authentication-service/Dockerfile | 2 +-
fda-container-service/Dockerfile | 2 +-
.../src/main/resources/application-local.yml | 2 +-
fda-database-service/Dockerfile | 2 +-
.../src/main/resources/application-local.yml | 2 +-
fda-identifier-service/Dockerfile | 2 +-
fda-identifier-service/pom.xml | 5 +++--
.../src/main/resources/application-local.yml | 2 +-
fda-metadata-db/Dockerfile | 11 ++++++++---
.../java/at/tuwien/entities/container/Container.java | 8 ++------
.../entities/container/image/ContainerImage.java | 8 ++------
.../entities/container/image/ContainerImageDate.java | 8 ++------
.../image/ContainerImageEnvironmentItem.java | 9 ++-------
.../java/at/tuwien/entities/database/Database.java | 8 ++------
.../main/java/at/tuwien/entities/database/View.java | 8 ++------
.../java/at/tuwien/entities/database/table/Table.java | 8 ++------
.../entities/database/table/columns/TableColumn.java | 8 ++------
.../table/columns/concepts/ColumnConcept.java | 8 +++++++-
.../database/table/columns/concepts/Concept.java | 8 ++------
.../java/at/tuwien/entities/identifier/Creator.java | 9 ++-------
.../at/tuwien/entities/identifier/Identifier.java | 9 ++-------
.../tuwien/entities/identifier/RelatedIdentifier.java | 8 ++------
.../main/java/at/tuwien/entities/user/TimeSecret.java | 9 ++-------
.../src/main/java/at/tuwien/entities/user/Token.java | 10 +++-------
.../src/main/java/at/tuwien/entities/user/User.java | 10 +++-------
fda-metadata-service/Dockerfile | 2 +-
.../src/main/resources/application-local.yml | 2 +-
fda-query-service/Dockerfile | 2 +-
.../src/main/resources/application-local.yml | 2 +-
fda-table-service/Dockerfile | 2 +-
.../src/main/resources/application-local.yml | 2 +-
36 files changed, 63 insertions(+), 119 deletions(-)
rename docker-compose.demo.yml => docker-compose.dbrepo1.yml (100%)
rename docker-compose.dev.yml => docker-compose.dbrepo2.yml (100%)
diff --git a/.env.unix.example b/.env.unix.example
index 9743a64539..a5413b4849 100644
--- a/.env.unix.example
+++ b/.env.unix.example
@@ -16,6 +16,5 @@ SMTP_PASSWORD=
JWT_ISSUER=dbrepo
JWT_SECRET=secret
JWT_EXPIRATION=86400000
-EUREKA_SERVER=http://discovery-service:9090/eureka/
SHARED_FILESYSTEM=/tmp
LOG_LEVEL=trace # error, warning, info, debug, trace
diff --git a/.env.win.example b/.env.win.example
index 2cb7c72b6a..db2d3f030a 100644
--- a/.env.win.example
+++ b/.env.win.example
@@ -16,6 +16,5 @@ SMTP_PASSWORD=
JWT_ISSUER=dbrepo
JWT_SECRET=secret
JWT_EXPIRATION=86400000
-EUREKA_SERVER=http://discovery-service:9090/eureka/
SHARED_FILESYSTEM=C:\tmp
LOG_LEVEL=trace # error, warning, info, debug, trace
diff --git a/docker-compose.demo.yml b/docker-compose.dbrepo1.yml
similarity index 100%
rename from docker-compose.demo.yml
rename to docker-compose.dbrepo1.yml
diff --git a/docker-compose.dev.yml b/docker-compose.dbrepo2.yml
similarity index 100%
rename from docker-compose.dev.yml
rename to docker-compose.dbrepo2.yml
diff --git a/docker-compose.yml b/docker-compose.yml
index 82c862b095..f93b872143 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -269,8 +269,6 @@ services:
image: fda-units-service
networks:
core:
- environment:
- EUREKA_SERVER: http://fda-discovery-service:9090/eureka/
ports:
- "5010:5010"
volumes:
diff --git a/fda-authentication-service/Dockerfile b/fda-authentication-service/Dockerfile
index 3011726fb1..037fd03bde 100644
--- a/fda-authentication-service/Dockerfile
+++ b/fda-authentication-service/Dockerfile
@@ -22,7 +22,7 @@ RUN mvn -q clean package -DskipTests
FROM openjdk:11-jre-slim as runtime
ENV METADATA_DB=fda
-ENV METADATA_USERNAME=dbrepo
+ENV METADATA_USERNAME=root
ENV METADATA_PASSWORD=dbrepo
ENV BROKER_USERNAME=fda
ENV BROKER_PASSWORD=fda
diff --git a/fda-container-service/Dockerfile b/fda-container-service/Dockerfile
index 9fbaa3dc94..4752a4a140 100644
--- a/fda-container-service/Dockerfile
+++ b/fda-container-service/Dockerfile
@@ -22,7 +22,7 @@ RUN mvn -q clean package -DskipTests > /dev/null
FROM openjdk:11-jre-slim as runtime
ENV METADATA_DB=fda
-ENV METADATA_USERNAME=dbrepo
+ENV METADATA_USERNAME=root
ENV METADATA_PASSWORD=dbrepo
ENV BROKER_USERNAME=fda
ENV BROKER_PASSWORD=fda
diff --git a/fda-container-service/rest-service/src/main/resources/application-local.yml b/fda-container-service/rest-service/src/main/resources/application-local.yml
index 640df600fa..0e03826a18 100644
--- a/fda-container-service/rest-service/src/main/resources/application-local.yml
+++ b/fda-container-service/rest-service/src/main/resources/application-local.yml
@@ -4,7 +4,7 @@ spring:
datasource:
url: jdbc:mariadb://localhost:3306/fda
driver-class-name: org.mariadb.jdbc.Driver
- username: dbrepo
+ username: root
password: dbrepo
jpa:
show-sql: false
diff --git a/fda-database-service/Dockerfile b/fda-database-service/Dockerfile
index 4da92d5f6a..859b9f980a 100644
--- a/fda-database-service/Dockerfile
+++ b/fda-database-service/Dockerfile
@@ -22,7 +22,7 @@ RUN mvn -q clean package -DskipTests > /dev/null
FROM openjdk:11-jre-slim as runtime
ENV METADATA_DB=fda
-ENV METADATA_USERNAME=dbrepo
+ENV METADATA_USERNAME=root
ENV METADATA_PASSWORD=dbrepo
ENV BROKER_USERNAME=fda
ENV BROKER_PASSWORD=fda
diff --git a/fda-database-service/rest-service/src/main/resources/application-local.yml b/fda-database-service/rest-service/src/main/resources/application-local.yml
index 76c11d7907..bc7fb96365 100644
--- a/fda-database-service/rest-service/src/main/resources/application-local.yml
+++ b/fda-database-service/rest-service/src/main/resources/application-local.yml
@@ -4,7 +4,7 @@ spring:
datasource:
url: jdbc:mariadb://metadata-db:3306/fda
driver-class-name: org.mariadb.jdbc.Driver
- username: dbrepo
+ username: root
password: dbrepo
jpa:
show-sql: false
diff --git a/fda-identifier-service/Dockerfile b/fda-identifier-service/Dockerfile
index 7a05fc2856..d9976484e8 100644
--- a/fda-identifier-service/Dockerfile
+++ b/fda-identifier-service/Dockerfile
@@ -23,7 +23,7 @@ RUN mvn -q clean package -DskipTests > /dev/null
FROM openjdk:11-jre-slim as runtime
ENV METADATA_DB=fda
-ENV METADATA_USERNAME=dbrepo
+ENV METADATA_USERNAME=root
ENV METADATA_PASSWORD=dbrepo
ENV GATEWAY_ENDPOINT=http://gateway-service:9095
ENV WEBSITE=http://localhost:3000
diff --git a/fda-identifier-service/pom.xml b/fda-identifier-service/pom.xml
index 2f5c91ff73..47f5d4dbd1 100644
--- a/fda-identifier-service/pom.xml
+++ b/fda-identifier-service/pom.xml
@@ -89,8 +89,9 @@
</dependency>
<!-- DataSource -->
<dependency>
- <groupId>org.postgresql</groupId>
- <artifactId>postgresql</artifactId>
+ <groupId>org.mariadb.jdbc</groupId>
+ <artifactId>mariadb-java-client</artifactId>
+ <version>${mariadb.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
diff --git a/fda-identifier-service/rest-service/src/main/resources/application-local.yml b/fda-identifier-service/rest-service/src/main/resources/application-local.yml
index 62ca8741e2..3211c42319 100644
--- a/fda-identifier-service/rest-service/src/main/resources/application-local.yml
+++ b/fda-identifier-service/rest-service/src/main/resources/application-local.yml
@@ -4,7 +4,7 @@ spring:
datasource:
url: jdbc:mariadb://metadata-db:3306/fda
driver-class-name: org.mariadb.jdbc.Driver
- username: dbrepo
+ username: root
password: dbrepo
jpa:
show-sql: false
diff --git a/fda-metadata-db/Dockerfile b/fda-metadata-db/Dockerfile
index 50141d3569..f9b7c8bece 100644
--- a/fda-metadata-db/Dockerfile
+++ b/fda-metadata-db/Dockerfile
@@ -21,7 +21,7 @@ RUN mvn -q clean install > /dev/null
FROM mariadb:10.5 as runtime
ENV METADATA_DB=fda
-ENV METADATA_USERNAME=dbrepo
+ENV METADATA_USERNAME=root
ENV METADATA_PASSWORD=dbrepo
ENV MARIADB_DATABASE="${METADATA_DB}"
ENV MARIADB_ROOT_PASSWORD="${METADATA_PASSWORD}"
@@ -31,7 +31,12 @@ ENV MARIADB_PASSWORD="${METADATA_PASSWORD}"
# Scripts are copied to /docker-entrypoint-initdb.d/ in docker-compose from analyze service
HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD mysqladmin ping --user="$METADATA_USERNAME" --password="$METADATA_PASSWORD" --silent
-COPY ./setup-user.sh /docker-entrypoint-initdb.d/1.sh
-COPY ./setup-schema.sql /docker-entrypoint-initdb.d/2.sql
+WORKDIR /docker-entrypoint-initdb.d
+
+COPY ./setup-schema.sql ./1.sql
+COPY ./setup-user.sh ./2.sh
+RUN chmod +x ./2.sh
+
+WORKDIR /app
COPY --from=build /root/.m2/repository/at/tuwien /root/.m2/repository/at/tuwien
\ No newline at end of file
diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/Container.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/Container.java
index d483e9f593..b8f9ecabe1 100644
--- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/Container.java
+++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/Container.java
@@ -31,12 +31,8 @@ public class Container {
@Id
@EqualsAndHashCode.Include
- @GeneratedValue(generator = "container-sequence")
- @GenericGenerator(
- name = "container-sequence",
- strategy = "enhanced-sequence",
- parameters = @org.hibernate.annotations.Parameter(name = "sequence_name", value = "mdb_containers_seq")
- )
+ @GenericGenerator(name = "native", strategy = "native")
+ @GeneratedValue(strategy = GenerationType.AUTO, generator = "native")
private Long id;
@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java
index a22793bcd0..07c389d693 100644
--- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java
+++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java
@@ -26,12 +26,8 @@ public class ContainerImage {
@Id
@EqualsAndHashCode.Include
- @GeneratedValue(generator = "image-sequence")
- @GenericGenerator(
- name = "image-sequence",
- strategy = "enhanced-sequence",
- parameters = @org.hibernate.annotations.Parameter(name = "sequence_name", value = "mdb_images_seq")
- )
+ @GenericGenerator(name = "native", strategy = "native")
+ @GeneratedValue(strategy = GenerationType.AUTO, generator = "native")
public Long id;
@Column(nullable = false)
diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageDate.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageDate.java
index 48a8d47a4b..26adee0347 100644
--- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageDate.java
+++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageDate.java
@@ -23,12 +23,8 @@ public class ContainerImageDate {
@Id
@EqualsAndHashCode.Include
- @GeneratedValue(generator = "images-date-sequence")
- @GenericGenerator(
- name = "images-date-sequence",
- strategy = "enhanced-sequence",
- parameters = @org.hibernate.annotations.Parameter(name = "sequence_name", value = "mdb_images_date_seq")
- )
+ @GenericGenerator(name = "native", strategy = "native")
+ @GeneratedValue(strategy = GenerationType.AUTO, generator = "native")
private Long id;
@Column(name = "iid")
diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageEnvironmentItem.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageEnvironmentItem.java
index 3b0df1ac6d..121933d4c3 100644
--- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageEnvironmentItem.java
+++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageEnvironmentItem.java
@@ -23,13 +23,8 @@ public class ContainerImageEnvironmentItem {
@Id
@EqualsAndHashCode.Include
- @ToString.Include
- @GeneratedValue(generator = "environment-sequence")
- @GenericGenerator(
- name = "environment-sequence",
- strategy = "enhanced-sequence",
- parameters = @org.hibernate.annotations.Parameter(name = "sequence_name", value = "mdb_images_environment_item_seq")
- )
+ @GenericGenerator(name = "native", strategy = "native")
+ @GeneratedValue(strategy = GenerationType.AUTO, generator = "native")
public Long id;
@Id
diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/Database.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/Database.java
index 361736ed67..190d971539 100644
--- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/Database.java
+++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/Database.java
@@ -34,12 +34,8 @@ public class Database {
@Id
@EqualsAndHashCode.Include
- @GeneratedValue(generator = "database-sequence")
- @GenericGenerator(
- name = "database-sequence",
- strategy = "enhanced-sequence",
- parameters = @org.hibernate.annotations.Parameter(name = "sequence_name", value = "mdb_databases_seq")
- )
+ @GenericGenerator(name = "native", strategy = "native")
+ @GeneratedValue(strategy = GenerationType.AUTO, generator = "native")
private Long id;
@ManyToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/View.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/View.java
index 6111b151c0..0a60f175b5 100644
--- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/View.java
+++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/View.java
@@ -23,12 +23,8 @@ public class View {
@Id
@EqualsAndHashCode.Include
- @GeneratedValue(generator = "view-sequence")
- @GenericGenerator(
- name = "view-sequence",
- strategy = "enhanced-sequence",
- parameters = @org.hibernate.annotations.Parameter(name = "sequence_name", value = "mdb_view_seq")
- )
+ @GenericGenerator(name = "native", strategy = "native")
+ @GeneratedValue(strategy = GenerationType.AUTO, generator = "native")
private Long id;
@Id
diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/Table.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/Table.java
index 36e08d194f..77e548c47d 100644
--- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/Table.java
+++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/Table.java
@@ -31,12 +31,8 @@ public class Table {
@Id
@EqualsAndHashCode.Include
- @GeneratedValue(generator = "table-sequence")
- @GenericGenerator(
- name = "table-sequence",
- strategy = "enhanced-sequence",
- parameters = @org.hibernate.annotations.Parameter(name = "sequence_name", value = "mdb_tables_seq")
- )
+ @GenericGenerator(name = "native", strategy = "native")
+ @GeneratedValue(strategy = GenerationType.AUTO, generator = "native")
private Long id;
@Id
diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java
index a297ddc9f8..eb13193b15 100644
--- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java
+++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java
@@ -32,12 +32,8 @@ public class TableColumn implements Comparable<TableColumn> {
@Id
@EqualsAndHashCode.Include
- @GeneratedValue(generator = "column-sequence")
- @GenericGenerator(
- name = "column-sequence",
- strategy = "enhanced-sequence",
- parameters = @org.hibernate.annotations.Parameter(name = "sequence_name", value = "mdb_columns_seq")
- )
+ @GenericGenerator(name = "native", strategy = "native")
+ @GeneratedValue(strategy = GenerationType.AUTO, generator = "native")
private Long id;
@Id
diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/concepts/ColumnConcept.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/concepts/ColumnConcept.java
index 9d38bfcef2..a2ed5eb24a 100644
--- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/concepts/ColumnConcept.java
+++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/concepts/ColumnConcept.java
@@ -1,6 +1,7 @@
package at.tuwien.entities.database.table.columns.concepts;
import lombok.*;
+import org.hibernate.annotations.GenericGenerator;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import javax.persistence.*;
@@ -23,7 +24,8 @@ public class ColumnConcept implements Serializable {
@Id
@EqualsAndHashCode.Include
- @Column(name = "cid", nullable = false)
+ @GenericGenerator(name = "native", strategy = "native")
+ @GeneratedValue(strategy = GenerationType.AUTO, generator = "native")
private Long cid;
@Id
@@ -33,4 +35,8 @@ public class ColumnConcept implements Serializable {
@Id
@EqualsAndHashCode.Include
private Long cdbid;
+
+ @EqualsAndHashCode.Include
+ @Column(name = "concept_id")
+ private Long conceptId;
}
diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/concepts/Concept.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/concepts/Concept.java
index 48dc8bcea9..6def65fe55 100644
--- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/concepts/Concept.java
+++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/concepts/Concept.java
@@ -23,12 +23,8 @@ public class Concept {
@Id
@EqualsAndHashCode.Include
- @GeneratedValue(generator = "concept-sequence")
- @GenericGenerator(
- name = "concept-sequence",
- strategy = "enhanced-sequence",
- parameters = @org.hibernate.annotations.Parameter(name = "sequence_name", value = "mdb_concepts_seq")
- )
+ @GenericGenerator(name = "native", strategy = "native")
+ @GeneratedValue(strategy = GenerationType.AUTO, generator = "native")
private Long id;
@Column(name = "URI", nullable = false, columnDefinition = "TEXT")
diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/Creator.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/Creator.java
index 16f1a63858..1681f68d4a 100644
--- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/Creator.java
+++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/Creator.java
@@ -23,13 +23,8 @@ public class Creator {
@Id
@EqualsAndHashCode.Include
- @ToString.Include
- @GeneratedValue(generator = "creator-sequence")
- @GenericGenerator(
- name = "creator-sequence",
- strategy = "enhanced-sequence",
- parameters = @org.hibernate.annotations.Parameter(name = "sequence_name", value = "mdb_creators_seq")
- )
+ @GenericGenerator(name = "native", strategy = "native")
+ @GeneratedValue(strategy = GenerationType.AUTO, generator = "native")
private Long id;
@Id
diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/Identifier.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/Identifier.java
index f5d1d3769e..950e54da3a 100644
--- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/Identifier.java
+++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/Identifier.java
@@ -33,13 +33,8 @@ public class Identifier {
@Id
@EqualsAndHashCode.Include
- @ToString.Include
- @GeneratedValue(generator = "database-sequence")
- @GenericGenerator(
- name = "database-sequence",
- strategy = "enhanced-sequence",
- parameters = @org.hibernate.annotations.Parameter(name = "sequence_name", value = "mdb_identifiers_seq")
- )
+ @GenericGenerator(name = "native", strategy = "native")
+ @GeneratedValue(strategy = GenerationType.AUTO, generator = "native")
private Long id;
@Column(name = "cid", nullable = false)
diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/RelatedIdentifier.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/RelatedIdentifier.java
index 01ec086b6a..ad318c4a22 100644
--- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/RelatedIdentifier.java
+++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/RelatedIdentifier.java
@@ -29,12 +29,8 @@ public class RelatedIdentifier {
@Id
@EqualsAndHashCode.Include
- @GeneratedValue(generator = "related-identifier-sequence")
- @GenericGenerator(
- name = "related-identifier-sequence",
- strategy = "enhanced-sequence",
- parameters = @org.hibernate.annotations.Parameter(name = "sequence_name", value = "mdb_related_identifiers_seq")
- )
+ @GenericGenerator(name = "native", strategy = "native")
+ @GeneratedValue(strategy = GenerationType.AUTO, generator = "native")
private Long id;
@Id
diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/user/TimeSecret.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/user/TimeSecret.java
index a6ffa31241..c6922b8541 100644
--- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/user/TimeSecret.java
+++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/user/TimeSecret.java
@@ -23,13 +23,8 @@ public class TimeSecret {
@Id
@EqualsAndHashCode.Include
- @Column(name = "id", columnDefinition = "numeric(19, 2)")
- @GeneratedValue(generator = "time-secret-sequence")
- @GenericGenerator(
- name = "time-secret-sequence",
- strategy = "enhanced-sequence",
- parameters = @org.hibernate.annotations.Parameter(name = "sequence_name", value = "mdb_time_secrets_seq")
- )
+ @GenericGenerator(name = "native", strategy = "native")
+ @GeneratedValue(strategy = GenerationType.AUTO, generator = "native")
private Long id;
@Column(nullable = false)
diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/user/Token.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/user/Token.java
index 7a6cca310f..bacb80fc34 100644
--- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/user/Token.java
+++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/user/Token.java
@@ -24,13 +24,9 @@ public class Token {
@Id
@EqualsAndHashCode.Include
- @Column(name = "id", columnDefinition = "numeric(19, 2)")
- @GeneratedValue(generator = "tokens-sequence")
- @GenericGenerator(
- name = "tokens-sequence",
- strategy = "enhanced-sequence",
- parameters = @org.hibernate.annotations.Parameter(name = "sequence_name", value = "mdb_tokens_seq")
- )
+ @Column(name = "id")
+ @GenericGenerator(name = "native", strategy = "native")
+ @GeneratedValue(strategy = GenerationType.AUTO, generator = "native")
private Long id;
@Column(nullable = false, updatable = false)
diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/user/User.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/user/User.java
index 1327fb6139..691bc2af6d 100644
--- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/user/User.java
+++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/user/User.java
@@ -25,13 +25,9 @@ public class User {
@Id
@EqualsAndHashCode.Include
- @Column(name = "userid", columnDefinition = "numeric(19, 2)")
- @GeneratedValue(generator = "user-sequence")
- @GenericGenerator(
- name = "user-sequence",
- strategy = "enhanced-sequence",
- parameters = @org.hibernate.annotations.Parameter(name = "sequence_name", value = "mdb_user_seq")
- )
+ @Column(name = "userid")
+ @GenericGenerator(name = "native", strategy = "native")
+ @GeneratedValue(strategy = GenerationType.AUTO, generator = "native")
private Long id;
@Column(unique = true, nullable = false)
diff --git a/fda-metadata-service/Dockerfile b/fda-metadata-service/Dockerfile
index 9b486066e9..274c810b3a 100644
--- a/fda-metadata-service/Dockerfile
+++ b/fda-metadata-service/Dockerfile
@@ -22,7 +22,7 @@ RUN mvn -q clean package -DskipTests > /dev/null
FROM openjdk:11-jre-slim as runtime
ENV METADATA_DB=fda
-ENV METADATA_USERNAME=dbrepo
+ENV METADATA_USERNAME=root
ENV METADATA_PASSWORD=dbrepo
ENV GATEWAY_ENDPOINT=http://gateway-service:9095
ENV PID_BASE="https://example.com/pid/"
diff --git a/fda-metadata-service/rest-service/src/main/resources/application-local.yml b/fda-metadata-service/rest-service/src/main/resources/application-local.yml
index 58b27eec0a..15bd364258 100644
--- a/fda-metadata-service/rest-service/src/main/resources/application-local.yml
+++ b/fda-metadata-service/rest-service/src/main/resources/application-local.yml
@@ -4,7 +4,7 @@ spring:
datasource:
url: jdbc:mariadb://metadata-db:3306/fda
driver-class-name: org.mariadb.jdbc.Driver
- username: dbrepo
+ username: root
password: dbrepo
jpa:
show-sql: false
diff --git a/fda-query-service/Dockerfile b/fda-query-service/Dockerfile
index dab9e245a7..5658e0313f 100644
--- a/fda-query-service/Dockerfile
+++ b/fda-query-service/Dockerfile
@@ -23,7 +23,7 @@ RUN mvn -q clean package -DskipTests > /dev/null
FROM openjdk:11-jre-slim as runtime
ENV METADATA_DB=fda
-ENV METADATA_USERNAME=dbrepo
+ENV METADATA_USERNAME=root
ENV METADATA_PASSWORD=dbrepo
ENV BROKER_USERNAME=fda
ENV BROKER_PASSWORD=fda
diff --git a/fda-query-service/rest-service/src/main/resources/application-local.yml b/fda-query-service/rest-service/src/main/resources/application-local.yml
index 8f8defbb1b..5de9ea5ac4 100644
--- a/fda-query-service/rest-service/src/main/resources/application-local.yml
+++ b/fda-query-service/rest-service/src/main/resources/application-local.yml
@@ -4,7 +4,7 @@ spring:
datasource:
url: jdbc:mariadb://metadata-db:3306/fda
driver-class-name: org.mariadb.jdbc.Driver
- username: dbrepo
+ username: root
password: dbrepo
jpa:
show-sql: false
diff --git a/fda-table-service/Dockerfile b/fda-table-service/Dockerfile
index 837ca53a56..dec9aae8f7 100644
--- a/fda-table-service/Dockerfile
+++ b/fda-table-service/Dockerfile
@@ -24,7 +24,7 @@ FROM openjdk:11-jre-slim as runtime
ENV multipart.location=/tmp
ENV METADATA_DB=fda
-ENV METADATA_USERNAME=dbrepo
+ENV METADATA_USERNAME=root
ENV METADATA_PASSWORD=dbrepo
ENV BROKER_USERNAME=fda
ENV BROKER_PASSWORD=fda
diff --git a/fda-table-service/rest-service/src/main/resources/application-local.yml b/fda-table-service/rest-service/src/main/resources/application-local.yml
index 843fbdebd0..99d3153d22 100644
--- a/fda-table-service/rest-service/src/main/resources/application-local.yml
+++ b/fda-table-service/rest-service/src/main/resources/application-local.yml
@@ -4,7 +4,7 @@ spring:
datasource:
url: jdbc:mariadb://metadata-db:3306/fda
driver-class-name: org.mariadb.jdbc.Driver
- username: dbrepo
+ username: root
password: dbrepo
jpa:
show-sql: false
--
GitLab