diff --git a/.env.unix.example b/.env.unix.example
index 9743a6453910594a958be5fb2f7d6c9d6754d582..a5413b4849ee8f63908a330c818b7b2d7cc62902 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 2cb7c72b6a673c2dc43aad14bfdb3830f928268c..db2d3f030a78decff5e7110754740e7c31685f55 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 82c862b095e13fe02bfe5f715b8e896bd21b9ba2..f93b8721438ac0dad5b201310c5dc2f2e3ccaa96 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 3011726fb1b2c5e4045a1c20466b63f9a274ef6c..037fd03bde06bbe28227785900992256a4d66087 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 9fbaa3dc9496448b608a0ee33365db44b48a4166..4752a4a140b1dd52e256350862067102131a78cd 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 640df600fad225ac73cb9451f5645fd040464f5a..0e03826a183b6bb5d2416d43bc1fb116c8431892 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 4da92d5f6aae387e690c8c86bae3dda253814a03..859b9f980aaf694e3c98f956b53f07378ec25596 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 76c11d7907fda8661a028f2c95f41cf65d614f90..bc7fb96365ef4c327d0afa24aa21cf87798a4d65 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 7a05fc285615d14a0a9c22c569adee933d88524e..d9976484e879af59c841aa5f4441a1770e85c759 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 2f5c91ff7374957c5638aec429204af450bed277..47f5d4dbd167b5238adaf3c618272e6f9e110179 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 62ca8741e2e536afdef07b9aa259c085d91e291d..3211c423196f153a6cc1221bf94b9340c097f3e6 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 50141d356956c0f38a5634a269ce2eec61fc23b4..f9b7c8becec4a1223fdc83239575ae335ff071aa 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 d483e9f5932e26a09a1260b21aee8b34004e597e..b8f9ecabe1ff904e91cca9f780d796f68bbf414d 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 a22793bcd050687147f464f65252ad111d2f8d21..07c389d693231dd1b3a2b09d4a97b95e962a9175 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 48a8d47a4b3e23756fdf49ae3160bc0b45d16aba..26adee03471c1de1159712a710d318f13979060b 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 3b0df1ac6d8e5d0b0c7b9750b0cfaa71a6d35d63..121933d4c32df6db478359126e54e4e35d77e1c5 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 361736ed677b438bb99eb81d7eac50de8e280f97..190d971539b1a60ea8188f55f81dc60ba275bd02 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 6111b151c0ade7aab3dae2379bb1a97fb94e8c10..0a60f175b545beb0ad48089db8667657a2ec6c78 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 36e08d194f3eb81935ee3c1fa2e75f83396e6d28..77e548c47d350a8afdcb368795e5747cbf934b3b 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 a297ddc9f8d817d12f3d86fafbe2eb1d77c18f14..eb13193b158f3a8b4b8b770b88a88d98dda24946 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 9d38bfcef2f40f1bca8faed04ca7af3ff1d09fce..a2ed5eb24a7c6e246f49204d6039d4d8dca857ed 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 48dc8bcea9ba14e1e3d5274ed98ef694f6bb0970..6def65fe5585c7b14062d1a2315378208238c311 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 16f1a6385885b7978c1154ffab1436c05a1c1d08..1681f68d4a2ecbc59af8be43b61732de44cd50db 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 f5d1d3769ebc9d163b12a6eb952752bde37de206..950e54da3af72cc35b2ee0266e930107cf683c75 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 01ec086b6a3b540eb421c9003c41574730934c87..ad318c4a22b5e80af96ce030f11ab16dba3a38ac 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 a6ffa31241441bb547bcf2d76158073391762337..c6922b85412353903cb9726150f5383fcdacdf68 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 7a6cca310fa1935038fde986c670620c2818c8e4..bacb80fc34b96f0f0bf3ac1740531d389f1e3a1c 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 1327fb6139a5cc5ce63b0aa3d387fa4108a1f933..691bc2af6d7a61b982601aaa01c767cb7aae41c9 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 9b486066e95f7daae4cf970f88624c789947f4dd..274c810b3a8fcc727badc137e81800b2772489cd 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 58b27eec0a4632f96d95298137e1e4d6dad0cd87..15bd36425808ac5a56fb1272e6af4dd5e645da3d 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 dab9e245a7b1a092da384e89894bd5597c8fc869..5658e0313fce55c0b3766625edf19c4b60834d6b 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 8f8defbb1bc7b8c7f7a719404749f21300041943..5de9ea5ac44a63d8a03fd42f9ec35c25ebe27cda 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 837ca53a56b118039e289c77627bb89382af32e0..dec9aae8f7a78bb85092e0fe43788467d724a28f 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 843fbdebd0eee63f1dbd8dedd1b34c2ea72dda3f..99d3153d22311683686b00eaa8bda5bd6bbc4ce7 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