Skip to content

Commit 6b31d97

Browse files
committed
Remove spring-integration-gemfire module
Starting with Spring Data 2022.0.0 there is not going to be GemFire (Geode) support directly from Spring team A source code of the `spring-integration-gemfire` is moving to Spring Integration Extensions from where community may consider to pull it and support in their own manner
1 parent fb1c89f commit 6b31d97

File tree

72 files changed

+26
-4679
lines changed

Some content is hidden

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

72 files changed

+26
-4679
lines changed

build.gradle

+1-27
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ allprojects {
135135
'https://jakarta.ee/specifications/platform/9/apidocs/',
136136
'https://docs.spring.io/spring-framework/docs/current/javadoc-api',
137137
'https://docs.spring.io/spring-amqp/docs/current/api/',
138-
'https://docs.spring.io/spring-data-gemfire/docs/current/api/',
139138
'https://docs.spring.io/spring-data/data-mongo/docs/current/api/',
140139
'https://docs.spring.io/spring-data/data-redis/docs/current/api/',
141140
'https://docs.spring.io/spring-ws/docs/current/api/'
@@ -583,11 +582,11 @@ project('spring-integration-file') {
583582

584583
testImplementation project(':spring-integration-redis')
585584
testImplementation project(':spring-integration-redis').sourceSets.test.output
586-
testImplementation project(':spring-integration-gemfire')
587585
testImplementation project(':spring-integration-jdbc')
588586
testImplementation "com.h2database:h2:$h2Version"
589587
testImplementation "io.lettuce:lettuce-core:$lettuceVersion"
590588
testImplementation "com.jayway.jsonpath:json-path:$jsonpathVersion"
589+
testImplementation 'com.fasterxml.jackson.core:jackson-databind'
591590
}
592591
}
593592

@@ -604,31 +603,6 @@ project('spring-integration-ftp') {
604603
}
605604
}
606605

