From 410c28230cf2c2263c02b1ac550e5ca7086f0040 Mon Sep 17 00:00:00 2001 From: Serhii Semenykhin Date: Mon, 27 Nov 2023 10:54:36 +0100 Subject: [PATCH] added lombok.config --- .../client/impl/KeycloakTokenServiceImpl.java | 39 ++++--- .../client/mapper/KeycloakAuthMapper.java | 2 +- .../client/mapper/KeycloakDataMapper.java | 1 - .../ConfigurableTokenResourceProvider.java | 2 +- .../initiation/TestDataAccountService.java | 9 +- .../app/mock/MockbankInitDataTest.java | 2 +- ...ositAccountTransactionServiceImplTest.java | 22 ++-- .../security/AccountAccessSecurityFilter.java | 2 +- .../api/domain/account/AccountStatusTO.java | 4 +- .../api/domain/account/UsageTypeTO.java | 4 +- .../ledgers/postings/db/domain/Posting.java | 3 +- .../ledgers/postings/api/domain/NamedBO.java | 3 - .../service/AccountStmtServiceImplIT.java | 102 +++++++++--------- .../impl/sender/PushOTPSenderTest.java | 2 - .../um/rest/controller/UserResourceTest.java | 12 +-- .../um/impl/converter/UserConverterTest.java | 2 - .../service/ScaUserDataServiceImplTest.java | 2 +- .../um/impl/service/UserServiceImplTest.java | 4 +- lombok.config | 1 + 19 files changed, 106 insertions(+), 112 deletions(-) create mode 100644 lombok.config diff --git a/keycloak/keycloak-client/src/main/java/de/adorsys/ledgers/keycloak/client/impl/KeycloakTokenServiceImpl.java b/keycloak/keycloak-client/src/main/java/de/adorsys/ledgers/keycloak/client/impl/KeycloakTokenServiceImpl.java index 1cc3d3c11..ce6efb2e5 100644 --- a/keycloak/keycloak-client/src/main/java/de/adorsys/ledgers/keycloak/client/impl/KeycloakTokenServiceImpl.java +++ b/keycloak/keycloak-client/src/main/java/de/adorsys/ledgers/keycloak/client/impl/KeycloakTokenServiceImpl.java @@ -32,6 +32,13 @@ @Service @RequiredArgsConstructor public class KeycloakTokenServiceImpl implements KeycloakTokenService { + private static final String CLIENT_ID_KEY = "client_id"; + private static final String CLIENT_SECRET_KEY = "client_secret"; + private static final String ACCESS_TOKEN_KEY = "access_token"; + private static final String REFRESH_TOKEN_KEY = "refresh_token"; + private static final String GRANT_TYPE_KEY = "grant_type"; + private static final String PASSWORD_KEY = "password"; + @Value("${keycloak.resource:}") private String clientId; @Value("${keycloak.credentials.secret:}") @@ -42,20 +49,20 @@ public class KeycloakTokenServiceImpl implements KeycloakTokenService { @Override public BearerTokenTO login(String username, String password) { MultiValueMap formParams = new LinkedMultiValueMap<>(); - formParams.add("grant_type", "password"); + formParams.add(GRANT_TYPE_KEY, "password"); formParams.add("username", username); - formParams.add("password", password); - formParams.add("client_id", clientId); - formParams.add("client_secret", clientSecret); + formParams.add(PASSWORD_KEY, password); + formParams.add(CLIENT_ID_KEY, clientId); + formParams.add(CLIENT_SECRET_KEY, clientSecret); ResponseEntity> resp = keycloakTokenRestClient.login(formParams); HttpStatus statusCode = (HttpStatus) resp.getStatusCode(); if (HttpStatus.OK != statusCode) { - log.error("Could not obtain token by user credentials [{}]", username); //todo: throw specific exception + log.error("Could not obtain token by user credentials [{}]", username); } Map body = Objects.requireNonNull(resp).getBody(); BearerTokenTO bearerTokenTO = new BearerTokenTO(); - bearerTokenTO.setAccess_token((String) Objects.requireNonNull(body).get("access_token")); - bearerTokenTO.setRefresh_token((String) Objects.requireNonNull(body).get("refresh_token")); + bearerTokenTO.setAccess_token((String) Objects.requireNonNull(body).get(ACCESS_TOKEN_KEY)); + bearerTokenTO.setRefresh_token((String) Objects.requireNonNull(body).get(REFRESH_TOKEN_KEY)); return bearerTokenTO; } @@ -71,12 +78,12 @@ public BearerTokenTO exchangeToken(String oldToken, Integer timeToLive, String s public BearerTokenTO validate(String token) { MultiValueMap formParams = new LinkedMultiValueMap<>(); formParams.add("token", token); - formParams.add("client_id", clientId); - formParams.add("client_secret", clientSecret); + formParams.add(CLIENT_ID_KEY, clientId); + formParams.add(CLIENT_SECRET_KEY, clientSecret); ResponseEntity resp = keycloakTokenRestClient.validate(formParams); HttpStatus statusCode = (HttpStatus) resp.getStatusCode(); if (HttpStatus.OK != statusCode) { - log.error("Could not validate token"); //todo: throw specific exception + log.error("Could not validate token"); } Map claimsMap = Optional.ofNullable(resp.getBody()) .map(JsonWebToken::getOtherClaims) @@ -90,10 +97,10 @@ public BearerTokenTO validate(String token) { @Override public BearerTokenTO refreshToken(String refreshToken) { MultiValueMap formParams = new LinkedMultiValueMap<>(); - formParams.add("grant_type", "refresh_token"); - formParams.add("client_id", clientId); - formParams.add("client_secret", clientSecret); - formParams.add("refresh_token", refreshToken); + formParams.add(GRANT_TYPE_KEY, "refresh_token"); + formParams.add(CLIENT_ID_KEY, clientId); + formParams.add(CLIENT_SECRET_KEY, clientSecret); + formParams.add(REFRESH_TOKEN_KEY, refreshToken); ResponseEntity> resp = keycloakTokenRestClient.login(formParams); HttpStatus statusCode = (HttpStatus) resp.getStatusCode(); if (HttpStatus.OK != statusCode) { @@ -102,8 +109,8 @@ public BearerTokenTO refreshToken(String refreshToken) { } Map body = Objects.requireNonNull(resp).getBody(); BearerTokenTO bearerTokenTO = new BearerTokenTO(); - bearerTokenTO.setAccess_token((String) Objects.requireNonNull(body).get("access_token")); - bearerTokenTO.setRefresh_token((String) Objects.requireNonNull(body).get("refresh_token")); + bearerTokenTO.setAccess_token((String) Objects.requireNonNull(body).get(ACCESS_TOKEN_KEY)); + bearerTokenTO.setRefresh_token((String) Objects.requireNonNull(body).get(REFRESH_TOKEN_KEY)); return bearerTokenTO; } diff --git a/keycloak/keycloak-client/src/main/java/de/adorsys/ledgers/keycloak/client/mapper/KeycloakAuthMapper.java b/keycloak/keycloak-client/src/main/java/de/adorsys/ledgers/keycloak/client/mapper/KeycloakAuthMapper.java index 6a16dca9b..e9b110c81 100644 --- a/keycloak/keycloak-client/src/main/java/de/adorsys/ledgers/keycloak/client/mapper/KeycloakAuthMapper.java +++ b/keycloak/keycloak-client/src/main/java/de/adorsys/ledgers/keycloak/client/mapper/KeycloakAuthMapper.java @@ -27,7 +27,7 @@ default AccessTokenTO toAccessTokenFromJwt(Jwt source) { token.setIat(Date.from(source.getIssuedAt())); token.setRole(getLedgersUserRolesFromJwt(source)); token.setSub(source.getClaimAsString("sub")); - token.setScopes(new HashSet(Arrays.asList(source.getClaimAsString("scope").split(" ")))); + token.setScopes(new HashSet<>(Arrays.asList(source.getClaimAsString("scope").split(" ")))); token.setLogin(source.getClaimAsString("name")); token.setExp(Date.from(source.getExpiresAt())); token.setJti(source.getClaimAsString("jti")); diff --git a/keycloak/keycloak-client/src/main/java/de/adorsys/ledgers/keycloak/client/mapper/KeycloakDataMapper.java b/keycloak/keycloak-client/src/main/java/de/adorsys/ledgers/keycloak/client/mapper/KeycloakDataMapper.java index 62391f071..6af8c8edb 100644 --- a/keycloak/keycloak-client/src/main/java/de/adorsys/ledgers/keycloak/client/mapper/KeycloakDataMapper.java +++ b/keycloak/keycloak-client/src/main/java/de/adorsys/ledgers/keycloak/client/mapper/KeycloakDataMapper.java @@ -32,7 +32,6 @@ default KeycloakUser toKeycloakUser(UserRepresentation userRepresentation) { } default UserRepresentation toUpdateUserPresentation(UserRepresentation userRepresentation, KeycloakUser user) { - //NOSONAR TODO: add fields to update if needed userRepresentation.setUsername(user.getLogin()); userRepresentation.setFirstName(user.getFirstName()); userRepresentation.setLastName(user.getLastName()); diff --git a/keycloak/keycloak-token-exchange/src/main/java/de/adorsys/ledgers/token/exchange/ConfigurableTokenResourceProvider.java b/keycloak/keycloak-token-exchange/src/main/java/de/adorsys/ledgers/token/exchange/ConfigurableTokenResourceProvider.java index e9e2fa7ae..e5f800f81 100644 --- a/keycloak/keycloak-token-exchange/src/main/java/de/adorsys/ledgers/token/exchange/ConfigurableTokenResourceProvider.java +++ b/keycloak/keycloak-token-exchange/src/main/java/de/adorsys/ledgers/token/exchange/ConfigurableTokenResourceProvider.java @@ -195,7 +195,7 @@ private AccessTokenResponse buildResponse(RealmModel realm, } private void updateTokenExpiration(AccessToken token, TokenConfiguration tokenConfiguration) { - token.expiration(tokenConfiguration.computeTokenExpiration(token.getExpiration(), true)); + token.expiration(tokenConfiguration.computeTokenExpiration(token.getExp().intValue(), true)); } private void updateScope(AccessToken token, TokenConfiguration tokenConfiguration) { diff --git a/ledgers-app/src/main/java/de/adorsys/ledgers/app/initiation/TestDataAccountService.java b/ledgers-app/src/main/java/de/adorsys/ledgers/app/initiation/TestDataAccountService.java index 4020c3062..e575b2047 100644 --- a/ledgers-app/src/main/java/de/adorsys/ledgers/app/initiation/TestDataAccountService.java +++ b/ledgers-app/src/main/java/de/adorsys/ledgers/app/initiation/TestDataAccountService.java @@ -58,12 +58,9 @@ public void createAccounts() { } finally { DepositAccountDetailsBO account = depositAccountService.getAccountDetailsByIbanAndCurrency(details.getIban(), details.getCurrency(), LocalDateTime.now(), true); mockbankInitData.getUserIdByIban(details.getIban(), userId) - .forEach(id -> { - mockbankInitData.getAccountAccess(details.getIban(), id) - .ifPresent(accountAccessTO -> { - updateAccountAccess(accountAccessTO, scaInfoTO, account, id); - }); - }); + .forEach(id -> mockbankInitData.getAccountAccess(details.getIban(), id) + .ifPresent(accountAccessTO -> updateAccountAccess(accountAccessTO, scaInfoTO, account, id)) + ); updateBalanceIfRequired(details, account); } } diff --git a/ledgers-app/src/test/java/de/adorsys/ledgers/app/mock/MockbankInitDataTest.java b/ledgers-app/src/test/java/de/adorsys/ledgers/app/mock/MockbankInitDataTest.java index 68ebc3c10..e70ea8e38 100644 --- a/ledgers-app/src/test/java/de/adorsys/ledgers/app/mock/MockbankInitDataTest.java +++ b/ledgers-app/src/test/java/de/adorsys/ledgers/app/mock/MockbankInitDataTest.java @@ -38,7 +38,7 @@ void testGetAccountAccess() { Optional result = mockbankInitData.getAccountAccess("DE32760700240271232100", "g.manager"); Assertions.assertFalse(result.isEmpty()); AccountAccessTO accountAccessTO = result.get(); - Assertions.assertEquals(accountAccessTO.getScaWeight(), 90); + Assertions.assertEquals(90, accountAccessTO.getScaWeight()); Assertions.assertEquals(accountAccessTO.getCurrency(), Currency.getInstance("EUR")); } diff --git a/ledgers-deposit-account/ledgers-deposit-account-service-impl/src/test/java/de/adorsys/ledgers/deposit/api/service/impl/DepositAccountTransactionServiceImplTest.java b/ledgers-deposit-account/ledgers-deposit-account-service-impl/src/test/java/de/adorsys/ledgers/deposit/api/service/impl/DepositAccountTransactionServiceImplTest.java index f9e870198..8fc7f6c8c 100644 --- a/ledgers-deposit-account/ledgers-deposit-account-service-impl/src/test/java/de/adorsys/ledgers/deposit/api/service/impl/DepositAccountTransactionServiceImplTest.java +++ b/ledgers-deposit-account/ledgers-deposit-account-service-impl/src/test/java/de/adorsys/ledgers/deposit/api/service/impl/DepositAccountTransactionServiceImplTest.java @@ -91,7 +91,7 @@ class DepositAccountTransactionServiceImplTest { private static final ObjectMapper STATIC_MAPPER; - private DepositAccountMapper depositAccountMapper = Mappers.getMapper(DepositAccountMapper.class); + private final DepositAccountMapper depositAccountMapper = Mappers.getMapper(DepositAccountMapper.class); static { STATIC_MAPPER = new ObjectMapper() @@ -172,8 +172,8 @@ void depositCash_OK() throws IOException { assertThat(transactionDetails.getEndToEndId()).isEqualTo(line.getId()); assertThat(transactionDetails.getTransactionId()).isNotBlank(); assertThat(transactionDetails.getBookingDate()).isEqualTo(transactionDetails.getValueDate()); - assertThat(transactionDetails.getCreditorAccount()).isEqualToComparingFieldByField(depositAccountMapper.toAccountReferenceBO(getDepositAccount())); - assertThat(transactionDetails.getTransactionAmount()).isEqualToComparingFieldByField(amount); + assertThat(transactionDetails.getCreditorAccount()).usingRecursiveComparison().isEqualTo(depositAccountMapper.toAccountReferenceBO(getDepositAccount())); + assertThat(transactionDetails.getTransactionAmount()).usingRecursiveComparison().isEqualTo(amount); } } @@ -206,7 +206,7 @@ void bookPayment_single_same_currency() throws IOException { PostingBO posting = postingCaptor.getValue(); List lines = posting.getLines(); - assertThat(lines.size()).isEqualTo(2); + assertThat(lines).hasSize(2); assertThat(dcAmountOk(lines)).isTrue(); PostingLineBO line1 = lines.get(0); @@ -249,7 +249,7 @@ void bookPayment_single_two_different_currency() throws IOException { PostingBO posting = postingCaptor.getValue(); List lines = posting.getLines(); - assertThat(lines.size()).isEqualTo(4); + assertThat(lines).hasSize(4); assertThat(dcAmountOk(lines)).isTrue(); PostingLineBO line1 = lines.get(0); @@ -325,7 +325,7 @@ void bookPayment_single_three_different_currency() throws IOException { PostingBO posting = postingCaptor.getValue(); List lines = posting.getLines(); - assertThat(lines.size()).isEqualTo(4); + assertThat(lines).hasSize(4); assertThat(dcAmountOk(lines)).isTrue(); PostingLineBO line1 = lines.get(0); @@ -384,7 +384,7 @@ void bookPayment_bulk_same_currency_batchBookingPreferredTrue() throws IOExcepti PostingBO posting = postingCaptor.getValue(); List lines = posting.getLines(); - assertThat(lines.size()).isEqualTo(2); + assertThat(lines).hasSize(2); assertThat(dcAmountOk(lines)).isTrue(); PostingLineBO line1 = lines.get(0); @@ -428,7 +428,7 @@ void bookPayment_bulk_same_currency_batchBookingPreferredFalse() throws IOExcept PostingBO posting = postingCaptor.getValue(); List lines = posting.getLines(); - assertThat(lines.size()).isEqualTo(2); + assertThat(lines).hasSize(2); assertThat(dcAmountOk(lines)).isTrue(); PostingLineBO line1 = lines.get(0); @@ -473,11 +473,11 @@ void bookPayment_bulk_two_different_currency() { PostingBO posting = postingCaptor.getValue(); List lines = posting.getLines(); - assertThat(lines.size()).isEqualTo(7); + assertThat(lines).hasSize(7); List creditLines = lines.stream().filter(l -> l.getCreditAmount().compareTo(BigDecimal.ZERO) > 0).collect(Collectors.toList()); List debitLines = lines.stream().filter(l -> l.getDebitAmount().compareTo(BigDecimal.ZERO) > 0).collect(Collectors.toList()); - assertThat(creditLines.size()).isEqualTo(4); - assertThat(debitLines.size()).isEqualTo(3); + assertThat(creditLines).hasSize(4); + assertThat(debitLines).hasSize(3); assertEquals(debitLines.stream().map(PostingLineBO::getDebitAmount).reduce(BigDecimal::add), creditLines.stream().map(PostingLineBO::getCreditAmount).reduce(BigDecimal::add)); diff --git a/ledgers-middleware/ledgers-middleware-rest-server/src/main/java/de/adorsys/ledgers/middleware/rest/security/AccountAccessSecurityFilter.java b/ledgers-middleware/ledgers-middleware-rest-server/src/main/java/de/adorsys/ledgers/middleware/rest/security/AccountAccessSecurityFilter.java index 36d4ef2b9..2a93ee7e3 100644 --- a/ledgers-middleware/ledgers-middleware-rest-server/src/main/java/de/adorsys/ledgers/middleware/rest/security/AccountAccessSecurityFilter.java +++ b/ledgers-middleware/ledgers-middleware-rest-server/src/main/java/de/adorsys/ledgers/middleware/rest/security/AccountAccessSecurityFilter.java @@ -155,7 +155,7 @@ private boolean hasAnyScope(String... scopes) { private Set getScopes() { Jwt credentials = (Jwt) getAuthentication().getCredentials(); - return new HashSet(Arrays.asList(credentials.getClaimAsString("scope").split(" "))); + return new HashSet<>(Arrays.asList(credentials.getClaimAsString("scope").split(" "))); } private boolean isEnabledAccountIban(String iban) { diff --git a/ledgers-middleware/ledgers-middleware-service-api/src/main/java/de/adorsys/ledgers/middleware/api/domain/account/AccountStatusTO.java b/ledgers-middleware/ledgers-middleware-service-api/src/main/java/de/adorsys/ledgers/middleware/api/domain/account/AccountStatusTO.java index 97b32f85e..7d1b9a162 100644 --- a/ledgers-middleware/ledgers-middleware-service-api/src/main/java/de/adorsys/ledgers/middleware/api/domain/account/AccountStatusTO.java +++ b/ledgers-middleware/ledgers-middleware-service-api/src/main/java/de/adorsys/ledgers/middleware/api/domain/account/AccountStatusTO.java @@ -14,7 +14,7 @@ public enum AccountStatusTO { DELETED("deleted"), BLOCKED("blocked"); - private final static Map container = new HashMap<>(); + private static final Map container = new HashMap<>(); static { for (AccountStatusTO accountStatus : values()) { @@ -22,7 +22,7 @@ public enum AccountStatusTO { } } - private String value; + private final String value; AccountStatusTO(String value) { this.value = value; diff --git a/ledgers-middleware/ledgers-middleware-service-api/src/main/java/de/adorsys/ledgers/middleware/api/domain/account/UsageTypeTO.java b/ledgers-middleware/ledgers-middleware-service-api/src/main/java/de/adorsys/ledgers/middleware/api/domain/account/UsageTypeTO.java index 3158dbd9a..e9fbc9d47 100644 --- a/ledgers-middleware/ledgers-middleware-service-api/src/main/java/de/adorsys/ledgers/middleware/api/domain/account/UsageTypeTO.java +++ b/ledgers-middleware/ledgers-middleware-service-api/src/main/java/de/adorsys/ledgers/middleware/api/domain/account/UsageTypeTO.java @@ -14,7 +14,7 @@ public enum UsageTypeTO { PRIV("PRIV"), ORGA("ORGA"); - private final static Map container = new HashMap<>(); + private static final Map container = new HashMap<>(); static { for (UsageTypeTO usageType : values()) { @@ -22,7 +22,7 @@ public enum UsageTypeTO { } } - private String value; + private final String value; UsageTypeTO(String value) { diff --git a/ledgers-postings/ledgers-postings-repository/src/main/java/de/adorsys/ledgers/postings/db/domain/Posting.java b/ledgers-postings/ledgers-postings-repository/src/main/java/de/adorsys/ledgers/postings/db/domain/Posting.java index 8e343046e..f757c87b5 100644 --- a/ledgers-postings/ledgers-postings-repository/src/main/java/de/adorsys/ledgers/postings/db/domain/Posting.java +++ b/ledgers-postings/ledgers-postings-repository/src/main/java/de/adorsys/ledgers/postings/db/domain/Posting.java @@ -140,7 +140,6 @@ public class Posting extends HashRecord { @Convert(converter = LocalDateTimeConverter.class) private LocalDateTime valTime; - // todo: add description to this field @OneToMany(fetch = FetchType.EAGER, cascade = {CascadeType.ALL}, orphanRemoval = true) @JoinColumn(name = "posting_id") private List lines = new ArrayList<>(); @@ -162,7 +161,7 @@ public class Posting extends HashRecord { private String discardingId; public Posting hash() { - // Skipp computation if a hash exists. Original value + // Skip computation if a hash exists. Original value // shall not be overriden. if (hash != null) { return this; diff --git a/ledgers-postings/ledgers-postings-service-api/src/main/java/de/adorsys/ledgers/postings/api/domain/NamedBO.java b/ledgers-postings/ledgers-postings-service-api/src/main/java/de/adorsys/ledgers/postings/api/domain/NamedBO.java index 3ac38b541..619e8cae9 100644 --- a/ledgers-postings/ledgers-postings-service-api/src/main/java/de/adorsys/ledgers/postings/api/domain/NamedBO.java +++ b/ledgers-postings/ledgers-postings-service-api/src/main/java/de/adorsys/ledgers/postings/api/domain/NamedBO.java @@ -31,14 +31,11 @@ public abstract class NamedBO { private LocalDateTime created; - // todo: seems this property should be moved from base class private String userDetails; - // todo: seems this property should be moved from base class /*The short description of this entity*/ private String shortDesc; - // todo: seems this property should be moved from base class /*The long description of this entity*/ private String longDesc; diff --git a/ledgers-postings/ledgers-postings-service-impl/src/test/java/de/adorsys/ledgers/postings/impl/service/AccountStmtServiceImplIT.java b/ledgers-postings/ledgers-postings-service-impl/src/test/java/de/adorsys/ledgers/postings/impl/service/AccountStmtServiceImplIT.java index fc325fab3..e8af6473f 100644 --- a/ledgers-postings/ledgers-postings-service-impl/src/test/java/de/adorsys/ledgers/postings/impl/service/AccountStmtServiceImplIT.java +++ b/ledgers-postings/ledgers-postings-service-impl/src/test/java/de/adorsys/ledgers/postings/impl/service/AccountStmtServiceImplIT.java @@ -93,9 +93,9 @@ void use_case_newbank_no_overriden_tx_nok() throws IOException { loadPosting("use_case_newbank_no_overriden_tx.yml"); LocalDateTime dateTime = LocalDateTime.of(2018, Month.JANUARY, 01, 23, 59); - checkBalance("1104", dateTime, new BigDecimal(4200000.00)); - checkBalance("3001", dateTime, new BigDecimal(-4200000.00)); - checkWrongBalance("1104", dateTime, new BigDecimal(0.00)); + checkBalance("1104", dateTime, new BigDecimal("4200000.00")); + checkBalance("3001", dateTime, BigDecimal.valueOf(-4200000.00)); + checkWrongBalance("1104", dateTime, new BigDecimal("0.00")); } /** @@ -107,31 +107,31 @@ void use_case_newbank_no_overriden_tx_ok() throws IOException { loadPosting("use_case_newbank_no_overriden_tx.yml"); LocalDateTime dateTime = LocalDateTime.of(2018, Month.JANUARY, 01, 8, 30); - checkBalance("1104", dateTime, new BigDecimal(0.00)); - checkBalance("3001", dateTime, new BigDecimal(0.00)); + checkBalance("1104", dateTime, new BigDecimal("0.00")); + checkBalance("3001", dateTime, new BigDecimal("0.00")); dateTime = LocalDateTime.of(2018, Month.JANUARY, 01, 23, 59); - checkBalance("1104", dateTime, new BigDecimal(4200000.00)); - checkBalance("3001", dateTime, new BigDecimal(-4200000.00)); + checkBalance("1104", dateTime, new BigDecimal("4200000.00")); + checkBalance("3001", dateTime, BigDecimal.valueOf(-4200000.00)); dateTime = LocalDateTime.of(2018, Month.JANUARY, 02, 23, 59); - checkBalance("11240", dateTime, new BigDecimal(2000000.00)); - checkBalance("1104", dateTime, new BigDecimal(2200000.00)); + checkBalance("11240", dateTime, new BigDecimal("2000000.00")); + checkBalance("1104", dateTime, new BigDecimal("2200000.00")); dateTime = LocalDateTime.of(2018, Month.JANUARY, 03, 23, 59); - checkBalance("11240", dateTime, new BigDecimal(1835600.00)); - checkBalance("1810", dateTime, new BigDecimal(14400.00)); - checkBalance("1001", dateTime, new BigDecimal(150000.00)); + checkBalance("11240", dateTime, new BigDecimal("1835600.00")); + checkBalance("1810", dateTime, new BigDecimal("14400.00")); + checkBalance("1001", dateTime, new BigDecimal("150000.00")); dateTime = LocalDateTime.of(2018, Month.JANUARY, 8, 23, 59); - checkBalance("11240", dateTime, new BigDecimal(1803600.00)); - checkBalance("5057", dateTime, new BigDecimal(32000.00)); + checkBalance("11240", dateTime, new BigDecimal("1803600.00")); + checkBalance("5057", dateTime, new BigDecimal("32000.00")); dateTime = LocalDateTime.of(2018, Month.JANUARY, 12, 23, 59); - checkBalance("1001", dateTime, new BigDecimal(156500.00)); - checkBalance("2332001", dateTime, new BigDecimal(-1500.00)); - checkBalance("1006", dateTime, new BigDecimal(3500.00)); - checkBalance("2332002", dateTime, new BigDecimal(-3500.00)); - checkBalance("2332003", dateTime, new BigDecimal(-5000.00)); + checkBalance("1001", dateTime, new BigDecimal("156500.00")); + checkBalance("2332001", dateTime, BigDecimal.valueOf(-1500.00)); + checkBalance("1006", dateTime, new BigDecimal("3500.00")); + checkBalance("2332002", dateTime, BigDecimal.valueOf(-3500.00)); + checkBalance("2332003", dateTime, BigDecimal.valueOf(-5000.00)); } @Test @@ -140,31 +140,31 @@ void use_case_newbank_overriden_amount_ok() throws IOException { loadPosting("use_case_newbank_overriden_amount.yml"); LocalDateTime dateTime = LocalDateTime.of(2018, Month.JANUARY, 01, 8, 30); - checkBalance("1104", dateTime, new BigDecimal(0.00)); - checkBalance("3001", dateTime, new BigDecimal(0.00)); + checkBalance("1104", dateTime, new BigDecimal("0.00")); + checkBalance("3001", dateTime, new BigDecimal("0.00")); dateTime = LocalDateTime.of(2018, Month.JANUARY, 01, 23, 59); - checkBalance("1104", dateTime, new BigDecimal(4200000.00)); - checkBalance("3001", dateTime, new BigDecimal(-4200000.00)); + checkBalance("1104", dateTime, new BigDecimal("4200000.00")); + checkBalance("3001", dateTime, BigDecimal.valueOf(-4200000.00)); dateTime = LocalDateTime.of(2018, Month.JANUARY, 02, 23, 59); - checkBalance("11240", dateTime, new BigDecimal(2000000.00)); - checkBalance("1104", dateTime, new BigDecimal(2200000.00)); + checkBalance("11240", dateTime, new BigDecimal("2000000.00")); + checkBalance("1104", dateTime, new BigDecimal("2200000.00")); dateTime = LocalDateTime.of(2018, Month.JANUARY, 03, 23, 59); - checkBalance("11240", dateTime, new BigDecimal(1835200.00)); - checkBalance("1810", dateTime, new BigDecimal(14800.00)); - checkBalance("1001", dateTime, new BigDecimal(150000.00)); + checkBalance("11240", dateTime, new BigDecimal("1835200.00")); + checkBalance("1810", dateTime, new BigDecimal("14800.00")); + checkBalance("1001", dateTime, new BigDecimal("150000.00")); dateTime = LocalDateTime.of(2018, Month.JANUARY, 8, 23, 59); - checkBalance("11240", dateTime, new BigDecimal(1803200.00)); - checkBalance("5057", dateTime, new BigDecimal(32000.00)); + checkBalance("11240", dateTime, new BigDecimal("1803200.00")); + checkBalance("5057", dateTime, new BigDecimal("32000.00")); dateTime = LocalDateTime.of(2018, Month.JANUARY, 12, 23, 59); - checkBalance("1001", dateTime, new BigDecimal(156500.00)); - checkBalance("2332001", dateTime, new BigDecimal(-1500.00)); - checkBalance("1006", dateTime, new BigDecimal(3500.00)); - checkBalance("2332002", dateTime, new BigDecimal(-3500.00)); - checkBalance("2332003", dateTime, new BigDecimal(-5000.00)); + checkBalance("1001", dateTime, new BigDecimal("156500.00")); + checkBalance("2332001", dateTime, BigDecimal.valueOf(-1500.00)); + checkBalance("1006", dateTime, new BigDecimal("3500.00")); + checkBalance("2332002", dateTime, BigDecimal.valueOf(-3500.00)); + checkBalance("2332003", dateTime, BigDecimal.valueOf(-5000.00)); } @Test @@ -173,31 +173,31 @@ void use_case_newbank_overriden_account_number_ok() throws IOException { loadPosting("use_case_newbank_overriden_account_number.yml"); LocalDateTime dateTime = LocalDateTime.of(2018, Month.JANUARY, 01, 8, 30); - checkBalance("1104", dateTime, new BigDecimal(0.00)); - checkBalance("3001", dateTime, new BigDecimal(0.00)); + checkBalance("1104", dateTime, new BigDecimal("0.00")); + checkBalance("3001", dateTime, new BigDecimal("0.00")); dateTime = LocalDateTime.of(2018, Month.JANUARY, 01, 23, 59); - checkBalance("1104", dateTime, new BigDecimal(4200000.00)); - checkBalance("3001", dateTime, new BigDecimal(-4200000.00)); + checkBalance("1104", dateTime, new BigDecimal("4200000.00")); + checkBalance("3001", dateTime, BigDecimal.valueOf(-4200000.00)); dateTime = LocalDateTime.of(2018, Month.JANUARY, 02, 23, 59); - checkBalance("11240", dateTime, new BigDecimal(2000000.00)); - checkBalance("1104", dateTime, new BigDecimal(2200000.00)); + checkBalance("11240", dateTime, new BigDecimal("2000000.00")); + checkBalance("1104", dateTime, new BigDecimal("2200000.00")); dateTime = LocalDateTime.of(2018, Month.JANUARY, 03, 23, 59); - checkBalance("11240", dateTime, new BigDecimal(1850000.00)); - checkBalance("1810", dateTime, new BigDecimal(14400.00)); - checkBalance("1001", dateTime, new BigDecimal(135600.00)); + checkBalance("11240", dateTime, new BigDecimal("1850000.00")); + checkBalance("1810", dateTime, new BigDecimal("14400.00")); + checkBalance("1001", dateTime, new BigDecimal("135600.00")); dateTime = LocalDateTime.of(2018, Month.JANUARY, 8, 23, 59); - checkBalance("11240", dateTime, new BigDecimal(1818000.00)); - checkBalance("5057", dateTime, new BigDecimal(32000.00)); + checkBalance("11240", dateTime, new BigDecimal("1818000.00")); + checkBalance("5057", dateTime, new BigDecimal("32000.00")); dateTime = LocalDateTime.of(2018, Month.JANUARY, 12, 23, 59); - checkBalance("1001", dateTime, new BigDecimal(142100.00)); - checkBalance("2332001", dateTime, new BigDecimal(-1500.00)); - checkBalance("1006", dateTime, new BigDecimal(3500.00)); - checkBalance("2332002", dateTime, new BigDecimal(-3500.00)); - checkBalance("2332003", dateTime, new BigDecimal(-5000.00)); + checkBalance("1001", dateTime, new BigDecimal("142100.00")); + checkBalance("2332001", dateTime, BigDecimal.valueOf(-1500.00)); + checkBalance("1006", dateTime, new BigDecimal("3500.00")); + checkBalance("2332002", dateTime, BigDecimal.valueOf(-3500.00)); + checkBalance("2332003", dateTime, BigDecimal.valueOf(-5000.00)); } private void checkBalance(String accountNumber, LocalDateTime date, BigDecimal expectedBalance) { diff --git a/ledgers-sca/ledgers-sca-service-impl/src/test/java/de/adorsys/ledgers/sca/service/impl/sender/PushOTPSenderTest.java b/ledgers-sca/ledgers-sca-service-impl/src/test/java/de/adorsys/ledgers/sca/service/impl/sender/PushOTPSenderTest.java index 4068a0b52..9e76e2388 100644 --- a/ledgers-sca/ledgers-sca-service-impl/src/test/java/de/adorsys/ledgers/sca/service/impl/sender/PushOTPSenderTest.java +++ b/ledgers-sca/ledgers-sca-service-impl/src/test/java/de/adorsys/ledgers/sca/service/impl/sender/PushOTPSenderTest.java @@ -76,6 +76,4 @@ private PushScaMessage getPushScaMessage() { scaMessage.setMessage(SUBJECT); return scaMessage; } - - } \ No newline at end of file diff --git a/ledgers-user-management/ledgers-user-management-rest-server/src/test/java/de/adorsys/ledgers/um/rest/controller/UserResourceTest.java b/ledgers-user-management/ledgers-user-management-rest-server/src/test/java/de/adorsys/ledgers/um/rest/controller/UserResourceTest.java index df142d9b2..000ad6212 100644 --- a/ledgers-user-management/ledgers-user-management-rest-server/src/test/java/de/adorsys/ledgers/um/rest/controller/UserResourceTest.java +++ b/ledgers-user-management/ledgers-user-management-rest-server/src/test/java/de/adorsys/ledgers/um/rest/controller/UserResourceTest.java @@ -31,7 +31,7 @@ @ExtendWith(MockitoExtension.class) @AutoConfigureMockMvc -public class UserResourceTest { +class UserResourceTest { private static final String USER_LOGIN = "vne"; private static final String USER_ID = "SomeUniqueID"; @@ -53,7 +53,7 @@ void createUser() throws Exception { when(userService.create(userBO)).thenReturn(userBO); // When - ResponseEntity actual = userResource.createUser(userBO); + ResponseEntity actual = userResource.createUser(userBO); // Then assertEquals("/users/vne_ua", actual.getHeaders().get("Location").get(0)); @@ -67,9 +67,9 @@ void getUserByLogin() { when(userService.findByLogin(USER_LOGIN)).thenReturn(userBO); // When - ResponseEntity actual = userResource.getUserByLogin(USER_LOGIN); + ResponseEntity actual = userResource.getUserByLogin(USER_LOGIN); - UserBO user = (UserBO) actual.getBody(); + UserBO user = actual.getBody(); // Then assertNotNull(user); @@ -84,9 +84,9 @@ void getUserById() { when(userService.findById(USER_ID)).thenReturn(userBO); // When - ResponseEntity actual = userResource.getUserById(USER_ID); + ResponseEntity actual = userResource.getUserById(USER_ID); - UserBO user = (UserBO) actual.getBody(); + UserBO user = actual.getBody(); // Then assertNotNull(user); diff --git a/ledgers-user-management/ledgers-user-management-service-impl/src/test/java/de/adorsys/ledgers/um/impl/converter/UserConverterTest.java b/ledgers-user-management/ledgers-user-management-service-impl/src/test/java/de/adorsys/ledgers/um/impl/converter/UserConverterTest.java index 7f0b5887a..266ff2042 100644 --- a/ledgers-user-management/ledgers-user-management-service-impl/src/test/java/de/adorsys/ledgers/um/impl/converter/UserConverterTest.java +++ b/ledgers-user-management/ledgers-user-management-service-impl/src/test/java/de/adorsys/ledgers/um/impl/converter/UserConverterTest.java @@ -206,7 +206,6 @@ private ScaUserDataEntity getScaUserDataEntity(String id) { return scaUserData; } - //todo: @spe replace by json source file private UserBO buildUserBO() { UserBO bo = new UserBO(); bo.setId(USER_ID); @@ -216,7 +215,6 @@ private UserBO buildUserBO() { return bo; } - //todo: @spe replace by json source file private UserEntity buildUserPO() { UserEntity entity = new UserEntity(); entity.setId(USER_ID); diff --git a/ledgers-user-management/ledgers-user-management-service-impl/src/test/java/de/adorsys/ledgers/um/impl/service/ScaUserDataServiceImplTest.java b/ledgers-user-management/ledgers-user-management-service-impl/src/test/java/de/adorsys/ledgers/um/impl/service/ScaUserDataServiceImplTest.java index fe8a115dd..4005c3750 100644 --- a/ledgers-user-management/ledgers-user-management-service-impl/src/test/java/de/adorsys/ledgers/um/impl/service/ScaUserDataServiceImplTest.java +++ b/ledgers-user-management/ledgers-user-management-service-impl/src/test/java/de/adorsys/ledgers/um/impl/service/ScaUserDataServiceImplTest.java @@ -68,7 +68,7 @@ void findByEmail() { @Test void findByEmail_scaNotFound() { // Given - when(scaUserDataRepository.findByMethodValue(any())).thenReturn(Collections.EMPTY_LIST); + when(scaUserDataRepository.findByMethodValue(any())).thenReturn(Collections.emptyList()); // Then assertThrows(ScaModuleException.class, () -> scaUserDataService.findByEmail(EMAIL)); diff --git a/ledgers-user-management/ledgers-user-management-service-impl/src/test/java/de/adorsys/ledgers/um/impl/service/UserServiceImplTest.java b/ledgers-user-management/ledgers-user-management-service-impl/src/test/java/de/adorsys/ledgers/um/impl/service/UserServiceImplTest.java index 19f3b5171..3e9243611 100644 --- a/ledgers-user-management/ledgers-user-management-service-impl/src/test/java/de/adorsys/ledgers/um/impl/service/UserServiceImplTest.java +++ b/ledgers-user-management/ledgers-user-management-service-impl/src/test/java/de/adorsys/ledgers/um/impl/service/UserServiceImplTest.java @@ -44,17 +44,15 @@ import static org.mockito.Mockito.*; @ExtendWith(MockitoExtension.class) -public class UserServiceImplTest { +class UserServiceImplTest { private static final List accountAccessList = readListYml(AccountAccess.class, "account-access.yml"); private static final List accountAccessBOList = readListYml(AccountAccessBO.class, "account-access.yml"); private static final String USER_ID = "SomeUniqueID"; private static final String CONSENT_ID = "consentId"; private static final String USER_EMAIL = "test@mail.de"; private static final String USER_LOGIN = "test"; - private static final String USER_PIN = "12345678"; private static final String USER_BRANCH = "userBranch"; private static final String USER_IBAN = "DE12345678"; - private static final String THE_ENCODED_VALUE = "25d55ad283aa400af464c76d713c07ad"; private static final ResourceReader reader = YamlReader.getInstance(); private static final UserConverter LOCAL_CONVERTER = Mappers.getMapper(UserConverter.class); diff --git a/lombok.config b/lombok.config new file mode 100644 index 000000000..7a21e8804 --- /dev/null +++ b/lombok.config @@ -0,0 +1 @@ +lombok.addLombokGeneratedAnnotation = true