Skip to content

Commit

Permalink
Merge pull request #5 from vnobo/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
vnobo authored Aug 1, 2024
2 parents 1ae71e1 + 569d09c commit ff0d6c3
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,14 @@
name: Gradle Build Docker Package
run-name: ${{ github.actor }} is bootBuildImage Actions
on:
release:
types: [ created ]
push:
branches:
- main
pull_request:
branches:
- main
release:
types: [ created ]

permissions:
contents: read
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ protected Mono<Long> countWithCache(Object key, String sql, Map<String, Object>
return countWithCache(key, source);
}


protected Mono<Long> countWithCache(Object key, Mono<Long> sourceMono) {
String cacheKey = key + ":count";
Long cacheCount = this.cache.get(cacheKey, () -> null);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import org.springframework.data.domain.ReactiveAuditorAware;
import org.springframework.data.r2dbc.config.AbstractR2dbcConfiguration;
import org.springframework.data.r2dbc.config.EnableR2dbcAuditing;
import org.springframework.lang.NonNull;
import org.springframework.transaction.annotation.EnableTransactionManagement;

import java.util.List;
Expand All @@ -28,12 +29,12 @@ public class R2dbcConfiguration extends AbstractR2dbcConfiguration {
private final List<Converter<?, ?>> customConverters;

@Override
public @lombok.NonNull ConnectionFactory connectionFactory() {
public @NonNull ConnectionFactory connectionFactory() {
return ConnectionFactories.get("r2dbc:..");
}

@Override
public @lombok.NonNull List<Object> getCustomConverters() {
public @NonNull List<Object> getCustomConverters() {
return Lists.newArrayList(customConverters);
}

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version=0.0.2-SNAPSHOT
org.gradle.parallel=false
org.gradle.parallel=true
org.gradle.caching=true
org.gradle.daemon=true
org.gradle.jvmargs=-Dfile.encoding=UTF-8

0 comments on commit ff0d6c3

Please sign in to comment.