Move all JPA converters to a dedicated package (#480)

* Move all JPA converters to a dedicated package

* Move tests as well

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<CurrencyUnit, BillingAccountEntry> billingAccountMap;
 
   /** A billing account entry for this registrar, consisting of a currency and an account Id. */

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

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;

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;

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;

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;
 

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;

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;
 

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;

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;

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;

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;

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 AbstractTypeDescriptor<StringCol
   public static final int COLUMN_TYPE = Types.ARRAY;
   public static final String COLUMN_NAME = "text";
   public static final String COLUMN_DDL_NAME = COLUMN_NAME + "[]";
+  private static final StringCollectionDescriptor INSTANCE = new StringCollectionDescriptor();
 
   protected StringCollectionDescriptor() {
     super(StringCollection.class);
   }
 
+  public static StringCollectionDescriptor getInstance() {
+    return INSTANCE;
+  }
+
   @Override
   public StringCollection fromString(String string) {
     throw new UnsupportedOperationException(

core/src/main/java/google/registry/persistence/converter/StringListConverter.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.util.List;
 import javax.persistence.AttributeConverter;

core/src/main/java/google/registry/persistence/converter/StringListConverterBase.java

@@ -12,11 +12,11 @@
 // 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.ImmutableList.toImmutableList;
 
-import google.registry.persistence.StringCollectionDescriptor.StringCollection;
+import google.registry.persistence.converter.StringCollectionDescriptor.StringCollection;
 import java.util.List;
 import javax.persistence.AttributeConverter;
 

core/src/main/java/google/registry/persistence/converter/StringSetConverter.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.util.Set;
 import javax.persistence.AttributeConverter;

core/src/main/java/google/registry/persistence/converter/StringSetConverterBase.java

@@ -12,11 +12,11 @@
 // 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.ImmutableSet.toImmutableSet;
 
-import google.registry.persistence.StringCollectionDescriptor.StringCollection;
+import google.registry.persistence.converter.StringCollectionDescriptor.StringCollection;
 import java.util.Set;
 import javax.persistence.AttributeConverter;
 

core/src/main/java/google/registry/persistence/converter/ToStringConverterBase.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.AttributeConverter;

core/src/main/java/google/registry/persistence/converter/UpdateAutoTimestampConverter.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 google.registry.persistence.transaction.TransactionManagerFactory.jpaTm;
 

core/src/main/java/google/registry/persistence/converter/ZonedDateTimeConverter.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.Timestamp;
 import java.time.ZoneId;

core/src/main/resources/META-INF/persistence.xml

@@ -33,17 +33,17 @@
     <class>google.registry.model.domain.GracePeriod</class>
 
     <!-- Customized type converters -->
-    <class>google.registry.persistence.BloomFilterConverter</class>
-    <class>google.registry.persistence.CidrAddressBlockListConverter</class>
-    <class>google.registry.persistence.CreateAutoTimestampConverter</class>
-    <class>google.registry.persistence.CurrencyUnitConverter</class>
-    <class>google.registry.persistence.DateTimeConverter</class>
-    <class>google.registry.persistence.RegistrarPocSetConverter</class>
-    <class>google.registry.persistence.StatusValueSetConverter</class>
-    <class>google.registry.persistence.StringListConverter</class>
-    <class>google.registry.persistence.StringSetConverter</class>
-    <class>google.registry.persistence.UpdateAutoTimestampConverter</class>
-    <class>google.registry.persistence.ZonedDateTimeConverter</class>
+    <class>google.registry.persistence.converter.BloomFilterConverter</class>
+    <class>google.registry.persistence.converter.CidrAddressBlockListConverter</class>
+    <class>google.registry.persistence.converter.CreateAutoTimestampConverter</class>
+    <class>google.registry.persistence.converter.CurrencyUnitConverter</class>
+    <class>google.registry.persistence.converter.DateTimeConverter</class>
+    <class>google.registry.persistence.converter.RegistrarPocSetConverter</class>
+    <class>google.registry.persistence.converter.StatusValueSetConverter</class>
+    <class>google.registry.persistence.converter.StringListConverter</class>
+    <class>google.registry.persistence.converter.StringSetConverter</class>
+    <class>google.registry.persistence.converter.UpdateAutoTimestampConverter</class>
+    <class>google.registry.persistence.converter.ZonedDateTimeConverter</class>
 
     <!-- TODO(weiminyu): check out application-layer validation. -->
     <validation-mode>NONE</validation-mode>

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;

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;

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;

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<CurrencyUnit, BillingAccountEntry> currencyToBilling;
 
     private TestEntity() {}

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;

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;

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;

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<String, String> map;
 
     private TestEntity() {}

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;

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;

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;

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;

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;

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;