Skip to content

GH-10083: Fix Nullability in some missed packages #10312

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

Merged
merged 2 commits into from
Aug 14, 2025
Merged

GH-10083: Fix Nullability in some missed packages #10312

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
0f47b5b
GH-10083: Fix Nullability in some missed packages
artembilan Aug 13, 2025
1c48b61
* Tighten `JpaParameter` contract in the `ExpressionEvaluatingParamet…
artembilan Aug 14, 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
60 changes: 6 additions & 54 deletions ...main/java/org/springframework/integration/hazelcast/message/EntryEventMessagePayload.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package org.springframework.integration.hazelcast.message;

import org.springframework.util.Assert;
import org.jspecify.annotations.Nullable;

/**
* Hazelcast Message Payload for Entry Events.
Expand All @@ -28,59 +28,11 @@
* @author Artem Bilan
*
* @since 6.0
*
* @param key The entry key.
* @param value The entry value.
* @param oldValue The entry old value if any.
*/
public class EntryEventMessagePayload<K, V> {

/**
* The entry key.
*/
public final K key;

/**
* The entry value.
*/
public final V value;

/**
* The entry old value if any.
*/
public final V oldValue;

public EntryEventMessagePayload(final K key, final V value, final V oldValue) {
Assert.notNull(key, "'key' must not be null");
this.key = key;
this.value = value;
this.oldValue = oldValue;
}

@Override
public String toString() {
return "EntryEventMessagePayload [key=" + this.key + ", value=" + this.value + ", oldValue=" + this.oldValue + "]";
}

@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}

EntryEventMessagePayload<?, ?> that = (EntryEventMessagePayload<?, ?>) o;

return this.key.equals(that.key) && !(this.value != null ? !this.value.equals(that.value)
: that.value != null) && !(this.oldValue != null
? !this.oldValue.equals(that.oldValue) : that.oldValue != null);

}

@Override
public int hashCode() {
int result = this.key.hashCode();
result = 31 * result + (this.value != null ? this.value.hashCode() : 0);
result = 31 * result + (this.oldValue != null ? this.oldValue.hashCode() : 0);
return result;
}
public record EntryEventMessagePayload<K, V>(K key, @Nullable V value, @Nullable V oldValue) {

}
1 change: 1 addition & 0 deletions ...zelcast/src/main/java/org/springframework/integration/hazelcast/message/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/**
* Provides classes supporting Hazelcast message headers and payload.
*/
@org.jspecify.annotations.NullMarked
package org.springframework.integration.hazelcast.message;
22 changes: 11 additions & 11 deletions ...rk/integration/hazelcast/inbound/HazelcastCQDistributedMapInboundChannelAdapterTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,13 @@ public void testContinuousQueryForOnlyREMOVEDEntryEvent() {
assertThat(msg.getHeaders().get(HazelcastHeaders.CACHE_NAME)).isEqualTo("cqDistributedMap2");

assertThat(((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).key).isEqualTo(Integer.valueOf(2));
.getPayload()).key()).isEqualTo(Integer.valueOf(2));
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).oldValue).getId()).isEqualTo(2);
.getPayload()).oldValue()).getId()).isEqualTo(2);
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).oldValue).getName()).isEqualTo("TestName2");
.getPayload()).oldValue()).getName()).isEqualTo("TestName2");
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).oldValue).getSurname()).isEqualTo("TestSurname2");
.getPayload()).oldValue()).getSurname()).isEqualTo("TestSurname2");
}

@Test
Expand All @@ -129,19 +129,19 @@ public void testContinuousQueryForOnlyUPDATEDEntryEvent() {
assertThat(msg.getHeaders().get(HazelcastHeaders.CACHE_NAME)).isEqualTo("cqDistributedMap4");

assertThat(((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).key).isEqualTo(Integer.valueOf(1));
.getPayload()).key()).isEqualTo(Integer.valueOf(1));
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).oldValue).getId()).isEqualTo(1);
.getPayload()).oldValue()).getId()).isEqualTo(1);
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).oldValue).getName()).isEqualTo("TestName1");
.getPayload()).oldValue()).getName()).isEqualTo("TestName1");
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).oldValue).getSurname()).isEqualTo("TestSurname1");
.getPayload()).oldValue()).getSurname()).isEqualTo("TestSurname1");
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).value).getId()).isEqualTo(2);
.getPayload()).value()).getId()).isEqualTo(2);
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).value).getName()).isEqualTo("TestName2");
.getPayload()).value()).getName()).isEqualTo("TestName2");
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).value).getSurname()).isEqualTo("TestSurname2");
.getPayload()).value()).getSurname()).isEqualTo("TestSurname2");
}

@Test
Expand Down
22 changes: 11 additions & 11 deletions ...ation/hazelcast/inbound/HazelcastDistributedMapEventDrivenInboundChannelAdapterTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,19 +92,19 @@ public void testEventDrivenForOnlyUPDATEDEntryEvent() {
assertThat(msg.getHeaders().get(HazelcastHeaders.CACHE_NAME)).isEqualTo("edDistributedMap2");

assertThat(((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).key).isEqualTo(Integer.valueOf(2));
.getPayload()).key()).isEqualTo(Integer.valueOf(2));
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).oldValue).getId()).isEqualTo(1);
.getPayload()).oldValue()).getId()).isEqualTo(1);
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).oldValue).getName()).isEqualTo("TestName1");
.getPayload()).oldValue()).getName()).isEqualTo("TestName1");
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).oldValue).getSurname()).isEqualTo("TestSurname1");
.getPayload()).oldValue()).getSurname()).isEqualTo("TestSurname1");
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).value).getId()).isEqualTo(2);
.getPayload()).value()).getId()).isEqualTo(2);
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).value).getName()).isEqualTo("TestName2");
.getPayload()).value()).getName()).isEqualTo("TestName2");
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).value).getSurname()).isEqualTo("TestSurname2");
.getPayload()).value()).getSurname()).isEqualTo("TestSurname2");
}

@Test
Expand All @@ -124,13 +124,13 @@ public void testEventDrivenForOnlyREMOVEDEntryEvent() {
assertThat(msg.getHeaders().get(HazelcastHeaders.CACHE_NAME)).isEqualTo("edDistributedMap3");

assertThat(((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).key).isEqualTo(Integer.valueOf(2));
.getPayload()).key()).isEqualTo(Integer.valueOf(2));
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).oldValue).getId()).isEqualTo(2);
.getPayload()).oldValue()).getId()).isEqualTo(2);
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).oldValue).getName()).isEqualTo("TestName2");
.getPayload()).oldValue()).getName()).isEqualTo("TestName2");
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).oldValue).getSurname()).isEqualTo("TestSurname2");
.getPayload()).oldValue()).getSurname()).isEqualTo("TestSurname2");
}

@Test
Expand Down
18 changes: 9 additions & 9 deletions ...integration/hazelcast/inbound/HazelcastMultiMapEventDrivenInboundChannelAdapterTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,13 @@ public void testEventDrivenForOnlyADDEDEntryEvent() {
assertThat(msg.getHeaders().get(HazelcastHeaders.CACHE_NAME)).isEqualTo("edMultiMap1");

assertThat(((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).key).isEqualTo(Integer.valueOf(1));
.getPayload()).key()).isEqualTo(Integer.valueOf(1));
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).value).getId()).isEqualTo(1);
.getPayload()).value()).getId()).isEqualTo(1);
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).value).getName()).isEqualTo("TestName1");
.getPayload()).value()).getName()).isEqualTo("TestName1");
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).value).getSurname()).isEqualTo("TestSurname1");
.getPayload()).value()).getSurname()).isEqualTo("TestSurname1");
}

@Test
Expand All @@ -103,14 +103,14 @@ public void testEventDrivenForOnlyREMOVEDEntryEvent() {
assertThat(msg.getHeaders().get(HazelcastHeaders.CACHE_NAME)).isEqualTo("edMultiMap2");

assertThat(((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).key).isEqualTo(Integer.valueOf(2));
assertThat(((EntryEventMessagePayload<?, ?>) msg.getPayload()).value).isNull();
.getPayload()).key()).isEqualTo(Integer.valueOf(2));
assertThat(((EntryEventMessagePayload<?, ?>) msg.getPayload()).value()).isNull();
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).oldValue).getId()).isEqualTo(2);
.getPayload()).oldValue()).getId()).isEqualTo(2);
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).oldValue).getName()).isEqualTo("TestName2");
.getPayload()).oldValue()).getName()).isEqualTo("TestName2");
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).oldValue).getSurname()).isEqualTo("TestSurname2");
.getPayload()).oldValue()).getSurname()).isEqualTo("TestSurname2");
}

@Test
Expand Down
30 changes: 15 additions & 15 deletions ...ration/hazelcast/inbound/HazelcastReplicatedMapEventDrivenInboundChannelAdapterTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,13 @@ public void testEventDrivenForOnlyADDEDEntryEvent() {
assertThat(msg.getHeaders().get(HazelcastHeaders.CACHE_NAME)).isEqualTo("edReplicatedMap1");

assertThat(((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).key).isEqualTo(Integer.valueOf(1));
.getPayload()).key()).isEqualTo(Integer.valueOf(1));
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).value).getId()).isEqualTo(1);
.getPayload()).value()).getId()).isEqualTo(1);
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).value).getName()).isEqualTo("TestName1");
.getPayload()).value()).getName()).isEqualTo("TestName1");
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).value).getSurname()).isEqualTo("TestSurname1");
.getPayload()).value()).getSurname()).isEqualTo("TestSurname1");
}

@Test
Expand All @@ -109,19 +109,19 @@ public void testEventDrivenForOnlyUPDATEDEntryEvent() {
assertThat(msg.getHeaders().get(HazelcastHeaders.CACHE_NAME)).isEqualTo("edReplicatedMap2");

assertThat(((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).key).isEqualTo(Integer.valueOf(2));
.getPayload()).key()).isEqualTo(Integer.valueOf(2));
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).oldValue).getId()).isEqualTo(1);
.getPayload()).oldValue()).getId()).isEqualTo(1);
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).oldValue).getName()).isEqualTo("TestName1");
.getPayload()).oldValue()).getName()).isEqualTo("TestName1");
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).oldValue).getSurname()).isEqualTo("TestSurname1");
.getPayload()).oldValue()).getSurname()).isEqualTo("TestSurname1");
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).value).getId()).isEqualTo(2);
.getPayload()).value()).getId()).isEqualTo(2);
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).value).getName()).isEqualTo("TestName2");
.getPayload()).value()).getName()).isEqualTo("TestName2");
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).value).getSurname()).isEqualTo("TestSurname2");
.getPayload()).value()).getSurname()).isEqualTo("TestSurname2");
}

@Test
Expand All @@ -141,13 +141,13 @@ public void testEventDrivenForOnlyREMOVEDEntryEvent() {
assertThat(msg.getHeaders().get(HazelcastHeaders.CACHE_NAME)).isEqualTo("edReplicatedMap3");

assertThat(((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).key).isEqualTo(Integer.valueOf(2));
.getPayload()).key()).isEqualTo(Integer.valueOf(2));
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).oldValue).getId()).isEqualTo(2);
.getPayload()).oldValue()).getId()).isEqualTo(2);
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).oldValue).getName()).isEqualTo("TestName2");
.getPayload()).oldValue()).getName()).isEqualTo("TestName2");
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).oldValue).getSurname()).isEqualTo("TestSurname2");
.getPayload()).oldValue()).getSurname()).isEqualTo("TestSurname2");
}

@Test
Expand Down
14 changes: 7 additions & 7 deletions ...framework/integration/hazelcast/inbound/util/HazelcastInboundChannelAdapterTestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,13 @@ public static void testEventDrivenForADDEDDistributedMapEntryEvent(
assertThat(msg.getHeaders().get(HazelcastHeaders.CACHE_NAME)).isEqualTo(cacheName);

assertThat(((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).key).isEqualTo(Integer.valueOf(1));
.getPayload()).key()).isEqualTo(Integer.valueOf(1));
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).value).getId()).isEqualTo(1);
.getPayload()).value()).getId()).isEqualTo(1);
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).value).getName()).isEqualTo("TestName1");
.getPayload()).value()).getName()).isEqualTo("TestName1");
assertThat((((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).value).getSurname()).isEqualTo("TestSurname1");
.getPayload()).value()).getSurname()).isEqualTo("TestSurname1");
}

public static void testEventDrivenForDistributedMapEntryEvents(
Expand Down Expand Up @@ -223,11 +223,11 @@ public static void testContinuousQueryForUPDATEDEntryEventWhenIncludeValueIsFals
assertThat(msg.getHeaders().get(HazelcastHeaders.CACHE_NAME)).isEqualTo(cacheName);

assertThat(((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).key).isEqualTo(Integer.valueOf(1));
.getPayload()).key()).isEqualTo(Integer.valueOf(1));
assertThat(((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).oldValue).isNull();
.getPayload()).oldValue()).isNull();
assertThat(((EntryEventMessagePayload<Integer, HazelcastIntegrationTestUser>) msg
.getPayload()).value).isNull();
.getPayload()).value()).isNull();
}

public static void testDistributedSQLForENTRYIterationType(
Expand Down
17 changes: 10 additions & 7 deletions .../springframework/integration/jpa/support/parametersource/BeanPropertyParameterSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,11 @@

import java.beans.PropertyDescriptor;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

import org.jspecify.annotations.Nullable;

import org.springframework.beans.BeanWrapper;
import org.springframework.beans.NotReadablePropertyException;
import org.springframework.beans.PropertyAccessorFactory;
Expand All @@ -29,6 +32,7 @@
* @author Gunnar Hillert
* @author Gary Russell
* @author Ngoc Nhan
* @author Artem Bilan
*
* @since 2.2
*
Expand All @@ -37,7 +41,7 @@ public class BeanPropertyParameterSource implements ParameterSource {

private final BeanWrapper beanWrapper;

private String[] propertyNames;
private String @Nullable [] propertyNames;

/**
* Create a new BeanPropertySqlParameterSource for the given bean.
Expand All @@ -53,19 +57,18 @@ public boolean hasValue(String paramName) {
}

@Override
public Object getValue(String paramName) {
public @Nullable Object getValue(String paramName) {
try {
return this.beanWrapper.getPropertyValue(paramName);
}
catch (NotReadablePropertyException ex) {
throw new IllegalArgumentException(ex.getMessage()); // NOSONAR - lost stack trace
throw new IllegalArgumentException(ex.getMessage());
}
}

/**
* Provide access to the property names of the wrapped bean.
* Uses support provided in the {@link org.springframework.beans.PropertyAccessor}
* interface.
* Uses support provided in the {@link org.springframework.beans.PropertyAccessor} interface.
* @return an array containing all the known property names
*/
public String[] getReadablePropertyNames() {
Expand All @@ -77,9 +80,9 @@ public String[] getReadablePropertyNames() {
names.add(pd.getName());
}
}
this.propertyNames = names.toArray(new String[names.size()]);
this.propertyNames = names.toArray(new String[0]);
}
return this.propertyNames; // NOSONAR - expose internals
return Arrays.copyOf(this.propertyNames, this.propertyNames.length);
}

}
Loading