From 65cf49f204cc6ad9b5d88353eb3e2001ccdc854a Mon Sep 17 00:00:00 2001
From: Weimin Yu <weiminyu@google.com>
Date: Thu, 12 Dec 2019 16:16:43 -0500
Subject: [PATCH] Fix sql script name conflict (#411)

* 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.
---
 core/gradle/dependency-locks/nomulus_test.lockfile             | 3 +++
 .../main/java/google/registry/schema/tld/PremiumListCache.java | 3 +--
 db/gradle/dependency-locks/schema.lockfile                     | 3 +++
 .../flyway/{V11__create_cursor.sql => V12__create_cursor.sql}  | 0
 .../gradle/dependency-locks/buildscript-classpath.lockfile     | 3 +++
 5 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 core/gradle/dependency-locks/nomulus_test.lockfile
 create mode 100644 db/gradle/dependency-locks/schema.lockfile
 rename db/src/main/resources/sql/flyway/{V11__create_cursor.sql => V12__create_cursor.sql} (100%)
 create mode 100644 integration/gradle/dependency-locks/buildscript-classpath.lockfile

diff --git a/core/gradle/dependency-locks/nomulus_test.lockfile b/core/gradle/dependency-locks/nomulus_test.lockfile
new file mode 100644
index 000000000..656c5dbcc
--- /dev/null
+++ b/core/gradle/dependency-locks/nomulus_test.lockfile
@@ -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.
diff --git a/core/src/main/java/google/registry/schema/tld/PremiumListCache.java b/core/src/main/java/google/registry/schema/tld/PremiumListCache.java
index 847083761..2be9565c7 100644
--- a/core/src/main/java/google/registry/schema/tld/PremiumListCache.java
+++ b/core/src/main/java/google/registry/schema/tld/PremiumListCache.java
@@ -28,7 +28,6 @@ import com.google.common.cache.LoadingCache;
 import google.registry.util.NonFinalForTesting;
 import java.math.BigDecimal;
 import java.util.Optional;
-import org.jetbrains.annotations.NotNull;
 import org.joda.time.Duration;
 
 /** Caching utils for {@link PremiumList}s. */
@@ -52,7 +51,7 @@ class PremiumListCache {
         .build(
             new CacheLoader<String, Optional<PremiumList>>() {
               @Override
-              public Optional<PremiumList> load(@NotNull String premiumListName) {
+              public Optional<PremiumList> load(String premiumListName) {
                 return PremiumListDao.getLatestRevision(premiumListName);
               }
             });
diff --git a/db/gradle/dependency-locks/schema.lockfile b/db/gradle/dependency-locks/schema.lockfile
new file mode 100644
index 000000000..656c5dbcc
--- /dev/null
+++ b/db/gradle/dependency-locks/schema.lockfile
@@ -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.
diff --git a/db/src/main/resources/sql/flyway/V11__create_cursor.sql b/db/src/main/resources/sql/flyway/V12__create_cursor.sql
similarity index 100%
rename from db/src/main/resources/sql/flyway/V11__create_cursor.sql
rename to db/src/main/resources/sql/flyway/V12__create_cursor.sql
diff --git a/integration/gradle/dependency-locks/buildscript-classpath.lockfile b/integration/gradle/dependency-locks/buildscript-classpath.lockfile
new file mode 100644
index 000000000..656c5dbcc
--- /dev/null
+++ b/integration/gradle/dependency-locks/buildscript-classpath.lockfile
@@ -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.