Skip to content

293011 upgrade maven depedency postgresql from 42.6.0 to 42.7.8 #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ChristosKalaitzis wants to merge 2 commits into
base: SandboxEnv
Choose a base branch
from
+62 −41
Open

293011 upgrade maven depedency postgresql from 42.6.0 to 42.7.8 #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0a4334
293011 upgrade maven depedency `postgresql` from 42.6.0 to 42.7.8
ChristosKalaitzis Nov 18, 2025
b55d298
293011 corrected default schema resolution at TenantResolver.java to …
ChristosKalaitzis Nov 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion collaboration-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.6.0</version>
<version>42.7.8</version>
</dependency>
</dependencies>
<distributionManagement>
Expand Down
2 changes: 1 addition & 1 deletion common-utitlities/src/main/java/org/eea/multitenancy/TenantResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public static void setTenantName(String tenantName) {
*/
public static String getTenantName() {
Map<String, Object> properties = thread.get();
String datasetName = "";
String datasetName = "dataset_0"; // default schema
Copy link
Author

@ChristosKalaitzis ChristosKalaitzis Dec 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is essential to resolve a schema before startup

if (null != properties && !properties.isEmpty()) {
Object value = properties.get(LiteralConstants.DATASET_NAME);
if (null != value && StringUtils.isNotEmpty(value.toString())) {
Expand Down
2 changes: 1 addition & 1 deletion database/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.6.0</version>
<version>42.7.8</version>
</dependency>
</dependencies>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion dataflow-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.6.0</version>
<version>42.7.8</version>
</dependency>
<dependency>
<groupId>com.opencsv</groupId>
Expand Down
2 changes: 1 addition & 1 deletion dataset-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.6.0</version>
<version>42.7.8</version>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
Expand Down
2 changes: 1 addition & 1 deletion dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/AttachmentValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
@Getter
@Setter
@ToString
@Table(name = "ATTACHMENT_VALUE")
@Table(name = "attachment_value")
public class AttachmentValue {


Expand Down
2 changes: 1 addition & 1 deletion dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/DatasetValidation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
@Getter
@Setter
@ToString
@Table(name = "DATASET_VALIDATION")
@Table(name = "dataset_validation")
public class DatasetValidation {

/**
Expand Down
2 changes: 1 addition & 1 deletion dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/DatasetValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
@Getter
@Setter
@ToString
@Table(name = "DATASET_VALUE")
@Table(name = "dataset_value")
public class DatasetValue {


Expand Down
2 changes: 1 addition & 1 deletion dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/FieldValidation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
@Getter
@Setter
@ToString
@Table(name = "FIELD_VALIDATION")
@Table(name = "field_validation")
public class FieldValidation {

/**
Expand Down
2 changes: 1 addition & 1 deletion dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/FieldValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
@Getter
@Setter
@ToString
@Table(name = "FIELD_VALUE")
@Table(name = "field_value")
public class FieldValue {

/**
Expand Down
2 changes: 1 addition & 1 deletion dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/RecordValidation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
@Getter
@Setter
@ToString
@Table(name = "RECORD_VALIDATION")
@Table(name = "record_validation")
public class RecordValidation {

/**
Expand Down
14 changes: 8 additions & 6 deletions dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/RecordValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
Expand All @@ -16,6 +15,7 @@

import org.eea.interfaces.vo.dataset.CsvLineAndRecordFieldsHolder;
import org.eea.interfaces.vo.dataset.enums.ErrorTypeEnum;
import org.hibernate.annotations.BatchSize;
import org.hibernate.annotations.GenericGenerator;
import lombok.Getter;
import lombok.Setter;
Expand All @@ -28,18 +28,20 @@
@Getter
@Setter
@ToString
@Table(name = "RECORD_VALUE")
@Table(name = "record_value")
public class RecordValue {


/**
* The id.
*/
@Id
@GenericGenerator(name = "record_sequence_generator",
strategy = "org.eea.dataset.persistence.data.sequence.RecordValueIdGenerator")
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "record_sequence_generator")
Copy link
Author

@ChristosKalaitzis ChristosKalaitzis Dec 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should not be removed

@Column(name = "ID", columnDefinition = "serial")
@GenericGenerator(
name = "record_sequence_generator",
strategy = "org.eea.dataset.persistence.data.sequence.RecordValueIdGenerator"
)
@GeneratedValue(generator = "record_sequence_generator")
@Column(name = "ID")
private String id;

/**
Expand Down
2 changes: 1 addition & 1 deletion dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/TableValidation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
@Getter
@Setter
@ToString
@Table(name = "TABLE_VALIDATION")
@Table(name = "table_validation")
public class TableValidation {

/**
Expand Down
12 changes: 8 additions & 4 deletions dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/TableValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import org.hibernate.annotations.BatchSize;

/**
* The Class TableValue.
Expand All @@ -26,7 +27,7 @@
@Getter
@Setter
@ToString
@Table(name = "TABLE_VALUE")
@Table(name = "table_value")
public class TableValue {


Expand All @@ -35,10 +36,13 @@ public class TableValue {
* The id.
*/
@Id
@SequenceGenerator(name = "table_sequence_generator", sequenceName = "table_sequence",
allocationSize = 1)
@SequenceGenerator(
name = "table_sequence_generator",
sequenceName = "table_sequence",
allocationSize = 1
)
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "table_sequence_generator")
@Column(name = "ID", columnDefinition = "serial")
@Column(name = "ID")
private Long id;

/**
Expand Down
2 changes: 1 addition & 1 deletion dataset-service/src/main/java/org/eea/dataset/persistence/data/domain/Validation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
@Getter
@Setter
@ToString
@Table(name = "VALIDATION")
@Table(name = "validation")
public class Validation {

/**
Expand Down
27 changes: 21 additions & 6 deletions dataset-service/src/main/java/org/eea/dataset/service/impl/DatasetServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2577,12 +2577,27 @@ private List<RecordValue> createRecords(Long datasetId, String dataProviderCode,
partitionDataSetMetabaseRepository.findFirstByIdDataSet_idAndUsername(datasetId, USER)
.orElse(new PartitionDataSetMetabase()).getId();

DatasetValue dataset = new DatasetValue();
dataset.setId(datasetId);

TableValue tableValue = new TableValue();
tableValue.setId(tableRepository.findIdByIdTableSchema(tableSchemaId));
tableValue.setDatasetId(dataset);
LOG.info("[CHRIS]");
// fetch dataset_value here, if null then save it
DatasetValue datasetValue = datasetRepository.findById(datasetId).orElse(null);
if (datasetValue == null) {
datasetValue = new DatasetValue();
datasetValue.setId(datasetId);
datasetValue = datasetRepository.save(datasetValue);
}
LOG.info("[CHRIS] DatasetValue: {}", datasetValue);


String schemaId = tableSchema.getIdTableSchema().toString();
// fetch table_value here, if null then save it
TableValue tableValue = tableRepository.findByIdTableSchema(schemaId);
if (tableValue == null) {
tableValue = new TableValue();
tableValue.setDatasetId(datasetValue);
tableValue.setIdTableSchema(schemaId);
tableValue = tableRepository.save(tableValue);
}
LOG.info("[CHRIS] TableValue: {}", tableValue);
Copy link
Author

@ChristosKalaitzis ChristosKalaitzis Dec 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have to remove the logs starting with [CHRIS]
Also not sure if this part of the code is needed currently, I have to check it


List<RecordValue> recordValues = new ArrayList<>();

Expand Down
2 changes: 1 addition & 1 deletion orchestrator-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.6.0</version>
<version>42.7.8</version>
</dependency>
</dependencies>
<distributionManagement>
Expand Down
2 changes: 1 addition & 1 deletion recordstore-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.6.0</version>
<version>42.7.8</version>
</dependency>
<dependency>
<groupId>com.dremio.distribution</groupId>
Expand Down
2 changes: 1 addition & 1 deletion validation-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.6.0</version>
<version>42.7.8</version>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
Expand Down
2 changes: 1 addition & 1 deletion ...n-service/src/main/java/org/eea/validation/persistence/data/domain/DatasetValidation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
@Getter
@Setter
@ToString
@Table(name = "DATASET_VALIDATION")
@Table(name = "dataset_validation")
public class DatasetValidation {

/** The id. */
Expand Down
2 changes: 1 addition & 1 deletion ...dation-service/src/main/java/org/eea/validation/persistence/data/domain/DatasetValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@Getter
@Setter
@ToString
@Table(name = "DATASET_VALUE")
@Table(name = "dataset_value")
public class DatasetValue {


Expand Down
2 changes: 1 addition & 1 deletion ...ion-service/src/main/java/org/eea/validation/persistence/data/domain/FieldValidation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
@Getter
@Setter
@ToString
@Table(name = "FIELD_VALIDATION")
@Table(name = "field_validation")
public class FieldValidation {

/**
Expand Down
2 changes: 1 addition & 1 deletion validation-service/src/main/java/org/eea/validation/persistence/data/domain/FieldValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
@Getter
@Setter
@ToString
@Table(name = "FIELD_VALUE")
@Table(name = "field_value")
public class FieldValue {

/** The id. */
Expand Down
2 changes: 1 addition & 1 deletion ...on-service/src/main/java/org/eea/validation/persistence/data/domain/RecordValidation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
@Getter
@Setter
@ToString
@Table(name = "RECORD_VALIDATION")
@Table(name = "record_validation")
public class RecordValidation {

/**
Expand Down
2 changes: 1 addition & 1 deletion validation-service/src/main/java/org/eea/validation/persistence/data/domain/RecordValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
@Getter
@Setter
@ToString
@Table(name = "RECORD_VALUE")
@Table(name = "record_value")
public class RecordValue {

/** The id. */
Expand Down
2 changes: 1 addition & 1 deletion ...ion-service/src/main/java/org/eea/validation/persistence/data/domain/TableValidation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
@Getter
@Setter
@ToString
@Table(name = "TABLE_VALIDATION")
@Table(name = "table_validation")
public class TableValidation {

/**
Expand Down
2 changes: 1 addition & 1 deletion validation-service/src/main/java/org/eea/validation/persistence/data/domain/TableValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
@Getter
@Setter
@ToString
@Table(name = "TABLE_VALUE")
@Table(name = "table_value")
public class TableValue {

/**
Expand Down
2 changes: 1 addition & 1 deletion validation-service/src/main/java/org/eea/validation/persistence/data/domain/Validation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
@Getter
@Setter
@ToString
@Table(name = "VALIDATION")
@Table(name = "validation")
public class Validation {

/**
Expand Down