diff --git a/dbrepo-data-service/rest-service/src/main/resources/application-local.yml b/dbrepo-data-service/rest-service/src/main/resources/application-local.yml
deleted file mode 100644
index a34f21307a0ce6e89641d74094f6a8196f5f4e3b..0000000000000000000000000000000000000000
--- a/dbrepo-data-service/rest-service/src/main/resources/application-local.yml
+++ /dev/null
@@ -1,84 +0,0 @@
-app.version: '@project.version@'
-spring:
- main.banner-mode: off
- datasource:
- url: jdbc:h2:mem:fda;DB_CLOSE_ON_EXIT=FALSE;INIT=CREATE SCHEMA IF NOT EXISTS FDA;NON_KEYWORDS=value
- driver-class-name: org.h2.Driver
- username: sa
- password: password
- rabbitmq:
- host: localhost
- virtual-host: dbrepo
- password: admin
- username: admin
- port: 5672
- jpa:
- show-sql: false
- database-platform: org.hibernate.dialect.H2Dialect
- open-in-view: false
- properties:
- hibernate:
- default_schema: fda
- jdbc:
- time_zone: UTC
- application:
- name: data-service
- cloud:
- loadbalancer.ribbon.enabled: false
-management:
- endpoints:
- web:
- exposure:
- include: health,info,prometheus
- endpoint:
- health:
- probes:
- enabled: true
- health:
- readinessState:
- enabled: true
- livenessState:
- enabled: true
-server:
- port: 19093
-logging:
- pattern.console: "%d %highlight(%-5level) %msg%n"
- level:
- root: warn
- at.tuwien.: trace
- org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
-dbrepo:
- endpoints:
- metadataService: "http://localhost:9099"
- analyseService: "http://localhost"
- storageService: "http://localhost:9000"
- authService: "http://localhost:8080"
- computeService: "local[2]"
- s3:
- accessKeyId: "seaweedfsadmin"
- secretAccessKey: "seaweedfsadmin"
- bucket: "dbrepo"
- system:
- username: "admin"
- password: "admin"
- jwt:
- public_key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB
- keycloak:
- username: admin
- password: admin
- client: dbrepo-client
- clientSecret: MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG
- sql:
- forbidden: AVG,BIT_AND,BIT_OR,BIT_XOR,COUNT,COUNTDISTINCT,GROUP_CONCAT,JSON_ARRAYAGG,JSON_OBJECTAGG,MAX,MIN,STD,STDDEV,STDDEV_POP,STDDEV_SAMP,SUM,VARIANCE,VAR_POP,VAR_SAMP,--
- grant:
- default:
- read: "SELECT"
- write: "SELECT, CREATE, CREATE VIEW, CREATE ROUTINE, CREATE TEMPORARY TABLES, LOCK TABLES, INDEX, TRIGGER, INSERT, UPDATE, DELETE"
- credentialCacheTimeout: 3600
- minConcurrent: 2
- maxConcurrent: 6
- requeueRejected: "false"
- queueName: "dbrepo"
- exchangeName: "dbrepo"
- routingKey: "#"
- connectionTimeout: 10000
diff --git a/dbrepo-data-service/rest-service/src/main/resources/application-prod.yml b/dbrepo-data-service/rest-service/src/main/resources/application-prod.yml
deleted file mode 100644
index b497f9c433566caf62077a9d74d0e201b9e47a26..0000000000000000000000000000000000000000
--- a/dbrepo-data-service/rest-service/src/main/resources/application-prod.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-management:
- endpoints:
- web:
- exposure:
- exclude: *
\ No newline at end of file
diff --git a/dbrepo-data-service/rest-service/src/main/resources/application.yml b/dbrepo-data-service/rest-service/src/main/resources/application.yml
index b06e3d35618ab0cb4558a0186543e072dc3fa3ad..9848928b7bd5d5d8b66802437ed3f2e0886396e7 100644
--- a/dbrepo-data-service/rest-service/src/main/resources/application.yml
+++ b/dbrepo-data-service/rest-service/src/main/resources/application.yml
@@ -5,8 +5,8 @@ spring:
datasource:
url: "jdbc:h2:mem:dbrepo;DB_CLOSE_ON_EXIT=FALSE;INIT=CREATE SCHEMA IF NOT EXISTS dbrepo;NON_KEYWORDS=value"
driver-class-name: org.h2.Driver
- username: sa
- password: password
+ username: "${H2_USERNAME:sa}"
+ password: "${H2_PASSWORD:sa}"
jpa:
show-sql: false
open-in-view: false
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/config/SparkConfig.java b/dbrepo-data-service/services/src/main/java/at/tuwien/config/SparkConfig.java
index 2a5ea780badcfee93ceb62aa102543dfd8b1912e..6a00ce718573b203ce8018379dd993ceff3486ca 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/config/SparkConfig.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/config/SparkConfig.java
@@ -30,20 +30,20 @@ public class SparkConfig {
@Bean
public Map<String, String> sparkOptions() {
- return new LinkedHashMap<>() {{
- put("spark.driver.extraJavaOptions", "-Divy.cache.dir=/tmp -Divy.home=/tmp");
- put("spark.ui.enabled", "false");
- }};
+ final Map<String, String> options = new LinkedHashMap<>();
+ options.put("spark.driver.extraJavaOptions", "-Divy.cache.dir=/tmp -Divy.home=/tmp");
+ options.put("spark.ui.enabled", "false");
+ return options;
}
@Bean
public Map<String, String> hadoopOptions() {
- return new LinkedHashMap<>() {{
- put("fs.s3a.path.style.access", "true");
- put("fs.s3a.endpoint", s3Endpoint);
- put("fs.s3a.access.key", s3AccessKeyId);
- put("fs.s3a.secret.key", s3SecretAccessKey);
- }};
+ final Map<String, String> options = new LinkedHashMap<>();
+ options.put("fs.s3a.path.style.access", "true");
+ options.put("fs.s3a.endpoint", s3Endpoint);
+ options.put("fs.s3a.access.key", s3AccessKeyId);
+ options.put("fs.s3a.secret.key", s3SecretAccessKey);
+ return options;
}
@Bean
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/HibernateConnector.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/HibernateConnector.java
index b52d1c792ec25856209e33be2c5fa6dce4996f80..242cefd557cfd68ef95a0b06b5ac4efb91ed83f1 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/HibernateConnector.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/HibernateConnector.java
@@ -21,7 +21,7 @@ public abstract class HibernateConnector {
dataSource.setAcquireIncrement(5);
dataSource.setMaxPoolSize(20);
dataSource.setMaxStatements(100);
- log.trace("created pooled data source {} in {} ms (user={}, password=(hidden))", url(container, databaseName), System.currentTimeMillis() - start, container.getUsername());
+ log.trace("created pooled data source {} in {} ms, user={}", url(container, databaseName), System.currentTimeMillis() - start, container.getUsername());
return dataSource;
}
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/semantics/TableColumnEntityDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/semantics/TableColumnEntityDto.java
index ec9845c341a0ca18899cbc36b7131eaf4c2339c0..309561b96680b500faf15e79e71dba6d38b92dcc 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/semantics/TableColumnEntityDto.java
+++ b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/semantics/TableColumnEntityDto.java
@@ -7,14 +7,13 @@ import jakarta.validation.constraints.NotNull;
import lombok.*;
import lombok.extern.jackson.Jacksonized;
-import java.util.Objects;
-
@Getter
@Setter
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Jacksonized
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
@ToString
public class TableColumnEntityDto {
@@ -34,6 +33,7 @@ public class TableColumnEntityDto {
private Long columnId;
@NotBlank
+ @EqualsAndHashCode.Include
@Schema(example = "https://www.wikidata.org/entity/Q1686799")
private String uri;
@@ -43,19 +43,4 @@ public class TableColumnEntityDto {
@Schema(example = "open source semantic web framework for Java")
private String description;
- @Override
- public boolean equals(final Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- final TableColumnEntityDto other = (TableColumnEntityDto) obj;
- return Objects.equals(uri, other.uri);
- }
-
}
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/DatabaseAccess.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/DatabaseAccess.java
index 27a35c0284139c540789c9c0ca91a313ab298bf1..eeb9da55fef08b16b743d3afe06ef1ea9b4ab5bc 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/DatabaseAccess.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/DatabaseAccess.java
@@ -2,13 +2,12 @@ package at.tuwien.entities.database;
import at.tuwien.entities.user.User;
import com.fasterxml.jackson.annotation.JsonFormat;
+import jakarta.persistence.*;
import lombok.*;
import org.hibernate.annotations.JdbcTypeCode;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-import jakarta.persistence.*;
-
import java.time.Instant;
import java.util.UUID;
@@ -18,6 +17,7 @@ import java.util.UUID;
@ToString
@AllArgsConstructor
@NoArgsConstructor
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
@IdClass(DatabaseAccessKey.class)
@EntityListeners(AuditingEntityListener.class)
@Table(name = "mdb_have_access")
@@ -28,6 +28,7 @@ import java.util.UUID;
public class DatabaseAccess {
@Id
+ @EqualsAndHashCode.Include
@JdbcTypeCode(java.sql.Types.VARCHAR)
@Column(name = "user_id", updatable = false, columnDefinition = "VARCHAR(36)")
private UUID huserid;
@@ -62,15 +63,4 @@ public class DatabaseAccess {
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", timezone = "UTC")
private Instant created;
- @Override
- public boolean equals(Object o) {
- if (o == this) {
- return true;
- }
- if (!(o instanceof DatabaseAccess other)) {
- return false;
- }
- return this.hdbid.equals(other.getHdbid()) && this.huserid.equals(other.getHuserid());
- }
-
}
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/Identifier.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/Identifier.java
index 7e4252a44504746f8c3d4c409f4242e3a523d9f1..311362a82073c1d8c936abd6500426d695a74acf 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/Identifier.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/Identifier.java
@@ -28,6 +28,7 @@ import java.util.UUID;
@ToString
@AllArgsConstructor
@NoArgsConstructor
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
@EntityListeners(AuditingEntityListener.class)
@Table(name = "mdb_identifiers")
@NamedQueries({
@@ -177,17 +178,6 @@ public class Identifier implements Serializable {
@Column(columnDefinition = "TIMESTAMP")
private Instant lastModified;
- @Override
- public boolean equals(Object o) {
- if (o == this) {
- return true;
- }
- if (!(o instanceof Identifier other)) {
- return false;
- }
- return this.id.equals(other.getId());
- }
-
}
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/user/User.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/user/User.java
index 797b0bd30f760fd27c2a82789ff22674b14acab1..2d6ac4ccbee653e28cc25c5b78bbedeb89b1652f 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/user/User.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/user/User.java
@@ -82,4 +82,21 @@ public class User {
return result;
}
+ @Override
+ public int hashCode() {
+ int hash = 7;
+ hash = 31 * hash + (id == null ? 0 : id.hashCode());
+ hash = 31 * hash + (username == null ? 0 : username.hashCode());
+ hash = 31 * hash + (firstname == null ? 0 : firstname.hashCode());
+ hash = 31 * hash + (lastname == null ? 0 : lastname.hashCode());
+ hash = 31 * hash + (email == null ? 0 : email.hashCode());
+ hash = 31 * hash + (orcid == null ? 0 : orcid.hashCode());
+ hash = 31 * hash + (affiliation == null ? 0 : affiliation.hashCode());
+ hash = 31 * hash + (language == null ? 0 : language.hashCode());
+ hash = 31 * hash + (accesses == null ? 0 : accesses.hashCode());
+ hash = 31 * hash + (theme == null ? 0 : theme.hashCode());
+ hash = 31 * hash + (mariadbPassword == null ? 0 : mariadbPassword.hashCode());
+ return hash;
+ }
+
}
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/UserEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/UserEndpoint.java
index 34082d18c14b4c6c92b9d353bedbb8892b571fe8..ca8159fd536ba0f55aefeb418479836b589192eb 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/UserEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/UserEndpoint.java
@@ -384,7 +384,7 @@ public class UserEndpoint {
@NotNull Principal principal) throws NotAllowedException, AuthServiceException,
AuthServiceConnectionException, UserNotFoundException, DatabaseNotFoundException, DataServiceException,
DataServiceConnectionException, CredentialsInvalidException {
- log.debug("endpoint modify a user password, userId={}, data.password=(hidden)", userId);
+ log.debug("endpoint modify a user password, userId={}", userId);
final User user = userService.findById(userId);
if (!user.equals(principal)) {
log.error("Failed to modify user password: not current user");
diff --git a/dbrepo-metadata-service/rest-service/src/main/resources/application-doi.yml b/dbrepo-metadata-service/rest-service/src/main/resources/application-doi.yml
deleted file mode 100644
index 6d53b6ef20b165591c8f588bd10f534b6e92c3b9..0000000000000000000000000000000000000000
--- a/dbrepo-metadata-service/rest-service/src/main/resources/application-doi.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-dbrepo:
- datacite:
- url: "${DATACITE_URL}"
- prefix: "${DATACITE_PREFIX}"
- username: "${DATACITE_USERNAME}"
- password: "${DATACITE_PASSWORD}"
\ No newline at end of file
diff --git a/dbrepo-metadata-service/rest-service/src/main/resources/application-local.yml b/dbrepo-metadata-service/rest-service/src/main/resources/application-local.yml
deleted file mode 100644
index c3667684462a50c4b7cf4dea7a1bea782b4bad8b..0000000000000000000000000000000000000000
--- a/dbrepo-metadata-service/rest-service/src/main/resources/application-local.yml
+++ /dev/null
@@ -1,82 +0,0 @@
-spring:
- datasource:
- url: jdbc:mariadb://localhost:3306/dbrepo
- driver-class-name: org.mariadb.jdbc.Driver
- username: root
- password: dbrepo
- jpa:
- show-sql: false
- open-in-view: false
- properties:
- hibernate:
- default_schema: dbrepo
- jdbc:
- time_zone: UTC
- format_sql: false
- application:
- name: metadata-service
- rabbitmq:
- host: localhost
- virtual-host: dbrepo
- username: admin
- password: admin
- port: 5672
-management:
- endpoints:
- web:
- exposure:
- include: health,info,prometheus
- endpoint:
- health:
- probes:
- enabled: true
- health:
- readinessState:
- enabled: true
- livenessState:
- enabled: true
-server:
- port: 19099
-logging:
- pattern.console: "%d %highlight(%-5level) %msg%n"
- level:
- root: warn
- at.tuwien.: trace
- org.springframework.security.web.FilterChainProxy: debug
-# org.hibernate.resource.jdbc: trace
- org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
-dbrepo:
- repository-name: Database Repository
- base-url: http://localhost
- admin-email: noreply@example.com
- deleted-record: persistent
- granularity: YYYY-MM-DDThh:mm:ssZ
- exchangeName: dbrepo
- queueName: dbrepo
- connectionTimeout: 10000
- s3:
- accessKeyId: seaweedfsadmin
- secretAccessKey: seaweedfsadmin
- bucket: dbrepo
- system:
- username: admin
- password: admin
- endpoints:
- searchService: http://localhost
- analyseService: http://localhost
- dataService: http://localhost:9093
- brokerService: http://localhost:15672
- authService: http://localhost
- storageService: http://localhost/api/storage
- rorService: https://api.ror.org
- crossRefService: http://data.crossref.org
- pid:
- base: http://localhost/pid/
- jwt:
- public_key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB
- keycloak:
- username: admin
- password: admin
- client: dbrepo-client
- clientSecret: MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG
- website: http://localhost
diff --git a/dbrepo-metadata-service/rest-service/src/main/resources/application-prod.yml b/dbrepo-metadata-service/rest-service/src/main/resources/application-prod.yml
deleted file mode 100644
index b497f9c433566caf62077a9d74d0e201b9e47a26..0000000000000000000000000000000000000000
--- a/dbrepo-metadata-service/rest-service/src/main/resources/application-prod.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-management:
- endpoints:
- web:
- exposure:
- exclude: *
\ No newline at end of file
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/DataCiteConfig.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/DataCiteConfig.java
index e845836754b0a16daf0d6c6d38fad585639428b6..9667553119f283b820ca1f0f98123181b10c76c9 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/DataCiteConfig.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/DataCiteConfig.java
@@ -34,7 +34,7 @@ public class DataCiteConfig {
public RestTemplate searchServiceRestTemplate() {
final RestTemplate restTemplate = new RestTemplate();
restTemplate.setUriTemplateHandler(new DefaultUriBuilderFactory(url));
- log.debug("add basic authentication for data cite: username={}, password=(hidden)", username);
+ log.debug("add basic authentication for data cite: username={}", username);
restTemplate.getInterceptors()
.add(new BasicAuthenticationInterceptor(username, password));
return restTemplate;
diff --git a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java b/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java
index 89185867216b1bf5b4382d4f99da6e6bf63cd76f..f5663f9c3c3efb394ce501361f1df20963786e42 100644
--- a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java
+++ b/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java
@@ -395,13 +395,16 @@ public abstract class BaseTest {
.build();
public final static String USER_BROKER_USERNAME = "guest";
+ @SuppressWarnings("java:S2068")
public final static String USER_BROKER_PASSWORD = "guest";
public final static UUID USER_LOCAL_ADMIN_ID = UUID.fromString("a54dcb2e-a644-4e82-87e7-05a96413983d");
public final static String USER_LOCAL_ADMIN_USERNAME = "admin";
+ @SuppressWarnings("java:S2068")
public final static String USER_LOCAL_ADMIN_PASSWORD = "admin";
public final static String USER_LOCAL_ADMIN_THEME = "dark";
public final static String USER_LOCAL_ADMIN_EMAIL = "admin@local";
+ @SuppressWarnings("java:S2068")
public final static String USER_LOCAL_ADMIN_MARIADB_PASSWORD = "*440BA4FD1A87A0999647DB67C0EE258198B247BA";
public final static UserDetails USER_LOCAL_ADMIN_DETAILS = UserDetailsDto.builder()
@@ -425,8 +428,11 @@ public abstract class BaseTest {
public final static UUID USER_1_LDAP_ID = UUID.fromString("8e541e05-f45c-4d40-ba1b-0e62f04ba3f8");
public final static String USER_1_EMAIL = "john.doe@example.com";
public final static String USER_1_USERNAME = "junit1";
+ @SuppressWarnings("java:S2068")
public final static String USER_1_PASSWORD = "junit1";
+ @SuppressWarnings("java:S2068")
public final static String USER_1_PASSWORD_ENCODED = "$2a$10$0dtdedA/RLTrFbUsvpbUw.I73AXOKeQP3t5UXj96OvnDEaDb3d3M6";
+ @SuppressWarnings("java:S2068")
public final static String USER_1_DATABASE_PASSWORD = "*440BA4FD1A87A0999647DB67C0EE258198B247BA" /* junit1 */;
public final static String USER_1_FIRSTNAME = "John";
public final static String USER_1_LASTNAME = "Doe";
@@ -581,7 +587,9 @@ public abstract class BaseTest {
public final static String USER_2_NAME = "Jane Doe";
public final static String USER_2_AFFILIATION = "TU Wien";
public final static String USER_2_ORCID_URL = "https://orcid.org/0000-0002-9272-6225";
+ @SuppressWarnings("java:S2068")
public final static String USER_2_PASSWORD = "junit2";
+ @SuppressWarnings("java:S2068")
public final static String USER_2_DATABASE_PASSWORD = "*9AA70A8B0EEFAFCB5BED5BDEF6EE264D5DA915AE" /* junit2 */;
public final static String USER_2_QUALIFIED_NAME = "@" + USER_2_USERNAME + " — " + USER_2_FIRSTNAME + " " + USER_2_LASTNAME;
public final static Boolean USER_2_VERIFIED = true;
@@ -685,7 +693,9 @@ public abstract class BaseTest {
public final static String USER_3_ORCID_URL = null;
public final static String USER_3_ORCID_UNCOMPRESSED = null;
public final static String USER_3_EMAIL = "system@example.com";
+ @SuppressWarnings("java:S2068")
public final static String USER_3_PASSWORD = "password";
+ @SuppressWarnings("java:S2068")
public final static String USER_3_DATABASE_PASSWORD = "*D65FCA043964B63E849DD6334699ECB065905DA4" /* junit3 */;
public final static String USER_3_QUALIFIED_NAME = "@" + USER_3_USERNAME + " — " + USER_3_FIRSTNAME + " " + USER_3_LASTNAME;
public final static Boolean USER_3_VERIFIED = true;
@@ -774,7 +784,9 @@ public abstract class BaseTest {
public final static String USER_4_NAME = "JUnit 4";
public final static String USER_4_AFFILIATION = "TU Wien";
public final static String USER_4_ORCID_URL = null;
+ @SuppressWarnings("java:S2068")
public final static String USER_4_PASSWORD = "junit4";
+ @SuppressWarnings("java:S2068")
public final static String USER_4_DATABASE_PASSWORD = "*C20EF5C6875857DEFA9BE6E9B62DD76AAAE51882" /* junit4 */;
public final static String USER_4_QUALIFIED_NAME = "@" + USER_4_USERNAME + " — " + USER_4_FIRSTNAME + " " + USER_4_LASTNAME;
public final static String USER_4_EMAIL = "junit4@ossdip.at";
@@ -847,7 +859,9 @@ public abstract class BaseTest {
public final static String USER_5_NAME = "System System";
public final static String USER_5_AFFILIATION = "TU Wien";
public final static String USER_5_ORCID = null;
+ @SuppressWarnings("java:S2068")
public final static String USER_5_PASSWORD = "junit5";
+ @SuppressWarnings("java:S2068")
public final static String USER_5_DATABASE_PASSWORD = "*C20EF5C6875857DEFA9BE6E9B62DD76AAAE51882" /* junit5 */;
public final static String USER_5_QUALIFIED_NAME = "@" + USER_5_USERNAME + " — " + USER_5_FIRSTNAME + " " + USER_5_LASTNAME;
public final static String USER_5_EMAIL = "system@ossdip.at";
@@ -920,7 +934,9 @@ public abstract class BaseTest {
public final static String USER_6_NAME = "System System";
public final static String USER_6_AFFILIATION = "TU Wien";
public final static String USER_6_ORCID = null;
+ @SuppressWarnings("java:S2068")
public final static String USER_6_PASSWORD = "junit5";
+ @SuppressWarnings("java:S2068")
public final static String USER_6_DATABASE_PASSWORD = "*C20EF5C6875857DEFA9BE6E9B62DD76AAAE51882" /* junit5 */;
public final static String USER_6_EMAIL = "system@ossdip.at";
public final static Boolean USER_6_VERIFIED = true;
@@ -1021,15 +1037,15 @@ public abstract class BaseTest {
public final static ImageDto CONTAINER_1_IMAGE_DTO = IMAGE_1_DTO;
public final static String CONTAINER_1_NAME = "u01";
public final static String CONTAINER_1_INTERNALNAME = "dbrepo-userdb-u01";
- public final static String CONTAINER_1_IP = "127.0.0.1";
public final static String CONTAINER_1_UI_HOST = "localhost";
public final static Integer CONTAINER_1_UI_PORT = 3306;
public final static String CONTAINER_1_UI_ADDITIONAL_FLAGS = "?sslMode=disable";
- public final static Integer CONTAINER_1_QUOTA = 4;
+ public final static Integer CONTAINER_1_QUOTA = 4;f
public final static Integer CONTAINER_1_COUNT = 3;
public final static String CONTAINER_1_HOST = "localhost";
public final static Integer CONTAINER_1_PORT = 3308;
public final static String CONTAINER_1_PRIVILEGED_USERNAME = "root";
+ @SuppressWarnings("java:S2068")
public final static String CONTAINER_1_PRIVILEGED_PASSWORD = "dbrepo";
public final static Instant CONTAINER_1_CREATED = Instant.ofEpochSecond(1677399629L) /* 2023-02-26 08:20:29 (UTC) */;
@@ -1084,12 +1100,12 @@ public abstract class BaseTest {
public final static ImageDto CONTAINER_2_IMAGE_DTO = IMAGE_1_DTO;
public final static String CONTAINER_2_NAME = "u02";
public final static String CONTAINER_2_INTERNALNAME = "dbrepo-userdb-u02";
- public final static String CONTAINER_2_IP = "172.30.0.6";
public final static String CONTAINER_2_HOST = "localhost";
public final static Integer CONTAINER_2_PORT = 3309;
public final static Integer CONTAINER_2_QUOTA = 3;
public final static Integer CONTAINER_2_COUNT = 3;
public final static String CONTAINER_2_PRIVILEGED_USERNAME = "root";
+ @SuppressWarnings("java:S2068")
public final static String CONTAINER_2_PRIVILEGED_PASSWORD = "dbrepo";
public final static Instant CONTAINER_2_CREATED = Instant.ofEpochSecond(1677399655L) /* 2023-02-26 08:20:55 (UTC) */;
@@ -1139,11 +1155,11 @@ public abstract class BaseTest {
public final static ContainerImage CONTAINER_3_IMAGE = IMAGE_1;
public final static String CONTAINER_3_NAME = "u03";
public final static String CONTAINER_3_INTERNALNAME = "dbrepo-userdb-u03";
- public final static String CONTAINER_3_IP = "172.30.0.7";
public final static String CONTAINER_3_HOST = "localhost";
public final static Integer CONTAINER_3_PORT = 3310;
public final static Integer CONTAINER_3_QUOTA = 20;
public final static String CONTAINER_3_PRIVILEGED_USERNAME = "root";
+ @SuppressWarnings("java:S2068")
public final static String CONTAINER_3_PRIVILEGED_PASSWORD = "dbrepo";
public final static Instant CONTAINER_3_CREATED = Instant.ofEpochSecond(1677399672L) /* 2023-02-26 08:21:12 (UTC) */;
@@ -1165,11 +1181,11 @@ public abstract class BaseTest {
public final static ContainerImage CONTAINER_4_IMAGE = IMAGE_1;
public final static String CONTAINER_4_NAME = "u04";
public final static String CONTAINER_4_INTERNALNAME = "dbrepo-userdb-u04";
- public final static String CONTAINER_4_IP = "172.30.0.8";
public final static String CONTAINER_4_HOST = "localhost";
public final static Integer CONTAINER_4_PORT = 3311;
public final static Integer CONTAINER_4_QUOTA = 0;
public final static String CONTAINER_4_PRIVILEGED_USERNAME = "root";
+ @SuppressWarnings("java:S2068")
public final static String CONTAINER_4_PRIVILEGED_PASSWORD = "dbrepo";
public final static Instant CONTAINER_4_CREATED = Instant.ofEpochSecond(1677399688L) /* 2023-02-26 08:21:28 (UTC) */;
@@ -1649,6 +1665,7 @@ public abstract class BaseTest {
.build();
public final static Long TABLE_1_DATA_COUNT = 3L;
+ @SuppressWarnings("java:S3599")
public final static List<Map<String, Object>> TABLE_1_DATA_DTO = new LinkedList<>(List.of(
new HashMap<>() {{
put("id", BigInteger.valueOf(1L));
@@ -2517,6 +2534,7 @@ public abstract class BaseTest {
.build());
public final static Long TABLE_8_DATA_COUNT = 6L;
+ @SuppressWarnings("java:S3599")
public final static List<Map<String, Object>> TABLE_8_DATA_DTO = new LinkedList<>(List.of(
new HashMap<>() {{
put(COLUMN_8_1_INTERNAL_NAME, BigInteger.valueOf(1L));
@@ -2549,7 +2567,8 @@ public abstract class BaseTest {
put(COLUMN_8_3_INTERNAL_NAME, null);
}}
));
-
+
+ @SuppressWarnings("java:S3599")
public final static TableStatisticDto TABLE_8_STATISTIC_DTO = TableStatisticDto.builder()
.columns(new HashMap<>() {{
put(COLUMN_8_1_INTERNAL_NAME, ColumnStatisticDto.builder()