Spring/spring-boot-data-geode
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor the Async Inline Caching Sample code.

Browse Source 
Change the @EnableCachingDefinedRegions annotation, serverRegionShortcut attribute to RegionShortcut.REPLICATE. AEQs cannot be configured for 'LOCAL' Regions.

Import the new AsyncInlineCachingRegionConfiguration declaring the Golfers Region and Template for the Peer Cache application configuration arrangement.

Add 'spring.autoconfigure.exclude' on Spring Data Geode Repositories Auto-Configuration in application-server.properties.

Add AsyncInlineCachingRegionConfiguration class explicilty declaring a 'Golfers' REPLICATE Region bean and a SD Template for the 'Golfers' Region.

Remove the @Region mapping anotation declaration from the Golfer model class.

Fix bug in the GolfCourse.withHole(..) builder method to 'add' to the List of holes rather than 'set' the par for hole, which leads to an IndexOutOfBoundsException.

Replace the custom, private 'nullSafeMap(:Map)' and 'sort(:List)' methods with SDG's CollectionUtils class methods in the GolferService class.

Change the 'Schedule' for the GolfTournamentService class, play() method to have an initialDelay of 5 seconds.
This commit is contained in:
John Blum
2020-12-07 08:54:29 -08:00
parent dc7d35706c
commit 3342f32263
11 changed files with 85 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/BootGeodeAsyncInlineCachingClientApplication.java
View File

@@ -34,6 +34,7 @@ import example.app.caching.inline.async.client.model.support.GolfCourseBuilder;
import example.app.caching.inline.async.client.model.support.GolferBuilder;
import example.app.caching.inline.async.client.service.GolfTournamentService;
import example.app.caching.inline.async.config.AsyncInlineCachingConfiguration;
import example.app.caching.inline.async.config.AsyncInlineCachingRegionConfiguration;
/**
* {@link SpringBootApplication} class simulating a golf tournament management application.
@@ -91,12 +92,12 @@ public class BootGeodeAsyncInlineCachingClientApplication {
@Configuration
@UseMemberName(APPLICATION_NAME)
@EnableCachingDefinedRegions(serverRegionShortcut = RegionShortcut.LOCAL)
@EnableCachingDefinedRegions(serverRegionShortcut = RegionShortcut.REPLICATE)
static class GeodeConfiguration { }
@PeerCacheApplication
@Profile("peer-cache")
@Import(AsyncInlineCachingConfiguration.class)
@Import({ AsyncInlineCachingConfiguration.class, AsyncInlineCachingRegionConfiguration.class })
static class PeerCacheApplicationConfiguration { }
}

2
spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/model/GolfCourse.java
View File

@@ -71,7 +71,7 @@ public class GolfCourse {
assertValidHoleNumber(holeNumber);
assertValidParForHole(par, holeNumber);
this.parForHole.set(indexForHole(holeNumber), par);
this.parForHole.add(indexForHole(holeNumber), par);
return this;
}

3
spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/model/Golfer.java
View File

@@ -19,7 +19,6 @@ import javax.persistence.Entity;
import javax.persistence.Table;
import org.springframework.data.annotation.Id;
import org.springframework.data.gemfire.mapping.annotation.Region;
import org.springframework.util.Assert;
import lombok.AccessLevel;
@@ -41,14 +40,12 @@ import lombok.ToString;
* @see javax.persistence.Entity
* @see javax.persistence.Table
* @see org.springframework.data.annotation.Id
* @see org.springframework.data.gemfire.mapping.annotation.Region
* @since 1.4.0
*/
@Entity
@Getter
@ToString(of = "name")
@Table(name = "golfers")
@Region(name = "Golfers")
@EqualsAndHashCode(of = "name")
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@RequiredArgsConstructor(staticName = "newGolfer")

2
spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/service/GolfTournamentService.java
View File

