mirror of
https://github.com/google/nomulus.git
synced 2025-07-13 22:45:10 +02:00
Clean up some code quality issues
This removes some qualifiers that aren't necessary (e.g. public/abstract on interfaces, private on enum constructors, final on private methods, static on nested interfaces/enums), uses Java 8 lambdas and features where that's an improvement ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=177182945
This commit is contained in:
parent
0935ba6450
commit
e2db3f914e
109 changed files with 286 additions and 379 deletions
|
@ -61,7 +61,7 @@ class EscrowTaskRunner {
|
|||
*
|
||||
* @param watermark the logical time for a point-in-time view of Datastore
|
||||
*/
|
||||
abstract void runWithLock(DateTime watermark) throws Exception;
|
||||
void runWithLock(DateTime watermark) throws Exception;
|
||||
}
|
||||
|
||||
private static final FormattingLogger logger = FormattingLogger.getLoggerForCallerClass();
|
||||
|
|
|
@ -117,8 +117,7 @@ public class RdeReporter {
|
|||
logger.infofmt("Received response:\n%s", new String(responseBytes, UTF_8));
|
||||
XjcIirdeaResponseElement response = XjcXmlTransformer.unmarshal(
|
||||
XjcIirdeaResponseElement.class, new ByteArrayInputStream(responseBytes));
|
||||
XjcIirdeaResult result = response.getResult();
|
||||
return result;
|
||||
return response.getResult();
|
||||
}
|
||||
|
||||
private URL makeReportUrl(String tld, String id) {
|
||||
|
|
|
@ -36,7 +36,7 @@ public enum RdeResourceType {
|
|||
private final String uri;
|
||||
private final Set<RdeMode> modes;
|
||||
|
||||
private RdeResourceType(String uri, EnumSet<RdeMode> modes) {
|
||||
RdeResourceType(String uri, EnumSet<RdeMode> modes) {
|
||||
this.uri = uri;
|
||||
this.modes = Collections.unmodifiableSet(modes);
|
||||
}
|
||||
|
|
|
@ -70,8 +70,7 @@ public final class RdeUtil {
|
|||
if (!watermarkMatcher.find()) {
|
||||
throw new XmlException("Could not find RDE watermark in XML");
|
||||
}
|
||||
DateTime watermark = DATETIME_FORMATTER.parseDateTime(watermarkMatcher.group(1));
|
||||
return watermark;
|
||||
return DATETIME_FORMATTER.parseDateTime(watermarkMatcher.group(1));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -204,7 +204,7 @@ public class RdeHostLinkAction implements Runnable {
|
|||
}
|
||||
}
|
||||
|
||||
private static enum HostLinkResult {
|
||||
private enum HostLinkResult {
|
||||
HOST_NOT_FOUND,
|
||||
HOST_OUT_OF_ZONE,
|
||||
SUPERORDINATE_DOMAIN_IN_PENDING_DELETE,
|
||||
|
|
|
@ -189,47 +189,41 @@ public class RdeImportUtils {
|
|||
|
||||
public static BillingEvent.Recurring createAutoRenewBillingEventForDomainImport(
|
||||
XjcRdeDomain domain, HistoryEntry historyEntry) {
|
||||
final BillingEvent.Recurring billingEvent =
|
||||
new BillingEvent.Recurring.Builder()
|
||||
.setReason(Reason.RENEW)
|
||||
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
|
||||
.setTargetId(domain.getRoid())
|
||||
.setClientId(domain.getClID())
|
||||
.setEventTime(domain.getExDate())
|
||||
.setRecurrenceEndTime(END_OF_TIME)
|
||||
.setParent(historyEntry)
|
||||
.build();
|
||||
return billingEvent;
|
||||
return new BillingEvent.Recurring.Builder()
|
||||
.setReason(Reason.RENEW)
|
||||
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
|
||||
.setTargetId(domain.getRoid())
|
||||
.setClientId(domain.getClID())
|
||||
.setEventTime(domain.getExDate())
|
||||
.setRecurrenceEndTime(END_OF_TIME)
|
||||
.setParent(historyEntry)
|
||||
.build();
|
||||
}
|
||||
|
||||
public static PollMessage.Autorenew createAutoRenewPollMessageForDomainImport(
|
||||
XjcRdeDomain domain, HistoryEntry historyEntry) {
|
||||
final PollMessage.Autorenew pollMessage =
|
||||
new PollMessage.Autorenew.Builder()
|
||||
.setTargetId(domain.getRoid())
|
||||
.setClientId(domain.getClID())
|
||||
.setEventTime(domain.getExDate())
|
||||
.setMsg("Domain was auto-renewed.")
|
||||
.setParent(historyEntry)
|
||||
.build();
|
||||
return pollMessage;
|
||||
return new PollMessage.Autorenew.Builder()
|
||||
.setTargetId(domain.getRoid())
|
||||
.setClientId(domain.getClID())
|
||||
.setEventTime(domain.getExDate())
|
||||
.setMsg("Domain was auto-renewed.")
|
||||
.setParent(historyEntry)
|
||||
.build();
|
||||
}
|
||||
|
||||
public static HistoryEntry createHistoryEntryForDomainImport(XjcRdeDomain domain) {
|
||||
XjcRdeDomainElement element = new XjcRdeDomainElement(domain);
|
||||
final HistoryEntry historyEntry =
|
||||
new HistoryEntry.Builder()
|
||||
.setType(HistoryEntry.Type.RDE_IMPORT)
|
||||
.setClientId(domain.getClID())
|
||||
.setTrid(generateTridForImport())
|
||||
.setModificationTime(ofy().getTransactionTime())
|
||||
.setXmlBytes(getObjectXml(element))
|
||||
.setBySuperuser(true)
|
||||
.setReason("RDE Import")
|
||||
.setRequestedByRegistrar(false)
|
||||
.setParent(Key.create(null, DomainResource.class, domain.getRoid()))
|
||||
.build();
|
||||
return historyEntry;
|
||||
return new HistoryEntry.Builder()
|
||||
.setType(HistoryEntry.Type.RDE_IMPORT)
|
||||
.setClientId(domain.getClID())
|
||||
.setTrid(generateTridForImport())
|
||||
.setModificationTime(ofy().getTransactionTime())
|
||||
.setXmlBytes(getObjectXml(element))
|
||||
.setBySuperuser(true)
|
||||
.setReason("RDE Import")
|
||||
.setRequestedByRegistrar(false)
|
||||
.setParent(Key.create(null, DomainResource.class, domain.getRoid()))
|
||||
.build();
|
||||
}
|
||||
|
||||
public static byte[] getObjectXml(Object jaxbElement) {
|
||||
|
|
|
@ -198,8 +198,7 @@ public class RdeParser implements Closeable {
|
|||
checkArgumentNotNull(uri, "uri cannot be null");
|
||||
try {
|
||||
if (isAtElement(uri, name)) {
|
||||
Object element = unmarshaller.unmarshal(reader);
|
||||
return element;
|
||||
return unmarshaller.unmarshal(reader);
|
||||
} else {
|
||||
throw new IllegalStateException(String.format("Not at element %s:%s", uri, name));
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue