From 14008013116d3a95440c6d33c1509ed1bb8e6bf3 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Thu, 11 Feb 2016 14:17:04 +0000
Subject: [PATCH] OPENDJSDK-42 Code cleanup
---
opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/TaskScheduleArgs.java | 34 +++++++++++++---------------------
1 files changed, 13 insertions(+), 21 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/TaskScheduleArgs.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/TaskScheduleArgs.java
index cada62e..70cce69 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/TaskScheduleArgs.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/TaskScheduleArgs.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2016 ForgeRock AS
*/
package org.opends.server.admin.client.cli;
@@ -33,7 +33,6 @@
import java.util.Collections;
import java.util.Date;
import java.util.EnumSet;
-import java.util.LinkedList;
import java.util.List;
import java.util.Set;
@@ -208,25 +207,8 @@
}
}
- if (completionNotificationArg.isPresent()) {
- LinkedList<String> addrs = completionNotificationArg.getValues();
- for (String addr : addrs) {
- if (!StaticUtils.isEmailAddress(addr)) {
- throw new ArgumentException(ERR_TASKTOOL_INVALID_EMAIL_ADDRESS.get(
- addr, completionNotificationArg.getLongIdentifier()));
- }
- }
- }
-
- if (errorNotificationArg.isPresent()) {
- LinkedList<String> addrs = errorNotificationArg.getValues();
- for (String addr : addrs) {
- if (!StaticUtils.isEmailAddress(addr)) {
- throw new ArgumentException(ERR_TASKTOOL_INVALID_EMAIL_ADDRESS.get(
- addr, errorNotificationArg.getLongIdentifier()));
- }
- }
- }
+ checkEmailArgument(completionNotificationArg);
+ checkEmailArgument(errorNotificationArg);
if (failedDependencyActionArg.isPresent()) {
@@ -244,6 +226,16 @@
}
}
+ private void checkEmailArgument(final StringArgument argument) throws ArgumentException {
+ if (argument.isPresent()) {
+ for (final String email : argument.getValues()) {
+ if (!StaticUtils.isEmailAddress(email)) {
+ throw new ArgumentException(ERR_TASKTOOL_INVALID_EMAIL_ADDRESS.get(email, argument.getLongIdentifier()));
+ }
+ }
+ }
+ }
+
/**
* Validates arguments related to task scheduling. This should be
* called after the <code>ArgumentParser.parseArguments</code> has
--
Gitblit v1.10.0