From 1c33f38555e99dcd5162703e1b10dcaea567ed3f Mon Sep 17 00:00:00 2001 From: mcilwain Date: Mon, 8 Apr 2019 11:25:59 -0700 Subject: [PATCH] Delete unused description field from premium/reserved list entities It isn't used now, and as far as I can tell it was never used for anything, so get rid of it. We won't be using it in our new Cloud SQL schema anyway. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=242501877 --- .../registry/model/registry/label/BaseDomainLabelList.java | 7 ------- .../registry/model/registry/label/ReservedListTest.java | 1 - javatests/google/registry/model/testdata/schema.txt | 2 -- .../registry/tools/server/ListPremiumListsActionTest.java | 6 +++--- 4 files changed, 3 insertions(+), 13 deletions(-) diff --git a/java/google/registry/model/registry/label/BaseDomainLabelList.java b/java/google/registry/model/registry/label/BaseDomainLabelList.java index cc4ca3fbd..833af9d19 100644 --- a/java/google/registry/model/registry/label/BaseDomainLabelList.java +++ b/java/google/registry/model/registry/label/BaseDomainLabelList.java @@ -64,8 +64,6 @@ public abstract class BaseDomainLabelList, R extends Dom DateTime lastUpdateTime; - String description; - public String getName() { return name; } @@ -182,11 +180,6 @@ public abstract class BaseDomainLabelList, R extends Dom return thisCastToDerived(); } - public B setDescription(String description) { - getInstance().description = description; - return thisCastToDerived(); - } - @Override public T build() { checkArgument(!isNullOrEmpty(getInstance().name), "List must have a name"); diff --git a/javatests/google/registry/model/registry/label/ReservedListTest.java b/javatests/google/registry/model/registry/label/ReservedListTest.java index 7c25294d3..3e9362082 100644 --- a/javatests/google/registry/model/registry/label/ReservedListTest.java +++ b/javatests/google/registry/model/registry/label/ReservedListTest.java @@ -332,7 +332,6 @@ public class ReservedListTest { ReservedList clone = original.asBuilder().build(); assertThat(clone.getName()).isEqualTo("tld-reserved-cloning"); assertThat(clone.creationTime).isEqualTo(original.creationTime); - assertThat(clone.description).isEqualTo(original.description); assertThat(clone.lastUpdateTime).isEqualTo(original.lastUpdateTime); assertThat(clone.parent).isEqualTo(original.parent); assertThat(original.getReservedListEntries()).isEqualTo(clone.getReservedListEntries()); diff --git a/javatests/google/registry/model/testdata/schema.txt b/javatests/google/registry/model/testdata/schema.txt index bc48d9813..abede7367 100644 --- a/javatests/google/registry/model/testdata/schema.txt +++ b/javatests/google/registry/model/testdata/schema.txt @@ -525,7 +525,6 @@ class google.registry.model.registry.label.PremiumList { @Id java.lang.String name; @Parent com.googlecode.objectify.Key parent; com.googlecode.objectify.Key revisionKey; - java.lang.String description; org.joda.time.DateTime creationTime; org.joda.time.DateTime lastUpdateTime; } @@ -552,7 +551,6 @@ class google.registry.model.registry.label.ReservedList { @Id java.lang.String name; @Parent com.googlecode.objectify.Key parent; boolean shouldPublish; - java.lang.String description; java.util.Map reservedListMap; org.joda.time.DateTime creationTime; org.joda.time.DateTime lastUpdateTime; diff --git a/javatests/google/registry/tools/server/ListPremiumListsActionTest.java b/javatests/google/registry/tools/server/ListPremiumListsActionTest.java index 5decdbad3..3d072217a 100644 --- a/javatests/google/registry/tools/server/ListPremiumListsActionTest.java +++ b/javatests/google/registry/tools/server/ListPremiumListsActionTest.java @@ -52,11 +52,11 @@ public class ListPremiumListsActionTest extends ListActionTestCase { public void testRun_withParameters() { testRunSuccess( action, - Optional.of("revisionKey,description"), + Optional.of("revisionKey"), Optional.empty(), Optional.empty(), - "^name\\s+revisionKey\\s+description\\s*$", - "^-+\\s+-+\\s+-+\\s*$", + "^name\\s+revisionKey\\s*$", + "^-+\\s+-+\\s*$", "^how\\s+.*PremiumList.*$", "^xn--q9jyb4c\\s+.*PremiumList.*$"); }