Skip to content

Commit

Permalink
refactor: refactor builder's name
Browse files Browse the repository at this point in the history
  • Loading branch information
GangCheng committed Aug 21, 2023
1 parent 75ca39f commit 6a5189a
Show file tree
Hide file tree
Showing 4 changed files with 59 additions and 59 deletions.
8 changes: 4 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
> InmemoryReactiveCache
```java
ReactiveCacheManager reactiveCacheManager = ReactiveCacheManagerBuilder.newInmemoryReactiveManagerBuilder()
ReactiveCacheManager reactiveCacheManager = ReactiveCacheManagerBuilder.newInmemoryReactiveCacheManagerBuilder()
.withMaxWaitingDuration(Duration.ofSeconds(5))
.build();
```

> CaffeineReactiveCache
```java
ReactiveCacheManager reactiveCacheManager = ReactiveCacheManagerBuilder.newCaffeineReactiveManagerBuilder()
ReactiveCacheManager reactiveCacheManager = ReactiveCacheManagerBuilder.newCaffeineReactiveCacheManagerBuilder()
.withMaxWaitingDuration(Duration.ofSeconds(5))
.build();
```
Expand All @@ -40,7 +40,7 @@ ReactiveCacheManager reactiveCacheManager = ReactiveCacheManagerBuilder.newCaffe
> RedisReactiveCache
```java
ReactiveCacheManager reactiveCacheManager = ReactiveCacheManagerBuilder.newRedisReactiveManagerBuilder(
ReactiveCacheManager reactiveCacheManager = ReactiveCacheManagerBuilder.newRedisReactiveCacheManagerBuilder(
reactiveRedisTemplate)
.withMaxWaitingDuration(Duration.ofSeconds(5))
.build();
Expand All @@ -49,7 +49,7 @@ ReactiveCacheManager reactiveCacheManager = ReactiveCacheManagerBuilder.newRedis
> Customized ReactiveCache
```java
ReactiveCacheManager reactiveCacheManager = ReactiveCacheManagerBuilder.newCustomReactiveManagerBuilder()
ReactiveCacheManager reactiveCacheManager = ReactiveCacheManagerBuilder.newCustomReactiveCacheManagerBuilder()
.withMaxWaitingDuration(Duration.ofSeconds(5))
// Customized ReactiveCacheLock instance implemented interface ReactiveCacheLock
.withReactiveCacheLock()
Expand Down
6 changes: 3 additions & 3 deletions ...henggang/project/reactive/cache/support/configuration/ReactiveCacheAutoConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public ReactiveCacheSupportProperties reactiveCacheSupportProperties() {
@ConditionalOnMissingBean(ReactiveCacheManager.class)
@Bean
public ReactiveCacheManager inmemoryReactiveCacheManager(ReactiveCacheSupportProperties reactiveCacheSupportProperties) {
return ReactiveCacheManagerBuilder.newInmemoryReactiveManagerBuilder()
return ReactiveCacheManagerBuilder.newInmemoryReactiveCacheManagerBuilder()
.withMaxWaitingDuration(reactiveCacheSupportProperties.getMaxWaitingDuration())
.build();
}
Expand All @@ -51,7 +51,7 @@ public ReactiveCacheManager inmemoryReactiveCacheManager(ReactiveCacheSupportPro
@ConditionalOnMissingBean(ReactiveCacheManager.class)
@Bean
public ReactiveCacheManager caffeineReactiveCacheManager(ReactiveCacheSupportProperties reactiveCacheSupportProperties) {
return ReactiveCacheManagerBuilder.newCaffeineReactiveManagerBuilder()
return ReactiveCacheManagerBuilder.newCaffeineReactiveCacheManagerBuilder()
.withMaxWaitingDuration(reactiveCacheSupportProperties.getMaxWaitingDuration())
.build();
}
Expand All @@ -63,7 +63,7 @@ public ReactiveCacheManager caffeineReactiveCacheManager(ReactiveCacheSupportPro
@Bean
public ReactiveCacheManager redisReactiveCacheManager(ReactiveCacheSupportProperties reactiveCacheSupportProperties,
ReactiveRedisTemplate reactiveRedisTemplate) {
return ReactiveCacheManagerBuilder.newRedisReactiveManagerBuilder(reactiveRedisTemplate)
return ReactiveCacheManagerBuilder.newRedisReactiveCacheManagerBuilder(reactiveRedisTemplate)
.withMaxWaitingDuration(reactiveCacheSupportProperties.getMaxWaitingDuration())
.build();
}
Expand Down
68 changes: 34 additions & 34 deletions ...ro/chenggang/project/reactive/cache/support/core/builder/ReactiveCacheManagerBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,48 +28,48 @@
public abstract class ReactiveCacheManagerBuilder {

/**
* New inmemory reactive manager builder.
* New inmemory reactive cache manager builder.
*
* @return the inmemory reactive manager builder
* @return the inmemory reactive cache manager builder
*/
public static InmemoryReactiveManagerBuilder newInmemoryReactiveManagerBuilder() {
return new InmemoryReactiveManagerBuilder();
public static InmemoryReactiveCacheManagerBuilder newInmemoryReactiveCacheManagerBuilder() {
return new InmemoryReactiveCacheManagerBuilder();
}

/**
* New caffeine reactive manager builder.
* New caffeine reactive cache manager builder.
*
* @return the caffeine reactive manager builder
* @return the caffeine reactive cache manager builder
*/
public static CaffeineReactiveManagerBuilder newCaffeineReactiveManagerBuilder() {
return new CaffeineReactiveManagerBuilder();
public static CaffeineReactiveCacheManagerBuilder newCaffeineReactiveCacheManagerBuilder() {
return new CaffeineReactiveCacheManagerBuilder();
}

/**
* New redis reactive manager builder.
* New redis reactive cache manager builder.
*
* @param reactiveRedisTemplate the reactive redis template
* @return the redis reactive manager builder
* @return the redis reactive cache manager builder
*/
public static RedisReactiveManagerBuilder newRedisReactiveManagerBuilder(@NonNull ReactiveRedisTemplate<String, Object> reactiveRedisTemplate) {
return new RedisReactiveManagerBuilder(reactiveRedisTemplate);
public static RedisReactiveCacheManagerBuilder newRedisReactiveCacheManagerBuilder(@NonNull ReactiveRedisTemplate<String, Object> reactiveRedisTemplate) {
return new RedisReactiveCacheManagerBuilder(reactiveRedisTemplate);
}

/**
* New custom reactive manager builder.
* New custom reactive cache manager builder.
*
* @return the custom reactive manager builder
* @return the custom reactive cache manager builder
*/
public static CustomReactiveManagerBuilder newCustomReactiveManagerBuilder() {
return new CustomReactiveManagerBuilder();
public static CustomReactiveCacheManagerBuilder newCustomReactiveCacheManagerBuilder() {
return new CustomReactiveCacheManagerBuilder();
}

/**
* The base reactive manager builder.
* The base reactive cache manager builder.
*
* @param <B> the BaseReactiveManagerBuilder type
*/
protected abstract static class BaseReactiveManagerBuilder<B extends BaseReactiveManagerBuilder<B>> {
protected abstract static class BaseReactiveCacheManagerBuilder<B extends BaseReactiveCacheManagerBuilder<B>> {

/**
* The Max waiting duration.
Expand Down Expand Up @@ -103,10 +103,10 @@ public B withMaxWaitingDuration(@NonNull Duration maxWaitingDuration) {
}

/**
* The custom reactive manager builder.
* The custom reactive cache manager builder.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public static class CustomReactiveManagerBuilder extends BaseReactiveManagerBuilder<CustomReactiveManagerBuilder> {
public static class CustomReactiveCacheManagerBuilder extends BaseReactiveCacheManagerBuilder<CustomReactiveCacheManagerBuilder> {

private ReactiveCacheLock reactiveCacheLock;
private ReactiveCacheMonoAdapter reactiveCacheMonoAdapter;
Expand All @@ -118,7 +118,7 @@ public static class CustomReactiveManagerBuilder extends BaseReactiveManagerBuil
* @param reactiveCacheLock the reactive cache lock
* @return the custom reactive manager builder
*/
public CustomReactiveManagerBuilder withReactiveCacheLock(@NonNull ReactiveCacheLock reactiveCacheLock) {
public CustomReactiveCacheManagerBuilder withReactiveCacheLock(@NonNull ReactiveCacheLock reactiveCacheLock) {
this.reactiveCacheLock = reactiveCacheLock;
return this;
}
Expand All @@ -129,7 +129,7 @@ public CustomReactiveManagerBuilder withReactiveCacheLock(@NonNull ReactiveCache
* @param reactiveCacheMonoAdapter the reactive cache mono adapter
* @return the custom reactive manager builder
*/
public CustomReactiveManagerBuilder withReactiveCacheMonoAdapter(@NonNull ReactiveCacheMonoAdapter reactiveCacheMonoAdapter) {
public CustomReactiveCacheManagerBuilder withReactiveCacheMonoAdapter(@NonNull ReactiveCacheMonoAdapter reactiveCacheMonoAdapter) {
this.reactiveCacheMonoAdapter = reactiveCacheMonoAdapter;
return this;
}
Expand All @@ -140,13 +140,13 @@ public CustomReactiveManagerBuilder withReactiveCacheMonoAdapter(@NonNull Reacti
* @param reactiveCacheFluxAdapter the reactive cache flux adapter
* @return the custom reactive manager builder
*/
public CustomReactiveManagerBuilder withReactiveCacheFluxAdapter(@NonNull ReactiveCacheFluxAdapter reactiveCacheFluxAdapter) {
public CustomReactiveCacheManagerBuilder withReactiveCacheFluxAdapter(@NonNull ReactiveCacheFluxAdapter reactiveCacheFluxAdapter) {
this.reactiveCacheFluxAdapter = reactiveCacheFluxAdapter;
return this;
}

@Override
public CustomReactiveManagerBuilder self() {
public CustomReactiveCacheManagerBuilder self() {
return this;
}

Expand All @@ -162,13 +162,13 @@ public ReactiveCacheManager build() {


/**
* The inmemory reactive manager builder.
* The inmemory reactive cache manager builder.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public static class InmemoryReactiveManagerBuilder extends BaseReactiveManagerBuilder<InmemoryReactiveManagerBuilder> {
public static class InmemoryReactiveCacheManagerBuilder extends BaseReactiveCacheManagerBuilder<InmemoryReactiveCacheManagerBuilder> {

@Override
public InmemoryReactiveManagerBuilder self() {
public InmemoryReactiveCacheManagerBuilder self() {
return this;
}

Expand All @@ -181,13 +181,13 @@ public ReactiveCacheManager build() {
}

/**
* The caffeine reactive manager builder.
* The caffeine reactive cache manager builder.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public static class CaffeineReactiveManagerBuilder extends BaseReactiveManagerBuilder<CaffeineReactiveManagerBuilder> {
public static class CaffeineReactiveCacheManagerBuilder extends BaseReactiveCacheManagerBuilder<CaffeineReactiveCacheManagerBuilder> {

@Override
public CaffeineReactiveManagerBuilder self() {
public CaffeineReactiveCacheManagerBuilder self() {
return this;
}

Expand All @@ -200,22 +200,22 @@ public ReactiveCacheManager build() {
}

/**
* The redis reactive manager builder.
* The redis reactive cache manager builder.
*/
public static class RedisReactiveManagerBuilder extends BaseReactiveManagerBuilder<RedisReactiveManagerBuilder> {
public static class RedisReactiveCacheManagerBuilder extends BaseReactiveCacheManagerBuilder<RedisReactiveCacheManagerBuilder> {

@NonNull
private final ReactiveRedisTemplate<String, Object> reactiveRedisTemplate;
@NonNull
private final RedisReactiveCacheLock redisReactiveCacheLock;

private RedisReactiveManagerBuilder(@NonNull ReactiveRedisTemplate<String, Object> reactiveRedisTemplate) {
private RedisReactiveCacheManagerBuilder(@NonNull ReactiveRedisTemplate<String, Object> reactiveRedisTemplate) {
this.reactiveRedisTemplate = reactiveRedisTemplate;
this.redisReactiveCacheLock = new RedisReactiveCacheLock(reactiveRedisTemplate);
}

@Override
public RedisReactiveManagerBuilder self() {
public RedisReactiveCacheManagerBuilder self() {
return this;
}

Expand Down
36 changes: 18 additions & 18 deletions ...henggang/project/reactive/cache/support/core/builder/ReactiveCacheManagerBuilderTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
import org.springframework.data.redis.serializer.RedisSerializationContext;
import org.springframework.data.redis.serializer.StringRedisSerializer;
import pro.chenggang.project.reactive.cache.support.core.ReactiveCacheManager;
import pro.chenggang.project.reactive.cache.support.core.builder.ReactiveCacheManagerBuilder.CaffeineReactiveManagerBuilder;
import pro.chenggang.project.reactive.cache.support.core.builder.ReactiveCacheManagerBuilder.CustomReactiveManagerBuilder;
import pro.chenggang.project.reactive.cache.support.core.builder.ReactiveCacheManagerBuilder.InmemoryReactiveManagerBuilder;
import pro.chenggang.project.reactive.cache.support.core.builder.ReactiveCacheManagerBuilder.RedisReactiveManagerBuilder;
import pro.chenggang.project.reactive.cache.support.core.builder.ReactiveCacheManagerBuilder.CaffeineReactiveCacheManagerBuilder;
import pro.chenggang.project.reactive.cache.support.core.builder.ReactiveCacheManagerBuilder.CustomReactiveCacheManagerBuilder;
import pro.chenggang.project.reactive.cache.support.core.builder.ReactiveCacheManagerBuilder.InmemoryReactiveCacheManagerBuilder;
import pro.chenggang.project.reactive.cache.support.core.builder.ReactiveCacheManagerBuilder.RedisReactiveCacheManagerBuilder;
import pro.chenggang.project.reactive.cache.support.defaults.inmemory.InmemoryReactiveCacheFluxAdapter;
import pro.chenggang.project.reactive.cache.support.defaults.inmemory.InmemoryReactiveCacheLock;
import pro.chenggang.project.reactive.cache.support.defaults.inmemory.InmemoryReactiveCacheMonoAdapter;
Expand Down Expand Up @@ -51,51 +51,51 @@ public void beforeAll() {
}

@Test
void newInmemoryReactiveManagerBuilder() {
InmemoryReactiveManagerBuilder inmemoryReactiveManagerBuilder = ReactiveCacheManagerBuilder.newInmemoryReactiveManagerBuilder();
void newInmemoryReactiveCacheManagerBuilder() {
InmemoryReactiveCacheManagerBuilder inmemoryReactiveManagerBuilder = ReactiveCacheManagerBuilder.newInmemoryReactiveCacheManagerBuilder();
Assertions.assertNotNull(inmemoryReactiveManagerBuilder);
}

@Test
void newCaffeineReactiveManagerBuilder() {
CaffeineReactiveManagerBuilder caffeineReactiveManagerBuilder = ReactiveCacheManagerBuilder.newCaffeineReactiveManagerBuilder();
void newCaffeineReactiveCacheManagerBuilder() {
CaffeineReactiveCacheManagerBuilder caffeineReactiveManagerBuilder = ReactiveCacheManagerBuilder.newCaffeineReactiveCacheManagerBuilder();
Assertions.assertNotNull(caffeineReactiveManagerBuilder);
}

@Test
void newRedisReactiveManagerBuilder() {
RedisReactiveManagerBuilder redisReactiveManagerBuilder = ReactiveCacheManagerBuilder.newRedisReactiveManagerBuilder(
void newRedisReactiveCacheManagerBuilder() {
RedisReactiveCacheManagerBuilder redisReactiveManagerBuilder = ReactiveCacheManagerBuilder.newRedisReactiveCacheManagerBuilder(
reactiveRedisTemplate
);
Assertions.assertNotNull(redisReactiveManagerBuilder);
}

@Test
void newCustomReactiveManagerBuilder() {
CustomReactiveManagerBuilder customReactiveManagerBuilder = ReactiveCacheManagerBuilder.newCustomReactiveManagerBuilder();
void newCustomReactiveCacheManagerBuilder() {
CustomReactiveCacheManagerBuilder customReactiveManagerBuilder = ReactiveCacheManagerBuilder.newCustomReactiveCacheManagerBuilder();
Assertions.assertNotNull(customReactiveManagerBuilder);
}

@Test
void testNewInmemoryReactiveManagerBuilder() {
ReactiveCacheManager reactiveCacheManager = ReactiveCacheManagerBuilder.newInmemoryReactiveManagerBuilder()
void testNewInmemoryReactiveCacheManagerBuilder() {
ReactiveCacheManager reactiveCacheManager = ReactiveCacheManagerBuilder.newInmemoryReactiveCacheManagerBuilder()
.withMaxWaitingDuration(Duration.ofSeconds(5))
.build();
Assertions.assertNotNull(reactiveCacheManager);
}

@Test
void testNewRedisReactiveManagerBuilder() {
ReactiveCacheManager reactiveCacheManager = ReactiveCacheManagerBuilder.newRedisReactiveManagerBuilder(
void testNewRedisReactiveCacheManagerBuilder() {
ReactiveCacheManager reactiveCacheManager = ReactiveCacheManagerBuilder.newRedisReactiveCacheManagerBuilder(
reactiveRedisTemplate)
.withMaxWaitingDuration(Duration.ofSeconds(5))
.build();
Assertions.assertNotNull(reactiveCacheManager);
}

@Test
void testNewCustomReactiveManagerBuilder() {
ReactiveCacheManager reactiveCacheManager = ReactiveCacheManagerBuilder.newCustomReactiveManagerBuilder()
void testNewCustomReactiveCacheManagerBuilder() {
ReactiveCacheManager reactiveCacheManager = ReactiveCacheManagerBuilder.newCustomReactiveCacheManagerBuilder()
.withMaxWaitingDuration(Duration.ofSeconds(5))
.withReactiveCacheLock(new InmemoryReactiveCacheLock())
.withReactiveCacheMonoAdapter(new InmemoryReactiveCacheMonoAdapter())
Expand Down

0 comments on commit 6a5189a

Please sign in to comment.