zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-12 22:38:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Add the ability to generate RDE deposits in lenient mode

Browse source 
We will not want to run this under normal circumstances, but in cases (such as PDT testing in sandbox) where it's desirable to generate an escrow deposit even if it isn't technically valid XML, this gives us that option. Manual-mode RDE generation is also changed so that, if no watermark date is specified, it defaults to the previous midnight, to better support running of RDE in sandbox to catch data problems.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=156108295
This commit is contained in:
mountford 2017-05-15 14:56:02 -07:00 • committed by Ben McIlwain
parent e1f4df86bd
commit 74a0defef3
9 changed files with 101 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

16
java/google/registry/xml/XmlFragmentMarshaller.java
View file

@ -16,6 +16,8 @@ package google.registry.xml;
import static com.google.common.base.Throwables.throwIfInstanceOf;
import static com.google.common.base.Verify.verify;
import static google.registry.xml.ValidationMode.LENIENT;
import static google.registry.xml.ValidationMode.STRICT;
import static java.nio.charset.StandardCharsets.UTF_8;
import com.google.re2j.Pattern;
@ -56,21 +58,27 @@ public final class XmlFragmentMarshaller {
* @throws MarshalException if schema validation failed
*/
public String marshal(JAXBElement<?> element) throws MarshalException {
return internalMarshal(element, true);
return marshal(element, STRICT);
}
/** Turns an individual JAXB element into an XML fragment string. */
public String marshalLenient(JAXBElement<?> element) {
try {
return internalMarshal(element, false);
return marshal(element, LENIENT);
} catch (MarshalException e) {
throw new RuntimeException("MarshalException shouldn't be thrown in lenient mode", e);
}
}
private String internalMarshal(JAXBElement<?> element, boolean strict) throws MarshalException {
/**
* Turns an individual JAXB element into an XML fragment string using the given validation mode.
*
* @throws MarshalException if schema validation failed
*/
public String marshal(JAXBElement<?> element, ValidationMode validationMode)
throws MarshalException {
os.reset();
marshaller.setSchema(strict ? schema : null);
marshaller.setSchema((validationMode == STRICT) ? schema : null);
try {
marshaller.marshal(element, os);
} catch (JAXBException e) {