Skip to content
Snippets Groups Projects
Unverified Commit e171b057 authored by Martin Weise's avatar Martin Weise
Browse files

Native sequence does not work

parent 6087d7bc
Branches
Tags
4 merge requests!129New module for citation as they occur multiple,!121Modified logging, modified logging level, modified flasgger endpoint,!113Resolve "Bugs related with Query Service",!109Resolve "Use MariaDB for metadata database"
Showing
with 30 additions and 53 deletions
...@@ -16,6 +16,5 @@ SMTP_PASSWORD= ...@@ -16,6 +16,5 @@ SMTP_PASSWORD=
JWT_ISSUER=dbrepo JWT_ISSUER=dbrepo
JWT_SECRET=secret JWT_SECRET=secret
JWT_EXPIRATION=86400000 JWT_EXPIRATION=86400000
EUREKA_SERVER=http://discovery-service:9090/eureka/
SHARED_FILESYSTEM=/tmp SHARED_FILESYSTEM=/tmp
LOG_LEVEL=trace # error, warning, info, debug, trace LOG_LEVEL=trace # error, warning, info, debug, trace
...@@ -16,6 +16,5 @@ SMTP_PASSWORD= ...@@ -16,6 +16,5 @@ SMTP_PASSWORD=
JWT_ISSUER=dbrepo JWT_ISSUER=dbrepo
JWT_SECRET=secret JWT_SECRET=secret
JWT_EXPIRATION=86400000 JWT_EXPIRATION=86400000
EUREKA_SERVER=http://discovery-service:9090/eureka/
SHARED_FILESYSTEM=C:\tmp SHARED_FILESYSTEM=C:\tmp
LOG_LEVEL=trace # error, warning, info, debug, trace LOG_LEVEL=trace # error, warning, info, debug, trace
File moved
File moved
...@@ -269,8 +269,6 @@ services: ...@@ -269,8 +269,6 @@ services:
image: fda-units-service image: fda-units-service
networks: networks:
core: core:
environment:
EUREKA_SERVER: http://fda-discovery-service:9090/eureka/
ports: ports:
- "5010:5010" - "5010:5010"
volumes: volumes:
......
...@@ -22,7 +22,7 @@ RUN mvn -q clean package -DskipTests ...@@ -22,7 +22,7 @@ RUN mvn -q clean package -DskipTests
FROM openjdk:11-jre-slim as runtime FROM openjdk:11-jre-slim as runtime
ENV METADATA_DB=fda ENV METADATA_DB=fda
ENV METADATA_USERNAME=dbrepo ENV METADATA_USERNAME=root
ENV METADATA_PASSWORD=dbrepo ENV METADATA_PASSWORD=dbrepo
ENV BROKER_USERNAME=fda ENV BROKER_USERNAME=fda
ENV BROKER_PASSWORD=fda ENV BROKER_PASSWORD=fda
......
...@@ -22,7 +22,7 @@ RUN mvn -q clean package -DskipTests > /dev/null ...@@ -22,7 +22,7 @@ RUN mvn -q clean package -DskipTests > /dev/null
FROM openjdk:11-jre-slim as runtime FROM openjdk:11-jre-slim as runtime
ENV METADATA_DB=fda ENV METADATA_DB=fda
ENV METADATA_USERNAME=dbrepo ENV METADATA_USERNAME=root
ENV METADATA_PASSWORD=dbrepo ENV METADATA_PASSWORD=dbrepo
ENV BROKER_USERNAME=fda ENV BROKER_USERNAME=fda
ENV BROKER_PASSWORD=fda ENV BROKER_PASSWORD=fda
......
...@@ -4,7 +4,7 @@ spring: ...@@ -4,7 +4,7 @@ spring:
datasource: datasource:
url: jdbc:mariadb://localhost:3306/fda url: jdbc:mariadb://localhost:3306/fda
driver-class-name: org.mariadb.jdbc.Driver driver-class-name: org.mariadb.jdbc.Driver
username: dbrepo username: root
password: dbrepo password: dbrepo
jpa: jpa:
show-sql: false show-sql: false
......
...@@ -22,7 +22,7 @@ RUN mvn -q clean package -DskipTests > /dev/null ...@@ -22,7 +22,7 @@ RUN mvn -q clean package -DskipTests > /dev/null
FROM openjdk:11-jre-slim as runtime FROM openjdk:11-jre-slim as runtime
ENV METADATA_DB=fda ENV METADATA_DB=fda
ENV METADATA_USERNAME=dbrepo ENV METADATA_USERNAME=root
ENV METADATA_PASSWORD=dbrepo ENV METADATA_PASSWORD=dbrepo
ENV BROKER_USERNAME=fda ENV BROKER_USERNAME=fda
ENV BROKER_PASSWORD=fda ENV BROKER_PASSWORD=fda
......
...@@ -4,7 +4,7 @@ spring: ...@@ -4,7 +4,7 @@ spring:
datasource: datasource:
url: jdbc:mariadb://metadata-db:3306/fda url: jdbc:mariadb://metadata-db:3306/fda
driver-class-name: org.mariadb.jdbc.Driver driver-class-name: org.mariadb.jdbc.Driver
username: dbrepo username: root
password: dbrepo password: dbrepo
jpa: jpa:
show-sql: false show-sql: false
......
...@@ -23,7 +23,7 @@ RUN mvn -q clean package -DskipTests > /dev/null ...@@ -23,7 +23,7 @@ RUN mvn -q clean package -DskipTests > /dev/null
FROM openjdk:11-jre-slim as runtime FROM openjdk:11-jre-slim as runtime
ENV METADATA_DB=fda ENV METADATA_DB=fda
ENV METADATA_USERNAME=dbrepo ENV METADATA_USERNAME=root
ENV METADATA_PASSWORD=dbrepo ENV METADATA_PASSWORD=dbrepo
ENV GATEWAY_ENDPOINT=http://gateway-service:9095 ENV GATEWAY_ENDPOINT=http://gateway-service:9095
ENV WEBSITE=http://localhost:3000 ENV WEBSITE=http://localhost:3000
......
...@@ -89,8 +89,9 @@ ...@@ -89,8 +89,9 @@
</dependency> </dependency>
<!-- DataSource --> <!-- DataSource -->
<dependency> <dependency>
<groupId>org.postgresql</groupId> <groupId>org.mariadb.jdbc</groupId>
<artifactId>postgresql</artifactId> <artifactId>mariadb-java-client</artifactId>
<version>${mariadb.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.data</groupId> <groupId>org.springframework.data</groupId>
......
...@@ -4,7 +4,7 @@ spring: ...@@ -4,7 +4,7 @@ spring:
datasource: datasource:
url: jdbc:mariadb://metadata-db:3306/fda url: jdbc:mariadb://metadata-db:3306/fda
driver-class-name: org.mariadb.jdbc.Driver driver-class-name: org.mariadb.jdbc.Driver
username: dbrepo username: root
password: dbrepo password: dbrepo
jpa: jpa:
show-sql: false show-sql: false
......
...@@ -21,7 +21,7 @@ RUN mvn -q clean install > /dev/null ...@@ -21,7 +21,7 @@ RUN mvn -q clean install > /dev/null
FROM mariadb:10.5 as runtime FROM mariadb:10.5 as runtime
ENV METADATA_DB=fda ENV METADATA_DB=fda
ENV METADATA_USERNAME=dbrepo ENV METADATA_USERNAME=root
ENV METADATA_PASSWORD=dbrepo ENV METADATA_PASSWORD=dbrepo
ENV MARIADB_DATABASE="${METADATA_DB}" ENV MARIADB_DATABASE="${METADATA_DB}"
ENV MARIADB_ROOT_PASSWORD="${METADATA_PASSWORD}" ENV MARIADB_ROOT_PASSWORD="${METADATA_PASSWORD}"
...@@ -31,7 +31,12 @@ ENV MARIADB_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 # 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 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 WORKDIR /docker-entrypoint-initdb.d
COPY ./setup-schema.sql /docker-entrypoint-initdb.d/2.sql
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 COPY --from=build /root/.m2/repository/at/tuwien /root/.m2/repository/at/tuwien
\ No newline at end of file
...@@ -31,12 +31,8 @@ public class Container { ...@@ -31,12 +31,8 @@ public class Container {
@Id @Id
@EqualsAndHashCode.Include @EqualsAndHashCode.Include
@GeneratedValue(generator = "container-sequence") @GenericGenerator(name = "native", strategy = "native")
@GenericGenerator( @GeneratedValue(strategy = GenerationType.AUTO, generator = "native")
name = "container-sequence",
strategy = "enhanced-sequence",
parameters = @org.hibernate.annotations.Parameter(name = "sequence_name", value = "mdb_containers_seq")
)
private Long id; private Long id;
@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL) @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
......
...@@ -26,12 +26,8 @@ public class ContainerImage { ...@@ -26,12 +26,8 @@ public class ContainerImage {
@Id @Id
@EqualsAndHashCode.Include @EqualsAndHashCode.Include
@GeneratedValue(generator = "image-sequence") @GenericGenerator(name = "native", strategy = "native")
@GenericGenerator( @GeneratedValue(strategy = GenerationType.AUTO, generator = "native")
name = "image-sequence",
strategy = "enhanced-sequence",
parameters = @org.hibernate.annotations.Parameter(name = "sequence_name", value = "mdb_images_seq")
)
public Long id; public Long id;
@Column(nullable = false) @Column(nullable = false)
......
...@@ -23,12 +23,8 @@ public class ContainerImageDate { ...@@ -23,12 +23,8 @@ public class ContainerImageDate {
@Id @Id
@EqualsAndHashCode.Include @EqualsAndHashCode.Include
@GeneratedValue(generator = "images-date-sequence") @GenericGenerator(name = "native", strategy = "native")
@GenericGenerator( @GeneratedValue(strategy = GenerationType.AUTO, generator = "native")
name = "images-date-sequence",
strategy = "enhanced-sequence",
parameters = @org.hibernate.annotations.Parameter(name = "sequence_name", value = "mdb_images_date_seq")
)
private Long id; private Long id;
@Column(name = "iid") @Column(name = "iid")
......
...@@ -23,13 +23,8 @@ public class ContainerImageEnvironmentItem { ...@@ -23,13 +23,8 @@ public class ContainerImageEnvironmentItem {
@Id @Id
@EqualsAndHashCode.Include @EqualsAndHashCode.Include
@ToString.Include @GenericGenerator(name = "native", strategy = "native")
@GeneratedValue(generator = "environment-sequence") @GeneratedValue(strategy = GenerationType.AUTO, generator = "native")
@GenericGenerator(
name = "environment-sequence",
strategy = "enhanced-sequence",
parameters = @org.hibernate.annotations.Parameter(name = "sequence_name", value = "mdb_images_environment_item_seq")
)
public Long id; public Long id;
@Id @Id
......
...@@ -34,12 +34,8 @@ public class Database { ...@@ -34,12 +34,8 @@ public class Database {
@Id @Id
@EqualsAndHashCode.Include @EqualsAndHashCode.Include
@GeneratedValue(generator = "database-sequence") @GenericGenerator(name = "native", strategy = "native")
@GenericGenerator( @GeneratedValue(strategy = GenerationType.AUTO, generator = "native")
name = "database-sequence",
strategy = "enhanced-sequence",
parameters = @org.hibernate.annotations.Parameter(name = "sequence_name", value = "mdb_databases_seq")
)
private Long id; private Long id;
@ManyToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL) @ManyToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
......
...@@ -23,12 +23,8 @@ public class View { ...@@ -23,12 +23,8 @@ public class View {
@Id @Id
@EqualsAndHashCode.Include @EqualsAndHashCode.Include
@GeneratedValue(generator = "view-sequence") @GenericGenerator(name = "native", strategy = "native")
@GenericGenerator( @GeneratedValue(strategy = GenerationType.AUTO, generator = "native")
name = "view-sequence",
strategy = "enhanced-sequence",
parameters = @org.hibernate.annotations.Parameter(name = "sequence_name", value = "mdb_view_seq")
)
private Long id; private Long id;
@Id @Id
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment