This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/main by this push:
new 0e72eb982b9 CAUSEWAY-3883: replaces val w/ var
0e72eb982b9 is described below
commit 0e72eb982b9c04c5236a7d15be8626b2b3a9c6cd
Author: Andi Huber <[email protected]>
AuthorDate: Wed Jun 18 06:31:20 2025 +0200
CAUSEWAY-3883: replaces val w/ var
---
.../integration/deadlock/DeadlockRecognizerDefault.java | 3 +--
.../interact/WrapperInteraction_1_IntegTest.java | 5 ++---
.../interact/WrapperInteraction_2_IntegTest.java | 5 ++---
.../interact/WrapperInteraction_3_IntegTest.java | 9 ++++-----
.../interact/WrapperInteraction_4_IntegTest.java | 5 ++---
.../persistence/jpa/wrapper/JpaWrapperSyncTest.java | 8 +++-----
.../security/keycloak/CausewayModuleSecurityKeycloak.java | 14 ++++++--------
.../testing/h2console/ui/webmodule/WebModuleH2Console.java | 9 ++++-----
8 files changed, 24 insertions(+), 34 deletions(-)
diff --git
a/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/deadlock/DeadlockRecognizerDefault.java
b/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/deadlock/DeadlockRecognizerDefault.java
index abc42fb74cf..d6d7d38ea6f 100644
---
a/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/deadlock/DeadlockRecognizerDefault.java
+++
b/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/deadlock/DeadlockRecognizerDefault.java
@@ -20,7 +20,6 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
-import lombok.val;
import jakarta.annotation.Priority;
import jakarta.inject.Inject;
@@ -48,7 +47,7 @@ public class DeadlockRecognizerDefault implements
DeadlockRecognizer {
@Override
public boolean isDeadlock(Throwable ex) {
- val whetherDeadlock = ex instanceof DeadlockLoserDataAccessException
|| isMessage(ex, SQL_SERVER_DEADLOCK_MESSAGE);
+ var whetherDeadlock = ex instanceof DeadlockLoserDataAccessException
|| isMessage(ex, SQL_SERVER_DEADLOCK_MESSAGE);
if (whetherDeadlock) {
log.warn("Detected deadlock");
log.debug("Detected deadlock details:", ex);
diff --git
a/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteraction_1_IntegTest.java
b/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteraction_1_IntegTest.java
index 0b60039686e..decd1fa00d8 100644
---
a/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteraction_1_IntegTest.java
+++
b/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteraction_1_IntegTest.java
@@ -47,7 +47,6 @@
import lombok.Data;
import lombok.RequiredArgsConstructor;
-import lombok.val;
@SpringBootTest(
classes = {
@@ -107,7 +106,7 @@ public String act(final String startTime, final String
endTime) {
@Test
void mixinMemberNamedFacet_whenSharingSameAbstractMixin() {
- val objectSpec = specificationLoader.specForType(Customer.class).get();
+ var objectSpec = specificationLoader.specForType(Customer.class).get();
assertEquals(
2L,
@@ -115,7 +114,7 @@ void mixinMemberNamedFacet_whenSharingSameAbstractMixin() {
.filter(ObjectAction::isMixedIn)
.peek(act->{
//System.out.println("act: " + act);
- val memberNamedFacet =
act.getFacet(MemberNamedFacet.class);
+ var memberNamedFacet =
act.getFacet(MemberNamedFacet.class);
assertNotNull(memberNamedFacet);
assertTrue(memberNamedFacet.getSpecialization().isLeft());
})
diff --git
a/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteraction_2_IntegTest.java
b/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteraction_2_IntegTest.java
index 60e1555cdfd..41529cc688c 100644
---
a/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteraction_2_IntegTest.java
+++
b/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteraction_2_IntegTest.java
@@ -44,7 +44,6 @@
import org.apache.causeway.testdomain.util.interaction.InteractionTestAbstract;
import lombok.Data;
-import lombok.val;
@SpringBootTest(
classes = {
@@ -100,7 +99,7 @@ public T act(final String startTime, final String endTime) {
@Test
void mixinMemberNamedFacet_whenSharingSameAbstractMixin() {
- val objectSpec = specificationLoader.specForType(Customer.class).get();
+ var objectSpec = specificationLoader.specForType(Customer.class).get();
assertEquals(
2L,
@@ -108,7 +107,7 @@ void mixinMemberNamedFacet_whenSharingSameAbstractMixin() {
.filter(ObjectAction::isMixedIn)
.peek(act->{
//System.out.println("act: " + act);
- val memberNamedFacet =
act.getFacet(MemberNamedFacet.class);
+ var memberNamedFacet =
act.getFacet(MemberNamedFacet.class);
assertNotNull(memberNamedFacet);
assertTrue(memberNamedFacet.getSpecialization().isLeft());
})
diff --git
a/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteraction_3_IntegTest.java
b/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteraction_3_IntegTest.java
index 571710da007..05e726eec8f 100644
---
a/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteraction_3_IntegTest.java
+++
b/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteraction_3_IntegTest.java
@@ -50,7 +50,6 @@
import lombok.Data;
import lombok.RequiredArgsConstructor;
-import lombok.val;
@SpringBootTest(
classes = {
@@ -120,8 +119,8 @@ public Task act(final Task.Outcome outcome) {
@Test
void mixinMemberNamedFacet_whenSharingSameAbstractMixin() {
- val mixinSpec1 =
specificationLoader.specForType(Task.Succeeded.class).get();
- val mixinSpec2 =
specificationLoader.specForType(Task.Failed.class).get();
+ var mixinSpec1 =
specificationLoader.specForType(Task.Succeeded.class).get();
+ var mixinSpec2 =
specificationLoader.specForType(Task.Failed.class).get();
assertTrue(mixinSpec1.isMixin());
assertTrue(mixinSpec2.isMixin());
@@ -129,14 +128,14 @@ void mixinMemberNamedFacet_whenSharingSameAbstractMixin()
{
assertTrue(mixinSpec1.mixinFacetElseFail().isMixinFor(Task.class));
assertTrue(mixinSpec2.mixinFacetElseFail().isMixinFor(Task.class));
- val objectSpec = specificationLoader.specForType(Task.class).get();
+ var objectSpec = specificationLoader.specForType(Task.class).get();
assertEquals(
2L,
objectSpec.streamRuntimeActions(MixedIn.INCLUDED)
.filter(ObjectAction::isMixedIn)
.peek(act->{
- val memberNamedFacet =
act.getFacet(MemberNamedFacet.class);
+ var memberNamedFacet =
act.getFacet(MemberNamedFacet.class);
assertNotNull(memberNamedFacet);
assertTrue(memberNamedFacet.getSpecialization().isLeft());
})
diff --git
a/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteraction_4_IntegTest.java
b/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteraction_4_IntegTest.java
index 0fc536ade52..38fdf18d9c0 100644
---
a/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteraction_4_IntegTest.java
+++
b/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/WrapperInteraction_4_IntegTest.java
@@ -50,7 +50,6 @@
import lombok.Data;
import lombok.RequiredArgsConstructor;
-import lombok.val;
@SpringBootTest(
classes = {
@@ -122,7 +121,7 @@ public Task act(final Task.Outcome outcome) {
@Test
void mixinMemberNamedFacet_whenSharingSameAbstractMixin() {
- val objectSpec = specificationLoader.specForType(Task.class).get();
+ var objectSpec = specificationLoader.specForType(Task.class).get();
assertEquals(
2L,
@@ -130,7 +129,7 @@ void mixinMemberNamedFacet_whenSharingSameAbstractMixin() {
.filter(ObjectAction::isMixedIn)
.peek(act->{
//System.out.println("act: " + act);
- val memberNamedFacet =
act.getFacet(MemberNamedFacet.class);
+ var memberNamedFacet =
act.getFacet(MemberNamedFacet.class);
assertNotNull(memberNamedFacet);
assertTrue(memberNamedFacet.getSpecialization().isLeft());
})
diff --git
a/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/wrapper/JpaWrapperSyncTest.java
b/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/wrapper/JpaWrapperSyncTest.java
index a62821d1e69..c88c23eba15 100644
---
a/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/wrapper/JpaWrapperSyncTest.java
+++
b/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/wrapper/JpaWrapperSyncTest.java
@@ -40,8 +40,6 @@
import org.apache.causeway.testdomain.jpa.entities.JpaProduct;
import
org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
-import lombok.val;
-
@SpringBootTest(
classes = {
Configuration_usingJpa.class
@@ -73,15 +71,15 @@ void uninstallFixture() {
@Test
void testWrapper_waitingOnDomainEvent() {
- val inventoryManager =
factoryService.viewModel(JpaInventoryManager.class);
- val sumOfPrices = repository.allInstances(JpaProduct.class)
+ var inventoryManager =
factoryService.viewModel(JpaInventoryManager.class);
+ var sumOfPrices = repository.allInstances(JpaProduct.class)
.stream()
.mapToDouble(JpaProduct::getPrice)
.sum();
assertEquals(167d, sumOfPrices, 1E-6);
- val products = wrapper.wrap(inventoryManager).getAllProducts();
+ var products = wrapper.wrap(inventoryManager).getAllProducts();
assertEquals(3, products.size());
assertEquals(JpaBook.class, products.get(0).getClass());
diff --git
a/security/keycloak/src/main/java/org/apache/causeway/security/keycloak/CausewayModuleSecurityKeycloak.java
b/security/keycloak/src/main/java/org/apache/causeway/security/keycloak/CausewayModuleSecurityKeycloak.java
index ae5668886a4..cbe68ef1400 100644
---
a/security/keycloak/src/main/java/org/apache/causeway/security/keycloak/CausewayModuleSecurityKeycloak.java
+++
b/security/keycloak/src/main/java/org/apache/causeway/security/keycloak/CausewayModuleSecurityKeycloak.java
@@ -53,8 +53,6 @@
import
org.apache.causeway.security.keycloak.services.KeycloakOauth2UserService;
import org.apache.causeway.security.spring.CausewayModuleSecuritySpring;
-import lombok.val;
-
/**
* Configuration Bean to support Causeway Security using Keycloak.
*
@@ -84,12 +82,12 @@ public SecurityFilterChain filterChain(
final List<LoginSuccessHandlerUNUSED> loginSuccessHandlersUNUSED,
final List<LogoutHandler> logoutHandlers) throws Exception {
- val successUrl =
causewayConfiguration.getSecurity().getKeycloak().getLoginSuccessUrl();
- val realm =
causewayConfiguration.getSecurity().getKeycloak().getRealm();
- val loginPage =
OAuth2AuthorizationRequestRedirectFilter.DEFAULT_AUTHORIZATION_REQUEST_BASE_URI
+ var successUrl =
causewayConfiguration.getSecurity().getKeycloak().getLoginSuccessUrl();
+ var realm =
causewayConfiguration.getSecurity().getKeycloak().getRealm();
+ var loginPage =
OAuth2AuthorizationRequestRedirectFilter.DEFAULT_AUTHORIZATION_REQUEST_BASE_URI
+ "/" + realm;
- val httpSecurityLogoutConfigurer =
+ var httpSecurityLogoutConfigurer =
http
.sessionManagement()
.sessionCreationPolicy(SessionCreationPolicy.IF_REQUIRED)
@@ -128,11 +126,11 @@ public SecurityFilterChain filterChain(
@Bean
KeycloakOauth2UserService keycloakOidcUserService(final
OAuth2ClientProperties oauth2ClientProperties, final CausewayConfiguration
causewayConfiguration) {
- val jwtDecoder = createNimbusJwtDecoder(
+ var jwtDecoder = createNimbusJwtDecoder(
oauth2ClientProperties.getProvider().get("keycloak").getJwkSetUri(),
JwsAlgorithms.RS256);
- val authoritiesMapper = new SimpleAuthorityMapper();
+ var authoritiesMapper = new SimpleAuthorityMapper();
authoritiesMapper.setConvertToUpperCase(true);
return new KeycloakOauth2UserService(jwtDecoder, authoritiesMapper,
causewayConfiguration);
diff --git
a/testing/h2console/ui/src/main/java/org/apache/causeway/testing/h2console/ui/webmodule/WebModuleH2Console.java
b/testing/h2console/ui/src/main/java/org/apache/causeway/testing/h2console/ui/webmodule/WebModuleH2Console.java
index 6d61cba9efa..8b96e9674a9 100644
---
a/testing/h2console/ui/src/main/java/org/apache/causeway/testing/h2console/ui/webmodule/WebModuleH2Console.java
+++
b/testing/h2console/ui/src/main/java/org/apache/causeway/testing/h2console/ui/webmodule/WebModuleH2Console.java
@@ -45,7 +45,6 @@
import org.apache.causeway.core.webapp.modules.WebModuleContext;
import lombok.Getter;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
/**
@@ -127,23 +126,23 @@ public void init() {
return;
}
- val dataSourceProperties = new DataSourceProperties();
+ var dataSourceProperties = new DataSourceProperties();
dataSourceProperties.setUsername("sa");
dataSourceProperties.setUrl(jdbcUrl);
- val connectionInfo = new ConnectionInfo(
+ var connectionInfo = new ConnectionInfo(
String.format("Generic Spring Datasource|%s|%s|%s",
dataSourceProperties.determineDriverClassName(),
dataSourceProperties.determineUrl(),
dataSourceProperties.determineUsername()));
- val webServlet = this;
+ var webServlet = this;
H2WebServerWrapper.withH2WebServerWrapperDo(webServlet,
h2WebServerWrapper->{
h2WebServerWrapper.setConnectionInfo(connectionInfo);
h2WebServerWrapper.setAllowOthers(isWebAllowRemoteAccess());
if(isGenerateRandomWebAdminPassword()) {
- val webAdminPass =
randomCodeGenerator.generateRandomCode(20); // h2 requires at least 12
+ var webAdminPass =
randomCodeGenerator.generateRandomCode(20); // h2 requires at least 12
log.info("webAdminPass: {}", webAdminPass);
h2WebServerWrapper.setAdminPassword(webAdminPass);
}
