Skip to content

Commit 0f225d8

Browse files
committed
Revert "GH-9441: Deprecate Hazelcast module"
This reverts commit 96ddc01
1 parent 5a1c3be commit 0f225d8

File tree

69 files changed

+6154
-71
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+6154
-71
lines changed

spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/CacheEventType.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2025 the original author or authors.
2+
* Copyright 2015-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@
2626
*
2727
* @see org.springframework.integration.hazelcast.inbound.AbstractHazelcastMessageProducer
2828
*/
29-
@Deprecated(forRemoval = true, since = "6.5")
3029
public enum CacheEventType {
3130

3231
/**

spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/CacheListeningPolicyType.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2025 the original author or authors.
2+
* Copyright 2015-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@
2626
*
2727
* @see org.springframework.integration.hazelcast.inbound.AbstractHazelcastMessageProducer
2828
*/
29-
@Deprecated(forRemoval = true, since = "6.5")
3029
public enum CacheListeningPolicyType {
3130

3231
/**

spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/ClusterMonitorType.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2025 the original author or authors.
2+
* Copyright 2015-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -28,7 +28,6 @@
2828
* @see com.hazelcast.core.DistributedObjectListener
2929
* @see com.hazelcast.core.LifecycleListener
3030
*/
31-
@Deprecated(forRemoval = true, since = "6.5")
3231
public enum ClusterMonitorType {
3332

3433
/**

spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/DistributedSQLIterationType.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2025 the original author or authors.
2+
* Copyright 2015-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -27,7 +27,6 @@
2727
* @see org.springframework.integration.hazelcast.inbound.HazelcastDistributedSQLMessageSource
2828
* @see com.hazelcast.map.IMap
2929
*/
30-
@Deprecated(forRemoval = true, since = "6.5")
3130
public enum DistributedSQLIterationType {
3231

3332
/**

spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/HazelcastHeaders.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2025 the original author or authors.
2+
* Copyright 2015-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@
2424
*
2525
* @since 6.0
2626
*/
27-
@Deprecated(forRemoval = true, since = "6.5")
2827
public abstract class HazelcastHeaders {
2928

3029
private static final String PREFIX = "hazelcast_";

spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/HazelcastIntegrationDefinitionValidator.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2025 the original author or authors.
2+
* Copyright 2015-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -40,8 +40,6 @@
4040
*
4141
* @since 6.0
4242
*/
43-
@Deprecated(forRemoval = true, since = "6.5")
44-
@SuppressWarnings("removal")
4543
public final class HazelcastIntegrationDefinitionValidator {
4644

4745
public static <E extends Enum<E>> Set<String> validateEnumType(final Class<E> enumType, final String types) {

spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/HazelcastLocalInstanceRegistrar.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2025 the original author or authors.
2+
* Copyright 2015-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -40,8 +40,6 @@
4040
*
4141
* @since 6.0
4242
*/
43-
@Deprecated(forRemoval = true, since = "6.5")
44-
@SuppressWarnings("removal")
4543
public class HazelcastLocalInstanceRegistrar implements SmartInitializingSingleton {
4644

4745
private static final Log logger = LogFactory.getLog(HazelcastLocalInstanceRegistrar.class);

spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/config/HazelcastIntegrationConfigurationInitializer.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2025 the original author or authors.
2+
* Copyright 2015-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -31,8 +31,6 @@
3131
*
3232
* @since 6.0
3333
*/
34-
@Deprecated(forRemoval = true, since = "6.5")
35-
@SuppressWarnings("removal")
3634
public class HazelcastIntegrationConfigurationInitializer implements IntegrationConfigurationInitializer {
3735

3836
@Override

spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/config/xml/HazelcastClusterMonitorInboundChannelAdapterParser.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2025 the original author or authors.
2+
* Copyright 2015-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -34,8 +34,6 @@
3434
* @author Eren Avsarogullari
3535
* @since 6.0
3636
*/
37-
@Deprecated(forRemoval = true, since = "6.5")
38-
@SuppressWarnings("removal")
3937
public class HazelcastClusterMonitorInboundChannelAdapterParser extends
4038
AbstractSingleBeanDefinitionParser {
4139

spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/config/xml/HazelcastContinuousQueryInboundChannelAdapterParser.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2025 the original author or authors.
2+
* Copyright 2015-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -37,8 +37,6 @@
3737
*
3838
* @since 6.0
3939
*/
40-
@Deprecated(forRemoval = true, since = "6.5")
41-
@SuppressWarnings("removal")
4240
public class HazelcastContinuousQueryInboundChannelAdapterParser extends AbstractSingleBeanDefinitionParser {
4341

4442
private static final String CHANNEL_ATTRIBUTE = "channel";

spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/config/xml/HazelcastDistributedSQLInboundChannelAdapterParser.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2025 the original author or authors.
2+
* Copyright 2015-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -33,8 +33,6 @@
3333
* @author Eren Avsarogullari
3434
* @since 6.0
3535
*/
36-
@Deprecated(forRemoval = true, since = "6.5")
37-
@SuppressWarnings("removal")
3836
public class HazelcastDistributedSQLInboundChannelAdapterParser extends AbstractPollingInboundChannelAdapterParser {
3937

4038
private static final String CACHE_ATTRIBUTE = "cache";

spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/config/xml/HazelcastEventDrivenInboundChannelAdapterParser.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2025 the original author or authors.
2+
* Copyright 2015 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -35,8 +35,6 @@
3535
* @author Eren Avsarogullari
3636
* @since 6.0
3737
*/
38-
@Deprecated(forRemoval = true, since = "6.5")
39-
@SuppressWarnings("removal")
4038
public class HazelcastEventDrivenInboundChannelAdapterParser extends AbstractSingleBeanDefinitionParser {
4139

4240
private static final String CHANNEL_ATTRIBUTE = "channel";

spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/config/xml/HazelcastIntegrationNamespaceHandler.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2025 the original author or authors.
2+
* Copyright 2015 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -24,8 +24,6 @@
2424
* @author Eren Avsarogullari
2525
* @since 6.0
2626
*/
27-
@Deprecated(forRemoval = true, since = "6.5")
28-
@SuppressWarnings("removal")
2927
public class HazelcastIntegrationNamespaceHandler extends AbstractIntegrationNamespaceHandler {
3028

3129
@Override

spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/config/xml/HazelcastOutboundChannelAdapterParser.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2025 the original author or authors.
2+
* Copyright 2015 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -33,8 +33,6 @@
3333
* @author Eren Avsarogullari
3434
* @since 6.0
3535
*/
36-
@Deprecated(forRemoval = true, since = "6.5")
37-
@SuppressWarnings("removal")
3836
public class HazelcastOutboundChannelAdapterParser extends AbstractOutboundChannelAdapterParser {
3937

4038
private static final String CACHE_ATTRIBUTE = "cache";

spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/inbound/AbstractHazelcastMessageProducer.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2025 the original author or authors.
2+
* Copyright 2015-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -54,8 +54,6 @@
5454
*
5555
* @since 6.0
5656
*/
57-
@Deprecated(forRemoval = true, since = "6.5")
58-
@SuppressWarnings("removal")
5957
public abstract class AbstractHazelcastMessageProducer extends MessageProducerSupport {
6058

6159
protected final DistributedObject distributedObject;

spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/inbound/HazelcastClusterMonitorMessageProducer.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2025 the original author or authors.
2+
* Copyright 2015-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -50,8 +50,6 @@
5050
*
5151
* @since 6.0
5252
*/
53-
@Deprecated(forRemoval = true, since = "6.5")
54-
@SuppressWarnings("removal")
5553
public class HazelcastClusterMonitorMessageProducer extends MessageProducerSupport {
5654

5755
private final HazelcastInstance hazelcastInstance;

spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/inbound/HazelcastContinuousQueryMessageProducer.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2025 the original author or authors.
2+
* Copyright 2015-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -30,8 +30,6 @@
3030
* @author Eren Avsarogullari
3131
* @since 6.0
3232
*/
33-
@Deprecated(forRemoval = true, since = "6.5")
34-
@SuppressWarnings("removal")
3533
public class HazelcastContinuousQueryMessageProducer extends AbstractHazelcastMessageProducer {
3634

3735
private final String predicate;

spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/inbound/HazelcastDistributedSQLMessageSource.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2025 the original author or authors.
2+
* Copyright 2015-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -36,8 +36,7 @@
3636
*
3737
* @since 6.0
3838
*/
39-
@SuppressWarnings({ "rawtypes", "removal" })
40-
@Deprecated(forRemoval = true, since = "6.5")
39+
@SuppressWarnings("rawtypes")
4140
public class HazelcastDistributedSQLMessageSource extends AbstractMessageSource {
4241

4342
private final IMap<?, ?> distributedMap;

spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/inbound/HazelcastEventDrivenMessageProducer.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2025 the original author or authors.
2+
* Copyright 2015-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -49,8 +49,6 @@
4949
*
5050
* @since 6.0
5151
*/
52-
@Deprecated(forRemoval = true, since = "6.5")
53-
@SuppressWarnings("removal")
5452
public class HazelcastEventDrivenMessageProducer extends AbstractHazelcastMessageProducer {
5553

5654
public HazelcastEventDrivenMessageProducer(DistributedObject distributedObject) {

spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/leader/LeaderInitiator.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2025 the original author or authors.
2+
* Copyright 2015-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -58,7 +58,6 @@
5858
* @author Christian Tzolov
5959
* @author Emil Palm
6060
*/
61-
@Deprecated(forRemoval = true, since = "6.5")
6261
public class LeaderInitiator implements SmartLifecycle, DisposableBean, ApplicationEventPublisherAware {
6362

6463
private static final LogAccessor logger = new LogAccessor(LeaderInitiator.class);

spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/listener/HazelcastMembershipListener.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2025 the original author or authors.
2+
* Copyright 2015-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -37,8 +37,6 @@
3737
*
3838
* @since 6.0
3939
*/
40-
@Deprecated(forRemoval = true, since = "6.5")
41-
@SuppressWarnings("removal")
4240
public class HazelcastMembershipListener extends MembershipAdapter {
4341

4442
@Override

spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/lock/HazelcastLockRegistry.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2017-2025 the original author or authors.
2+
* Copyright 2017-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -28,7 +28,6 @@
2828
*
2929
* @author Artem Bilan
3030
*/
31-
@Deprecated(forRemoval = true, since = "6.5")
3231
public class HazelcastLockRegistry implements LockRegistry {
3332

3433
private final HazelcastInstance client;

spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/message/EntryEventMessagePayload.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2025 the original author or authors.
2+
* Copyright 2015-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -29,7 +29,6 @@
2929
*
3030
* @since 6.0
3131
*/
32-
@Deprecated(forRemoval = true, since = "6.5")
3332
public class EntryEventMessagePayload<K, V> {
3433

3534
/**

spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/metadata/HazelcastMetadataStore.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2017-2025 the original author or authors.
2+
* Copyright 2017-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -37,7 +37,6 @@
3737
* @author Vinicius Carvalho
3838
* @author Artem Bilan
3939
*/
40-
@Deprecated(forRemoval = true, since = "6.5")
4140
public class HazelcastMetadataStore implements ListenableMetadataStore, InitializingBean {
4241

4342
private static final String METADATA_STORE_MAP_NAME = "SPRING_INTEGRATION_METADATA_STORE";

spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/outbound/HazelcastCacheWritingMessageHandler.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2025 the original author or authors.
2+
* Copyright 2015-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -40,8 +40,6 @@
4040
*
4141
* @since 6.0
4242
*/
43-
@Deprecated(forRemoval = true, since = "6.5")
44-
@SuppressWarnings("removal")
4543
public class HazelcastCacheWritingMessageHandler extends AbstractMessageHandler {
4644

4745
private DistributedObject distributedObject;

0 commit comments

Comments
 (0)