Repository: syncope Updated Branches: refs/heads/master 5ebdcf7f5 -> 462289dce
Managed error messages from Logger stack and managed server down exception, SYNCOPE-158 Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/462289dc Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/462289dc Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/462289dc Branch: refs/heads/master Commit: 462289dce937d9590947d1d9141bd75804288f03 Parents: 5ebdcf7 Author: massi <[email protected]> Authored: Tue Oct 20 17:35:26 2015 +0200 Committer: massi <[email protected]> Committed: Tue Oct 20 17:35:26 2015 +0200 ---------------------------------------------------------------------- .../apache/syncope/client/cli/SyncopeAdm.java | 9 ++++++--- .../client/cli/commands/logger/LoggerCreate.java | 7 ++----- .../client/cli/commands/logger/LoggerDelete.java | 7 +++---- .../client/cli/commands/logger/LoggerList.java | 3 +-- .../client/cli/commands/logger/LoggerRead.java | 7 +++---- .../client/cli/commands/logger/LoggerUpdate.java | 14 +++++--------- .../cli/commands/logger/LoggerUpdateAll.java | 10 +++------- .../cli/commands/logger/ResultManager.java | 19 +++++++++++++++++++ .../syncope/client/cli/messages/Table.java | 2 +- 9 files changed, 43 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/462289dc/client/cli/src/main/java/org/apache/syncope/client/cli/SyncopeAdm.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/SyncopeAdm.java b/client/cli/src/main/java/org/apache/syncope/client/cli/SyncopeAdm.java index e62e818..78e2f54 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/SyncopeAdm.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/SyncopeAdm.java @@ -18,8 +18,9 @@ */ package org.apache.syncope.client.cli; +import javax.ws.rs.ProcessingException; import org.apache.syncope.client.cli.commands.AbstractCommand; -import org.apache.syncope.client.cli.messages.Messages; +import org.apache.syncope.client.cli.commands.logger.ResultManager; import org.apache.syncope.client.cli.util.CommandUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,10 +49,12 @@ public final class SyncopeAdm { System.out.println(helpMessage()); } catch (final IllegalArgumentException ex) { LOG.error("Error in main", ex); - Messages.printMessage(ex.getMessage()); + new ResultManager().genericError(ex.getMessage()); if (!ex.getMessage().startsWith("It seems you")) { System.out.println(helpMessage()); } + } catch (final ProcessingException e) { + new ResultManager().genericError("Syncope server offline", e.getCause().getMessage()); } } @@ -69,7 +72,7 @@ public final class SyncopeAdm { helpMessageBuilder.append("\n"); } } catch (final IllegalAccessException | IllegalArgumentException | InstantiationException ex) { - Messages.printMessage(ex.getMessage()); + new ResultManager().genericError(ex.getMessage()); } return helpMessageBuilder.toString(); http://git-wip-us.apache.org/repos/asf/syncope/blob/462289dc/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerCreate.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerCreate.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerCreate.java index 1444938..d70aad1 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerCreate.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerCreate.java @@ -21,8 +21,6 @@ package org.apache.syncope.client.cli.commands.logger; import java.util.LinkedList; import javax.xml.ws.WebServiceException; import org.apache.syncope.client.cli.Input; -import org.apache.syncope.client.cli.messages.Messages; -import org.apache.syncope.client.cli.util.CommandUtils; import org.apache.syncope.common.lib.SyncopeClientException; import org.apache.syncope.common.lib.to.LoggerTO; import org.apache.syncope.common.lib.types.LoggerLevel; @@ -54,8 +52,7 @@ public class LoggerCreate extends AbstractLoggerCommand { loggerService.update(LoggerType.LOG, loggerTO); loggerTOs.add(loggerTO); } catch (final WebServiceException | SyncopeClientException | IllegalArgumentException ex) { - Messages.printTypeNotValidMessage( - "logger level", input.firstParameter(), CommandUtils.fromEnumToArray(LoggerLevel.class)); + resultManager.typeNotValidError(input.firstParameter()); failed = true; break; } @@ -64,7 +61,7 @@ public class LoggerCreate extends AbstractLoggerCommand { resultManager.fromUpdate(loggerTOs); } } else { - Messages.printCommandOptionMessage(CREATE_HELP_MESSAGE); + resultManager.commandOptionError(CREATE_HELP_MESSAGE); } } http://git-wip-us.apache.org/repos/asf/syncope/blob/462289dc/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerDelete.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerDelete.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerDelete.java index 49becd5..44f39ee 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerDelete.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerDelete.java @@ -21,7 +21,6 @@ package org.apache.syncope.client.cli.commands.logger; import java.util.LinkedList; import javax.xml.ws.WebServiceException; import org.apache.syncope.client.cli.Input; -import org.apache.syncope.client.cli.messages.Messages; import org.apache.syncope.common.lib.SyncopeClientException; import org.apache.syncope.common.lib.to.LoggerTO; import org.apache.syncope.common.lib.types.LoggerType; @@ -45,9 +44,9 @@ public class LoggerDelete extends AbstractLoggerCommand { loggerService.delete(LoggerType.LOG, parameter); } catch (final WebServiceException | SyncopeClientException ex) { if (ex.getMessage().startsWith("NotFound")) { - Messages.printNofFoundMessage("Logger", parameter); + resultManager.notFoundError(parameter); } else { - Messages.printMessage(ex.getMessage()); + resultManager.genericError(ex.getMessage()); } failed = true; } @@ -56,7 +55,7 @@ public class LoggerDelete extends AbstractLoggerCommand { resultManager.fromDelete(loggerTOs); } } else { - Messages.printCommandOptionMessage(DELETE_HELP_MESSAGE); + resultManager.commandOptionError(DELETE_HELP_MESSAGE); } } http://git-wip-us.apache.org/repos/asf/syncope/blob/462289dc/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 78d2ced..bee7e7c 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,7 +19,6 @@ package org.apache.syncope.client.cli.commands.logger; import java.util.LinkedList; -import org.apache.syncope.client.cli.messages.Messages; import org.apache.syncope.common.lib.SyncopeClientException; import org.apache.syncope.common.lib.types.LoggerType; @@ -32,7 +31,7 @@ public class LoggerList extends AbstractLoggerCommand { try { resultManager.fromList(new LinkedList<>(loggerService.list(LoggerType.LOG))); } catch (final SyncopeClientException ex) { - Messages.printMessage("Error: " + ex.getMessage()); + resultManager.genericError("Error: " + ex.getMessage()); } } } http://git-wip-us.apache.org/repos/asf/syncope/blob/462289dc/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 4d33191..3cbca46 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 @@ -21,7 +21,6 @@ package org.apache.syncope.client.cli.commands.logger; import java.util.LinkedList; import javax.xml.ws.WebServiceException; import org.apache.syncope.client.cli.Input; -import org.apache.syncope.client.cli.messages.Messages; import org.apache.syncope.common.lib.SyncopeClientException; import org.apache.syncope.common.lib.to.LoggerTO; import org.apache.syncope.common.lib.types.LoggerType; @@ -45,9 +44,9 @@ public class LoggerRead extends AbstractLoggerCommand { loggerTOs.add(loggerService.read(LoggerType.LOG, parameter)); } catch (final SyncopeClientException | WebServiceException ex) { if (ex.getMessage().startsWith("NotFound")) { - Messages.printNofFoundMessage("Logger", parameter); + resultManager.notFoundError(parameter); } else { - Messages.printMessage("Error: " + ex.getMessage()); + resultManager.genericError("Error: " + ex.getMessage()); } failed = true; break; @@ -57,7 +56,7 @@ public class LoggerRead extends AbstractLoggerCommand { resultManager.fromRead(loggerTOs); } } else { - Messages.printCommandOptionMessage(READ_HELP_MESSAGE); + resultManager.commandOptionError(READ_HELP_MESSAGE); } } } http://git-wip-us.apache.org/repos/asf/syncope/blob/462289dc/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 fccfe72..d309c4c 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 @@ -21,8 +21,6 @@ package org.apache.syncope.client.cli.commands.logger; import java.util.LinkedList; import javax.xml.ws.WebServiceException; import org.apache.syncope.client.cli.Input; -import org.apache.syncope.client.cli.messages.Messages; -import org.apache.syncope.client.cli.util.CommandUtils; import org.apache.syncope.common.lib.SyncopeClientException; import org.apache.syncope.common.lib.to.LoggerTO; import org.apache.syncope.common.lib.types.LoggerLevel; @@ -54,15 +52,13 @@ public class LoggerUpdate extends AbstractLoggerCommand { loggerTOs.add(loggerTO); } catch (final WebServiceException | SyncopeClientException | IllegalArgumentException ex) { if (ex.getMessage().startsWith("No enum constant org.apache.syncope.common.lib.types.")) { - Messages.printTypeNotValidMessage( - "logger level", - input.firstParameter(), CommandUtils.fromEnumToArray(LoggerLevel.class)); + resultManager.typeNotValidError(input.firstParameter()); } else if ("Parameter syntax error!".equalsIgnoreCase(ex.getMessage())) { - Messages.printMessage(ex.getMessage(), UPDATE_HELP_MESSAGE); + resultManager.genericError(ex.getMessage(), UPDATE_HELP_MESSAGE); } else if (ex.getMessage().startsWith("NotFound")) { - Messages.printNofFoundMessage("Logger", parameter); + resultManager.notFoundError(parameter); } else { - Messages.printMessage(ex.getMessage(), UPDATE_HELP_MESSAGE); + resultManager.genericError(ex.getMessage(), UPDATE_HELP_MESSAGE); } failed = true; break; @@ -72,7 +68,7 @@ public class LoggerUpdate extends AbstractLoggerCommand { resultManager.fromUpdate(loggerTOs); } } else { - Messages.printCommandOptionMessage(UPDATE_HELP_MESSAGE); + resultManager.commandOptionError(UPDATE_HELP_MESSAGE); } } } http://git-wip-us.apache.org/repos/asf/syncope/blob/462289dc/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 b0ee25c..3393ae4 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 @@ -21,8 +21,6 @@ package org.apache.syncope.client.cli.commands.logger; import java.util.LinkedList; import javax.xml.ws.WebServiceException; import org.apache.syncope.client.cli.Input; -import org.apache.syncope.client.cli.messages.Messages; -import org.apache.syncope.client.cli.util.CommandUtils; import org.apache.syncope.common.lib.SyncopeClientException; import org.apache.syncope.common.lib.to.LoggerTO; import org.apache.syncope.common.lib.types.LoggerLevel; @@ -49,11 +47,9 @@ public class LoggerUpdateAll extends AbstractLoggerCommand { loggerTOs.add(loggerTO); } catch (final WebServiceException | SyncopeClientException | IllegalArgumentException ex) { if (ex.getMessage().startsWith("No enum constant org.apache.syncope.common.lib.types.")) { - Messages.printTypeNotValidMessage( - "logger level", - input.firstParameter(), CommandUtils.fromEnumToArray(LoggerLevel.class)); + resultManager.typeNotValidError(input.firstParameter()); } else { - Messages.printMessage(ex.getMessage(), UPDATE_ALL_HELP_MESSAGE); + resultManager.genericError(ex.getMessage(), UPDATE_ALL_HELP_MESSAGE); } failed = true; break; @@ -63,7 +59,7 @@ public class LoggerUpdateAll extends AbstractLoggerCommand { resultManager.fromUpdate(loggerTOs); } } else { - Messages.printCommandOptionMessage(UPDATE_ALL_HELP_MESSAGE); + resultManager.commandOptionError(UPDATE_ALL_HELP_MESSAGE); } } } http://git-wip-us.apache.org/repos/asf/syncope/blob/462289dc/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/ResultManager.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/ResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/ResultManager.java index 102ff74..e993eb7 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/ResultManager.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/ResultManager.java @@ -20,11 +20,30 @@ package org.apache.syncope.client.cli.commands.logger; import java.util.Arrays; import java.util.LinkedList; +import org.apache.syncope.client.cli.messages.Messages; import org.apache.syncope.client.cli.messages.Table; +import org.apache.syncope.client.cli.util.CommandUtils; import org.apache.syncope.common.lib.to.LoggerTO; +import org.apache.syncope.common.lib.types.LoggerLevel; public class ResultManager { + public void notFoundError(final String parameter) { + Messages.printNofFoundMessage("Logger", parameter); + } + + public void typeNotValidError(final String parameter) { + Messages.printTypeNotValidMessage("logger level", parameter, CommandUtils.fromEnumToArray(LoggerLevel.class)); + } + + public void commandOptionError(final String message) { + Messages.printCommandOptionMessage(message); + } + + public void genericError(final String... messages) { + Messages.printMessage(messages); + } + public void fromList(final LinkedList<LoggerTO> loggerTOs) { fromCommandToView("list loggers", "level", loggerTOs); } http://git-wip-us.apache.org/repos/asf/syncope/blob/462289dc/client/cli/src/main/java/org/apache/syncope/client/cli/messages/Table.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/messages/Table.java b/client/cli/src/main/java/org/apache/syncope/client/cli/messages/Table.java index 4f22980..8a28965 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/messages/Table.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/messages/Table.java @@ -128,7 +128,7 @@ public final class Table { System.out.format(TABLE_TITLE_FORMAT, StringUtils.center(" ", tableWidth - 6)); } - public void printHeaders() { + private void printHeaders() { printColumnSpace(); for (int h = 0; h < columnsNumber; h++) {
