diff --git a/build.gradle b/build.gradle index 26452b59..af3a8da9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,10 @@ plugins { id 'java' - id 'org.springframework.boot' version '3.2.3' + id 'org.springframework.boot' version '3.2.4' id 'io.spring.dependency-management' version '1.1.4' id 'checkstyle' id 'com.github.ben-manes.versions' version '0.51.0' - id 'org.sonarqube' version '4.4.1.3373' + id 'org.sonarqube' version '5.0.0.4638' id 'com.adarshr.test-logger' version '4.0.0' id 'jacoco' id 'idea' @@ -44,18 +44,18 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-validation' implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' - implementation 'org.springframework.session:spring-session-jdbc:3.2.1' - implementation 'org.flywaydb:flyway-core:10.8.1' - implementation "org.flywaydb:flyway-database-postgresql:10.8.1" + implementation 'org.springframework.session:spring-session-jdbc:3.2.2' + implementation 'org.flywaydb:flyway-core:10.10.0' + implementation "org.flywaydb:flyway-database-postgresql:10.10.0" implementation 'commons-lang:commons-lang:2.6' implementation 'commons-beanutils:commons-beanutils:1.9.4' - implementation 'com.github.erosb:json-sKema:0.11.0' + implementation 'com.github.erosb:json-sKema:0.14.0' compileOnly 'org.projectlombok:lombok' - runtimeOnly 'org.postgresql:postgresql:42.7.2' + runtimeOnly 'org.postgresql:postgresql:42.7.3' annotationProcessor 'org.projectlombok:lombok' testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'io.cucumber:cucumber-java:7.15.0' - testImplementation 'io.cucumber:cucumber-junit:7.15.0' + testImplementation 'io.cucumber:cucumber-java:7.16.1' + testImplementation 'io.cucumber:cucumber-junit:7.16.1' testImplementation 'org.junit.vintage:junit-vintage-engine:5.10.2' } diff --git a/src/main/java/com/ditrit/letomodelizerapi/persistence/function/UserAccesControlViewToAccessControlFunction.java b/src/main/java/com/ditrit/letomodelizerapi/persistence/function/UserAccesControlViewToAccessControlFunction.java index abfd61c3..1e1d9b19 100644 --- a/src/main/java/com/ditrit/letomodelizerapi/persistence/function/UserAccesControlViewToAccessControlFunction.java +++ b/src/main/java/com/ditrit/letomodelizerapi/persistence/function/UserAccesControlViewToAccessControlFunction.java @@ -18,7 +18,7 @@ public AccessControl apply(final UserAccessControlView userAccessControlView) { AccessControl accessControl = new AccessControl(); accessControl.setId(userAccessControlView.getAccessControlId()); - accessControl.setName(userAccessControlView.getAccessControlName()); + accessControl.setName(userAccessControlView.getName()); accessControl.setType(userAccessControlView.getType()); return accessControl; diff --git a/src/main/java/com/ditrit/letomodelizerapi/persistence/function/UserAccessControlViewToAccessControlDirectDTOFunction.java b/src/main/java/com/ditrit/letomodelizerapi/persistence/function/UserAccessControlViewToAccessControlDirectDTOFunction.java index a86c863b..8cefbbda 100644 --- a/src/main/java/com/ditrit/letomodelizerapi/persistence/function/UserAccessControlViewToAccessControlDirectDTOFunction.java +++ b/src/main/java/com/ditrit/letomodelizerapi/persistence/function/UserAccessControlViewToAccessControlDirectDTOFunction.java @@ -19,7 +19,7 @@ public AccessControlDirectDTO apply(final UserAccessControlView userAccessContro AccessControlDirectDTO dto = new AccessControlDirectDTO(); dto.setId(userAccessControlView.getAccessControlId()); - dto.setName(userAccessControlView.getAccessControlName()); + dto.setName(userAccessControlView.getName()); dto.setIsDirect(userAccessControlView.getIsDirect()); return dto; diff --git a/src/main/java/com/ditrit/letomodelizerapi/persistence/model/UserAccessControlView.java b/src/main/java/com/ditrit/letomodelizerapi/persistence/model/UserAccessControlView.java index ce386555..d0156aed 100644 --- a/src/main/java/com/ditrit/letomodelizerapi/persistence/model/UserAccessControlView.java +++ b/src/main/java/com/ditrit/letomodelizerapi/persistence/model/UserAccessControlView.java @@ -69,7 +69,7 @@ public class UserAccessControlView { */ @Column(name = "access_control_name") @FilterType(type = FilterType.Type.TEXT) - private String accessControlName; + private String name; /** * The type of access control, which determines whether it's a ROLE, GROUP, or SCOPE. diff --git a/src/main/java/com/ditrit/letomodelizerapi/service/AccessControlServiceImpl.java b/src/main/java/com/ditrit/letomodelizerapi/service/AccessControlServiceImpl.java index 37a557d5..eed7d300 100644 --- a/src/main/java/com/ditrit/letomodelizerapi/service/AccessControlServiceImpl.java +++ b/src/main/java/com/ditrit/letomodelizerapi/service/AccessControlServiceImpl.java @@ -129,7 +129,7 @@ public Page findAll(final AccessControlType type, PageRequest.of( pageable.getPageNumber(), pageable.getPageSize(), - pageable.getSortOr(Sort.by(Sort.Direction.ASC, "accessControlName")) + pageable.getSortOr(Sort.by(Sort.Direction.ASC, "name")) ) ).map(new UserAccessControlViewToAccessControlDirectDTOFunction()); } diff --git a/src/test/java/com/ditrit/letomodelizerapi/persistence/function/UserAccesControlViewToAccessControlFunctionTest.java b/src/test/java/com/ditrit/letomodelizerapi/persistence/function/UserAccesControlViewToAccessControlFunctionTest.java index ee6fddf1..6703688e 100644 --- a/src/test/java/com/ditrit/letomodelizerapi/persistence/function/UserAccesControlViewToAccessControlFunctionTest.java +++ b/src/test/java/com/ditrit/letomodelizerapi/persistence/function/UserAccesControlViewToAccessControlFunctionTest.java @@ -24,7 +24,7 @@ void testApply() { userAccessControlView.setUserId(UUID.randomUUID()); userAccessControlView.setId("3"); userAccessControlView.setUserName("userName"); - userAccessControlView.setAccessControlName("accessControlName"); + userAccessControlView.setName("accessControlName"); userAccessControlView.setEmail("email"); userAccessControlView.setLogin("login"); userAccessControlView.setType(AccessControlType.ROLE); diff --git a/src/test/java/com/ditrit/letomodelizerapi/persistence/function/UserAccesControlViewToUserFunctionTest.java b/src/test/java/com/ditrit/letomodelizerapi/persistence/function/UserAccesControlViewToUserFunctionTest.java index f452f290..7678aa84 100644 --- a/src/test/java/com/ditrit/letomodelizerapi/persistence/function/UserAccesControlViewToUserFunctionTest.java +++ b/src/test/java/com/ditrit/letomodelizerapi/persistence/function/UserAccesControlViewToUserFunctionTest.java @@ -24,7 +24,7 @@ void testApply() { userAccessControlView.setUserId(UUID.randomUUID()); userAccessControlView.setId("3"); userAccessControlView.setUserName("userName"); - userAccessControlView.setAccessControlName("accessControlName"); + userAccessControlView.setName("accessControlName"); userAccessControlView.setEmail("email"); userAccessControlView.setLogin("login"); userAccessControlView.setType(AccessControlType.ROLE); diff --git a/src/test/java/com/ditrit/letomodelizerapi/persistence/function/UserAccessControlViewToAccessControlDirectDTOFunctionTest.java b/src/test/java/com/ditrit/letomodelizerapi/persistence/function/UserAccessControlViewToAccessControlDirectDTOFunctionTest.java index f91f8bee..c597e722 100644 --- a/src/test/java/com/ditrit/letomodelizerapi/persistence/function/UserAccessControlViewToAccessControlDirectDTOFunctionTest.java +++ b/src/test/java/com/ditrit/letomodelizerapi/persistence/function/UserAccessControlViewToAccessControlDirectDTOFunctionTest.java @@ -20,7 +20,7 @@ class UserAccessControlViewToAccessControlDirectDTOFunctionTest { void testApply() { UserAccessControlView userAccessControlView = new UserAccessControlView(); userAccessControlView.setAccessControlId(UUID.randomUUID()); - userAccessControlView.setAccessControlName("current"); + userAccessControlView.setName("current"); userAccessControlView.setIsDirect(true); AccessControlDirectDTO accessControl = new UserAccessControlViewToAccessControlDirectDTOFunction()