@@ -85,7 +85,7 @@ public class GolfTournamentService implements Closeable {
}
@SuppressWarnings("unused")
@Scheduled(fixedRate = 2500L)
@Scheduled(initialDelay = 5000L, fixedDelay = 2500L)
public void play() {
GolfTournament golfTournament = this.golfTournament;

17
spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/client/service/GolferService.java
View File

@@ -16,7 +16,6 @@
package example.app.caching.inline.async.client.service;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -26,6 +25,7 @@ import org.apache.geode.cache.Region;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.cache.annotation.CachePut;
import org.springframework.data.gemfire.GemfireTemplate;
import org.springframework.data.gemfire.util.CollectionUtils;
import org.springframework.data.gemfire.util.RegionUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
@@ -70,25 +70,16 @@ public class GolferService {
public List<Golfer> getAllGolfersFromCache() {
Map<String, Golfer> golferMap =
nullSafeMap(this.golfersTemplate.getAll(resolveKeys(this.golfersTemplate.getRegion())));
CollectionUtils.nullSafeMap(this.golfersTemplate.getAll(resolveKeys(this.golfersTemplate.getRegion())));
return sort(new ArrayList<>(golferMap.values()));
return CollectionUtils.sort(new ArrayList<>(golferMap.values()));
}
public List<Golfer> getAllGolfersFromDatabase() {
return sort(this.golferRepository.findAll());
}
private <KEY, VALUE> Map<KEY, VALUE> nullSafeMap(Map<KEY, VALUE> map) {
return map != null ? map : Collections.emptyMap();
return CollectionUtils.sort(this.golferRepository.findAll());
}
private Set<String> resolveKeys(Region<String, ?> region) {
return RegionUtils.isClient(region) ? region.keySetOnServer() : region.keySet();
}
private <T extends Comparable<T>> List<T> sort(List<T> list) {
Collections.sort(list);
return list;
}
}

2
spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/config/AsyncInlineCachingConfiguration.java
View File

@@ -43,7 +43,7 @@ import example.app.caching.inline.async.client.repo.GolferRepository;
@SuppressWarnings("unused")
public class AsyncInlineCachingConfiguration {
private static final String GOLFERS_REGION_NAME = "Golfers";
protected static final String GOLFERS_REGION_NAME = "Golfers";
@Bean
@Profile("queue-batch-size")

66
spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/config/AsyncInlineCachingRegionConfiguration.java Normal file
View File

@@ -0,0 +1,66 @@
/*
* Copyright 2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
package example.app.caching.inline.async.config;
import org.apache.geode.cache.GemFireCache;
import org.apache.geode.cache.Region;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.DependsOn;
import org.springframework.data.gemfire.GemfireTemplate;
import org.springframework.data.gemfire.ReplicatedRegionFactoryBean;
import org.springframework.geode.cache.AsyncInlineCachingRegionConfigurer;
import example.app.caching.inline.async.client.model.Golfer;
/**
* Spring {@link Configuration} class used to configure an Apache Geode cache {@link Region}
*
* @author John Blum
* @see org.apache.geode.cache.GemFireCache
* @see org.apache.geode.cache.Region
* @see org.springframework.context.annotation.Bean
* @see org.springframework.context.annotation.Configuration
* @see org.springframework.data.gemfire.ReplicatedRegionFactoryBean
* @see org.springframework.geode.cache.AsyncInlineCachingRegionConfigurer
* @since 1.4.0
*/
@Configuration
@SuppressWarnings("unused")
public class AsyncInlineCachingRegionConfiguration {
protected static final String GOLFERS_REGION_NAME = "Golfers";
@Bean(GOLFERS_REGION_NAME)
public ReplicatedRegionFactoryBean<Object, Object> golfersRegion(GemFireCache gemfireCache,
AsyncInlineCachingRegionConfigurer<Golfer, String> asyncInlineCachingRegionConfigurer) {
ReplicatedRegionFactoryBean<Object, Object> golfersRegion = new ReplicatedRegionFactoryBean<>();
golfersRegion.setCache(gemfireCache);
golfersRegion.setPersistent(false);
golfersRegion.setRegionConfigurers(asyncInlineCachingRegionConfigurer);
return golfersRegion;
}
@Bean
@DependsOn(GOLFERS_REGION_NAME)
public GemfireTemplate golfersTemplate(GemFireCache gemfireCache) {
return new GemfireTemplate(gemfireCache.getRegion(GOLFERS_REGION_NAME));
}
}

11
spring-geode-samples/caching/inline-async/src/main/java/example/app/caching/inline/async/server/BootGeodeAsyncInlineCachingServerApplication.java
View File

@@ -15,19 +15,15 @@
*/
package example.app.caching.inline.async.server;
import org.apache.geode.cache.RegionShortcut;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.Profile;
import org.springframework.data.gemfire.config.annotation.CacheServerApplication;
import org.springframework.data.gemfire.config.annotation.EnableEntityDefinedRegions;
import example.app.caching.inline.async.client.model.Golfer;
import example.app.caching.inline.async.config.AsyncInlineCachingConfiguration;
import example.app.caching.inline.async.config.AsyncInlineCachingRegionConfiguration;
/**
* {@link SpringBootApplication} class implementing the server-side of the golf tournament management application.
@@ -36,7 +32,6 @@ import example.app.caching.inline.async.config.AsyncInlineCachingConfiguration;
* @see java.time.Duration
* @see org.springframework.boot.autoconfigure.SpringBootApplication
* @see org.springframework.boot.builder.SpringApplicationBuilder
* @see org.springframework.context.annotation.Configuration
* @see org.springframework.context.annotation.Import
* @see org.springframework.context.annotation.Profile
* @see org.springframework.data.gemfire.config.annotation.CacheServerApplication
@@ -59,10 +54,8 @@ public class BootGeodeAsyncInlineCachingServerApplication {
.run(args);
}
@Configuration
@CacheServerApplication(name = APPLICATION_NAME)
@EnableEntityDefinedRegions(basePackageClasses = Golfer.class, serverRegionShortcut = RegionShortcut.LOCAL)
@Import(AsyncInlineCachingConfiguration.class)
@Import({ AsyncInlineCachingConfiguration.class, AsyncInlineCachingRegionConfiguration.class })
@SuppressWarnings("unused")
static class GeodeConfiguration { }

1
spring-geode-samples/caching/inline-async/src/main/resources/application-server.properties
View File

@@ -1,5 +1,6 @@
# Spring Boot application.properties configuration for the golfer server application.
# RBMS (Database) configuration properties.
#spring.autoconfigure.exclude=org.springframework.geode.boot.autoconfigure.RepositoriesAutoConfiguration
spring.jpa.show-sql=true
spring.jpa.hibernate.ddl-auto=none

8
spring-geode-samples/caching/inline-async/src/test/java/example/app/caching/inline/async/queue_batch_size/AsyncInlineCachingUsingQueueBatchSizeIntegrationTests.java
View File

@@ -30,7 +30,6 @@ import org.junit.runner.RunWith;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.asyncqueue.AsyncEventListener;
import org.apache.geode.cache.asyncqueue.AsyncEventQueue;
@@ -42,7 +41,6 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Import;
import org.springframework.data.gemfire.GemfireTemplate;
import org.springframework.data.gemfire.config.annotation.EnableEntityDefinedRegions;
import org.springframework.data.gemfire.config.annotation.PeerCacheApplication;
import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport;
import org.springframework.data.gemfire.tests.util.ReflectionUtils;
@@ -57,6 +55,7 @@ import example.app.caching.inline.async.client.model.Golfer;
import example.app.caching.inline.async.client.repo.GolferRepository;
import example.app.caching.inline.async.client.service.GolferService;
import example.app.caching.inline.async.config.AsyncInlineCachingConfiguration;
import example.app.caching.inline.async.config.AsyncInlineCachingRegionConfiguration;
/**
* Integration Tests for Spring Boot configured Async Inline Caching with Apache Geode using Queue Batch Size.
@@ -197,10 +196,9 @@ public class AsyncInlineCachingUsingQueueBatchSizeIntegrationTests extends Integ
@PeerCacheApplication
@EnableAutoConfiguration
@EnableEntityDefinedRegions(basePackageClasses = Golfer.class, serverRegionShortcut = RegionShortcut.REPLICATE)
@EnableJpaRepositories(basePackageClasses = GolferRepository.class)
@EntityScan(basePackageClasses = Golfer.class)
@Import(AsyncInlineCachingConfiguration.class)
@EnableJpaRepositories(basePackageClasses = GolferRepository.class)
@Import({ AsyncInlineCachingConfiguration.class, AsyncInlineCachingRegionConfiguration.class })
static class TestConfiguration {
@Bean

8
spring-geode-samples/caching/inline-async/src/test/java/example/app/caching/inline/async/queue_batch_time_interval/AsyncInlineCachingUsingQueueBatchTimeIntervalIntegrationTests.java
View File

@@ -30,7 +30,6 @@ import org.junit.runner.RunWith;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.asyncqueue.AsyncEventListener;
import org.apache.geode.cache.asyncqueue.AsyncEventQueue;
@@ -42,7 +41,6 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Import;
import org.springframework.data.gemfire.GemfireTemplate;
import org.springframework.data.gemfire.config.annotation.EnableEntityDefinedRegions;
import org.springframework.data.gemfire.config.annotation.PeerCacheApplication;
import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport;
import org.springframework.data.gemfire.tests.util.ReflectionUtils;
@@ -57,6 +55,7 @@ import example.app.caching.inline.async.client.model.Golfer;
import example.app.caching.inline.async.client.repo.GolferRepository;
import example.app.caching.inline.async.client.service.GolferService;
import example.app.caching.inline.async.config.AsyncInlineCachingConfiguration;
import example.app.caching.inline.async.config.AsyncInlineCachingRegionConfiguration;
/**
* Integration Tests for Spring Boot configured Async Inline Caching with Apache Geode using Queue Batch Time Interval.
@@ -179,10 +178,9 @@ public class AsyncInlineCachingUsingQueueBatchTimeIntervalIntegrationTests exten
@PeerCacheApplication
@EnableAutoConfiguration
@EnableEntityDefinedRegions(basePackageClasses = Golfer.class, serverRegionShortcut = RegionShortcut.REPLICATE)
@EnableJpaRepositories(basePackageClasses = GolferRepository.class)
@EntityScan(basePackageClasses = Golfer.class)
@Import(AsyncInlineCachingConfiguration.class)
@EnableJpaRepositories(basePackageClasses = GolferRepository.class)
@Import({ AsyncInlineCachingConfiguration.class, AsyncInlineCachingRegionConfiguration.class })
static class TestConfiguration {
@Bean