Skip to content

Commit d17cb4f

Browse files
committed
temporary fix flyway gradle script
Signed-off-by: neo <1100909+neowu@users.noreply.github.com>
1 parent 385b27d commit d17cb4f

File tree

4 files changed

+11
-2
lines changed

4 files changed

+11
-2
lines changed

buildSrc/src/main/kotlin/db-migration.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ plugins {
55
}
66

77
tasks.withType<AbstractFlywayTask> {
8+
notCompatibleWithConfigurationCache("https://github.com/flyway/flyway/issues/3550")
9+
810
val migrationDir = file("src/main/resources/db/migration")
911
if (!migrationDir.exists()) throw Error("$migrationDir does not exist")
1012
val env = properties["env"] // use gradlew -Penv=${env} to pass

core-ng/src/main/java/core/framework/internal/db/RepositoryImpl.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import core.framework.internal.validate.Validator;
66
import core.framework.util.StopWatch;
77
import core.framework.util.Strings;
8+
import org.jspecify.annotations.Nullable;
89
import org.slf4j.Logger;
910
import org.slf4j.LoggerFactory;
1011

@@ -116,7 +117,7 @@ public boolean update(T entity) {
116117
return update(entity, false, null, null);
117118
}
118119

119-
private boolean update(T entity, boolean partial, String where, Object[] params) {
120+
private boolean update(T entity, boolean partial, @Nullable String where, Object @Nullable [] params) {
120121
var watch = new StopWatch();
121122
validator.validate(entity, partial);
122123
UpdateQuery.Statement query = updateQuery.update(entity, partial, where, params);

core-ng/src/main/java/core/framework/internal/db/UpdateQuery.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package core.framework.internal.db;
22

3+
import org.jspecify.annotations.Nullable;
4+
35
/**
46
* @author neo
57
*/
68
public interface UpdateQuery<T> {
7-
Statement update(T entity, boolean partial, String where, Object[] params);
9+
Statement update(T entity, boolean partial, @Nullable String where, Object @Nullable [] params);
810

911
class Statement {
1012
final String sql;
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
@NullMarked
2+
package core.framework.internal.db;
3+
4+
import org.jspecify.annotations.NullMarked;

0 commit comments

Comments
 (0)