zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-08 07:48:21 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix sql script name conflict (#411)

Browse source 
* Fix sql script name conflict

There are two V11__ files due to concurrent merge. Renamed one
to V12__

Also removed a @NotNull annotation, which is the fist in the code base.
Most of the code base use @Nullable instead. If we do want to use
@NotNull, we may want to use the javax one instead.
This commit is contained in:
Weimin Yu 2019-12-12 16:16:43 -05:00 • committed by GitHub
parent 22004a4ee4
commit afed1e3779
5 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/gradle/dependency-locks/nomulus_test.lockfile Normal file
View file

@ -0,0 +1,3 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.

3
core/src/main/java/google/registry/schema/tld/PremiumListCache.java
View file

@ -28,7 +28,6 @@ import com.google.common.cache.LoadingCache;
import google.registry.util.NonFinalForTesting; import google.registry.util.NonFinalForTesting;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Optional; import java.util.Optional;
import org.jetbrains.annotations.NotNull;
import org.joda.time.Duration; import org.joda.time.Duration;
/** Caching utils for {@link PremiumList}s. */ /** Caching utils for {@link PremiumList}s. */
@ -52,7 +51,7 @@ class PremiumListCache {
.build( .build(
new CacheLoader<String, Optional<PremiumList>>() { new CacheLoader<String, Optional<PremiumList>>() {
@Override @Override
public Optional<PremiumList> load(@NotNull String premiumListName) { public Optional<PremiumList> load(String premiumListName) {
return PremiumListDao.getLatestRevision(premiumListName); return PremiumListDao.getLatestRevision(premiumListName);
} }
}); });

3
db/gradle/dependency-locks/schema.lockfile Normal file
View file

@ -0,0 +1,3 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.

0
db/src/main/resources/sql/flyway/V11__create_cursor.sql → db/src/main/resources/sql/flyway/V12__create_cursor.sql
View file

3
integration/gradle/dependency-locks/buildscript-classpath.lockfile Normal file
View file

@ -0,0 +1,3 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.