http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerList.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerList.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerList.java index b64eef6..6a4bfec 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerList.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerList.java @@ -19,18 +19,28 @@ package org.apache.syncope.client.cli.commands.logger; import java.util.LinkedList; +import org.apache.syncope.client.cli.Input; import org.apache.syncope.common.lib.SyncopeClientException; public class LoggerList extends AbstractLoggerCommand { - public LoggerList() { + private static final String LIST_HELP_MESSAGE = "logger --list"; + + private final Input input; + + public LoggerList(final Input input) { + this.input = input; } public void list() { - try { - loggerResultManager.fromList(new LinkedList<>(loggerSyncopeOperations.list())); - } catch (final SyncopeClientException ex) { - loggerResultManager.generic("Error: " + ex.getMessage()); + if (input.parameterNumber() == 0) { + try { + loggerResultManager.fromList(new LinkedList<>(loggerSyncopeOperations.list())); + } catch (final SyncopeClientException ex) { + loggerResultManager.genericError(ex.getMessage()); + } + } else { + loggerResultManager.unnecessaryParameters(input.listParameters(), LIST_HELP_MESSAGE); } } }
http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerRead.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerRead.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerRead.java index 1192252..321e257 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerRead.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerRead.java @@ -45,7 +45,7 @@ public class LoggerRead extends AbstractLoggerCommand { if (ex.getMessage().startsWith("NotFound")) { loggerResultManager.notFoundError("Logger", parameter); } else { - loggerResultManager.generic("Error: " + ex.getMessage()); + loggerResultManager.genericError(ex.getMessage()); } failed = true; break; http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerResultManager.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerResultManager.java index a693aff..d6f759c 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerResultManager.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerResultManager.java @@ -57,5 +57,4 @@ public class LoggerResultManager extends CommonsResultManager { } tableBuilder.build().print(); } - } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerUpdate.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerUpdate.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerUpdate.java index 9a45916..6f118e9 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerUpdate.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerUpdate.java @@ -57,11 +57,13 @@ public class LoggerUpdate extends AbstractLoggerCommand { input.firstParameter(), CommandUtils.fromEnumToArray(LoggerLevel.class)); } else if ("Parameter syntax error!".equalsIgnoreCase(ex.getMessage())) { - loggerResultManager.generic(ex.getMessage(), UPDATE_HELP_MESSAGE); + loggerResultManager.genericError(ex.getMessage()); + loggerResultManager.genericError(UPDATE_HELP_MESSAGE); } else if (ex.getMessage().startsWith("NotFound")) { loggerResultManager.notFoundError("Logger", parameter); } else { - loggerResultManager.generic(ex.getMessage(), UPDATE_HELP_MESSAGE); + loggerResultManager.genericError(ex.getMessage()); + loggerResultManager.genericError(UPDATE_HELP_MESSAGE); } failed = true; break; http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerUpdateAll.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerUpdateAll.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerUpdateAll.java index 83c8b9a..981b2aa 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerUpdateAll.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerUpdateAll.java @@ -52,7 +52,8 @@ public class LoggerUpdateAll extends AbstractLoggerCommand { input.firstParameter(), CommandUtils.fromEnumToArray(LoggerLevel.class)); } else { - loggerResultManager.generic(ex.getMessage(), UPDATE_ALL_HELP_MESSAGE); + loggerResultManager.genericError(ex.getMessage()); + loggerResultManager.genericError(UPDATE_ALL_HELP_MESSAGE); } failed = true; break; http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationCommand.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationCommand.java index d5197ac..ee0f77c 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationCommand.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationCommand.java @@ -45,7 +45,7 @@ public class NotificationCommand extends AbstractCommand { switch (Options.fromName(input.getOption())) { case LIST: - new NotificationList().list(); + new NotificationList(input).list(); break; case READ: new NotificationRead(input).read(); @@ -105,5 +105,4 @@ public class NotificationCommand extends AbstractCommand { return options; } } - } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationDelete.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationDelete.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationDelete.java index 3b11a5a..4690d24 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationDelete.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationDelete.java @@ -20,7 +20,6 @@ package org.apache.syncope.client.cli.commands.notification; import javax.xml.ws.WebServiceException; import org.apache.syncope.client.cli.Input; -import org.apache.syncope.client.cli.view.Messages; import org.apache.syncope.common.lib.SyncopeClientException; public class NotificationDelete extends AbstractNotificationCommand { @@ -43,7 +42,7 @@ public class NotificationDelete extends AbstractNotificationCommand { if (ex.getMessage().startsWith("NotFound")) { notificationResultManager.notFoundError("Notification", parameter); } else { - Messages.printMessage(ex.getMessage()); + notificationResultManager.genericError(ex.getMessage()); } } catch (final NumberFormatException ex) { notificationResultManager.notBooleanDeletedError("notification", parameter); http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationList.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationList.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationList.java index 3df5d64..9341ae2 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationList.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationList.java @@ -18,18 +18,31 @@ */ package org.apache.syncope.client.cli.commands.notification; +import org.apache.syncope.client.cli.Input; import org.apache.syncope.common.lib.SyncopeClientException; import org.apache.syncope.common.lib.to.NotificationTO; public class NotificationList extends AbstractNotificationCommand { + private static final String LIST_HELP_MESSAGE = "notification --list"; + + private final Input input; + + public NotificationList(final Input input) { + this.input = input; + } + public void list() { - try { - for (final NotificationTO notificationTO : notificationSyncopeOperations.list()) { - System.out.println(notificationTO); + if (input.parameterNumber() == 0) { + try { + for (final NotificationTO notificationTO : notificationSyncopeOperations.list()) { + System.out.println(notificationTO); + } + } catch (final SyncopeClientException ex) { + notificationResultManager.genericError(ex.getMessage()); } - } catch (final SyncopeClientException ex) { - notificationResultManager.generic(ex.getMessage()); + } else { + notificationResultManager.unnecessaryParameters(input.listParameters(), LIST_HELP_MESSAGE); } } } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationRead.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationRead.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationRead.java index bd82663..d493fa5 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationRead.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationRead.java @@ -43,7 +43,7 @@ public class NotificationRead extends AbstractNotificationCommand { if (ex.getMessage().startsWith("NotFound")) { notificationResultManager.notFoundError("Notification", parameter); } else { - notificationResultManager.generic(ex.getMessage()); + notificationResultManager.genericError(ex.getMessage()); } } } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyCommand.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyCommand.java index 7c92d9d..f665113 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyCommand.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyCommand.java @@ -107,5 +107,4 @@ public class PolicyCommand extends AbstractCommand { return options; } } - } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyDelete.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyDelete.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyDelete.java index 8f9ede3..5dde82b 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyDelete.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyDelete.java @@ -39,13 +39,12 @@ public class PolicyDelete extends AbstractPolicyCommand { policySyncopeOperations.delete(parameter); policyResultManager.deletedMessage("Policy", parameter); } catch (final WebServiceException | SyncopeClientException ex) { - System.out.println("Error:"); if (ex.getMessage().startsWith("NotFound")) { policyResultManager.notFoundError("Policy", parameter); } else if (ex.getMessage().startsWith("DataIntegrityViolation")) { - policyResultManager.generic("You cannot delete policy " + parameter); + policyResultManager.genericError("You cannot delete policy " + parameter); } else { - policyResultManager.generic(ex.getMessage()); + policyResultManager.genericError(ex.getMessage()); } } catch (final NumberFormatException ex) { policyResultManager.notBooleanDeletedError("policy", parameter); @@ -55,5 +54,4 @@ public class PolicyDelete extends AbstractPolicyCommand { policyResultManager.commandOptionError(DELETE_HELP_MESSAGE); } } - } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyList.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyList.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyList.java index 4b672d6..d23fa11 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyList.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyList.java @@ -47,7 +47,7 @@ public class PolicyList extends AbstractPolicyCommand { } policyResultManager.fromList(policyType, policyTOs); } catch (final SyncopeClientException ex) { - policyResultManager.generic(ex.getMessage()); + policyResultManager.genericError(ex.getMessage()); } catch (final IllegalArgumentException ex) { policyResultManager.typeNotValidError( "policy", input.firstParameter(), CommandUtils.fromEnumToArray(PolicyType.class)); http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyRead.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyRead.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyRead.java index 25c9306..0a466e0 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyRead.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyRead.java @@ -40,17 +40,17 @@ public class PolicyRead extends AbstractPolicyCommand { for (final String parameter : input.getParameters()) { try { policyTOs.add(policySyncopeOperations.read(parameter)); - policyResultManager.fromRead(policyTOs); } catch (final NumberFormatException ex) { policyResultManager.notBooleanDeletedError("policy", parameter); } catch (final WebServiceException | SyncopeClientException ex) { if (ex.getMessage().startsWith("NotFound")) { policyResultManager.notFoundError("Policy", parameter); } else { - policyResultManager.generic(ex.getMessage()); + policyResultManager.genericError(ex.getMessage()); } } } + policyResultManager.fromRead(policyTOs); } else { policyResultManager.commandOptionError(READ_HELP_MESSAGE); } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionCommand.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionCommand.java index 4d48b8d..0259e30 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionCommand.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionCommand.java @@ -45,7 +45,7 @@ public class QuestionCommand extends AbstractCommand { switch (QuestionOptions.fromName(input.getOption())) { case LIST: - new QuestionList().list(); + new QuestionList(input).list(); break; case READ: new QuestionRead(input).read(); @@ -104,5 +104,4 @@ public class QuestionCommand extends AbstractCommand { return options; } } - } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionDelete.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionDelete.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionDelete.java index d57ae5c..29cff9d 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionDelete.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionDelete.java @@ -42,7 +42,7 @@ public class QuestionDelete extends AbstractQuestionCommand { if (ex.getMessage().startsWith("NotFound")) { questionResultManager.notFoundError("Security question", parameter); } else { - questionResultManager.generic("Error: " + ex.getMessage()); + questionResultManager.genericError(ex.getMessage()); } break; } catch (final NumberFormatException ex) { @@ -53,5 +53,4 @@ public class QuestionDelete extends AbstractQuestionCommand { questionResultManager.commandOptionError(DELETE_HELP_MESSAGE); } } - } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionList.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionList.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionList.java index 836554a..7d2e18d 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionList.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionList.java @@ -18,15 +18,28 @@ */ package org.apache.syncope.client.cli.commands.question; +import org.apache.syncope.client.cli.Input; import org.apache.syncope.common.lib.SyncopeClientException; public class QuestionList extends AbstractQuestionCommand { + private static final String LIST_HELP_MESSAGE = "question --list"; + + private final Input input; + + public QuestionList(final Input input) { + this.input = input; + } + public void list() { - try { - questionResultManager.toView(questionSyncopeOperations.list()); - } catch (final SyncopeClientException ex) { - questionResultManager.generic(ex.getMessage()); + if (input.parameterNumber() == 0) { + try { + questionResultManager.toView(questionSyncopeOperations.list()); + } catch (final SyncopeClientException ex) { + questionResultManager.genericError(ex.getMessage()); + } + } else { + questionResultManager.unnecessaryParameters(input.listParameters(), LIST_HELP_MESSAGE); } } } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionRead.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionRead.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionRead.java index 5f96cd5..306f449 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionRead.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionRead.java @@ -45,7 +45,7 @@ public class QuestionRead extends AbstractQuestionCommand { if (ex.getMessage().startsWith("NotFound")) { questionResultManager.notFoundError("Security question", parameter); } else { - questionResultManager.generic("Error: " + ex.getMessage()); + questionResultManager.genericError(ex.getMessage()); } break; } catch (final NumberFormatException ex) { @@ -57,5 +57,4 @@ public class QuestionRead extends AbstractQuestionCommand { questionResultManager.commandOptionError(READ_HELP_MESSAGE); } } - } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionSyncopeOperations.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionSyncopeOperations.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionSyncopeOperations.java index 238a576..8caced7 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionSyncopeOperations.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionSyncopeOperations.java @@ -42,5 +42,4 @@ public class QuestionSyncopeOperations { public SecurityQuestionTO readByUser(final String username) { return securityQuestionService.readByUser(username); } - } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmCommand.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmCommand.java index 6a32562..95b8ec4 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmCommand.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmCommand.java @@ -40,7 +40,7 @@ public class RealmCommand extends AbstractCommand { } switch (Options.fromName(input.getOption())) { case LIST: - new RealmList().list(); + new RealmList(input).list(); break; case HELP: System.out.println(HELP_MESSAGE); @@ -92,5 +92,4 @@ public class RealmCommand extends AbstractCommand { return options; } } - } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmList.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmList.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmList.java index 5d4b902..51b5fe4 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmList.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmList.java @@ -18,19 +18,28 @@ */ package org.apache.syncope.client.cli.commands.realm; +import org.apache.syncope.client.cli.Input; import org.apache.syncope.common.lib.SyncopeClientException; public class RealmList extends AbstractRealmCommand { - public RealmList() { + private static final String LIST_HELP_MESSAGE = "realm --list"; + + private final Input input; + + public RealmList(final Input input) { + this.input = input; } public void list() { - try { - realmResultManager.toView(realmSyncopeOperations.list()); - } catch (final SyncopeClientException ex) { - realmResultManager.generic("Error: " + ex.getMessage()); + if (input.parameterNumber() == 0) { + try { + realmResultManager.toView(realmSyncopeOperations.list()); + } catch (final SyncopeClientException ex) { + realmResultManager.genericError(ex.getMessage()); + } + } else { + realmResultManager.unnecessaryParameters(input.listParameters(), LIST_HELP_MESSAGE); } } - } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmSyncopeOperations.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmSyncopeOperations.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmSyncopeOperations.java index e9d0b65..19af12f 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmSyncopeOperations.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmSyncopeOperations.java @@ -40,5 +40,4 @@ public class RealmSyncopeOperations { } return exists; } - } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportCommand.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportCommand.java index 1d64bf1..ac67fcf 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportCommand.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportCommand.java @@ -32,6 +32,7 @@ public class ReportCommand extends AbstractCommand { + " Options:\n" + " --help \n" + " --list \n" + + " --list-jobs \n" + " --read \n" + " Syntax: --read {REPORT-ID} {REPORT-ID} [...] \n" + " --delete \n" @@ -54,10 +55,10 @@ public class ReportCommand extends AbstractCommand { switch (Options.fromName(input.getOption())) { case LIST: - new ReportList().list(); + new ReportList(input).list(); break; case LIST_JOBS: - new ReportListJobs().list(); + new ReportListJobs(input).list(); break; case READ: new ReportRead(input).read(); http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportDelete.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportDelete.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportDelete.java index aa2c5f8..52850bd 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportDelete.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportDelete.java @@ -42,9 +42,9 @@ public class ReportDelete extends AbstractReportCommand { if (ex.getMessage().startsWith("NotFound")) { reportResultManager.notFoundError("Report", parameter); } else if (ex.getMessage().startsWith("DataIntegrityViolation")) { - reportResultManager.generic("You cannot delete report " + parameter); + reportResultManager.genericError("You cannot delete report " + parameter); } else { - reportResultManager.generic(ex.getMessage()); + reportResultManager.genericError(ex.getMessage()); } } catch (final NumberFormatException ex) { reportResultManager.numberFormatException("report", parameter); @@ -54,5 +54,4 @@ public class ReportDelete extends AbstractReportCommand { reportResultManager.commandOptionError(DELETE_HELP_MESSAGE); } } - } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportDeleteExecution.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportDeleteExecution.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportDeleteExecution.java index 86f31a2..3ae7bb7 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportDeleteExecution.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportDeleteExecution.java @@ -34,10 +34,8 @@ public class ReportDeleteExecution extends AbstractReportCommand { } public void delete() { - if (input.parameterNumber() >= 1) { for (final String parameter : input.getParameters()) { - try { reportSyncopeOperations.deleteExecution(parameter); reportResultManager.deletedMessage("Report execution", parameter); @@ -45,9 +43,9 @@ public class ReportDeleteExecution extends AbstractReportCommand { if (ex.getMessage().startsWith("NotFound")) { reportResultManager.notFoundError("Report", parameter); } else if (ex.getMessage().startsWith("DataIntegrityViolation")) { - reportResultManager.generic("You cannot delete report " + parameter); + reportResultManager.genericError("You cannot delete report " + parameter); } else { - reportResultManager.generic(ex.getMessage()); + reportResultManager.genericError(ex.getMessage()); } } catch (final NumberFormatException ex) { reportResultManager.numberFormatException("report", parameter); @@ -57,5 +55,4 @@ public class ReportDeleteExecution extends AbstractReportCommand { reportResultManager.commandOptionError(DELETE_EXECUTION_HELP_MESSAGE); } } - } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportExecute.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportExecute.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportExecute.java index 0641203..f8a4f6d 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportExecute.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportExecute.java @@ -37,7 +37,6 @@ public class ReportExecute extends AbstractReportCommand { public void execute() { if (input.parameterNumber() == 1) { - try { reportSyncopeOperations.execute(input.firstParameter()); final List<ReportExecTO> executionList @@ -48,9 +47,9 @@ public class ReportExecute extends AbstractReportCommand { if (ex.getMessage().startsWith("NotFound")) { reportResultManager.notFoundError("Report", input.firstParameter()); } else if (ex.getMessage().startsWith("DataIntegrityViolation")) { - reportResultManager.generic("You cannot delete report " + input.firstParameter()); + reportResultManager.genericError("You cannot delete report " + input.firstParameter()); } else { - reportResultManager.generic(ex.getMessage()); + reportResultManager.genericError(ex.getMessage()); } } catch (final NumberFormatException ex) { reportResultManager.numberFormatException("report", input.firstParameter()); @@ -59,5 +58,4 @@ public class ReportExecute extends AbstractReportCommand { reportResultManager.commandOptionError(EXECUTE_HELP_MESSAGE); } } - } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportExportExecution.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportExportExecution.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportExportExecution.java index ae79e57..e7aca1e 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportExportExecution.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportExportExecution.java @@ -55,34 +55,35 @@ public class ReportExportExecution extends AbstractReportCommand { case XML: final String xmlFinalName = "export_" + parameter + ".xml"; XMLUtils.createXMLFile(report, xmlFinalName); - reportResultManager.generic(xmlFinalName + " successfully created"); + reportResultManager.genericMessage(xmlFinalName + " successfully created"); break; case CSV: - reportResultManager.generic(format + " doesn't supported"); + reportResultManager.genericError(format + " doesn't supported"); break; case PDF: - reportResultManager.generic(format + " doesn't supported"); + reportResultManager.genericError(format + " doesn't supported"); break; case HTML: - reportResultManager.generic(format + " doesn't supported"); + reportResultManager.genericError(format + " doesn't supported"); break; case RTF: - reportResultManager.generic(format + " doesn't supported"); + reportResultManager.genericError(format + " doesn't supported"); break; default: - reportResultManager.generic(format + " doesn't supported"); + reportResultManager.genericError(format + " doesn't supported"); break; } } catch (final WebServiceException | SyncopeClientException ex) { if (ex.getMessage().startsWith("NotFound")) { reportResultManager.notFoundError("Report", parameter); } else { - reportResultManager.generic(ex.getMessage()); + reportResultManager.genericError(ex.getMessage()); } } catch (final NumberFormatException ex) { reportResultManager.numberFormatException("report", parameter); } catch (IOException | ParserConfigurationException | SAXException | TransformerException e) { - reportResultManager.generic(" - Error creating " + "export_" + parameter + " " + e.getMessage()); + reportResultManager.genericError( + " - Error creating " + "export_" + parameter + " " + e.getMessage()); } catch (final IllegalArgumentException ex) { reportResultManager.typeNotValidError( "format", input.firstParameter(), @@ -94,5 +95,4 @@ public class ReportExportExecution extends AbstractReportCommand { reportResultManager.commandOptionError(EXPORT_EXECUTION_HELP_MESSAGE); } } - } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportList.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportList.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportList.java index 7fca5c0..abeaf4e 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportList.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportList.java @@ -18,16 +18,28 @@ */ package org.apache.syncope.client.cli.commands.report; +import org.apache.syncope.client.cli.Input; import org.apache.syncope.common.lib.SyncopeClientException; public class ReportList extends AbstractReportCommand { + private static final String LIST_HELP_MESSAGE = "report --list"; + + private final Input input; + + public ReportList(final Input input) { + this.input = input; + } + public void list() { - try { - reportResultManager.fromValueToView(reportSyncopeOperations.list()); - } catch (final SyncopeClientException ex) { - reportResultManager.generic(ex.getMessage()); + if (input.parameterNumber() == 0) { + try { + reportResultManager.fromValueToView(reportSyncopeOperations.list()); + } catch (final SyncopeClientException ex) { + reportResultManager.genericMessage(ex.getMessage()); + } + } else { + reportResultManager.unnecessaryParameters(input.listParameters(), LIST_HELP_MESSAGE); } } - } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportListJobs.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportListJobs.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportListJobs.java index 5b13cbf..2735f85 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportListJobs.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportListJobs.java @@ -18,18 +18,31 @@ */ package org.apache.syncope.client.cli.commands.report; +import org.apache.syncope.client.cli.Input; import org.apache.syncope.common.lib.SyncopeClientException; import org.apache.syncope.common.lib.types.JobStatusType; public class ReportListJobs extends AbstractReportCommand { + private static final String LIST_HELP_MESSAGE = "report --list-jobs"; + + private final Input input; + + public ReportListJobs(final Input input) { + this.input = input; + } + public void list() { - try { - for (final JobStatusType jobStatusType : JobStatusType.values()) { - reportResultManager.printReportExecution(reportSyncopeOperations.listJobs(jobStatusType)); + if (input.parameterNumber() == 0) { + try { + for (final JobStatusType jobStatusType : JobStatusType.values()) { + reportResultManager.printReportExecution(reportSyncopeOperations.listJobs(jobStatusType)); + } + } catch (final SyncopeClientException ex) { + reportResultManager.genericError(ex.getMessage()); } - } catch (final SyncopeClientException ex) { - reportResultManager.generic(ex.getMessage()); + } else { + reportResultManager.unnecessaryParameters(input.listParameters(), LIST_HELP_MESSAGE); } } } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportRead.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportRead.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportRead.java index 9a1ebc8..acd5da0 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportRead.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportRead.java @@ -47,7 +47,7 @@ public class ReportRead extends AbstractReportCommand { if (ex.getMessage().startsWith("NotFound")) { reportResultManager.notFoundError("Report", parameter); } else { - reportResultManager.generic(ex.getMessage()); + reportResultManager.genericError(ex.getMessage()); } } } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportReadExecution.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportReadExecution.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportReadExecution.java index 45d1c54..f7c9ec3 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportReadExecution.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportReadExecution.java @@ -43,11 +43,10 @@ public class ReportReadExecution extends AbstractReportCommand { try { reportExecTOs.add(reportSyncopeOperations.readExecution(parameter)); } catch (final WebServiceException | SyncopeClientException ex) { - System.out.println("Error:"); if (ex.getMessage().startsWith("NotFound")) { reportResultManager.notFoundError("Report", parameter); } else { - reportResultManager.generic(ex.getMessage()); + reportResultManager.genericError(ex.getMessage()); } } catch (final NumberFormatException ex) { reportResultManager.numberFormatException("report", parameter); @@ -58,5 +57,4 @@ public class ReportReadExecution extends AbstractReportCommand { reportResultManager.commandOptionError(READ_EXECUTION_HELP_MESSAGE); } } - } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceCommand.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceCommand.java index 942fcd2..185cd99 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceCommand.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceCommand.java @@ -45,7 +45,7 @@ public class ResourceCommand extends AbstractCommand { switch (ResourceOptions.fromName(input.getOption())) { case LIST: - new ResourceList().list(); + new ResourceList(input).list(); break; case READ: new ResourceRead(input).read(); @@ -105,5 +105,4 @@ public class ResourceCommand extends AbstractCommand { return options; } } - } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceDelete.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceDelete.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceDelete.java index 9068b7d..3b94ecb 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceDelete.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceDelete.java @@ -43,7 +43,7 @@ public class ResourceDelete extends AbstractResourceCommand { if (ex.getMessage().startsWith("NotFound")) { resourceResultManager.notFoundError("Resource", parameter); } else { - resourceResultManager.generic(ex.getMessage()); + resourceResultManager.genericError(ex.getMessage()); } break; } @@ -52,5 +52,4 @@ public class ResourceDelete extends AbstractResourceCommand { resourceResultManager.commandOptionError(DELETE_HELP_MESSAGE); } } - } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceList.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceList.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceList.java index 27f0d74..8b09536 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceList.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceList.java @@ -18,15 +18,28 @@ */ package org.apache.syncope.client.cli.commands.resource; +import org.apache.syncope.client.cli.Input; import org.apache.syncope.common.lib.SyncopeClientException; public class ResourceList extends AbstractResourceCommand { + private static final String LIST_HELP_MESSAGE = "resource --list"; + + private final Input input; + + public ResourceList(final Input input) { + this.input = input; + } + public void list() { - try { - resourceResultManager.toView(resourceSyncopeOperations.list()); - } catch (final SyncopeClientException ex) { - resourceResultManager.generic(ex.getMessage()); + if (input.parameterNumber() == 0) { + try { + resourceResultManager.toView(resourceSyncopeOperations.list()); + } catch (final SyncopeClientException ex) { + resourceResultManager.genericError(ex.getMessage()); + } + } else { + resourceResultManager.unnecessaryParameters(input.listParameters(), LIST_HELP_MESSAGE); } } } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceRead.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceRead.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceRead.java index 85cd669..8f8c874 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceRead.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceRead.java @@ -46,7 +46,7 @@ public class ResourceRead extends AbstractResourceCommand { if (ex.getMessage().startsWith("NotFound")) { resourceResultManager.notFoundError("Resource", parameter); } else { - resourceResultManager.generic(ex.getMessage()); + resourceResultManager.genericError(ex.getMessage()); } break; } @@ -56,5 +56,4 @@ public class ResourceRead extends AbstractResourceCommand { resourceResultManager.commandOptionError(READ_HELP_MESSAGE); } } - } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceResultManager.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceResultManager.java index d598910..488f574 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceResultManager.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceResultManager.java @@ -31,7 +31,6 @@ public class ResourceResultManager extends CommonsResultManager { for (final ResourceTO resourceTO : resourceTOs) { printResource(resourceTO); } - System.out.println(""); } private void printResource(final ResourceTO resourceTO) { @@ -90,5 +89,4 @@ public class ResourceResultManager extends CommonsResultManager { System.out.println(""); } } - } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleCommand.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleCommand.java index bb2f988..63c9f09 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleCommand.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleCommand.java @@ -45,7 +45,7 @@ public class RoleCommand extends AbstractCommand { switch (RoleOptions.fromName(input.getOption())) { case LIST: - new RoleList().list(); + new RoleList(input).list(); break; case READ: new RoleRead(input).read(); @@ -105,5 +105,4 @@ public class RoleCommand extends AbstractCommand { return options; } } - } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleDelete.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleDelete.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleDelete.java index e47a40e..4691312 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleDelete.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleDelete.java @@ -42,7 +42,7 @@ public class RoleDelete extends AbstractRoleCommand { if (ex.getMessage().startsWith("NotFound")) { roleResultManager.notFoundError("Role", parameter); } else { - roleResultManager.generic("Error: " + ex.getMessage()); + roleResultManager.genericError(ex.getMessage()); } break; } catch (final NumberFormatException ex) { http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleList.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleList.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleList.java index e87b1c2..53f7105 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleList.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleList.java @@ -18,15 +18,28 @@ */ package org.apache.syncope.client.cli.commands.role; +import org.apache.syncope.client.cli.Input; import org.apache.syncope.common.lib.SyncopeClientException; public class RoleList extends AbstractRoleCommand { + private static final String LIST_HELP_MESSAGE = "role --list"; + + private final Input input; + + public RoleList(final Input input) { + this.input = input; + } + public void list() { - try { - roleResultManager.toView(roleSyncopeOperations.list()); - } catch (final SyncopeClientException ex) { - roleResultManager.generic(ex.getMessage()); + if (input.parameterNumber() == 0) { + try { + roleResultManager.toView(roleSyncopeOperations.list()); + } catch (final SyncopeClientException ex) { + roleResultManager.genericError(ex.getMessage()); + } + } else { + roleResultManager.unnecessaryParameters(input.listParameters(), LIST_HELP_MESSAGE); } } } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleRead.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleRead.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleRead.java index 2a0393f..021b65c 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleRead.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleRead.java @@ -45,7 +45,7 @@ public class RoleRead extends AbstractRoleCommand { if (ex.getMessage().startsWith("NotFound")) { roleResultManager.notFoundError("Role", parameter); } else { - roleResultManager.generic("Error: " + ex.getMessage()); + roleResultManager.genericError(ex.getMessage()); } break; } catch (final NumberFormatException ex) { @@ -57,5 +57,4 @@ public class RoleRead extends AbstractRoleCommand { roleResultManager.commandOptionError(READ_HELP_MESSAGE); } } - } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleSyncopeOperations.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleSyncopeOperations.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleSyncopeOperations.java index c24c3e9..11c207d 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleSyncopeOperations.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleSyncopeOperations.java @@ -38,5 +38,4 @@ public class RoleSyncopeOperations { public void delete(final String roleId) { roleService.delete(Long.valueOf(roleId)); } - } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaCommand.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaCommand.java index 193c79b..c0d3976 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaCommand.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaCommand.java @@ -51,16 +51,16 @@ public class SchemaCommand extends AbstractCommand { new SchemaList(input).list(); break; case LIST_ALL: - new SchemaListAll().listAll(); + new SchemaListAll(input).listAll(); break; case LIST_PLAIN: - new SchemaListPlain().listPlain(); + new SchemaListPlain(input).listPlain(); break; case LIST_DERIVED: - new SchemaListDerived().listDerived(); + new SchemaListDerived(input).listDerived(); break; case LIST_VIRTUAL: - new SchemaListVirtual().listVirtual(); + new SchemaListVirtual(input).listVirtual(); break; case READ: new SchemaRead(input).read(); http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaDelete.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaDelete.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaDelete.java index 0850e2f..d3d5314 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaDelete.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaDelete.java @@ -48,9 +48,9 @@ public class SchemaDelete extends AbstractSchemaCommand { if (ex.getMessage().startsWith("NotFound")) { schemaResultManager.notFoundError("Schema", parameters[0]); } else if (ex.getMessage().startsWith("DataIntegrityViolation")) { - schemaResultManager.generic("You cannot delete schema " + parameters[0]); + schemaResultManager.genericError("You cannot delete schema " + parameters[0]); } else { - schemaResultManager.generic(ex.getMessage()); + schemaResultManager.genericError(ex.getMessage()); } } catch (final IllegalArgumentException ex) { schemaResultManager.typeNotValidError( @@ -60,5 +60,4 @@ public class SchemaDelete extends AbstractSchemaCommand { schemaResultManager.commandOptionError(DELETE_HELP_MESSAGE); } } - } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaList.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaList.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaList.java index 404a487..cf41aa7 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaList.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaList.java @@ -58,7 +58,7 @@ public class SchemaList extends AbstractSchemaCommand { break; } } catch (final SyncopeClientException ex) { - schemaResultManager.generic(ex.getMessage()); + schemaResultManager.genericError(ex.getMessage()); } catch (final IllegalArgumentException ex) { schemaResultManager.typeNotValidError( "schema", input.firstParameter(), CommandUtils.fromEnumToArray(SchemaType.class)); http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaListAll.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaListAll.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaListAll.java index 57d95a1..2c17a3a 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaListAll.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaListAll.java @@ -20,36 +20,48 @@ package org.apache.syncope.client.cli.commands.schema; import java.util.LinkedList; import javax.xml.ws.WebServiceException; +import org.apache.syncope.client.cli.Input; import org.apache.syncope.common.lib.SyncopeClientException; import org.apache.syncope.common.lib.to.AbstractSchemaTO; import org.apache.syncope.common.lib.types.SchemaType; public class SchemaListAll extends AbstractSchemaCommand { + private static final String LIST_HELP_MESSAGE = "schema --list-all"; + + private final Input input; + + public SchemaListAll(final Input input) { + this.input = input; + } + public void listAll() { - try { - for (final SchemaType schemaType : SchemaType.values()) { - final LinkedList<AbstractSchemaTO> schemaTOs = new LinkedList<>(); - for (final AbstractSchemaTO schemaTO : schemaSyncopeOperations.list(schemaType)) { - schemaTOs.add(schemaTO); - } - switch (schemaType) { - case PLAIN: - schemaResultManager.fromListPlain(schemaTOs); - break; - case DERIVED: - schemaResultManager.fromListDerived(schemaTOs); - break; - case VIRTUAL: - schemaResultManager.fromListVirtual(schemaTOs); - break; - default: - break; + if (input.parameterNumber() == 0) { + try { + for (final SchemaType schemaType : SchemaType.values()) { + final LinkedList<AbstractSchemaTO> schemaTOs = new LinkedList<>(); + for (final AbstractSchemaTO schemaTO : schemaSyncopeOperations.list(schemaType)) { + schemaTOs.add(schemaTO); + } + switch (schemaType) { + case PLAIN: + schemaResultManager.fromListPlain(schemaTOs); + break; + case DERIVED: + schemaResultManager.fromListDerived(schemaTOs); + break; + case VIRTUAL: + schemaResultManager.fromListVirtual(schemaTOs); + break; + default: + break; + } } + } catch (final SyncopeClientException | WebServiceException ex) { + schemaResultManager.genericError(ex.getMessage()); } - } catch (final SyncopeClientException | WebServiceException ex) { - schemaResultManager.generic(ex.getMessage()); + } else { + schemaResultManager.unnecessaryParameters(input.listParameters(), LIST_HELP_MESSAGE); } } - } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaListDerived.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaListDerived.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaListDerived.java index ee90327..fa76684 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaListDerived.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaListDerived.java @@ -20,20 +20,33 @@ package org.apache.syncope.client.cli.commands.schema; import java.util.LinkedList; import javax.xml.ws.WebServiceException; +import org.apache.syncope.client.cli.Input; import org.apache.syncope.common.lib.SyncopeClientException; import org.apache.syncope.common.lib.to.AbstractSchemaTO; public class SchemaListDerived extends AbstractSchemaCommand { + private static final String LIST_HELP_MESSAGE = "schema --list-derived"; + + private final Input input; + + public SchemaListDerived(final Input input) { + this.input = input; + } + public void listDerived() { - try { - final LinkedList<AbstractSchemaTO> schemaTOs = new LinkedList<>(); - for (final AbstractSchemaTO schemaTO : schemaSyncopeOperations.listDerived()) { - schemaTOs.add(schemaTO); + if (input.parameterNumber() == 0) { + try { + final LinkedList<AbstractSchemaTO> schemaTOs = new LinkedList<>(); + for (final AbstractSchemaTO schemaTO : schemaSyncopeOperations.listDerived()) { + schemaTOs.add(schemaTO); + } + schemaResultManager.fromListDerived(schemaTOs); + } catch (final SyncopeClientException | WebServiceException ex) { + schemaResultManager.genericError(ex.getMessage()); } - schemaResultManager.fromListDerived(schemaTOs); - } catch (final SyncopeClientException | WebServiceException ex) { - schemaResultManager.generic(ex.getMessage()); + } else { + schemaResultManager.unnecessaryParameters(input.listParameters(), LIST_HELP_MESSAGE); } } } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaListPlain.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaListPlain.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaListPlain.java index 6fa9ad6..746b856 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaListPlain.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaListPlain.java @@ -20,20 +20,33 @@ package org.apache.syncope.client.cli.commands.schema; import java.util.LinkedList; import javax.xml.ws.WebServiceException; +import org.apache.syncope.client.cli.Input; import org.apache.syncope.common.lib.SyncopeClientException; import org.apache.syncope.common.lib.to.AbstractSchemaTO; public class SchemaListPlain extends AbstractSchemaCommand { + private static final String LIST_HELP_MESSAGE = "schema --list-plain"; + + private final Input input; + + public SchemaListPlain(final Input input) { + this.input = input; + } + public void listPlain() { - try { - final LinkedList<AbstractSchemaTO> schemaTOs = new LinkedList<>(); - for (final AbstractSchemaTO schemaTO : schemaSyncopeOperations.listPlain()) { - schemaTOs.add(schemaTO); + if (input.parameterNumber() == 0) { + try { + final LinkedList<AbstractSchemaTO> schemaTOs = new LinkedList<>(); + for (final AbstractSchemaTO schemaTO : schemaSyncopeOperations.listPlain()) { + schemaTOs.add(schemaTO); + } + schemaResultManager.fromListPlain(schemaTOs); + } catch (final SyncopeClientException | WebServiceException ex) { + schemaResultManager.genericError(ex.getMessage()); } - schemaResultManager.fromListPlain(schemaTOs); - } catch (final SyncopeClientException | WebServiceException ex) { - schemaResultManager.generic(ex.getMessage()); + } else { + schemaResultManager.unnecessaryParameters(input.listParameters(), LIST_HELP_MESSAGE); } } } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaListVirtual.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaListVirtual.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaListVirtual.java index 74b5b6c..d7da8c8 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaListVirtual.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaListVirtual.java @@ -20,20 +20,33 @@ package org.apache.syncope.client.cli.commands.schema; import java.util.LinkedList; import javax.xml.ws.WebServiceException; +import org.apache.syncope.client.cli.Input; import org.apache.syncope.common.lib.SyncopeClientException; import org.apache.syncope.common.lib.to.AbstractSchemaTO; public class SchemaListVirtual extends AbstractSchemaCommand { + private static final String LIST_HELP_MESSAGE = "schema --list-virtual"; + + private final Input input; + + public SchemaListVirtual(final Input input) { + this.input = input; + } + public void listVirtual() { - try { - final LinkedList<AbstractSchemaTO> schemaTOs = new LinkedList<>(); - for (final AbstractSchemaTO schemaTO : schemaSyncopeOperations.listVirtual()) { - schemaTOs.add(schemaTO); + if (input.parameterNumber() == 0) { + try { + final LinkedList<AbstractSchemaTO> schemaTOs = new LinkedList<>(); + for (final AbstractSchemaTO schemaTO : schemaSyncopeOperations.listVirtual()) { + schemaTOs.add(schemaTO); + } + schemaResultManager.fromListVirtual(schemaTOs); + } catch (final SyncopeClientException | WebServiceException ex) { + schemaResultManager.genericError(ex.getMessage()); } - schemaResultManager.fromListVirtual(schemaTOs); - } catch (final SyncopeClientException | WebServiceException ex) { - schemaResultManager.generic(ex.getMessage()); + } else { + schemaResultManager.unnecessaryParameters(input.listParameters(), LIST_HELP_MESSAGE); } } } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaRead.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaRead.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaRead.java index d84444d..133a14c 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaRead.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaRead.java @@ -64,7 +64,7 @@ public class SchemaRead extends AbstractSchemaCommand { if (ex.getMessage().startsWith("NotFound")) { schemaResultManager.notFoundError("Schema", parameters[0]); } else { - schemaResultManager.generic(ex.getMessage()); + schemaResultManager.genericError(ex.getMessage()); } } catch (final IllegalArgumentException ex) { schemaResultManager.typeNotValidError( @@ -74,5 +74,4 @@ public class SchemaRead extends AbstractSchemaCommand { schemaResultManager.commandOptionError(READ_HELP_MESSAGE); } } - } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/self/WorkflowCommand.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/self/WorkflowCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/self/WorkflowCommand.java index c40dda9..dd5a3ff 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/self/WorkflowCommand.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/self/WorkflowCommand.java @@ -100,5 +100,4 @@ public class WorkflowCommand extends AbstractCommand { return options; } } - } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/self/WorkflowExportDefinition.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/self/WorkflowExportDefinition.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/self/WorkflowExportDefinition.java index 89443da..aa1d8a3 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/self/WorkflowExportDefinition.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/self/WorkflowExportDefinition.java @@ -43,7 +43,7 @@ public class WorkflowExportDefinition extends AbstractWorkflowCommand { if (ex.getMessage().startsWith("NotFound")) { workflowResultManager.notFoundError("Workflow", input.firstParameter()); } else { - workflowResultManager.generic(ex.getMessage()); + workflowResultManager.genericError(ex.getMessage()); } } catch (final IllegalArgumentException ex) { workflowResultManager.typeNotValidError( http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/self/WorkflowExportDiagram.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/self/WorkflowExportDiagram.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/self/WorkflowExportDiagram.java index f65bf2f..abc4c61 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/self/WorkflowExportDiagram.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/self/WorkflowExportDiagram.java @@ -48,18 +48,18 @@ public class WorkflowExportDiagram extends AbstractWorkflowCommand { final FileOutputStream fos = new FileOutputStream("/tmp/diagram.png"); fos.write(diagram); fos.close(); - workflowResultManager.generic("Diagram created: /tmp/diagram.png"); + workflowResultManager.genericMessage("Diagram created: /tmp/diagram.png"); } catch (final SyncopeClientException | WebServiceException ex) { if (ex.getMessage().startsWith("NotFound")) { workflowResultManager.notFoundError("Workflow", input.firstParameter()); } else { - workflowResultManager.generic(ex.getMessage()); + workflowResultManager.genericError(ex.getMessage()); } } catch (final IllegalArgumentException ex) { workflowResultManager.typeNotValidError( "workflow", input.firstParameter(), CommandUtils.fromEnumToArray(AnyTypeKind.class)); } catch (final IOException ex) { - + workflowResultManager.genericError(ex.getMessage()); } } else { workflowResultManager.commandOptionError(EXPORT_HELP_MESSAGE); http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/self/WorkflowSyncopeOperations.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/self/WorkflowSyncopeOperations.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/self/WorkflowSyncopeOperations.java index 2add12d..173db43 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/self/WorkflowSyncopeOperations.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/self/WorkflowSyncopeOperations.java @@ -37,5 +37,4 @@ public class WorkflowSyncopeOperations { public Response exportDefinition(final AnyTypeKind anyTypeKind) { return workflowService.exportDefinition(anyTypeKind); } - } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskCommand.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskCommand.java index a616692..f95d69f 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskCommand.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskCommand.java @@ -59,10 +59,10 @@ public class TaskCommand extends AbstractCommand { new TaskList(input).list(); break; case LIST_RUNNING_JOBS: - new TaskRunningJobs().list(); + new TaskListRunningJobs(input).list(); break; case LIST_SCHEDULED_JOBS: - new TaskScheduledJobs().list(); + new TaskListScheduledJobs(input).list(); break; case READ: new TaskRead(input).read(); @@ -85,7 +85,6 @@ public class TaskCommand extends AbstractCommand { default: new TaskResultManager().defaultError(input.getOption(), HELP_MESSAGE); } - } @Override http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskDelete.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskDelete.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskDelete.java index e0d4753..c5089ff 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskDelete.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskDelete.java @@ -43,9 +43,9 @@ public class TaskDelete extends AbstractTaskCommand { if (ex.getMessage().startsWith("NotFound")) { taskResultManager.notFoundError("Task", parameter); } else if (ex.getMessage().startsWith("DataIntegrityViolation")) { - taskResultManager.generic("You cannot delete task " + parameter); + taskResultManager.genericError("You cannot delete task " + parameter); } else { - taskResultManager.generic(ex.getMessage()); + taskResultManager.genericError(ex.getMessage()); } } catch (final NumberFormatException ex) { taskResultManager.notBooleanDeletedError("task", parameter); http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskExecute.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskExecute.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskExecute.java index dfefae3..a501905 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskExecute.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskExecute.java @@ -51,9 +51,9 @@ public class TaskExecute extends AbstractTaskCommand { if (ex.getMessage().startsWith("NotFound")) { taskResultManager.notFoundError("Task", input.firstParameter()); } else if (ex.getMessage().startsWith("DataIntegrityViolation")) { - taskResultManager.generic("You cannot delete task " + input.firstParameter()); + taskResultManager.genericError("You cannot delete task " + input.firstParameter()); } else { - taskResultManager.generic(ex.getMessage()); + taskResultManager.genericError(ex.getMessage()); } } catch (final NumberFormatException ex) { taskResultManager.notBooleanDeletedError("task", input.firstParameter()); @@ -62,5 +62,4 @@ public class TaskExecute extends AbstractTaskCommand { taskResultManager.commandOptionError(EXECUTE_HELP_MESSAGE); } } - } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskExecutionDelete.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskExecutionDelete.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskExecutionDelete.java index bb6d694..30cbf42 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskExecutionDelete.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskExecutionDelete.java @@ -43,9 +43,9 @@ public class TaskExecutionDelete extends AbstractTaskCommand { if (ex.getMessage().startsWith("NotFound")) { taskResultManager.notFoundError("Task execution", parameter); } else if (ex.getMessage().startsWith("DataIntegrityViolation")) { - taskResultManager.generic("You cannot delete task execution" + parameter); + taskResultManager.genericError("You cannot delete task execution" + parameter); } else { - taskResultManager.generic(ex.getMessage()); + taskResultManager.genericError(ex.getMessage()); } } catch (final NumberFormatException ex) { taskResultManager.notBooleanDeletedError("task execution", parameter); http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskExecutionRead.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskExecutionRead.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskExecutionRead.java index d83e2ef..c234028 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskExecutionRead.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskExecutionRead.java @@ -45,7 +45,7 @@ public class TaskExecutionRead extends AbstractTaskCommand { if (ex.getMessage().startsWith("NotFound")) { taskResultManager.notFoundError("Task execution", parameter); } else { - taskResultManager.generic("Error: " + ex.getMessage()); + taskResultManager.genericError(ex.getMessage()); } break; } @@ -54,5 +54,4 @@ public class TaskExecutionRead extends AbstractTaskCommand { taskResultManager.commandOptionError(EXECUTION_READ_HELP_MESSAGE); } } - } http://git-wip-us.apache.org/repos/asf/syncope/blob/6d368c8b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskList.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskList.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskList.java index b8c08e5..e01141a 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskList.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskList.java @@ -47,7 +47,7 @@ public class TaskList extends AbstractTaskCommand { } taskResultManager.fromList(taskType, taskTOs); } catch (final SyncopeClientException ex) { - taskResultManager.generic(ex.getMessage()); + taskResultManager.genericError(ex.getMessage()); } catch (final IllegalArgumentException ex) { taskResultManager.typeNotValidError( "task", input.firstParameter(), CommandUtils.fromEnumToArray(TaskType.class));