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

Decouple dryRun from SessionMetadata

Browse source 
dryRun is only available via the (sessionless!) tool, and is not
a property of the session.
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=125203026
This commit is contained in:
cgoldfeder 2016-06-17 14:31:22 -07:00 • committed by Ben McIlwain
parent 3ae646d687
commit e359ab5f52
17 changed files with 31 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

10
java/google/registry/flows/FlowRunner.java
View file

@ -36,7 +36,7 @@ import org.joda.time.DateTime;
/** Run a flow, either transactionally or not, with logging and retrying as needed. */
public class FlowRunner {
private static final String COMMAND_LOG_FORMAT = "EPP Command" + Strings.repeat("\n\t%s", 5);
private static final String COMMAND_LOG_FORMAT = "EPP Command" + Strings.repeat("\n\t%s", 6);
private static final FormattingLogger logger = FormattingLogger.getLoggerForCallerClass();
@ -44,6 +44,7 @@ public class FlowRunner {
private final EppInput eppInput;
private final Trid trid;
private final SessionMetadata sessionMetadata;
private final boolean isDryRun;
private final TransportCredentials credentials;
private final byte[] inputXmlBytes;
private final EppMetrics metrics;
@ -55,6 +56,7 @@ public class FlowRunner {
Trid trid,
SessionMetadata sessionMetadata,
TransportCredentials credentials,
boolean isDryRun,
byte[] inputXmlBytes,
final EppMetrics metrics,
Clock clock) {
@ -64,6 +66,7 @@ public class FlowRunner {
this.trid = trid;
this.sessionMetadata = sessionMetadata;
this.credentials = credentials;
this.isDryRun = isDryRun;
this.inputXmlBytes = inputXmlBytes;
this.metrics = metrics;
this.clock = clock;
@ -77,7 +80,8 @@ public class FlowRunner {
clientId,
sessionMetadata,
prettyPrint(inputXmlBytes).replaceAll("\n", "\n\t"),
credentials);
credentials,
isDryRun ? "DRY_RUN" : "LIVE");
if (!isTransactional()) {
if (metrics != null) {
metrics.incrementAttempts();
@ -100,7 +104,7 @@ public class FlowRunner {
}
try {
EppOutput output = createAndInitFlow(ofy().getTransactionTime()).run();
if (sessionMetadata.isDryRun()) {
if (isDryRun) {
throw new DryRunException(output);
}
return output;