From 168ad326055e0a218efb88f5b1a8cdaf1fa159c0 Mon Sep 17 00:00:00 2001 From: Gianluca d'Agosta Date: Wed, 3 Nov 2021 18:22:07 +0100 Subject: [PATCH] Form modifications --- .../config/userDBConfiguration.java | 20 +- .../controller/DataController.java | 5 +- ...oller.java => DynamicInputController.java} | 0 .../controller/StructureController.java | 251 ++++++++++++++++++ .../controller/UserController.java | 2 +- .../GECORegistration/dto/MetadataDTO.java | 12 +- .../dto/TableMetadataDTO.java | 6 +- .../model/structure/ForeignKey.java | 46 ++++ .../{user => structure}/VwTableMetadata.java | 2 +- .../structure/ForeignKeyInterface.java | 16 ++ .../TableMetadataInterface.java | 4 +- .../service/user/DTOManager.java | 2 +- .../resources/application-test.properties | 56 ++-- src/main/resources/application.properties | 53 ++-- 14 files changed, 405 insertions(+), 70 deletions(-) rename src/main/java/it/enea/xlab/GECORegistration/controller/{dynamicInputController.java => DynamicInputController.java} (100%) create mode 100644 src/main/java/it/enea/xlab/GECORegistration/controller/StructureController.java create mode 100644 src/main/java/it/enea/xlab/GECORegistration/model/structure/ForeignKey.java rename src/main/java/it/enea/xlab/GECORegistration/model/{user => structure}/VwTableMetadata.java (98%) create mode 100644 src/main/java/it/enea/xlab/GECORegistration/service/structure/ForeignKeyInterface.java rename src/main/java/it/enea/xlab/GECORegistration/service/{user => structure}/TableMetadataInterface.java (70%) diff --git a/src/main/java/it/enea/xlab/GECORegistration/config/userDBConfiguration.java b/src/main/java/it/enea/xlab/GECORegistration/config/userDBConfiguration.java index 8e3dd48..5c69ce5 100644 --- a/src/main/java/it/enea/xlab/GECORegistration/config/userDBConfiguration.java +++ b/src/main/java/it/enea/xlab/GECORegistration/config/userDBConfiguration.java @@ -7,11 +7,13 @@ import javax.sql.DataSource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.jdbc.DataSourceBuilder; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; import org.springframework.core.env.Environment; @@ -23,9 +25,17 @@ import org.springframework.transaction.PlatformTransactionManager; @SpringBootConfiguration @EnableJpaRepositories( - basePackages = {"it.enea.xlab.GECORegistration.model.user", "it.enea.xlab.GECORegistration.service.user"}, + basePackages = { + "it.enea.xlab.GECORegistration.model.structure", + "it.enea.xlab.GECORegistration.service.structure", + "it.enea.xlab.GECORegistration.model.user", + "it.enea.xlab.GECORegistration.service.user"}, entityManagerFactoryRef = "userEntityManagerIDP", transactionManagerRef = "userTransactionManagerIDP") + +@EntityScan(basePackages = { + "it.enea.xlab.GECORegistration.model.structure", + "it.enea.xlab.GECORegistration.model.user"}) @EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class}) public class userDBConfiguration { @@ -45,8 +55,12 @@ public class userDBConfiguration { = new LocalContainerEntityManagerFactoryBean(); em.setDataSource(userDataSource()); em.setPackagesToScan( - new String[] { "it.enea.xlab.GECORegistration.model.user", - "it.enea.xlab.GECORegistration.service.user" }); + new String[] { + "it.enea.xlab.GECORegistration.model.structure", + "it.enea.xlab.GECORegistration.service.structure", + "it.enea.xlab.GECORegistration.model.user", + "it.enea.xlab.GECORegistration.service.user" + }); HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter(); diff --git a/src/main/java/it/enea/xlab/GECORegistration/controller/DataController.java b/src/main/java/it/enea/xlab/GECORegistration/controller/DataController.java index 7b1ad2e..19a9bcb 100644 --- a/src/main/java/it/enea/xlab/GECORegistration/controller/DataController.java +++ b/src/main/java/it/enea/xlab/GECORegistration/controller/DataController.java @@ -57,7 +57,6 @@ import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import io.swagger.annotations.Api; @@ -70,12 +69,10 @@ import it.enea.xlab.GECORegistration.data.ElectricMeterReading.Property; import it.enea.xlab.GECORegistration.data.ElectricMeterReading.UrbanDataset; import it.enea.xlab.GECORegistration.data.ElectricMeterReading.Values; import it.enea.xlab.GECORegistration.data.InputParameters; -import it.enea.xlab.GECORegistration.dto.MetadataDTO; import it.enea.xlab.GECORegistration.model.data.DataConsumption; import it.enea.xlab.GECORegistration.model.parametricQuery.LocalQueryParameter; import it.enea.xlab.GECORegistration.model.parametricQuery.ParametricQuery; import it.enea.xlab.GECORegistration.model.user.User; -import it.enea.xlab.GECORegistration.model.user.VwTableMetadata; import it.enea.xlab.GECORegistration.service.data.DataInterface; import it.enea.xlab.GECORegistration.service.identityManager.IEncryptionManager; import it.enea.xlab.GECORegistration.service.identityManager.IIdpClientManager; @@ -83,9 +80,9 @@ import it.enea.xlab.GECORegistration.service.parametricQuery.LocalQueryParameter import it.enea.xlab.GECORegistration.service.parametricQuery.ParametricQueryInterface; import it.enea.xlab.GECORegistration.service.parametricQuery.ParametricQueryManager; import it.enea.xlab.GECORegistration.service.parametricQuery.ParametricQueryManager.ResultWithMetadata; +import it.enea.xlab.GECORegistration.service.structure.TableMetadataInterface; import it.enea.xlab.GECORegistration.service.user.DTOManager; import it.enea.xlab.GECORegistration.service.user.NewUserInterface; -import it.enea.xlab.GECORegistration.service.user.TableMetadataInterface; import lombok.extern.log4j.Log4j2; @RestController diff --git a/src/main/java/it/enea/xlab/GECORegistration/controller/dynamicInputController.java b/src/main/java/it/enea/xlab/GECORegistration/controller/DynamicInputController.java similarity index 100% rename from src/main/java/it/enea/xlab/GECORegistration/controller/dynamicInputController.java rename to src/main/java/it/enea/xlab/GECORegistration/controller/DynamicInputController.java diff --git a/src/main/java/it/enea/xlab/GECORegistration/controller/StructureController.java b/src/main/java/it/enea/xlab/GECORegistration/controller/StructureController.java new file mode 100644 index 0000000..b75c9b7 --- /dev/null +++ b/src/main/java/it/enea/xlab/GECORegistration/controller/StructureController.java @@ -0,0 +1,251 @@ +package it.enea.xlab.GECORegistration.controller; + +import java.lang.reflect.Field; +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.ws.rs.GET; +import javax.ws.rs.POST; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.support.rowset.SqlRowSet; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestHeader; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + +import it.enea.xlab.GECORegistration.dto.LocalUserDTO; +import it.enea.xlab.GECORegistration.dto.MetadataDTO; +import it.enea.xlab.GECORegistration.dto.TableMetadataDTO; +import it.enea.xlab.GECORegistration.model.parametricQuery.ParametricQuery; +import it.enea.xlab.GECORegistration.model.structure.ForeignKey; +import it.enea.xlab.GECORegistration.model.structure.VwTableMetadata; +import it.enea.xlab.GECORegistration.model.user.User; +import it.enea.xlab.GECORegistration.service.structure.ForeignKeyInterface; +import it.enea.xlab.GECORegistration.service.structure.TableMetadataInterface; +import it.enea.xlab.GECORegistration.service.user.DTOManager; +import lombok.extern.log4j.Log4j2; + +@Controller +@Log4j2 +public class StructureController { + + @Autowired + TableMetadataInterface tmInterface; + + @Autowired + ForeignKeyInterface fkInterface; + + @Autowired + DTOManager dtoManager; + + @Autowired + JdbcTemplate jdbcTemplate; + + + @POST + @PostMapping("/getTableMetadata") + public ResponseEntity getTableMetadata( + @RequestHeader(name = "Authorization", required = false) String token, + @RequestHeader(name = "Content-Language", required = false, defaultValue = "it_IT") String language, + @RequestBody String tableName) { + + List tmData1 = tmInterface.findByTableName(tableName); + List fKeyList = fkInterface.findByTableName(tableName); + + Map keyMap = new HashMap(); + + for (ForeignKey fKey : fKeyList) { + keyMap.put(fKey.getColumnName(), fKey); + } + + TableMetadataDTO tDTO = new TableMetadataDTO(); + + List tmDataDTO = new ArrayList(); + + for (VwTableMetadata tempData : tmData1) { + if (!((tempData.getColumnDefault() != null && tempData.getColumnDefault().contains("nextval")) || + (tempData.getIdentityGeneration() != null && tempData.getIdentityGeneration().contains("ALWAYS")))) + { + MetadataDTO mDto = new MetadataDTO(); + + + if(keyMap.containsKey(tempData.getColumnName())) { + Object[] parameters = new Object[] { }; + log.info ("Found the key " + tempData.getColumnName()); + ForeignKey key = keyMap.get(tempData.getColumnName()); + + mDto.setDataType("integer"); + mDto.setColumnName(key.getColumnName()); + mDto.setRequired(true); + //adesso devo eseguire una query... + String sql = "SELECT * from " + key.getForeign_table_name(); + log.info("querying for data from " + key.getForeign_table_name()); + SqlRowSet srs = jdbcTemplate.queryForRowSet(sql , parameters); + List> options = new ArrayList>(); + while(srs.next()) { + Long id = srs.getLong(key.getForeign_column_name()); + String value = srs.getString("description"); + if (value == null) { + String fieldName = key.getForeign_table_name().substring(0, key.getForeign_table_name().length() - 1) + "name"; + value = srs.getString(fieldName); + } + HashMap opt = new HashMap(); + opt.put("key", id); + opt.put("value", value); + options.add(opt); + + } + mDto.setOptions(options); + //List result = jdbcTemplate.queryForObject(sql, new Object[]{column,arg}, String.class); + } + else { + mDto = dtoManager.mtDataDTO(tempData, language); + } + tmDataDTO.add(mDto); + tDTO.setTableName(tempData.getTableName()); + tDTO.setTableDescription(getDescription(tempData.getTableDescription(), language)); + } + + } + + tDTO.setMetadata(tmDataDTO); + log.info(tmDataDTO); + ObjectMapper objectMapper = new ObjectMapper(); + try { + log.info(objectMapper.writeValueAsString(tmDataDTO)); + } catch (JsonProcessingException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + return new ResponseEntity(tDTO, HttpStatus.OK); + } + + + @GET + @GetMapping("listManagedEntities") + public ResponseEntity > listManagedEneities ( + @RequestHeader(name = "Authorization", required = false) String token, + @RequestHeader(name = "Content-Language", required = false, defaultValue = "it_IT") String language) + { + List result = new ArrayList(); + result.add("flows"); + result.add("users"); + result.add("communities"); + return new ResponseEntity> (result, HttpStatus.OK); + } + + @GET + @GetMapping("forms/{formId}") + public ResponseEntity getForms ( + @RequestHeader(name = "Authorization", required = false) String token, + @RequestHeader(name = "Content-Language", required = false, defaultValue = "it_IT") String language, + @PathVariable String formId) { + //if (formId == "flows" || formId == "communities") { + // return getTableMetadata (token, language, formId); + //} + //TableMetadataDTO result = new TableMetadataDTO(); + String fakeResponse = "{\n" + + " \"code\": \"device\",\n" + + " \"id\": null, <-- EDIT (GET) È IDENTICO MA CON ID VALORIZZATO\n" + + " \"columns\": [\n" + + " {\n" + + " \"name\": \"title\",\n" + + " \"description\": \"Titolo\",\n" + + " \"type\": \"text\",\n" + + " \"required\": false,\n" + + " \"value\": null <-- EDIT (GET) È IDENTICO MA CON VALORI\n" + + " },\n" + + " {\n" + + " \"name\": \"quantity\",\n" + + " \"description\": \"Quantità\",\n" + + " \"type\": \"number\",\n" + + " \"required\": false,\n" + + " \"value\": null\n" + + " },\n" + + " {\n" + + " \"name\": \"startDate\",\n" + + " \"description\": \"Data inizio\",\n" + + " \"type\": \"date\",\n" + + " \"required\": false,\n" + + " \"value\": null\n" + + " },\n" + + " {\n" + + " \"name\": \"communityId\",\n" + + " \"description\": \"Community\",\n" + + " \"type\": \"text\",\n" + + " \"required\": false,\n" + + " \"value\": null,\n" + + " \"options\": [\n" + + " {\n" + + " \"key\": \"1\",\n" + + " \"value\": \"Community 01\"\n" + + " },\n" + + " {\n" + + " \"key\": \"2\",\n" + + " \"value\": \"Community 01\"\n" + + " }\n" + + " ]\n" + + " }\n" + + " ]\n" + + "}"; + log.info("creating a fake respone to request for form creation"); + return new ResponseEntity (fakeResponse, HttpStatus.OK); + } + + @POST + @PostMapping("forms/{formId}") + public ResponseEntity postForms ( + @RequestHeader(name = "Authorization", required = false) String token, + @RequestHeader(name = "Content-Language", required = false, defaultValue = "it_IT") String language, + @PathVariable String formId, + @RequestBody Object body) + { + List fKeyList = fkInterface.findByTableName(formId); + for (ForeignKey fKey : fKeyList) { + String tableName = fKey.getForeign_table_name(); + log.info(tableName); + List vwTData = tmInterface.findByTableName(tableName); + + log.info(vwTData); + } + //ForeignKey fKey = fkInterface.findByTableNameAndColumnName(formId, "supplierid"); + + + + return new ResponseEntity("Ricevuto", HttpStatus.OK); + } + + + public String getDescription(String cComment, String language) { + if (cComment != null) { + log.info("working with: " + cComment); + String[] result = cComment.contains("|") ? cComment.split(" \\| ") : null; + if (result != null) { + if (language.contains("it")) { + return (result[2] + " | " + result[3]); + } else { + if (result.length > 1) { + return (result[0] + " | " + result[1]); + } else + return (result[0] + " | " + result[1]); + } + } else + return cComment; + } else return ""; + } + + +} diff --git a/src/main/java/it/enea/xlab/GECORegistration/controller/UserController.java b/src/main/java/it/enea/xlab/GECORegistration/controller/UserController.java index 70c17fb..22a9791 100644 --- a/src/main/java/it/enea/xlab/GECORegistration/controller/UserController.java +++ b/src/main/java/it/enea/xlab/GECORegistration/controller/UserController.java @@ -39,11 +39,11 @@ import it.enea.xlab.GECORegistration.service.identityManager.IEncryptionManager; import it.enea.xlab.GECORegistration.service.identityManager.IdpClientManager; import it.enea.xlab.GECORegistration.service.identityManager.JWTManager; import it.enea.xlab.GECORegistration.service.identityManager.KeycloakGECOManager; +import it.enea.xlab.GECORegistration.service.structure.TableMetadataInterface; import it.enea.xlab.GECORegistration.service.user.CommunityInterface; import it.enea.xlab.GECORegistration.service.user.NewUserInterface; import it.enea.xlab.GECORegistration.service.user.DTOManager; import it.enea.xlab.GECORegistration.service.user.RoleInterface; -import it.enea.xlab.GECORegistration.service.user.TableMetadataInterface; import it.enea.xlab.GECORegistration.service.user.UserCommunityInterface; import it.enea.xlab.GECORegistration.service.user.UserRoleInterface; import lombok.extern.log4j.Log4j2; diff --git a/src/main/java/it/enea/xlab/GECORegistration/dto/MetadataDTO.java b/src/main/java/it/enea/xlab/GECORegistration/dto/MetadataDTO.java index 1a5afa2..cab30f4 100644 --- a/src/main/java/it/enea/xlab/GECORegistration/dto/MetadataDTO.java +++ b/src/main/java/it/enea/xlab/GECORegistration/dto/MetadataDTO.java @@ -1,7 +1,12 @@ package it.enea.xlab.GECORegistration.dto; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreType; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Getter; @@ -24,12 +29,13 @@ public class MetadataDTO { @JsonProperty("name") private String columnName; - @JsonProperty("comment") + @JsonProperty("description") String columnComment; @JsonProperty("default") private String columnDefault; + @JsonProperty("type") private String dataType; private String example; @@ -39,11 +45,13 @@ public class MetadataDTO { private Boolean required; - //private String tableDescription; + private String value; @JsonIgnore private String language; + private List> options; + public void setColumnComment(String cComment) { columnComment = getDescription(cComment, language); example = getExample(cComment); diff --git a/src/main/java/it/enea/xlab/GECORegistration/dto/TableMetadataDTO.java b/src/main/java/it/enea/xlab/GECORegistration/dto/TableMetadataDTO.java index 0f0ae0a..bb9fd47 100644 --- a/src/main/java/it/enea/xlab/GECORegistration/dto/TableMetadataDTO.java +++ b/src/main/java/it/enea/xlab/GECORegistration/dto/TableMetadataDTO.java @@ -14,12 +14,16 @@ import lombok.Setter; @NoArgsConstructor public class TableMetadataDTO { - @JsonProperty("entity") + @JsonProperty("code") private String tableName; @JsonProperty("desciption") private String tableDescription; + private Long id; + + + @JsonProperty("fields") private List metadata; } diff --git a/src/main/java/it/enea/xlab/GECORegistration/model/structure/ForeignKey.java b/src/main/java/it/enea/xlab/GECORegistration/model/structure/ForeignKey.java new file mode 100644 index 0000000..cd756cf --- /dev/null +++ b/src/main/java/it/enea/xlab/GECORegistration/model/structure/ForeignKey.java @@ -0,0 +1,46 @@ +package it.enea.xlab.GECORegistration.model.structure; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + +import org.springframework.data.annotation.Immutable; + +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; + +@Entity +@Table(name="vw_foreignkey", schema="cruise") +@Immutable +@Getter +@Setter +@NoArgsConstructor +@ToString +public class ForeignKey { + + @Id + @Column(name="columnName") + private String columnName; + + @Column(name="table_schema") + private String tableSchema; + + @Column(name="constraint_name") + private String constraintName; + + @Column(name="tableName") + private String tableName; + + @Column(name="foreign_table_schema") + private String foreign_table_schema; + + @Column(name="foreign_table_name") + private String foreign_table_name; + + @Column(name="foreign_column_name") + private String foreign_column_name; + +} diff --git a/src/main/java/it/enea/xlab/GECORegistration/model/user/VwTableMetadata.java b/src/main/java/it/enea/xlab/GECORegistration/model/structure/VwTableMetadata.java similarity index 98% rename from src/main/java/it/enea/xlab/GECORegistration/model/user/VwTableMetadata.java rename to src/main/java/it/enea/xlab/GECORegistration/model/structure/VwTableMetadata.java index bf4a72c..3cfdcaf 100644 --- a/src/main/java/it/enea/xlab/GECORegistration/model/user/VwTableMetadata.java +++ b/src/main/java/it/enea/xlab/GECORegistration/model/structure/VwTableMetadata.java @@ -1,4 +1,4 @@ -package it.enea.xlab.GECORegistration.model.user; +package it.enea.xlab.GECORegistration.model.structure; import java.io.Serializable; import javax.persistence.*; diff --git a/src/main/java/it/enea/xlab/GECORegistration/service/structure/ForeignKeyInterface.java b/src/main/java/it/enea/xlab/GECORegistration/service/structure/ForeignKeyInterface.java new file mode 100644 index 0000000..9782834 --- /dev/null +++ b/src/main/java/it/enea/xlab/GECORegistration/service/structure/ForeignKeyInterface.java @@ -0,0 +1,16 @@ +package it.enea.xlab.GECORegistration.service.structure; + +import java.util.List; + +import org.springframework.data.jpa.repository.JpaRepository; + +import it.enea.xlab.GECORegistration.model.structure.ForeignKey; + +public interface ForeignKeyInterface extends JpaRepository { + + + List findByTableName (String tableName); + + ForeignKey findByTableNameAndColumnName (String tableName, String columnName); + +} diff --git a/src/main/java/it/enea/xlab/GECORegistration/service/user/TableMetadataInterface.java b/src/main/java/it/enea/xlab/GECORegistration/service/structure/TableMetadataInterface.java similarity index 70% rename from src/main/java/it/enea/xlab/GECORegistration/service/user/TableMetadataInterface.java rename to src/main/java/it/enea/xlab/GECORegistration/service/structure/TableMetadataInterface.java index 0302e35..fff9494 100644 --- a/src/main/java/it/enea/xlab/GECORegistration/service/user/TableMetadataInterface.java +++ b/src/main/java/it/enea/xlab/GECORegistration/service/structure/TableMetadataInterface.java @@ -1,11 +1,11 @@ -package it.enea.xlab.GECORegistration.service.user; +package it.enea.xlab.GECORegistration.service.structure; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; -import it.enea.xlab.GECORegistration.model.user.VwTableMetadata; +import it.enea.xlab.GECORegistration.model.structure.VwTableMetadata; public interface TableMetadataInterface extends JpaRepository { diff --git a/src/main/java/it/enea/xlab/GECORegistration/service/user/DTOManager.java b/src/main/java/it/enea/xlab/GECORegistration/service/user/DTOManager.java index 5e98a6c..1b4a27d 100644 --- a/src/main/java/it/enea/xlab/GECORegistration/service/user/DTOManager.java +++ b/src/main/java/it/enea/xlab/GECORegistration/service/user/DTOManager.java @@ -10,12 +10,12 @@ import it.enea.xlab.GECORegistration.dto.CommunityDTO; import it.enea.xlab.GECORegistration.dto.DeviceDTO; import it.enea.xlab.GECORegistration.dto.LocalUserDTO; import it.enea.xlab.GECORegistration.dto.MetadataDTO; +import it.enea.xlab.GECORegistration.model.structure.VwTableMetadata; import it.enea.xlab.GECORegistration.model.user.Community; import it.enea.xlab.GECORegistration.model.user.Device; import it.enea.xlab.GECORegistration.model.user.User; import it.enea.xlab.GECORegistration.model.user.UserCommunity; import it.enea.xlab.GECORegistration.model.user.UserRole; -import it.enea.xlab.GECORegistration.model.user.VwTableMetadata; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/resources/application-test.properties b/src/main/resources/application-test.properties index 00f5df4..e7492fc 100644 --- a/src/main/resources/application-test.properties +++ b/src/main/resources/application-test.properties @@ -19,43 +19,43 @@ spring.jpa.hibernate.naming_strategy=org.hibernate.cfg.EJB3NamingStrategy ## PostgreSQL #Test - -spring.user-datasource-idp.jdbcUrl=jdbc:postgresql://datacollector.bologna.enea.it:5432/selfuser -spring.user-datasource-idp.hikari.url=jdbc:postgresql://datacollector.bologna.enea.it:5432/selfuser -spring.user-datasource-idp.username=dagosta -spring.user-datasource-idp.password=D@go037A -spring.user-datasource-idp.driver-class-name=org.postgresql.Driver -spring.user-datasource-idp.maximumPoolSize=2 -spring.user-datasource-idp.minimumIdle=1 - -spring.data-datasource-idp.jdbcUrl=jdbc:postgresql://datacollector.bologna.enea.it:5432/selfuser -spring.data-datasource-idp.hikari.url=jdbc:postgresql://datacollector.bologna.enea.it:5432/selfuser -spring.data-datasource-idp.username=cruise -spring.data-datasource-idp.password=crU1s&& -spring.data-datasource-idp.driver-class-name=org.postgresql.Driver -spring.data-datasource-idp.maximumPoolSize=2 -spring.data-datasource-idp.minimumIdle=1 - - -#spring.user-datasource-idp.jdbcUrl=jdbc:postgresql://winter.bologna.enea.it:5432/selfuser -#spring.user-datasource-idp.url=jdbc:postgresql://winter.bologna.enea.it:5432/selfuser -#spring.user-datasource-idp.username=selfuser -#spring.user-datasource-idp.password=selfuser +#spring.user-datasource-idp.jdbcUrl=jdbc:postgresql://datacollector.bologna.enea.it:5432/selfuser +#spring.user-datasource-idp.username=dagosta +#spring.user-datasource-idp.hikari.url=jdbc:postgresql://datacollector.bologna.enea.it:5432/selfuser +#spring.user-datasource-idp.password=D@go037A #spring.user-datasource-idp.driver-class-name=org.postgresql.Driver #spring.user-datasource-idp.maximumPoolSize=2 #spring.user-datasource-idp.minimumIdle=1 -#spring.data-datasource-idp.jdbcUrl=jdbc:postgresql://winter.bologna.enea.it:5432/selfuser -#spring.data-datasource-idp.hikari.url=jdbc:postgresql://winter.bologna.enea.it:5432/selfuser -#spring.data-datasource-idp.username=selfuser -#spring.data-datasource-idp.password=selfuser +#spring.data-datasource-idp.jdbcUrl=jdbc:postgresql://datacollector.bologna.enea.it:5432/selfuser +#spring.data-datasource-idp.hikari.url=jdbc:postgresql://datacollector.bologna.enea.it:5432/selfuser +#spring.data-datasource-idp.username=cruise +#spring.data-datasource-idp.password=crU1s&& #spring.data-datasource-idp.driver-class-name=org.postgresql.Driver #spring.data-datasource-idp.maximumPoolSize=2 #spring.data-datasource-idp.minimumIdle=1 -#spring.jpa.show-sql=true -logging.level.org.hibernate.SQL=INFO -#logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE +spring.user-datasource-idp.jdbcUrl=jdbc:postgresql://winter.bologna.enea.it:5432/selfuser +spring.user-datasource-idp.url=jdbc:postgresql://winter.bologna.enea.it:5432/selfuser +spring.user-datasource-idp.username=selfuser +spring.user-datasource-idp.password=selfuser +spring.user-datasource-idp.driver-class-name=org.postgresql.Driver +spring.user-datasource-idp.maximumPoolSize=2 +spring.user-datasource-idp.minimumIdle=1 + +spring.data-datasource-idp.jdbcUrl=jdbc:postgresql://winter.bologna.enea.it:5432/selfuser +spring.data-datasource-idp.hikari.url=jdbc:postgresql://winter.bologna.enea.it:5432/selfuser +spring.data-datasource-idp.username=selfuser +spring.data-datasource-idp.password=selfuser +spring.data-datasource-idp.driver-class-name=org.postgresql.Driver +spring.data-datasource-idp.maximumPoolSize=2 +spring.data-datasource-idp.minimumIdle=1 + + +spring.jpa.show-sql=true +logging.level.org.hibernate.SQL=TRACE +logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 6e4ec36..93a6117 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -20,40 +20,39 @@ spring.data-datasource-idp.hikari.maximumPoolSize=5 spring.jpa.hibernate.naming_strategy=org.hibernate.cfg.EJB3NamingStrategy ## PostgreSQL -spring.user-datasource-idp.jdbcUrl=jdbc:postgresql://datacollector.bologna.enea.it:5432/selfuser -spring.user-datasource-idp.hikari.url=jdbc:postgresql://datacollector.bologna.enea.it:5432/selfuser -spring.user-datasource-idp.username=dagosta -spring.user-datasource-idp.password=D@go037A -spring.user-datasource-idp.driver-class-name=org.postgresql.Driver -spring.user-datasource-idp.maximumPoolSize=2 -spring.user-datasource-idp.minimumIdle=1 +#spring.user-datasource-idp.jdbcUrl=jdbc:postgresql://datacollector.bologna.enea.it:5432/selfuser +#spring.user-datasource-idp.hikari.url=jdbc:postgresql://datacollector.bologna.enea.it:5432/selfuser +#spring.user-datasource-idp.username=dagosta +#spring.user-datasource-idp.password=D@go037A +#spring.user-datasource-idp.driver-class-name=org.postgresql.Driver +#spring.user-datasource-idp.maximumPoolSize=2 +#spring.user-datasource-idp.minimumIdle=1 -spring.data-datasource-idp.jdbcUrl=jdbc:postgresql://datacollector.bologna.enea.it:5432/selfuser -spring.data-datasource-idp.hikari.url=jdbc:postgresql://datacollector.bologna.enea.it:5432/selfuser -spring.data-datasource-idp.username=cruise -spring.data-datasource-idp.password=crU1s&& -spring.data-datasource-idp.driver-class-name=org.postgresql.Driver -spring.data-datasource-idp.maximumPoolSize=2 +#spring.data-datasource-idp.jdbcUrl=jdbc:postgresql://datacollector.bologna.enea.it:5432/selfuser +#spring.data-datasource-idp.hikari.url=jdbc:postgresql://datacollector.bologna.enea.it:5432/selfuser +#spring.data-datasource-idp.username=cruise +#spring.data-datasource-idp.password=crU1s&& +#spring.data-datasource-idp.driver-class-name=org.postgresql.Driver +#spring.data-datasource-idp.maximumPoolSize=2 -#spring.user-datasource-idp.jdbcUrl=jdbc:postgresql://winter.bologna.enea.it:5432/selfuser -#spring.user-datasource-idp.username=selfuser -#spring.user-datasource-idp.password=selfuser -#spring.user-datasource-idp.max-active=1 -#spring.user-datasource-idp.driver-class-name=org.postgresql.Driver - +spring.user-datasource-idp.jdbcUrl=jdbc:postgresql://winter.bologna.enea.it:5432/selfuser +spring.user-datasource-idp.username=selfuser +spring.user-datasource-idp.password=selfuser +spring.user-datasource-idp.max-active=1 +spring.user-datasource-idp.driver-class-name=org.postgresql.Driver -#spring.data-datasource-idp.jdbcUrl=jdbc:postgresql://winter.bologna.enea.it:5432/selfuser -#spring.data-datasource-idp.username=selfuser -#spring.data-datasource-idp.password=selfuser -#spring.data-datasource-idp.max-active=1 -#spring.data-datasource-idp.driver-class-name=org.postgresql.Driver +spring.data-datasource-idp.jdbcUrl=jdbc:postgresql://winter.bologna.enea.it:5432/selfuser +spring.data-datasource-idp.username=selfuser +spring.data-datasource-idp.password=selfuser +spring.data-datasource-idp.max-active=1 +spring.data-datasource-idp.driver-class-name=org.postgresql.Driver -#spring.jpa.show-sql=true -#logging.level.org.hibernate.SQL=DEBUG -#logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE +spring.jpa.show-sql=true +logging.level.org.hibernate.SQL=DEBUG +logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE ## Keycloak -- GitLab