zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-07-25 20:18:34 +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 f48e3933f5
commit 65cf49f204
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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 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);
}
});