diff --git a/core/src/main/java/google/registry/beam/rde/RdeIO.java b/core/src/main/java/google/registry/beam/rde/RdeIO.java index a945a3e37..f23df9c30 100644 --- a/core/src/main/java/google/registry/beam/rde/RdeIO.java +++ b/core/src/main/java/google/registry/beam/rde/RdeIO.java @@ -212,17 +212,16 @@ public class RdeIO { } } - // Don't write the IDN elements for BRDA. + // Don't write the IDN elements or EPP params for BRDA. if (mode == RdeMode.FULL) { for (IdnTableEnum idn : IdnTableEnum.values()) { output.write(marshaller.marshalIdn(idn.getTable())); counter.increment(RdeResourceType.IDN); } + output.write(marshaller.marshalRdeEppParams()); + counter.increment(RdeResourceType.EPP_PARAMS); } - output.write(marshaller.marshalRdeEppParams()); - counter.increment(RdeResourceType.EPP_PARAMS); - // Output XML that says how many resources were emitted. header = counter.makeHeader(tld, mode); output.write(marshaller.marshalOrDie(new XjcRdeHeaderElement(header))); diff --git a/core/src/main/java/google/registry/beam/rde/RdePipeline.java b/core/src/main/java/google/registry/beam/rde/RdePipeline.java index ebfb64632..37507988e 100644 --- a/core/src/main/java/google/registry/beam/rde/RdePipeline.java +++ b/core/src/main/java/google/registry/beam/rde/RdePipeline.java @@ -372,7 +372,7 @@ public class RdePipeline implements Serializable { *
The (repoId, pendingDeposit) pairs denote hosts that are referenced from a domain, that are * to be included in the corresponding pending deposit. * - *
The (repoId, revisionId) paris come from the most recent history entry query, which can be + *
The (repoId, revisionId) pairs come from the most recent history entry query, which can be
* used to load the embedded resources themselves.
*
* @return a pair of (repoId, ([pendingDeposit], [revisionId])) where neither the pendingDeposit
diff --git a/core/src/main/java/google/registry/rde/RdeResourceType.java b/core/src/main/java/google/registry/rde/RdeResourceType.java
index c8b80d551..3f1c36ba6 100644
--- a/core/src/main/java/google/registry/rde/RdeResourceType.java
+++ b/core/src/main/java/google/registry/rde/RdeResourceType.java
@@ -30,7 +30,7 @@ public enum RdeResourceType {
REGISTRAR("urn:ietf:params:xml:ns:rdeRegistrar-1.0", EnumSet.of(FULL, THIN)),
IDN("urn:ietf:params:xml:ns:rdeIDN-1.0", EnumSet.of(FULL)),
HEADER("urn:ietf:params:xml:ns:rdeHeader-1.0", EnumSet.of(FULL, THIN)),
- EPP_PARAMS("urn:ietf:params:xml:ns:rdeEppParams-1.0", EnumSet.of(FULL, THIN));
+ EPP_PARAMS("urn:ietf:params:xml:ns:rdeEppParams-1.0", EnumSet.of(FULL));
private final String uri;
private final ImmutableSet