From be395611cac7df1e8052169ea63abb231c299152 Mon Sep 17 00:00:00 2001 From: Shicong Huang Date: Wed, 19 Feb 2020 13:54:27 -0500 Subject: [PATCH] Move all JPA converters to a dedicated package (#480) * Move all JPA converters to a dedicated package * Move tests as well --- .../registry/model/registrar/Registrar.java | 3 ++- .../persistence/NomulusPostgreSQLDialect.java | 5 +++-- .../{ => converter}/BloomFilterConverter.java | 2 +- .../CidrAddressBlockListConverter.java | 2 +- .../CreateAutoTimestampConverter.java | 2 +- .../CurrencyToBillingMapUserType.java | 2 +- .../CurrencyUnitConverter.java | 2 +- .../{ => converter}/DateTimeConverter.java | 2 +- .../{ => converter}/MapUserType.java | 2 +- .../{ => converter}/MutableUserType.java | 2 +- .../RegistrarPocSetConverter.java | 2 +- .../StatusValueSetConverter.java | 2 +- .../StringCollectionDescriptor.java | 9 ++++++-- .../{ => converter}/StringListConverter.java | 2 +- .../StringListConverterBase.java | 4 ++-- .../{ => converter}/StringSetConverter.java | 2 +- .../StringSetConverterBase.java | 4 ++-- .../ToStringConverterBase.java | 2 +- .../UpdateAutoTimestampConverter.java | 2 +- .../ZonedDateTimeConverter.java | 2 +- .../main/resources/META-INF/persistence.xml | 22 +++++++++---------- .../BloomFilterConverterTest.java | 2 +- .../CidrAddressBlockListUserTypeTest.java | 2 +- .../CreateAutoTimestampConverterTest.java | 2 +- .../CurrencyToBillingMapUserTypeTest.java | 4 ++-- .../CurrencyUnitConverterTest.java | 2 +- .../DateTimeConverterTest.java | 2 +- .../JodaMoneyConverterTest.java | 2 +- .../{ => converter}/MapUserTypeTest.java | 4 ++-- .../StatusValueSetConverterTest.java | 2 +- .../StringListConverterTest.java | 2 +- .../StringSetConverterTest.java | 2 +- .../StringValueEnumeratedTest.java | 2 +- .../UpdateAutoTimestampConverterTest.java | 2 +- .../ZonedDateTimeConverterTest.java | 2 +- 35 files changed, 58 insertions(+), 51 deletions(-) rename core/src/main/java/google/registry/persistence/{ => converter}/BloomFilterConverter.java (97%) rename core/src/main/java/google/registry/persistence/{ => converter}/CidrAddressBlockListConverter.java (96%) rename core/src/main/java/google/registry/persistence/{ => converter}/CreateAutoTimestampConverter.java (97%) rename core/src/main/java/google/registry/persistence/{ => converter}/CurrencyToBillingMapUserType.java (97%) rename core/src/main/java/google/registry/persistence/{ => converter}/CurrencyUnitConverter.java (95%) rename core/src/main/java/google/registry/persistence/{ => converter}/DateTimeConverter.java (96%) rename core/src/main/java/google/registry/persistence/{ => converter}/MapUserType.java (98%) rename core/src/main/java/google/registry/persistence/{ => converter}/MutableUserType.java (97%) rename core/src/main/java/google/registry/persistence/{ => converter}/RegistrarPocSetConverter.java (96%) rename core/src/main/java/google/registry/persistence/{ => converter}/StatusValueSetConverter.java (96%) rename core/src/main/java/google/registry/persistence/{ => converter}/StringCollectionDescriptor.java (95%) rename core/src/main/java/google/registry/persistence/{ => converter}/StringListConverter.java (95%) rename core/src/main/java/google/registry/persistence/{ => converter}/StringListConverterBase.java (91%) rename core/src/main/java/google/registry/persistence/{ => converter}/StringSetConverter.java (95%) rename core/src/main/java/google/registry/persistence/{ => converter}/StringSetConverterBase.java (91%) rename core/src/main/java/google/registry/persistence/{ => converter}/ToStringConverterBase.java (95%) rename core/src/main/java/google/registry/persistence/{ => converter}/UpdateAutoTimestampConverter.java (97%) rename core/src/main/java/google/registry/persistence/{ => converter}/ZonedDateTimeConverter.java (97%) rename core/src/test/java/google/registry/persistence/{ => converter}/BloomFilterConverterTest.java (98%) rename core/src/test/java/google/registry/persistence/{ => converter}/CidrAddressBlockListUserTypeTest.java (98%) rename core/src/test/java/google/registry/persistence/{ => converter}/CreateAutoTimestampConverterTest.java (98%) rename core/src/test/java/google/registry/persistence/{ => converter}/CurrencyToBillingMapUserTypeTest.java (95%) rename core/src/test/java/google/registry/persistence/{ => converter}/CurrencyUnitConverterTest.java (98%) rename core/src/test/java/google/registry/persistence/{ => converter}/DateTimeConverterTest.java (98%) rename core/src/test/java/google/registry/persistence/{ => converter}/JodaMoneyConverterTest.java (99%) rename core/src/test/java/google/registry/persistence/{ => converter}/MapUserTypeTest.java (97%) rename core/src/test/java/google/registry/persistence/{ => converter}/StatusValueSetConverterTest.java (97%) rename core/src/test/java/google/registry/persistence/{ => converter}/StringListConverterTest.java (99%) rename core/src/test/java/google/registry/persistence/{ => converter}/StringSetConverterTest.java (98%) rename core/src/test/java/google/registry/persistence/{ => converter}/StringValueEnumeratedTest.java (98%) rename core/src/test/java/google/registry/persistence/{ => converter}/UpdateAutoTimestampConverterTest.java (98%) rename core/src/test/java/google/registry/persistence/{ => converter}/ZonedDateTimeConverterTest.java (98%) diff --git a/core/src/main/java/google/registry/model/registrar/Registrar.java b/core/src/main/java/google/registry/model/registrar/Registrar.java index d11f944bc..c364ee609 100644 --- a/core/src/main/java/google/registry/model/registrar/Registrar.java +++ b/core/src/main/java/google/registry/model/registrar/Registrar.java @@ -392,7 +392,8 @@ public class Registrar extends ImmutableObject implements Buildable, Jsonifiable */ @Nullable @Mapify(CurrencyMapper.class) - @org.hibernate.annotations.Type(type = "google.registry.persistence.CurrencyToBillingMapUserType") + @org.hibernate.annotations.Type( + type = "google.registry.persistence.converter.CurrencyToBillingMapUserType") Map billingAccountMap; /** A billing account entry for this registrar, consisting of a currency and an account Id. */ diff --git a/core/src/main/java/google/registry/persistence/NomulusPostgreSQLDialect.java b/core/src/main/java/google/registry/persistence/NomulusPostgreSQLDialect.java index 786787da9..3e209473c 100644 --- a/core/src/main/java/google/registry/persistence/NomulusPostgreSQLDialect.java +++ b/core/src/main/java/google/registry/persistence/NomulusPostgreSQLDialect.java @@ -13,6 +13,7 @@ // limitations under the License. package google.registry.persistence; +import google.registry.persistence.converter.StringCollectionDescriptor; import java.sql.Types; import org.hibernate.boot.model.TypeContributions; import org.hibernate.dialect.PostgreSQL95Dialect; @@ -34,7 +35,7 @@ public class NomulusPostgreSQLDialect extends PostgreSQL95Dialect { public void contributeTypes( TypeContributions typeContributions, ServiceRegistry serviceRegistry) { super.contributeTypes(typeContributions, serviceRegistry); - typeContributions.contributeJavaTypeDescriptor(new StringCollectionDescriptor()); - typeContributions.contributeSqlTypeDescriptor(new StringCollectionDescriptor()); + typeContributions.contributeJavaTypeDescriptor(StringCollectionDescriptor.getInstance()); + typeContributions.contributeSqlTypeDescriptor(StringCollectionDescriptor.getInstance()); } } diff --git a/core/src/main/java/google/registry/persistence/BloomFilterConverter.java b/core/src/main/java/google/registry/persistence/converter/BloomFilterConverter.java similarity index 97% rename from core/src/main/java/google/registry/persistence/BloomFilterConverter.java rename to core/src/main/java/google/registry/persistence/converter/BloomFilterConverter.java index 3622ce68b..6588bd217 100644 --- a/core/src/main/java/google/registry/persistence/BloomFilterConverter.java +++ b/core/src/main/java/google/registry/persistence/converter/BloomFilterConverter.java @@ -11,7 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.persistence; +package google.registry.persistence.converter; import static com.google.common.base.Charsets.US_ASCII; import static com.google.common.hash.Funnels.stringFunnel; diff --git a/core/src/main/java/google/registry/persistence/CidrAddressBlockListConverter.java b/core/src/main/java/google/registry/persistence/converter/CidrAddressBlockListConverter.java similarity index 96% rename from core/src/main/java/google/registry/persistence/CidrAddressBlockListConverter.java rename to core/src/main/java/google/registry/persistence/converter/CidrAddressBlockListConverter.java index aae37c8b9..f7072f60d 100644 --- a/core/src/main/java/google/registry/persistence/CidrAddressBlockListConverter.java +++ b/core/src/main/java/google/registry/persistence/converter/CidrAddressBlockListConverter.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.persistence; +package google.registry.persistence.converter; import google.registry.util.CidrAddressBlock; import java.util.List; diff --git a/core/src/main/java/google/registry/persistence/CreateAutoTimestampConverter.java b/core/src/main/java/google/registry/persistence/converter/CreateAutoTimestampConverter.java similarity index 97% rename from core/src/main/java/google/registry/persistence/CreateAutoTimestampConverter.java rename to core/src/main/java/google/registry/persistence/converter/CreateAutoTimestampConverter.java index d7879b5c0..938528368 100644 --- a/core/src/main/java/google/registry/persistence/CreateAutoTimestampConverter.java +++ b/core/src/main/java/google/registry/persistence/converter/CreateAutoTimestampConverter.java @@ -11,7 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.persistence; +package google.registry.persistence.converter; import static com.google.common.base.MoreObjects.firstNonNull; import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm; diff --git a/core/src/main/java/google/registry/persistence/CurrencyToBillingMapUserType.java b/core/src/main/java/google/registry/persistence/converter/CurrencyToBillingMapUserType.java similarity index 97% rename from core/src/main/java/google/registry/persistence/CurrencyToBillingMapUserType.java rename to core/src/main/java/google/registry/persistence/converter/CurrencyToBillingMapUserType.java index bbbd2d269..1c03abbb1 100644 --- a/core/src/main/java/google/registry/persistence/CurrencyToBillingMapUserType.java +++ b/core/src/main/java/google/registry/persistence/converter/CurrencyToBillingMapUserType.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.persistence; +package google.registry.persistence.converter; import static com.google.common.collect.ImmutableMap.toImmutableMap; diff --git a/core/src/main/java/google/registry/persistence/CurrencyUnitConverter.java b/core/src/main/java/google/registry/persistence/converter/CurrencyUnitConverter.java similarity index 95% rename from core/src/main/java/google/registry/persistence/CurrencyUnitConverter.java rename to core/src/main/java/google/registry/persistence/converter/CurrencyUnitConverter.java index 7b8d601d6..ea9283887 100644 --- a/core/src/main/java/google/registry/persistence/CurrencyUnitConverter.java +++ b/core/src/main/java/google/registry/persistence/converter/CurrencyUnitConverter.java @@ -11,7 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.persistence; +package google.registry.persistence.converter; import javax.annotation.Nullable; import javax.persistence.Converter; diff --git a/core/src/main/java/google/registry/persistence/DateTimeConverter.java b/core/src/main/java/google/registry/persistence/converter/DateTimeConverter.java similarity index 96% rename from core/src/main/java/google/registry/persistence/DateTimeConverter.java rename to core/src/main/java/google/registry/persistence/converter/DateTimeConverter.java index ecd9048ee..41020fc54 100644 --- a/core/src/main/java/google/registry/persistence/DateTimeConverter.java +++ b/core/src/main/java/google/registry/persistence/converter/DateTimeConverter.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.persistence; +package google.registry.persistence.converter; import static org.joda.time.DateTimeZone.UTC; diff --git a/core/src/main/java/google/registry/persistence/MapUserType.java b/core/src/main/java/google/registry/persistence/converter/MapUserType.java similarity index 98% rename from core/src/main/java/google/registry/persistence/MapUserType.java rename to core/src/main/java/google/registry/persistence/converter/MapUserType.java index 6a2759888..4b1dd3a79 100644 --- a/core/src/main/java/google/registry/persistence/MapUserType.java +++ b/core/src/main/java/google/registry/persistence/converter/MapUserType.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.persistence; +package google.registry.persistence.converter; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/core/src/main/java/google/registry/persistence/MutableUserType.java b/core/src/main/java/google/registry/persistence/converter/MutableUserType.java similarity index 97% rename from core/src/main/java/google/registry/persistence/MutableUserType.java rename to core/src/main/java/google/registry/persistence/converter/MutableUserType.java index 534020646..519b81722 100644 --- a/core/src/main/java/google/registry/persistence/MutableUserType.java +++ b/core/src/main/java/google/registry/persistence/converter/MutableUserType.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.persistence; +package google.registry.persistence.converter; import java.io.Serializable; import java.util.Objects; diff --git a/core/src/main/java/google/registry/persistence/RegistrarPocSetConverter.java b/core/src/main/java/google/registry/persistence/converter/RegistrarPocSetConverter.java similarity index 96% rename from core/src/main/java/google/registry/persistence/RegistrarPocSetConverter.java rename to core/src/main/java/google/registry/persistence/converter/RegistrarPocSetConverter.java index f4e0da400..74a4bbeb8 100644 --- a/core/src/main/java/google/registry/persistence/RegistrarPocSetConverter.java +++ b/core/src/main/java/google/registry/persistence/converter/RegistrarPocSetConverter.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.persistence; +package google.registry.persistence.converter; import google.registry.model.registrar.RegistrarContact.Type; import java.util.Set; diff --git a/core/src/main/java/google/registry/persistence/StatusValueSetConverter.java b/core/src/main/java/google/registry/persistence/converter/StatusValueSetConverter.java similarity index 96% rename from core/src/main/java/google/registry/persistence/StatusValueSetConverter.java rename to core/src/main/java/google/registry/persistence/converter/StatusValueSetConverter.java index 17485a89b..3a0e66b15 100644 --- a/core/src/main/java/google/registry/persistence/StatusValueSetConverter.java +++ b/core/src/main/java/google/registry/persistence/converter/StatusValueSetConverter.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.persistence; +package google.registry.persistence.converter; import google.registry.model.eppcommon.StatusValue; import java.util.Set; diff --git a/core/src/main/java/google/registry/persistence/StringCollectionDescriptor.java b/core/src/main/java/google/registry/persistence/converter/StringCollectionDescriptor.java similarity index 95% rename from core/src/main/java/google/registry/persistence/StringCollectionDescriptor.java rename to core/src/main/java/google/registry/persistence/converter/StringCollectionDescriptor.java index 098b812f8..e3e3c66b1 100644 --- a/core/src/main/java/google/registry/persistence/StringCollectionDescriptor.java +++ b/core/src/main/java/google/registry/persistence/converter/StringCollectionDescriptor.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.persistence; +package google.registry.persistence.converter; -import static google.registry.persistence.StringCollectionDescriptor.StringCollection; +import static google.registry.persistence.converter.StringCollectionDescriptor.StringCollection; import com.google.common.collect.ImmutableList; import java.sql.Array; @@ -51,11 +51,16 @@ public class StringCollectionDescriptor extends AbstractTypeDescriptorgoogle.registry.model.domain.GracePeriod - google.registry.persistence.BloomFilterConverter - google.registry.persistence.CidrAddressBlockListConverter - google.registry.persistence.CreateAutoTimestampConverter - google.registry.persistence.CurrencyUnitConverter - google.registry.persistence.DateTimeConverter - google.registry.persistence.RegistrarPocSetConverter - google.registry.persistence.StatusValueSetConverter - google.registry.persistence.StringListConverter - google.registry.persistence.StringSetConverter - google.registry.persistence.UpdateAutoTimestampConverter - google.registry.persistence.ZonedDateTimeConverter + google.registry.persistence.converter.BloomFilterConverter + google.registry.persistence.converter.CidrAddressBlockListConverter + google.registry.persistence.converter.CreateAutoTimestampConverter + google.registry.persistence.converter.CurrencyUnitConverter + google.registry.persistence.converter.DateTimeConverter + google.registry.persistence.converter.RegistrarPocSetConverter + google.registry.persistence.converter.StatusValueSetConverter + google.registry.persistence.converter.StringListConverter + google.registry.persistence.converter.StringSetConverter + google.registry.persistence.converter.UpdateAutoTimestampConverter + google.registry.persistence.converter.ZonedDateTimeConverter NONE diff --git a/core/src/test/java/google/registry/persistence/BloomFilterConverterTest.java b/core/src/test/java/google/registry/persistence/converter/BloomFilterConverterTest.java similarity index 98% rename from core/src/test/java/google/registry/persistence/BloomFilterConverterTest.java rename to core/src/test/java/google/registry/persistence/converter/BloomFilterConverterTest.java index e73aa30bb..e6d8fa44c 100644 --- a/core/src/test/java/google/registry/persistence/BloomFilterConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/BloomFilterConverterTest.java @@ -11,7 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.persistence; +package google.registry.persistence.converter; import static com.google.common.base.Charsets.US_ASCII; import static com.google.common.hash.Funnels.stringFunnel; diff --git a/core/src/test/java/google/registry/persistence/CidrAddressBlockListUserTypeTest.java b/core/src/test/java/google/registry/persistence/converter/CidrAddressBlockListUserTypeTest.java similarity index 98% rename from core/src/test/java/google/registry/persistence/CidrAddressBlockListUserTypeTest.java rename to core/src/test/java/google/registry/persistence/converter/CidrAddressBlockListUserTypeTest.java index 73930662a..84c09fa5a 100644 --- a/core/src/test/java/google/registry/persistence/CidrAddressBlockListUserTypeTest.java +++ b/core/src/test/java/google/registry/persistence/converter/CidrAddressBlockListUserTypeTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.persistence; +package google.registry.persistence.converter; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm; diff --git a/core/src/test/java/google/registry/persistence/CreateAutoTimestampConverterTest.java b/core/src/test/java/google/registry/persistence/converter/CreateAutoTimestampConverterTest.java similarity index 98% rename from core/src/test/java/google/registry/persistence/CreateAutoTimestampConverterTest.java rename to core/src/test/java/google/registry/persistence/converter/CreateAutoTimestampConverterTest.java index 19da4f2dc..56f5d003c 100644 --- a/core/src/test/java/google/registry/persistence/CreateAutoTimestampConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/CreateAutoTimestampConverterTest.java @@ -11,7 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.persistence; +package google.registry.persistence.converter; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm; diff --git a/core/src/test/java/google/registry/persistence/CurrencyToBillingMapUserTypeTest.java b/core/src/test/java/google/registry/persistence/converter/CurrencyToBillingMapUserTypeTest.java similarity index 95% rename from core/src/test/java/google/registry/persistence/CurrencyToBillingMapUserTypeTest.java rename to core/src/test/java/google/registry/persistence/converter/CurrencyToBillingMapUserTypeTest.java index b0577cecb..50339faa1 100644 --- a/core/src/test/java/google/registry/persistence/CurrencyToBillingMapUserTypeTest.java +++ b/core/src/test/java/google/registry/persistence/converter/CurrencyToBillingMapUserTypeTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.persistence; +package google.registry.persistence.converter; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm; @@ -62,7 +62,7 @@ public class CurrencyToBillingMapUserTypeTest { @Id String name = "id"; - @Type(type = "google.registry.persistence.CurrencyToBillingMapUserType") + @Type(type = "google.registry.persistence.converter.CurrencyToBillingMapUserType") Map currencyToBilling; private TestEntity() {} diff --git a/core/src/test/java/google/registry/persistence/CurrencyUnitConverterTest.java b/core/src/test/java/google/registry/persistence/converter/CurrencyUnitConverterTest.java similarity index 98% rename from core/src/test/java/google/registry/persistence/CurrencyUnitConverterTest.java rename to core/src/test/java/google/registry/persistence/converter/CurrencyUnitConverterTest.java index 2a1e007fe..d21f08b04 100644 --- a/core/src/test/java/google/registry/persistence/CurrencyUnitConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/CurrencyUnitConverterTest.java @@ -11,7 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.persistence; +package google.registry.persistence.converter; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm; diff --git a/core/src/test/java/google/registry/persistence/DateTimeConverterTest.java b/core/src/test/java/google/registry/persistence/converter/DateTimeConverterTest.java similarity index 98% rename from core/src/test/java/google/registry/persistence/DateTimeConverterTest.java rename to core/src/test/java/google/registry/persistence/converter/DateTimeConverterTest.java index a209c76d5..bc3066fe6 100644 --- a/core/src/test/java/google/registry/persistence/DateTimeConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/DateTimeConverterTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.persistence; +package google.registry.persistence.converter; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm; diff --git a/core/src/test/java/google/registry/persistence/JodaMoneyConverterTest.java b/core/src/test/java/google/registry/persistence/converter/JodaMoneyConverterTest.java similarity index 99% rename from core/src/test/java/google/registry/persistence/JodaMoneyConverterTest.java rename to core/src/test/java/google/registry/persistence/converter/JodaMoneyConverterTest.java index 283cbd615..a892b870c 100644 --- a/core/src/test/java/google/registry/persistence/JodaMoneyConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/JodaMoneyConverterTest.java @@ -11,7 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.persistence; +package google.registry.persistence.converter; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm; diff --git a/core/src/test/java/google/registry/persistence/MapUserTypeTest.java b/core/src/test/java/google/registry/persistence/converter/MapUserTypeTest.java similarity index 97% rename from core/src/test/java/google/registry/persistence/MapUserTypeTest.java rename to core/src/test/java/google/registry/persistence/converter/MapUserTypeTest.java index 8f0fb9a71..19b35560f 100644 --- a/core/src/test/java/google/registry/persistence/MapUserTypeTest.java +++ b/core/src/test/java/google/registry/persistence/converter/MapUserTypeTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.persistence; +package google.registry.persistence.converter; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm; @@ -131,7 +131,7 @@ public class MapUserTypeTest { @Id String name = "id"; - @Type(type = "google.registry.persistence.MapUserType") + @Type(type = "google.registry.persistence.converter.MapUserType") Map map; private TestEntity() {} diff --git a/core/src/test/java/google/registry/persistence/StatusValueSetConverterTest.java b/core/src/test/java/google/registry/persistence/converter/StatusValueSetConverterTest.java similarity index 97% rename from core/src/test/java/google/registry/persistence/StatusValueSetConverterTest.java rename to core/src/test/java/google/registry/persistence/converter/StatusValueSetConverterTest.java index a141a59b2..c86819107 100644 --- a/core/src/test/java/google/registry/persistence/StatusValueSetConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/StatusValueSetConverterTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.persistence; +package google.registry.persistence.converter; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm; diff --git a/core/src/test/java/google/registry/persistence/StringListConverterTest.java b/core/src/test/java/google/registry/persistence/converter/StringListConverterTest.java similarity index 99% rename from core/src/test/java/google/registry/persistence/StringListConverterTest.java rename to core/src/test/java/google/registry/persistence/converter/StringListConverterTest.java index 5d7ea0a6d..c39e12f18 100644 --- a/core/src/test/java/google/registry/persistence/StringListConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/StringListConverterTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.persistence; +package google.registry.persistence.converter; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm; diff --git a/core/src/test/java/google/registry/persistence/StringSetConverterTest.java b/core/src/test/java/google/registry/persistence/converter/StringSetConverterTest.java similarity index 98% rename from core/src/test/java/google/registry/persistence/StringSetConverterTest.java rename to core/src/test/java/google/registry/persistence/converter/StringSetConverterTest.java index cb5925611..ae862967f 100644 --- a/core/src/test/java/google/registry/persistence/StringSetConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/StringSetConverterTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.persistence; +package google.registry.persistence.converter; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm; diff --git a/core/src/test/java/google/registry/persistence/StringValueEnumeratedTest.java b/core/src/test/java/google/registry/persistence/converter/StringValueEnumeratedTest.java similarity index 98% rename from core/src/test/java/google/registry/persistence/StringValueEnumeratedTest.java rename to core/src/test/java/google/registry/persistence/converter/StringValueEnumeratedTest.java index 6a59375f3..02db57a3b 100644 --- a/core/src/test/java/google/registry/persistence/StringValueEnumeratedTest.java +++ b/core/src/test/java/google/registry/persistence/converter/StringValueEnumeratedTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.persistence; +package google.registry.persistence.converter; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm; diff --git a/core/src/test/java/google/registry/persistence/UpdateAutoTimestampConverterTest.java b/core/src/test/java/google/registry/persistence/converter/UpdateAutoTimestampConverterTest.java similarity index 98% rename from core/src/test/java/google/registry/persistence/UpdateAutoTimestampConverterTest.java rename to core/src/test/java/google/registry/persistence/converter/UpdateAutoTimestampConverterTest.java index a6b1fb544..4878a46ef 100644 --- a/core/src/test/java/google/registry/persistence/UpdateAutoTimestampConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/UpdateAutoTimestampConverterTest.java @@ -11,7 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.persistence; +package google.registry.persistence.converter; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm; diff --git a/core/src/test/java/google/registry/persistence/ZonedDateTimeConverterTest.java b/core/src/test/java/google/registry/persistence/converter/ZonedDateTimeConverterTest.java similarity index 98% rename from core/src/test/java/google/registry/persistence/ZonedDateTimeConverterTest.java rename to core/src/test/java/google/registry/persistence/converter/ZonedDateTimeConverterTest.java index 41300e0cc..88fe1da11 100644 --- a/core/src/test/java/google/registry/persistence/ZonedDateTimeConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/ZonedDateTimeConverterTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.persistence; +package google.registry.persistence.converter; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm;