Skip to content
Snippets Groups Projects
Verified Commit 229998c6 authored by Martin Weise's avatar Martin Weise
Browse files
parent 8a05a118
Branches backtrack/entities
No related tags found
No related merge requests found
Showing
with 148 additions and 21 deletions
...@@ -83,6 +83,7 @@ services: ...@@ -83,6 +83,7 @@ services:
- ./config/import-realms.sh:/docker-entrypoint-initdb.d/import-realms.sh - ./config/import-realms.sh:/docker-entrypoint-initdb.d/import-realms.sh
- ./config/master-realm.json:/opt/keycloak/data/import/master-realm.json - ./config/master-realm.json:/opt/keycloak/data/import/master-realm.json
- ./config/dbrepo-realm.json:/opt/keycloak/data/import/dbrepo-realm.json - ./config/dbrepo-realm.json:/opt/keycloak/data/import/dbrepo-realm.json
- ./config/create-event-listener.jar:/opt/bitnami/keycloak/providers/create-event-listener.jar
ports: ports:
- "8080:8080" - "8080:8080"
environment: environment:
...@@ -93,6 +94,9 @@ services: ...@@ -93,6 +94,9 @@ services:
KEYCLOAK_DATABASE_NAME: "${AUTH_DB_NAME:-keycloak}" KEYCLOAK_DATABASE_NAME: "${AUTH_DB_NAME:-keycloak}"
KEYCLOAK_DATABASE_USER: "${AUTH_DB_USERNAME:-keycloak}" KEYCLOAK_DATABASE_USER: "${AUTH_DB_USERNAME:-keycloak}"
KEYCLOAK_DATABASE_PASSWORD: "${AUTH_DB_PASSWORD:-dbrepo}" KEYCLOAK_DATABASE_PASSWORD: "${AUTH_DB_PASSWORD:-dbrepo}"
METADATA_SERVICE_ENDPOINT: "${METADATA_SERVICE_ENDPOINT:-http://metadata-service:8080}/api/user"
SYSTEM_USERNAME: "${SYSTEM_USERNAME:-admin}"
SYSTEM_PASSWORD: "${SYSTEM_PASSWORD:-admin}"
healthcheck: healthcheck:
test: curl --head -fsS http://localhost:9000/health/ready test: curl --head -fsS http://localhost:9000/health/ready
interval: 10s interval: 10s
...@@ -109,7 +113,12 @@ services: ...@@ -109,7 +113,12 @@ services:
dbrepo-auth-service-init: dbrepo-auth-service-init:
init: true init: true
restart: "no" restart: "no"
<<<<<<< Updated upstream
image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.6.0 image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.6.0
=======
container_name: dbrepo-auth-service-init
image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.6.3
>>>>>>> Stashed changes
environment: environment:
AUTH_SERVICE_ADMIN: ${AUTH_SERVICE_ADMIN:-admin} AUTH_SERVICE_ADMIN: ${AUTH_SERVICE_ADMIN:-admin}
AUTH_SERVICE_ADMIN_PASSWORD: ${AUTH_SERVICE_ADMIN_PASSWORD:-admin} AUTH_SERVICE_ADMIN_PASSWORD: ${AUTH_SERVICE_ADMIN_PASSWORD:-admin}
...@@ -130,7 +139,11 @@ services: ...@@ -130,7 +139,11 @@ services:
restart: "no" restart: "no"
container_name: dbrepo-metadata-service container_name: dbrepo-metadata-service
hostname: metadata-service hostname: metadata-service
<<<<<<< Updated upstream
image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.6.0 image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.6.0
=======
image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.6.3
>>>>>>> Stashed changes
volumes: volumes:
- "${SHARED_VOLUME:-/tmp}:/tmp" - "${SHARED_VOLUME:-/tmp}:/tmp"
environment: environment:
...@@ -193,7 +206,11 @@ services: ...@@ -193,7 +206,11 @@ services:
restart: "no" restart: "no"
container_name: dbrepo-analyse-service container_name: dbrepo-analyse-service
hostname: analyse-service hostname: analyse-service
<<<<<<< Updated upstream
image: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.6.0 image: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.6.0
=======
image: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.6.3
>>>>>>> Stashed changes
environment: environment:
AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client} AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client}
AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG} AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}
...@@ -248,7 +265,11 @@ services: ...@@ -248,7 +265,11 @@ services:
restart: "no" restart: "no"
container_name: dbrepo-search-db container_name: dbrepo-search-db
hostname: search-db hostname: search-db
<<<<<<< Updated upstream
image: registry.datalab.tuwien.ac.at/dbrepo/search-db:1.6.0 image: registry.datalab.tuwien.ac.at/dbrepo/search-db:1.6.0
=======
image: registry.datalab.tuwien.ac.at/dbrepo/search-db:1.6.3
>>>>>>> Stashed changes
healthcheck: healthcheck:
test: curl -sSL localhost:9200/_plugins/_security/health | jq .status | grep UP test: curl -sSL localhost:9200/_plugins/_security/health | jq .status | grep UP
interval: 10s interval: 10s
...@@ -272,7 +293,11 @@ services: ...@@ -272,7 +293,11 @@ services:
restart: "no" restart: "no"
container_name: dbrepo-search-service container_name: dbrepo-search-service
hostname: search-service hostname: search-service
<<<<<<< Updated upstream
image: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.6.0 image: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.6.0
=======
image: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.6.3
>>>>>>> Stashed changes
environment: environment:
AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client} AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client}
AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT_SECRET:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG} AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT_SECRET:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}
...@@ -294,7 +319,11 @@ services: ...@@ -294,7 +319,11 @@ services:
restart: "no" restart: "no"
container_name: dbrepo-ui container_name: dbrepo-ui
hostname: ui hostname: ui
<<<<<<< Updated upstream
image: registry.datalab.tuwien.ac.at/dbrepo/ui:1.6.0 image: registry.datalab.tuwien.ac.at/dbrepo/ui:1.6.0
=======
image: registry.datalab.tuwien.ac.at/dbrepo/ui:1.6.3
>>>>>>> Stashed changes
environment: environment:
NUXT_PUBLIC_API_CLIENT: "${BASE_URL:-http://localhost}" NUXT_PUBLIC_API_CLIENT: "${BASE_URL:-http://localhost}"
NUXT_PUBLIC_API_SERVER: "${BASE_URL:-http://localhost}" NUXT_PUBLIC_API_SERVER: "${BASE_URL:-http://localhost}"
...@@ -363,7 +392,11 @@ services: ...@@ -363,7 +392,11 @@ services:
init: true init: true
container_name: dbrepo-search-service-init container_name: dbrepo-search-service-init
hostname: search-service-init hostname: search-service-init
<<<<<<< Updated upstream
image: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.6.0 image: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.6.0
=======
image: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.6.3
>>>>>>> Stashed changes
environment: environment:
METADATA_SERVICE_ENDPOINT: ${METADATA_SERVICE_ENDPOINT:-http://metadata-service:8080} METADATA_SERVICE_ENDPOINT: ${METADATA_SERVICE_ENDPOINT:-http://metadata-service:8080}
OPENSEARCH_HOST: ${OPENSEARCH_HOST:-search-db} OPENSEARCH_HOST: ${OPENSEARCH_HOST:-search-db}
...@@ -417,7 +450,11 @@ services: ...@@ -417,7 +450,11 @@ services:
restart: "no" restart: "no"
container_name: dbrepo-dashboard-service container_name: dbrepo-dashboard-service
hostname: dashboard-service hostname: dashboard-service
<<<<<<< Updated upstream
image: registry.datalab.tuwien.ac.at/dbrepo/dashboard-service:1.6.0 image: registry.datalab.tuwien.ac.at/dbrepo/dashboard-service:1.6.0
=======
image: registry.datalab.tuwien.ac.at/dbrepo/dashboard-service:1.6.3
>>>>>>> Stashed changes
ports: ports:
- "3000:3000" - "3000:3000"
volumes: volumes:
...@@ -444,7 +481,11 @@ services: ...@@ -444,7 +481,11 @@ services:
init: true init: true
container_name: dbrepo-storage-service-init container_name: dbrepo-storage-service-init
hostname: storage-service-init hostname: storage-service-init
<<<<<<< Updated upstream
image: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.6.0 image: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.6.0
=======
image: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.6.3
>>>>>>> Stashed changes
environment: environment:
S3_ACCESS_KEY_ID: ${S3_ACCESS_KEY_ID:-seaweedfsadmin} S3_ACCESS_KEY_ID: ${S3_ACCESS_KEY_ID:-seaweedfsadmin}
S3_BUCKET: "${S3_BUCKET:-dbrepo}" S3_BUCKET: "${S3_BUCKET:-dbrepo}"
...@@ -489,7 +530,11 @@ services: ...@@ -489,7 +530,11 @@ services:
restart: "no" restart: "no"
container_name: dbrepo-data-service container_name: dbrepo-data-service
hostname: data-service hostname: data-service
<<<<<<< Updated upstream
image: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.6.0 image: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.6.0
=======
image: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.6.3
>>>>>>> Stashed changes
volumes: volumes:
- "${SHARED_VOLUME:-/tmp}:/tmp" - "${SHARED_VOLUME:-/tmp}:/tmp"
environment: environment:
......
...@@ -81,6 +81,48 @@ lint-helm-chart: ...@@ -81,6 +81,48 @@ lint-helm-chart:
- helm dependency update ./helm/dbrepo - helm dependency update ./helm/dbrepo
script: script:
- helm lint ./helm/dbrepo - helm lint ./helm/dbrepo
<<<<<<< Updated upstream
=======
- helm schema -input ./helm/dbrepo/values.yaml -output ./helm/dbrepo/values.schema.json
- diff ./CI_values.schema.json ./helm/dbrepo/values.schema.json
- diff ./dbrepo-metadata-db/1_setup-schema.sql ./helm/dbrepo/files/01-setup-schema.sql
- diff ./dbrepo-auth-service/listeners/target/create-event-listener.jar ./helm/dbrepo/files/create-event-listener.jar
artifacts:
when: always
paths:
- ./helm/dbrepo/values.schema.json
expire_in: 1 days
lint-helm-readme:
image: docker.io/node:${NODE_VERSION}-alpine${ALPINE_VERSION}
stage: lint
before_script:
- apk --no-cache add alpine-sdk bash git
- cp ./helm/dbrepo/README.md ./CI_README.md
- git clone https://github.com/bitnami/readme-generator-for-helm
- (cd ./readme-generator-for-helm && npm install && npm install -g pkg && pkg . -o /usr/local/sbin/readme-generator)
script:
- readme-generator --readme ./helm/dbrepo/README.md --values ./helm/dbrepo/values.yaml
- diff ./CI_README.md ./helm/dbrepo/README.md
artifacts:
when: always
paths:
- ./helm/dbrepo/README.md
expire_in: 1 days
lint-open-api-version:
image: docker.io/alpine:${ALPINE_VERSION}
stage: lint
variables:
VERSION: 4.45.1
BINARY: yq_linux_amd64
before_script:
- 'apk --no-cache add bash wget'
- 'wget https://github.com/mikefarah/yq/releases/download/v${VERSION}/${BINARY} -O /usr/bin/yq && chmod +x /usr/bin/yq'
script:
- yq '.externalDocs.url' ./.docs/.openapi/api.base.yaml | grep "${DOC_VERSION}"
- yq '.info.version' ./.docs/.openapi/api.base.yaml | grep "${DOC_VERSION}"
>>>>>>> Stashed changes
build-metadata-service: build-metadata-service:
image: maven:3-openjdk-${JAVA_VERSION} image: maven:3-openjdk-${JAVA_VERSION}
......
{ {
"_meta": { "_meta": {
"hash": { "hash": {
<<<<<<< Updated upstream
"sha256": "683cc19a3205b9b5f9b99db8b71c0abadadfd652a94dcf710a73aeca92b97227" "sha256": "683cc19a3205b9b5f9b99db8b71c0abadadfd652a94dcf710a73aeca92b97227"
=======
"sha256": "9cc4c161729b642069bbf4ab379c0f4a9122035afcb3ac7b5b1bfc13281f76aa"
>>>>>>> Stashed changes
}, },
"pipfile-spec": 6, "pipfile-spec": 6,
"requires": { "requires": {
...@@ -412,8 +416,12 @@ ...@@ -412,8 +416,12 @@
}, },
"dbrepo": { "dbrepo": {
"hashes": [ "hashes": [
<<<<<<< Updated upstream
"sha256:1495b7efa016d75a2f978cf20aa1729d8dee2809583f2c253264f7fd3233addb", "sha256:1495b7efa016d75a2f978cf20aa1729d8dee2809583f2c253264f7fd3233addb",
"sha256:839a4f5810d83e93b1fa88c7ab7641727b65af1d0eada93195d3f0daa3e13e5a" "sha256:839a4f5810d83e93b1fa88c7ab7641727b65af1d0eada93195d3f0daa3e13e5a"
=======
"sha256:7f98329f08d1da6fe45da8130cfb3ebd6e947a4101d46f92b31d7204b29a153d"
>>>>>>> Stashed changes
], ],
"markers": "python_version >= '3.11'", "markers": "python_version >= '3.11'",
"path": "./lib/dbrepo-1.6.1.tar.gz" "path": "./lib/dbrepo-1.6.1.tar.gz"
......
File added
...@@ -6,22 +6,26 @@ LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at" ...@@ -6,22 +6,26 @@ LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
FROM maven:3-amazoncorretto-17 AS build FROM maven:3-amazoncorretto-17 AS build
LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at" LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
<<<<<<< Updated upstream
COPY ./pom.xml ./ COPY ./pom.xml ./
RUN mvn -fn -B dependency:go-offline RUN mvn -fn -B dependency:go-offline
=======
>>>>>>> Stashed changes
COPY --from=dependency /root/.m2/repository/at/tuwien /root/.m2/repository/at/tuwien COPY --from=dependency /root/.m2/repository/at/tuwien /root/.m2/repository/at/tuwien
COPY ./querystore ./querystore COPY ./querystore ./querystore
COPY ./report ./report COPY ./report ./report
COPY ./rest-service ./rest-service COPY ./rest-service ./rest-service
COPY ./services ./services COPY ./services ./services
COPY ./pom.xml ./
# Make sure it compiles # Make sure it compiles
RUN mvn clean package -DskipTests RUN mvn clean package -DskipTests
###### THIRD STAGE ###### ###### THIRD STAGE ######
FROM amazoncorretto:17-alpine3.19 AS runtime FROM amazoncorretto:17-alpine3.21 AS runtime
LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at" LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
RUN apk add --no-cache curl bash jq RUN apk add --no-cache curl bash jq
...@@ -32,7 +36,7 @@ RUN adduser -S -u 1001 data-service ...@@ -32,7 +36,7 @@ RUN adduser -S -u 1001 data-service
USER 1001 USER 1001
COPY --from=build --chown=1001 ./rest-service/target/rest-service-*.jar ./data-service.jar COPY --from=build --chown=1001 ./rest-service/target/data-service.jar ./data-service.jar
# non-root port # non-root port
EXPOSE 8080 EXPOSE 8080
......
...@@ -292,6 +292,7 @@ ...@@ -292,6 +292,7 @@
</dependencies> </dependencies>
<build> <build>
<finalName>data-service</finalName>
<resources> <resources>
<resource> <resource>
<directory>${basedir}/src/main/resources</directory> <directory>${basedir}/src/main/resources</directory>
......
###### FIRST STAGE ###### ###### FIRST STAGE ######
FROM maven:3-amazoncorretto-17 AS build FROM maven:3-amazoncorretto-17-alpine AS build
LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at" LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
COPY ./pom.xml ./ COPY ./pom.xml ./
...@@ -12,7 +12,11 @@ COPY ./rest-service/pom.xml ./rest-service/ ...@@ -12,7 +12,11 @@ COPY ./rest-service/pom.xml ./rest-service/
COPY ./services/pom.xml ./services/ COPY ./services/pom.xml ./services/
COPY ./test/pom.xml ./test/ COPY ./test/pom.xml ./test/
<<<<<<< Updated upstream
RUN mvn verify -B -fn RUN mvn verify -B -fn
=======
RUN mvn dependency:go-offline
>>>>>>> Stashed changes
COPY ./api ./api COPY ./api ./api
COPY ./entities ./entities COPY ./entities ./entities
...@@ -27,7 +31,7 @@ COPY ./test ./test ...@@ -27,7 +31,7 @@ COPY ./test ./test
RUN mvn clean install -DskipTests RUN mvn clean install -DskipTests
###### SECOND STAGE ###### ###### SECOND STAGE ######
FROM amazoncorretto:17-alpine3.19 AS runtime FROM amazoncorretto:17-alpine3.21 AS runtime
LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at" LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
RUN apk add --no-cache curl bash jq RUN apk add --no-cache curl bash jq
...@@ -36,9 +40,9 @@ WORKDIR /app ...@@ -36,9 +40,9 @@ WORKDIR /app
USER 1001 USER 1001
COPY --from=build --chown=1001 ./rest-service/target/dbrepo-metadata-service-rest-service-*.jar ./metadata-service.jar COPY --from=build --chown=1001 ./rest-service/target/metadata-service.jar ./metadata-service.jar
# non-root port # non-root port
EXPOSE 8080 EXPOSE 8080
ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./metadata-service.jar"] ENTRYPOINT ["java", "-jar", "./metadata-service.jar"]
...@@ -14,6 +14,10 @@ import java.time.Instant; ...@@ -14,6 +14,10 @@ import java.time.Instant;
@Getter @Getter
@Setter @Setter
@Builder @Builder
<<<<<<< Updated upstream
=======
@EqualsAndHashCode(callSuper = false)
>>>>>>> Stashed changes
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Jacksonized @Jacksonized
......
...@@ -16,7 +16,11 @@ import java.util.List; ...@@ -16,7 +16,11 @@ import java.util.List;
@Getter @Getter
@Setter @Setter
@Builder @Builder
<<<<<<< Updated upstream
@EqualsAndHashCode @EqualsAndHashCode
=======
@EqualsAndHashCode(callSuper = false)
>>>>>>> Stashed changes
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Jacksonized @Jacksonized
...@@ -61,6 +65,12 @@ public class DatabaseDto { ...@@ -61,6 +65,12 @@ public class DatabaseDto {
@Schema(example = "true") @Schema(example = "true")
private Boolean isSchemaPublic; private Boolean isSchemaPublic;
<<<<<<< Updated upstream
=======
@NotNull
private ContainerDto container;
>>>>>>> Stashed changes
@NotNull @NotNull
private ContainerBriefDto container; private ContainerBriefDto container;
......
...@@ -14,7 +14,11 @@ import java.util.List; ...@@ -14,7 +14,11 @@ import java.util.List;
@Getter @Getter
@Setter @Setter
@Builder @Builder
<<<<<<< Updated upstream
@EqualsAndHashCode @EqualsAndHashCode
=======
@EqualsAndHashCode(callSuper = false)
>>>>>>> Stashed changes
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Jacksonized @Jacksonized
...@@ -60,6 +64,12 @@ public class ViewDto { ...@@ -60,6 +64,12 @@ public class ViewDto {
@Schema(example = "7de03e818900b6ea6d58ad0306d4a741d658c6df3d1964e89ed2395d8c7e7916") @Schema(example = "7de03e818900b6ea6d58ad0306d4a741d658c6df3d1964e89ed2395d8c7e7916")
private String queryHash; private String queryHash;
<<<<<<< Updated upstream
=======
@ToString.Exclude
private DatabaseDto database;
>>>>>>> Stashed changes
@NotNull @NotNull
private UserBriefDto owner; private UserBriefDto owner;
......
...@@ -17,7 +17,11 @@ import java.util.List; ...@@ -17,7 +17,11 @@ import java.util.List;
@Getter @Getter
@Setter @Setter
@Builder @Builder
<<<<<<< Updated upstream
@EqualsAndHashCode @EqualsAndHashCode
=======
@EqualsAndHashCode(callSuper = false)
>>>>>>> Stashed changes
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Jacksonized @Jacksonized
...@@ -100,6 +104,12 @@ public class TableDto { ...@@ -100,6 +104,12 @@ public class TableDto {
@NotNull @NotNull
private List<ColumnDto> columns; private List<ColumnDto> columns;
<<<<<<< Updated upstream
=======
@ToString.Exclude
private DatabaseDto database;
>>>>>>> Stashed changes
@NotNull @NotNull
private ConstraintsDto constraints; private ConstraintsDto constraints;
......
...@@ -11,7 +11,11 @@ import java.util.UUID; ...@@ -11,7 +11,11 @@ import java.util.UUID;
@Getter @Getter
@Setter @Setter
@Builder @Builder
<<<<<<< Updated upstream
@EqualsAndHashCode @EqualsAndHashCode
=======
@EqualsAndHashCode(callSuper = false)
>>>>>>> Stashed changes
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Jacksonized @Jacksonized
......
...@@ -54,7 +54,6 @@ public class Container { ...@@ -54,7 +54,6 @@ public class Container {
@Column @Column
private String uiAdditionalFlags; private String uiAdditionalFlags;
@EqualsAndHashCode.Exclude
@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.MERGE) @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
@JoinColumns({ @JoinColumns({
@JoinColumn(name = "cid", referencedColumnName = "id", insertable = false, updatable = false) @JoinColumn(name = "cid", referencedColumnName = "id", insertable = false, updatable = false)
...@@ -67,13 +66,11 @@ public class Container { ...@@ -67,13 +66,11 @@ public class Container {
}) })
private ContainerImage image; private ContainerImage image;
@EqualsAndHashCode.Exclude
@CreatedDate @CreatedDate
@Column(nullable = false, updatable = false, columnDefinition = "TIMESTAMP default NOW()") @Column(nullable = false, updatable = false, columnDefinition = "TIMESTAMP default NOW()")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", timezone = "UTC") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", timezone = "UTC")
private Instant created; private Instant created;
@EqualsAndHashCode.Exclude
@LastModifiedDate @LastModifiedDate
@Column(columnDefinition = "TIMESTAMP") @Column(columnDefinition = "TIMESTAMP")
private Instant lastModified; private Instant lastModified;
......
...@@ -60,13 +60,11 @@ public class ContainerImage { ...@@ -60,13 +60,11 @@ public class ContainerImage {
@OneToMany(fetch = FetchType.LAZY, mappedBy = "image") @OneToMany(fetch = FetchType.LAZY, mappedBy = "image")
private List<Container> containers; private List<Container> containers;
@EqualsAndHashCode.Exclude
@CreatedDate @CreatedDate
@Column(nullable = false, updatable = false, columnDefinition = "TIMESTAMP default NOW()") @Column(nullable = false, updatable = false, columnDefinition = "TIMESTAMP default NOW()")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", timezone = "UTC") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", timezone = "UTC")
private Instant created; private Instant created;
@EqualsAndHashCode.Exclude
@LastModifiedDate @LastModifiedDate
@Column(columnDefinition = "TIMESTAMP") @Column(columnDefinition = "TIMESTAMP")
private Instant lastModified; private Instant lastModified;
......
...@@ -68,7 +68,6 @@ public class DataType { ...@@ -68,7 +68,6 @@ public class DataType {
private Boolean buildable; private Boolean buildable;
@ToString.Exclude @ToString.Exclude
@EqualsAndHashCode.Exclude
@ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.MERGE}) @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.MERGE})
@JoinColumns({ @JoinColumns({
@JoinColumn(name = "image_id", referencedColumnName = "id") @JoinColumn(name = "image_id", referencedColumnName = "id")
......
...@@ -32,7 +32,6 @@ public class Operator { ...@@ -32,7 +32,6 @@ public class Operator {
private String documentation; private String documentation;
@ToString.Exclude @ToString.Exclude
@EqualsAndHashCode.Exclude
@ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.MERGE}) @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.MERGE})
@JoinColumns({ @JoinColumns({
@JoinColumn(name = "image_id", referencedColumnName = "id") @JoinColumn(name = "image_id", referencedColumnName = "id")
......
...@@ -120,13 +120,11 @@ public class Database implements Serializable { ...@@ -120,13 +120,11 @@ public class Database implements Serializable {
@Column(columnDefinition = "LONGBLOB") @Column(columnDefinition = "LONGBLOB")
private byte[] image; private byte[] image;
@EqualsAndHashCode.Exclude
@CreatedDate @CreatedDate
@Column(nullable = false, updatable = false, columnDefinition = "TIMESTAMP default NOW()") @Column(nullable = false, updatable = false, columnDefinition = "TIMESTAMP default NOW()")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", timezone = "UTC") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", timezone = "UTC")
private Instant created; private Instant created;
@EqualsAndHashCode.Exclude
@LastModifiedDate @LastModifiedDate
@Column(columnDefinition = "TIMESTAMP") @Column(columnDefinition = "TIMESTAMP")
private Instant lastModified; private Instant lastModified;
......
...@@ -33,7 +33,6 @@ public class DatabaseAccess { ...@@ -33,7 +33,6 @@ public class DatabaseAccess {
private UUID huserid; private UUID huserid;
@ToString.Exclude @ToString.Exclude
@EqualsAndHashCode.Exclude
@org.springframework.data.annotation.Transient @org.springframework.data.annotation.Transient
@ManyToOne(fetch = FetchType.LAZY) @ManyToOne(fetch = FetchType.LAZY)
@JoinColumns({ @JoinColumns({
...@@ -46,7 +45,6 @@ public class DatabaseAccess { ...@@ -46,7 +45,6 @@ public class DatabaseAccess {
private Long hdbid; private Long hdbid;
@ToString.Exclude @ToString.Exclude
@EqualsAndHashCode.Exclude
@org.springframework.data.annotation.Transient @org.springframework.data.annotation.Transient
@ManyToOne(fetch = FetchType.LAZY) @ManyToOne(fetch = FetchType.LAZY)
@JoinColumns({ @JoinColumns({
......
...@@ -89,7 +89,6 @@ public class View { ...@@ -89,7 +89,6 @@ public class View {
private List<Identifier> identifiers; private List<Identifier> identifiers;
@ToString.Exclude @ToString.Exclude
@EqualsAndHashCode.Exclude
@org.springframework.data.annotation.Transient @org.springframework.data.annotation.Transient
@ManyToOne(fetch = FetchType.LAZY) @ManyToOne(fetch = FetchType.LAZY)
@JoinColumns({ @JoinColumns({
...@@ -103,13 +102,11 @@ public class View { ...@@ -103,13 +102,11 @@ public class View {
@OrderBy("ordinalPosition") @OrderBy("ordinalPosition")
private List<ViewColumn> columns; private List<ViewColumn> columns;
@EqualsAndHashCode.Exclude
@CreatedDate @CreatedDate
@Column(nullable = false, updatable = false, columnDefinition = "TIMESTAMP default NOW()") @Column(nullable = false, updatable = false, columnDefinition = "TIMESTAMP default NOW()")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", timezone = "UTC") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", timezone = "UTC")
private Instant created; private Instant created;
@EqualsAndHashCode.Exclude
@LastModifiedDate @LastModifiedDate
@Column(columnDefinition = "TIMESTAMP") @Column(columnDefinition = "TIMESTAMP")
private Instant lastModified; private Instant lastModified;
......
...@@ -26,7 +26,6 @@ public class ViewColumn implements Comparable<ViewColumn> { ...@@ -26,7 +26,6 @@ public class ViewColumn implements Comparable<ViewColumn> {
private Long id; private Long id;
@ToString.Exclude @ToString.Exclude
@EqualsAndHashCode.Exclude
@ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.MERGE}) @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.MERGE})
@JoinColumns({ @JoinColumns({
@JoinColumn(name = "view_id", referencedColumnName = "id", nullable = false) @JoinColumn(name = "view_id", referencedColumnName = "id", nullable = false)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment