mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-06-09 16:33:02 +00:00
Code Issues Releases Wiki Activity

Automatically apply JPA type converters (#305)

Browse Source 
* Automatically apply JPA type converters

* Include converters in tests and schema generation too
This commit is contained in:
Ben McIlwain
2019-10-08 13:16:39 -04:00
committed by GitHub
parent 0fd7cf29b5
commit 5dc058ec99
11 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/google/registry/persistence/CreateAutoTimestampConverter.java
View File

@@ -27,7 +27,7 @@ import javax.persistence.Converter;
import org.joda.time.DateTime;
/** JPA converter to for storing/retrieving CreateAutoTimestamp objects. */
@Converter
@Converter(autoApply = true)
public class CreateAutoTimestampConverter
implements AttributeConverter<CreateAutoTimestamp, Timestamp> {

2
core/src/main/java/google/registry/persistence/UpdateAutoTimestampConverter.java
View File

@@ -25,7 +25,7 @@ import javax.persistence.AttributeConverter;
import javax.persistence.Converter;
/** JPA converter for storing/retrieving UpdateAutoTimestamp objects. */
@Converter
@Converter(autoApply = true)
public class UpdateAutoTimestampConverter
implements AttributeConverter<UpdateAutoTimestamp, Timestamp> {

3
core/src/main/java/google/registry/schema/domain/RegistryLock.java
View File

@@ -21,12 +21,10 @@ import static google.registry.util.PreconditionsUtils.checkArgumentNotNull;
import google.registry.model.Buildable;
import google.registry.model.CreateAutoTimestamp;
import google.registry.model.ImmutableObject;
import google.registry.persistence.CreateAutoTimestampConverter;
import google.registry.util.DateTimeUtils;
import java.time.ZonedDateTime;
import java.util.Optional;
import javax.persistence.Column;
import javax.persistence.Convert;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
@@ -109,7 +107,6 @@ public final class RegistryLock extends ImmutableObject implements Buildable {
/** Creation timestamp is when the lock/unlock is first requested. */
@Column(nullable = false)
@Convert(converter = CreateAutoTimestampConverter.class)
private CreateAutoTimestamp creationTimestamp = CreateAutoTimestamp.create(null);
/**

3
core/src/main/java/google/registry/schema/tld/PremiumList.java
View File

@@ -17,12 +17,10 @@ package google.registry.schema.tld;
import static com.google.common.base.Preconditions.checkState;
import google.registry.model.CreateAutoTimestamp;
import google.registry.persistence.CreateAutoTimestampConverter;
import java.math.BigDecimal;
import java.util.Map;
import javax.persistence.CollectionTable;
import javax.persistence.Column;
import javax.persistence.Convert;
import javax.persistence.ElementCollection;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -56,7 +54,6 @@ public class PremiumList {
private Long revisionId;
@Column(nullable = false)
@Convert(converter = CreateAutoTimestampConverter.class)
private CreateAutoTimestamp creationTimestamp = CreateAutoTimestamp.create(null);
@Column(nullable = false)

6
core/src/main/java/google/registry/tools/GenerateSqlSchemaCommand.java
View File

@@ -27,8 +27,10 @@ import google.registry.model.domain.secdns.DelegationSignerData;
import google.registry.model.eppcommon.Trid;
import google.registry.model.transfer.BaseTransferObject;
import google.registry.model.transfer.TransferData;
import google.registry.persistence.CreateAutoTimestampConverter;
import google.registry.persistence.NomulusNamingStrategy;
import google.registry.persistence.NomulusPostgreSQLDialect;
import google.registry.persistence.UpdateAutoTimestampConverter;
import google.registry.schema.domain.RegistryLock;
import google.registry.schema.tld.PremiumList;
import google.registry.schema.tmch.ClaimsList;
@@ -62,6 +64,7 @@ public class GenerateSqlSchemaCommand implements Command {
ImmutableSet.of(
BaseTransferObject.class,
ClaimsList.class,
CreateAutoTimestampConverter.class,
DelegationSignerData.class,
DesignatedContact.class,
DomainBase.class,
@@ -70,7 +73,8 @@ public class GenerateSqlSchemaCommand implements Command {
PremiumList.class,
RegistryLock.class,
TransferData.class,
Trid.class);
Trid.class,
UpdateAutoTimestampConverter.class);
@VisibleForTesting
public static final String DB_OPTIONS_CLASH =

4
core/src/main/resources/META-INF/persistence.xml
View File

@@ -32,6 +32,10 @@
<class>google.registry.model.transfer.TransferData</class>
<class>google.registry.model.eppcommon.Trid</class>
<!-- Customized type converters -->
<class>google.registry.persistence.CreateAutoTimestampConverter</class>
<class>google.registry.persistence.UpdateAutoTimestampConverter</class>
<!-- TODO(weiminyu): check out application-layer validation. -->
<validation-mode>NONE</validation-mode>
</persistence-unit>