607-
project('spring-integration-gemfire') {
608-
description = 'Spring Integration GemFire Support'
609-
dependencies {
610-
api project(':spring-integration-core')
611-
api('org.springframework.data:spring-data-geode') {
612-
exclude group: 'org.springframework'
613-
exclude group: 'org.apache.shiro', module: 'shiro-event'
614-
exclude group: 'org.apache.shiro', module: 'shiro-lang'
615-
exclude group: 'org.apache.shiro', module: 'shiro-crypto-hash'
616-
exclude group: 'org.apache.shiro', module: 'shiro-crypto-cipher'
617-
exclude group: 'org.apache.shiro', module: 'shiro-config-ogdl'
618-
exclude group: 'org.apache.shiro', module: 'shiro-config-core'
619-
exclude group: 'org.apache.shiro', module: 'shiro-cache'
620-
exclude group: 'commons-logging'
621-
}
622-
api "commons-io:commons-io:$commonsIoVersion"
623-
624-
testImplementation project(':spring-integration-stream')
625-
}
626-
627-
tasks.withType(JavaForkOptions) {
628-
jvmArgs '--add-opens', 'jdk.management/com.sun.management.internal=ALL-UNNAMED'
629-
}
630-
}
631-
632606
project('spring-integration-graphql') {
633607
description = 'Spring Integration GraphQL Support'
634608
dependencies {

spring-integration-file/src/test/java/org/springframework/integration/file/aggregator/FileAggregatorTests.java

+1-27
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021 the original author or authors.
2+
* Copyright 2021-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.
@@ -33,7 +33,6 @@
3333
import org.springframework.beans.factory.annotation.Qualifier;
3434
import org.springframework.context.annotation.Bean;
3535
import org.springframework.context.annotation.Configuration;
36-
import org.springframework.context.annotation.ImportResource;
3736
import org.springframework.core.task.TaskExecutor;
3837
import org.springframework.integration.IntegrationMessageHeaderAccessor;
3938
import org.springframework.integration.channel.QueueChannel;
@@ -56,7 +55,6 @@
5655

5756
/**
5857
* @author Artem Bilan
59-
*
6058
* @since 5.5
6159
*/
6260
@SpringJUnitConfig
@@ -81,12 +79,6 @@ public class FileAggregatorTests {
8179
@Autowired
8280
PollableChannel resultChannel;
8381

84-
@Autowired
85-
MessageChannel input;
86-
87-
@Autowired
88-
PollableChannel output;
89-
9082
@BeforeAll
9183
static void setup() throws IOException {
9284
file = new File(tmpDir, "foo.txt");
@@ -146,26 +138,8 @@ void testEmptyFileAggregator() throws IOException {
146138
.isEmpty();
147139
}
148140

149-
@Test
150-
void testFileAggregatorXmlConfig() {
151-
this.input.send(new GenericMessage<>(file));
152-
153-
Message<?> receive = this.output.receive(10_000);
154-
assertThat(receive).isNotNull();
155-
assertThat(receive.getHeaders())
156-
.containsEntry(FileHeaders.FILENAME, "foo.txt")
157-
.containsEntry(FileHeaders.LINE_COUNT, 4L)
158-
.doesNotContainKeys("firstLine", IntegrationMessageHeaderAccessor.CORRELATION_ID);
159-
160-
assertThat(receive.getPayload())
161-
.isInstanceOf(List.class)
162-
.asList()
163-
.containsExactly("file header", "first line", "second line", "last line");
164-
}
165-
166141
@Configuration
167142
@EnableIntegration
168-
@ImportResource("org/springframework/integration/file/aggregator/FileAggregatorTests.xml")
169143
public static class Config {
170144

171145
@Bean

spring-integration-file/src/test/java/org/springframework/integration/file/aggregator/FileAggregatorTests.xml

-31
This file was deleted.

spring-integration-file/src/test/java/org/springframework/integration/file/filters/PersistentAcceptOnceFileListFilterExternalStoreTests.java

+5-14
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,13 @@
2727
import java.util.concurrent.TimeUnit;
2828
import java.util.concurrent.atomic.AtomicBoolean;
2929

30-
import org.apache.geode.cache.CacheFactory;
3130
import org.junit.jupiter.api.BeforeAll;
3231
import org.junit.jupiter.api.Test;
3332
import org.mockito.Mockito;
3433

3534
import org.springframework.data.redis.connection.RedisConnectionFactory;
3635
import org.springframework.data.redis.core.RedisTemplate;
3736
import org.springframework.data.redis.serializer.StringRedisSerializer;
38-
import org.springframework.integration.gemfire.metadata.GemfireMetadataStore;
3937
import org.springframework.integration.jdbc.metadata.JdbcMetadataStore;
4038
import org.springframework.integration.metadata.ConcurrentMetadataStore;
4139
import org.springframework.integration.redis.RedisContainerTest;
@@ -50,9 +48,7 @@
5048
* @author Artem Bilan
5149
* @author Bojan Vukasovic
5250
* @author Artem Vozhdayenko
53-
*
5451
* @since 4.0
55-
*
5652
*/
5753
public class PersistentAcceptOnceFileListFilterExternalStoreTests implements RedisContainerTest {
5854

@@ -80,11 +76,6 @@ public void testFileSystemWithRedisMetadataStore() throws Exception {
8076
}
8177
}
8278

83-
@Test
84-
public void testFileSystemWithGemfireMetadataStore() throws Exception {
85-
this.testFileSystem(new GemfireMetadataStore(new CacheFactory().create()));
86-
}
87-
8879
@Test
8980
public void testFileSystemWithJdbcMetadataStore() throws Exception {
9081
EmbeddedDatabase dataSource = new EmbeddedDatabaseBuilder()
@@ -135,21 +126,21 @@ private void testFileSystem(ConcurrentMetadataStore store) throws Exception {
135126
final FileSystemPersistentAcceptOnceFileListFilter filter =
136127
new FileSystemPersistentAcceptOnceFileListFilter(store, "foo:");
137128
final File file = File.createTempFile("foo", ".txt");
138-
assertThat(filter.filterFiles(new File[] {file})).hasSize(1);
129+
assertThat(filter.filterFiles(new File[]{ file })).hasSize(1);
139130
String ts = store.get("foo:" + file.getAbsolutePath());
140131
assertThat(ts).isEqualTo(String.valueOf(file.lastModified()));
141-
assertThat(filter.filterFiles(new File[] {file})).isEmpty();
132+
assertThat(filter.filterFiles(new File[]{ file })).isEmpty();
142133
assertThat(file.setLastModified(file.lastModified() + 5000L)).isTrue();
143-
assertThat(filter.filterFiles(new File[] {file})).hasSize(1);
134+
assertThat(filter.filterFiles(new File[]{ file })).hasSize(1);
144135
ts = store.get("foo:" + file.getAbsolutePath());
145136
assertThat(ts).isEqualTo(String.valueOf(file.lastModified()));
146-
assertThat(filter.filterFiles(new File[] {file})).isEmpty();
137+
assertThat(filter.filterFiles(new File[]{ file })).isEmpty();
147138

148139
suspend.set(true);
149140
assertThat(file.setLastModified(file.lastModified() + 5000L)).isTrue();
150141

151142
Future<Integer> result = Executors.newSingleThreadExecutor()
152-
.submit(() -> filter.filterFiles(new File[] {file}).size());
143+
.submit(() -> filter.filterFiles(new File[]{ file }).size());
153144
assertThat(latch2.await(10, TimeUnit.SECONDS)).isTrue();
154145
store.put("foo:" + file.getAbsolutePath(), "43");
155146
latch1.countDown();

spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/config/xml/GemfireCqInboundChannelAdapterParser.java

-87
This file was deleted.

spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/config/xml/GemfireInboundChannelAdapterParser.java

-69
This file was deleted.

0 commit comments

Comments
 (0)