diff --git a/core/src/main/java/google/registry/flows/domain/DomainInfoFlow.java b/core/src/main/java/google/registry/flows/domain/DomainInfoFlow.java index 05c2e603b..8cdad04e9 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainInfoFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainInfoFlow.java @@ -41,10 +41,10 @@ import google.registry.model.domain.Domain; import google.registry.model.domain.DomainCommand.Info; import google.registry.model.domain.DomainCommand.Info.HostsRequest; import google.registry.model.domain.DomainInfoData; +import google.registry.model.domain.bulktoken.BulkTokenExtension; +import google.registry.model.domain.bulktoken.BulkTokenResponseExtension; import google.registry.model.domain.fee06.FeeInfoCommandExtensionV06; import google.registry.model.domain.fee06.FeeInfoResponseExtensionV06; -import google.registry.model.domain.packagetoken.PackageTokenExtension; -import google.registry.model.domain.packagetoken.PackageTokenResponseExtension; import google.registry.model.domain.rgp.GracePeriodStatus; import google.registry.model.domain.rgp.RgpInfoExtension; import google.registry.model.eppcommon.AuthInfo; @@ -95,7 +95,7 @@ public final class DomainInfoFlow implements Flow { @Override public EppResponse run() throws EppException { - extensionManager.register(FeeInfoCommandExtensionV06.class, PackageTokenExtension.class); + extensionManager.register(FeeInfoCommandExtensionV06.class, BulkTokenExtension.class); flowCustomLogic.beforeValidation(); validateRegistrarIsLoggedIn(registrarId); extensionManager.validate(); @@ -155,13 +155,13 @@ public final class DomainInfoFlow implements Flow { if (!gracePeriodStatuses.isEmpty()) { extensions.add(RgpInfoExtension.create(gracePeriodStatuses)); } - Optional packageInfo = - eppInput.getSingleExtension(PackageTokenExtension.class); + Optional packageInfo = + eppInput.getSingleExtension(BulkTokenExtension.class); if (packageInfo.isPresent()) { // Package info was requested. if (isSuperuser || registrarId.equals(domain.getCurrentSponsorRegistrarId())) { // Only show package info to owning registrar or superusers - extensions.add(PackageTokenResponseExtension.create(domain.getCurrentPackageToken())); + extensions.add(BulkTokenResponseExtension.create(domain.getCurrentPackageToken())); } } Optional feeInfo = diff --git a/core/src/main/java/google/registry/model/domain/packagetoken/PackageTokenExtension.java b/core/src/main/java/google/registry/model/domain/bulktoken/BulkTokenExtension.java similarity index 78% rename from core/src/main/java/google/registry/model/domain/packagetoken/PackageTokenExtension.java rename to core/src/main/java/google/registry/model/domain/bulktoken/BulkTokenExtension.java index 64f7a3a40..5c36ed5be 100644 --- a/core/src/main/java/google/registry/model/domain/packagetoken/PackageTokenExtension.java +++ b/core/src/main/java/google/registry/model/domain/bulktoken/BulkTokenExtension.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.model.domain.packagetoken; +package google.registry.model.domain.bulktoken; import google.registry.model.ImmutableObject; import google.registry.model.eppinput.EppInput.CommandExtension; import javax.xml.bind.annotation.XmlRootElement; -/** A package token extension that may be present on EPP domain commands. */ +/** A bulk token extension that may be present on EPP domain commands. */ @XmlRootElement(name = "info") -public class PackageTokenExtension extends ImmutableObject implements CommandExtension {} +public class BulkTokenExtension extends ImmutableObject implements CommandExtension {} diff --git a/core/src/main/java/google/registry/model/domain/packagetoken/PackageTokenResponseExtension.java b/core/src/main/java/google/registry/model/domain/bulktoken/BulkTokenResponseExtension.java similarity index 72% rename from core/src/main/java/google/registry/model/domain/packagetoken/PackageTokenResponseExtension.java rename to core/src/main/java/google/registry/model/domain/bulktoken/BulkTokenResponseExtension.java index 9be11d543..1a23bdcad 100644 --- a/core/src/main/java/google/registry/model/domain/packagetoken/PackageTokenResponseExtension.java +++ b/core/src/main/java/google/registry/model/domain/bulktoken/BulkTokenResponseExtension.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.model.domain.packagetoken; +package google.registry.model.domain.bulktoken; import google.registry.model.ImmutableObject; import google.registry.model.domain.token.AllocationToken; @@ -24,18 +24,18 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** - * An XML data object that represents a package token extension that may be present on the response - * to EPP domain info commands. + * An XML data object that represents a bulk token extension that may be present on the response to + * EPP domain info commands. */ -@XmlRootElement(name = "packageData") -public class PackageTokenResponseExtension extends ImmutableObject implements ResponseExtension { +@XmlRootElement(name = "bulkData") +public class BulkTokenResponseExtension extends ImmutableObject implements ResponseExtension { /** Token string of the PACKAGE token the name belongs to. */ @XmlJavaTypeAdapter(TrimWhitespaceAdapter.class) String token; - public static PackageTokenResponseExtension create(Optional> tokenKey) { - PackageTokenResponseExtension instance = new PackageTokenResponseExtension(); + public static BulkTokenResponseExtension create(Optional> tokenKey) { + BulkTokenResponseExtension instance = new BulkTokenResponseExtension(); instance.token = ""; if (tokenKey.isPresent()) { instance.token = tokenKey.get().getKey().toString(); diff --git a/core/src/main/java/google/registry/model/domain/packagetoken/package-info.java b/core/src/main/java/google/registry/model/domain/bulktoken/package-info.java similarity index 80% rename from core/src/main/java/google/registry/model/domain/packagetoken/package-info.java rename to core/src/main/java/google/registry/model/domain/bulktoken/package-info.java index af29abadf..8f9d9f944 100644 --- a/core/src/main/java/google/registry/model/domain/packagetoken/package-info.java +++ b/core/src/main/java/google/registry/model/domain/bulktoken/package-info.java @@ -13,12 +13,11 @@ // limitations under the License. @XmlSchema( - namespace = "urn:google:params:xml:ns:packageToken-1.0", - xmlns = - @XmlNs(prefix = "packageToken", namespaceURI = "urn:google:params:xml:ns:packageToken-1.0"), + namespace = "urn:google:params:xml:ns:bulkToken-1.0", + xmlns = @XmlNs(prefix = "bulkToken", namespaceURI = "urn:google:params:xml:ns:bulkToken-1.0"), elementFormDefault = XmlNsForm.QUALIFIED) @XmlAccessorType(XmlAccessType.FIELD) -package google.registry.model.domain.packagetoken; +package google.registry.model.domain.bulktoken; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/core/src/main/java/google/registry/model/eppcommon/EppXmlTransformer.java b/core/src/main/java/google/registry/model/eppcommon/EppXmlTransformer.java index ab5d90d4c..42d4daa81 100644 --- a/core/src/main/java/google/registry/model/eppcommon/EppXmlTransformer.java +++ b/core/src/main/java/google/registry/model/eppcommon/EppXmlTransformer.java @@ -51,7 +51,7 @@ public class EppXmlTransformer { "allocate.xsd", "superuser.xsd", "allocationToken-1.0.xsd", - "packageToken.xsd"); + "bulkToken.xsd"); private static final XmlTransformer INPUT_TRANSFORMER = new XmlTransformer(SCHEMAS, EppInput.class); diff --git a/core/src/main/java/google/registry/model/eppinput/EppInput.java b/core/src/main/java/google/registry/model/eppinput/EppInput.java index 524c61db5..8ad63bd78 100644 --- a/core/src/main/java/google/registry/model/eppinput/EppInput.java +++ b/core/src/main/java/google/registry/model/eppinput/EppInput.java @@ -23,6 +23,7 @@ import com.google.common.collect.ImmutableSet; import google.registry.model.ImmutableObject; import google.registry.model.contact.ContactCommand; import google.registry.model.domain.DomainCommand; +import google.registry.model.domain.bulktoken.BulkTokenExtension; import google.registry.model.domain.fee06.FeeCheckCommandExtensionV06; import google.registry.model.domain.fee06.FeeCreateCommandExtensionV06; import google.registry.model.domain.fee06.FeeInfoCommandExtensionV06; @@ -45,7 +46,6 @@ import google.registry.model.domain.launch.LaunchDeleteExtension; import google.registry.model.domain.launch.LaunchInfoExtension; import google.registry.model.domain.launch.LaunchUpdateExtension; import google.registry.model.domain.metadata.MetadataExtension; -import google.registry.model.domain.packagetoken.PackageTokenExtension; import google.registry.model.domain.rgp.RgpUpdateExtension; import google.registry.model.domain.secdns.SecDnsCreateExtension; import google.registry.model.domain.secdns.SecDnsUpdateExtension; @@ -362,8 +362,8 @@ public class EppInput extends ImmutableObject { // Other extensions @XmlElementRef(type = AllocationTokenExtension.class), + @XmlElementRef(type = BulkTokenExtension.class), @XmlElementRef(type = MetadataExtension.class), - @XmlElementRef(type = PackageTokenExtension.class), @XmlElementRef(type = RgpUpdateExtension.class), @XmlElementRef(type = SecDnsCreateExtension.class), @XmlElementRef(type = SecDnsUpdateExtension.class) diff --git a/core/src/main/java/google/registry/model/eppoutput/EppResponse.java b/core/src/main/java/google/registry/model/eppoutput/EppResponse.java index 0446585c8..eab60f3e0 100644 --- a/core/src/main/java/google/registry/model/eppoutput/EppResponse.java +++ b/core/src/main/java/google/registry/model/eppoutput/EppResponse.java @@ -23,6 +23,7 @@ import google.registry.model.ImmutableObject; import google.registry.model.contact.ContactInfoData; import google.registry.model.domain.DomainInfoData; import google.registry.model.domain.DomainRenewData; +import google.registry.model.domain.bulktoken.BulkTokenResponseExtension; import google.registry.model.domain.fee06.FeeCheckResponseExtensionV06; import google.registry.model.domain.fee06.FeeCreateResponseExtensionV06; import google.registry.model.domain.fee06.FeeDeleteResponseExtensionV06; @@ -43,7 +44,6 @@ import google.registry.model.domain.fee12.FeeRenewResponseExtensionV12; import google.registry.model.domain.fee12.FeeTransferResponseExtensionV12; import google.registry.model.domain.fee12.FeeUpdateResponseExtensionV12; import google.registry.model.domain.launch.LaunchCheckResponseExtension; -import google.registry.model.domain.packagetoken.PackageTokenResponseExtension; import google.registry.model.domain.rgp.RgpInfoExtension; import google.registry.model.domain.secdns.SecDnsInfoExtension; import google.registry.model.eppcommon.Trid; @@ -122,6 +122,7 @@ public class EppResponse extends ImmutableObject implements ResponseOrGreeting { /** Zero or more response extensions. */ @XmlElementRefs({ + @XmlElementRef(type = BulkTokenResponseExtension.class), @XmlElementRef(type = FeeCheckResponseExtensionV06.class), @XmlElementRef(type = FeeInfoResponseExtensionV06.class), @XmlElementRef(type = FeeCreateResponseExtensionV06.class), @@ -142,7 +143,6 @@ public class EppResponse extends ImmutableObject implements ResponseOrGreeting { @XmlElementRef(type = FeeTransferResponseExtensionV12.class), @XmlElementRef(type = FeeUpdateResponseExtensionV12.class), @XmlElementRef(type = LaunchCheckResponseExtension.class), - @XmlElementRef(type = PackageTokenResponseExtension.class), @XmlElementRef(type = RgpInfoExtension.class), @XmlElementRef(type = SecDnsInfoExtension.class) }) diff --git a/core/src/main/java/google/registry/xml/xsd/bulkToken.xsd b/core/src/main/java/google/registry/xml/xsd/bulkToken.xsd new file mode 100644 index 000000000..a947d96e3 --- /dev/null +++ b/core/src/main/java/google/registry/xml/xsd/bulkToken.xsd @@ -0,0 +1,38 @@ + + + + + + + Extensible Provisioning Protocol v1.0 + Bulk Token Extension. + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/core/src/main/java/google/registry/xml/xsd/packageToken.xsd b/core/src/main/java/google/registry/xml/xsd/packageToken.xsd deleted file mode 100644 index f9b11f46c..000000000 --- a/core/src/main/java/google/registry/xml/xsd/packageToken.xsd +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - Extensible Provisioning Protocol v1.0 - Package Token Extension. - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/core/src/test/java/google/registry/flows/domain/DomainInfoFlowTest.java b/core/src/test/java/google/registry/flows/domain/DomainInfoFlowTest.java index a72c6043d..bb28fc4cd 100644 --- a/core/src/test/java/google/registry/flows/domain/DomainInfoFlowTest.java +++ b/core/src/test/java/google/registry/flows/domain/DomainInfoFlowTest.java @@ -1085,7 +1085,7 @@ class DomainInfoFlowTest extends ResourceFlowTestCase { } @Test - void testPackageInfoExtension_returnsPackageInfo() throws Exception { + void testBulkInfoExtension_returnsBulkInfo() throws Exception { persistTestEntities(false); AllocationToken token = persistResource( @@ -1100,12 +1100,12 @@ class DomainInfoFlowTest extends ResourceFlowTestCase { .build()); domain = domain.asBuilder().setCurrentPackageToken(token.createVKey()).build(); persistResource(domain); - setEppInput("domain_info_package.xml"); - doSuccessfulTest("domain_info_response_package.xml", false); + setEppInput("domain_info_bulk.xml"); + doSuccessfulTest("domain_info_response_bulk.xml", false); } @Test - void testPackageInfoExtension_returnsPackageInfoForSuperUser() throws Exception { + void testBulkInfoExtension_returnsBulkInfoForSuperUser() throws Exception { persistTestEntities(false); AllocationToken token = persistResource( @@ -1121,23 +1121,23 @@ class DomainInfoFlowTest extends ResourceFlowTestCase { domain = domain.asBuilder().setCurrentPackageToken(token.createVKey()).build(); persistResource(domain); sessionMetadata.setRegistrarId("TheRegistrar"); - setEppInput("domain_info_package.xml"); + setEppInput("domain_info_bulk.xml"); EppOutput output = runFlowAsSuperuser(); String expectedOutput = loadFile( - "domain_info_response_superuser_package.xml", + "domain_info_response_superuser_bulk.xml", updateSubstitutions(ImmutableMap.of(), "ROID", "2FF-TLD")); assertXmlEquals(expectedOutput, new String(marshal(output, ValidationMode.LENIENT), UTF_8)); } @Test - void testPackageInfoExtension_nameNotInPackage() throws Exception { - setEppInput("domain_info_package.xml"); - doSuccessfulTest("domain_info_response_empty_package.xml"); + void testBulkInfoExtension_nameNotInBulkPackage() throws Exception { + setEppInput("domain_info_bulk.xml"); + doSuccessfulTest("domain_info_response_empty_bulk_package.xml"); } @Test - void testPackageInfoExtension_notCurrentSponsorRegistrar() throws Exception { + void testBulkInfoExtension_notCurrentSponsorRegistrar() throws Exception { persistTestEntities(false); AllocationToken token = persistResource( @@ -1153,7 +1153,7 @@ class DomainInfoFlowTest extends ResourceFlowTestCase { domain = domain.asBuilder().setCurrentPackageToken(token.createVKey()).build(); persistResource(domain); sessionMetadata.setRegistrarId("TheRegistrar"); - setEppInput("domain_info_package.xml"); + setEppInput("domain_info_bulk.xml"); doSuccessfulTest("domain_info_response_unauthorized.xml", false); } } diff --git a/core/src/test/resources/google/registry/flows/domain/domain_delete_response_fee_free_grace.xml b/core/src/test/resources/google/registry/flows/domain/domain_delete_response_fee_free_grace.xml index 5e4d824a2..79a85c288 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_delete_response_fee_free_grace.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_delete_response_fee_free_grace.xml @@ -1,5 +1,5 @@ - + Command completed successfully diff --git a/core/src/test/resources/google/registry/flows/domain/domain_info_package.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_bulk.xml similarity index 73% rename from core/src/test/resources/google/registry/flows/domain/domain_info_package.xml rename to core/src/test/resources/google/registry/flows/domain/domain_info_bulk.xml index 19f3c8617..9a26d1617 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_info_package.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_info_bulk.xml @@ -7,9 +7,9 @@ - + ABC-12345 diff --git a/core/src/test/resources/google/registry/flows/domain/domain_info_response_empty_package.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_response_bulk.xml similarity index 88% rename from core/src/test/resources/google/registry/flows/domain/domain_info_response_empty_package.xml rename to core/src/test/resources/google/registry/flows/domain/domain_info_response_bulk.xml index 7caf10ad9..13b5dffc9 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_info_response_empty_package.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_info_response_bulk.xml @@ -32,10 +32,10 @@ - - - + + abc123 + ABC-12345 diff --git a/core/src/test/resources/google/registry/flows/domain/domain_info_response_package.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_response_empty_bulk_package.xml similarity index 88% rename from core/src/test/resources/google/registry/flows/domain/domain_info_response_package.xml rename to core/src/test/resources/google/registry/flows/domain/domain_info_response_empty_bulk_package.xml index e0103bf54..cc0e03081 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_info_response_package.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_info_response_empty_bulk_package.xml @@ -32,10 +32,10 @@ - - abc123 - + + + ABC-12345 diff --git a/core/src/test/resources/google/registry/flows/domain/domain_info_response_superuser_package.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_response_superuser_bulk.xml similarity index 84% rename from core/src/test/resources/google/registry/flows/domain/domain_info_response_superuser_package.xml rename to core/src/test/resources/google/registry/flows/domain/domain_info_response_superuser_bulk.xml index e3797f409..0f27c4868 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_info_response_superuser_package.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_info_response_superuser_bulk.xml @@ -22,10 +22,10 @@ - - abc123 - + + abc123 + ABC-12345