You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2016/08/25 10:20:43 UTC
[3/3] syncope git commit: [SYNCOPE-700] Reviwing CLI
[SYNCOPE-700] Reviwing CLI
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/d18bdbd5
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/d18bdbd5
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/d18bdbd5
Branch: refs/heads/master
Commit: d18bdbd582dfe17ffb5605da584aade7ddd11f7e
Parents: 2c4d363
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Thu Aug 25 12:20:30 2016 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Thu Aug 25 12:20:30 2016 +0200
----------------------------------------------------------------------
.../commands/anyobject/AnyObjectCommand.java | 2 +-
.../cli/commands/anyobject/AnyObjectDelete.java | 2 +-
.../cli/commands/anyobject/AnyObjectRead.java | 4 +-
...ctReadAttributeBySchemaTypeAndSchemaKey.java | 61 ++++++++++++++++++
...tReadAttributeBySchemaTypeAndSchemaName.java | 61 ------------------
.../AnyObjectReadAttributesBySchemaType.java | 2 +-
.../anyobject/AnyObjectResultManager.java | 6 +-
.../cli/commands/connector/ConnectorDelete.java | 2 +-
.../ConnectorListConfigurationProperties.java | 2 +-
.../cli/commands/connector/ConnectorRead.java | 2 +-
.../connector/ConnectorReadByResource.java | 3 +-
.../connector/ConnectorResultManager.java | 2 +-
.../commands/domain/DomainResultManager.java | 2 +-
.../entitlement/EntitlementCommand.java | 6 +-
.../entitlement/EntitlementReadByUserId.java | 59 -----------------
.../entitlement/EntitlementReadByUserKey.java | 59 +++++++++++++++++
.../entitlement/EntitlementResultManager.java | 2 +-
.../entitlement/EntitlementSearchByRole.java | 2 +-
.../client/cli/commands/group/GroupCommand.java | 2 +-
.../client/cli/commands/group/GroupDelete.java | 2 +-
.../client/cli/commands/group/GroupRead.java | 2 +-
...upReadAttributeBySchemaTypeAndSchemaKey.java | 61 ++++++++++++++++++
...pReadAttributeBySchemaTypeAndSchemaName.java | 61 ------------------
.../group/GroupReadAttributesBySchemaType.java | 2 +-
.../cli/commands/group/GroupResultManager.java | 2 +-
.../notification/NotificationDelete.java | 3 +-
.../commands/notification/NotificationRead.java | 2 +-
.../notification/NotificationResultManager.java | 2 +-
.../cli/commands/policy/PolicyDelete.java | 2 +-
.../client/cli/commands/policy/PolicyRead.java | 2 +-
.../cli/commands/question/QuestionDelete.java | 2 +-
.../cli/commands/question/QuestionRead.java | 2 +-
.../question/QuestionResultManager.java | 2 +-
.../cli/commands/realm/RealmResultManager.java | 8 +--
.../cli/commands/report/ReportDelete.java | 2 +-
.../commands/report/ReportDeleteExecution.java | 2 +-
.../cli/commands/report/ReportExecute.java | 2 +-
.../commands/report/ReportExportExecution.java | 2 +-
.../client/cli/commands/report/ReportRead.java | 2 +-
.../commands/report/ReportResultManager.java | 4 +-
.../cli/commands/resource/ResourceDelete.java | 2 +-
.../cli/commands/resource/ResourceRead.java | 2 +-
.../resource/ResourceResultManager.java | 12 ++--
.../client/cli/commands/role/RoleDelete.java | 2 +-
.../client/cli/commands/role/RoleRead.java | 2 +-
.../cli/commands/role/RoleResultManager.java | 2 +-
.../commands/schema/SchemaResultManager.java | 2 +-
.../client/cli/commands/task/TaskDelete.java | 2 +-
.../client/cli/commands/task/TaskExecute.java | 2 +-
.../cli/commands/task/TaskExecutionDelete.java | 2 +-
.../client/cli/commands/task/TaskRead.java | 2 +-
.../client/cli/commands/user/UserCommand.java | 6 +-
.../client/cli/commands/user/UserDelete.java | 2 +-
.../cli/commands/user/UserReadByUserId.java | 66 --------------------
.../cli/commands/user/UserReadByUserKey.java | 66 ++++++++++++++++++++
.../cli/commands/user/UserResultManager.java | 8 +--
.../cli/commands/user/UserSearchByResource.java | 2 +-
.../cli/commands/user/UserSearchByRole.java | 2 +-
.../cli/src/main/resources/messages.properties | 24 +++----
.../api/notification/NotificationManager.java | 2 +-
.../org/apache/syncope/fit/cli/CLIITCase.java | 6 +-
.../workingwithapachesyncope/cli/anyObject.adoc | 55 ++++++++++++++++
.../workingwithapachesyncope/cli/cli.adoc | 2 +
.../cli/configuration.adoc | 3 +-
.../workingwithapachesyncope/cli/connector.adoc | 9 ++-
.../workingwithapachesyncope/cli/domain.adoc | 5 +-
.../cli/entitlement.adoc | 12 ++--
.../workingwithapachesyncope/cli/group.adoc | 11 ++--
.../workingwithapachesyncope/cli/info.adoc | 3 +-
.../workingwithapachesyncope/cli/logger.adoc | 5 +-
.../cli/notification.adoc | 7 +--
.../workingwithapachesyncope/cli/policy.adoc | 9 ++-
.../workingwithapachesyncope/cli/question.adoc | 7 +--
.../workingwithapachesyncope/cli/realm.adoc | 3 +-
.../workingwithapachesyncope/cli/report.adoc | 15 +++--
.../workingwithapachesyncope/cli/resource.adoc | 7 +--
.../workingwithapachesyncope/cli/role.adoc | 7 +--
.../workingwithapachesyncope/cli/schema.adoc | 3 +-
.../workingwithapachesyncope/cli/task.adoc | 19 +++---
.../workingwithapachesyncope/cli/user.adoc | 25 ++++----
80 files changed, 457 insertions(+), 416 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/anyobject/AnyObjectCommand.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/anyobject/AnyObjectCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/anyobject/AnyObjectCommand.java
index 6dc6ba7..520e3ec 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/anyobject/AnyObjectCommand.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/anyobject/AnyObjectCommand.java
@@ -45,7 +45,7 @@ public class AnyObjectCommand extends AbstractCommand {
new AnyObjectRead(input).read();
break;
case READ_ATTRIBUTES_BY_SCHEMA:
- new AnyObjectReadAttributeBySchemaTypeAndSchemaName(input).read();
+ new AnyObjectReadAttributeBySchemaTypeAndSchemaKey(input).read();
break;
case READ_ATTRIBUTES_BY_SCHEMA_TYPE:
new AnyObjectReadAttributesBySchemaType(input).read();
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/anyobject/AnyObjectDelete.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/anyobject/AnyObjectDelete.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/anyobject/AnyObjectDelete.java
index 16ff80b..f7b635c 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/anyobject/AnyObjectDelete.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/anyobject/AnyObjectDelete.java
@@ -27,7 +27,7 @@ public class AnyObjectDelete extends AbstractAnyObjectCommand {
private static final Logger LOG = LoggerFactory.getLogger(AnyObjectDelete.class);
- private static final String DELETE_HELP_MESSAGE = "any --delete {ANY-ID} {ANY-ID} [...]";
+ private static final String DELETE_HELP_MESSAGE = "any --delete {ANY_OBJECT-KEY} {ANY_OBJECT-KEY} [...]";
private final Input input;
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/anyobject/AnyObjectRead.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/anyobject/AnyObjectRead.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/anyobject/AnyObjectRead.java
index 03137f7..f084c38 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/anyobject/AnyObjectRead.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/anyobject/AnyObjectRead.java
@@ -27,7 +27,7 @@ public class AnyObjectRead extends AbstractAnyObjectCommand {
private static final Logger LOG = LoggerFactory.getLogger(AnyObjectRead.class);
- private static final String READ_HELP_MESSAGE = "any --read {ANY-ID} {ANY-ID} [...]";
+ private static final String READ_HELP_MESSAGE = "any --read {ANY_OBJECT-KEY} {ANY_OBJECT-KEY} [...]";
private final Input input;
@@ -39,7 +39,7 @@ public class AnyObjectRead extends AbstractAnyObjectCommand {
if (input.parameterNumber() >= 1) {
for (final String parameter : input.getParameters()) {
try {
- anyResultManager.printGroup(anySyncopeOperations.read(parameter));
+ anyResultManager.printAny(anySyncopeOperations.read(parameter));
} catch (final SyncopeClientException ex) {
LOG.error("Error reading group", ex);
if (ex.getMessage().startsWith("NotFound")) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/anyobject/AnyObjectReadAttributeBySchemaTypeAndSchemaKey.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/anyobject/AnyObjectReadAttributeBySchemaTypeAndSchemaKey.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/anyobject/AnyObjectReadAttributeBySchemaTypeAndSchemaKey.java
new file mode 100644
index 0000000..e3deda3
--- /dev/null
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/anyobject/AnyObjectReadAttributeBySchemaTypeAndSchemaKey.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.client.cli.commands.anyobject;
+
+import org.apache.syncope.client.cli.Input;
+import org.apache.syncope.client.cli.util.CommandUtils;
+import org.apache.syncope.common.lib.SyncopeClientException;
+import org.apache.syncope.common.lib.types.SchemaType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class AnyObjectReadAttributeBySchemaTypeAndSchemaKey extends AbstractAnyObjectCommand {
+
+ private static final Logger LOG = LoggerFactory.getLogger(AnyObjectReadAttributeBySchemaTypeAndSchemaKey.class);
+
+ private static final String READ_HELP_MESSAGE
+ = "any --read-attr-by-schema {ANY_OBJECT-KEY} {SCHEMA-TYPE} {SCHEMA-KEY}\n"
+ + " Schema type: PLAIN / DERIVED / VIRTUAL";
+
+ private final Input input;
+
+ public AnyObjectReadAttributeBySchemaTypeAndSchemaKey(final Input input) {
+ this.input = input;
+ }
+
+ public void read() {
+ if (input.parameterNumber() == 3) {
+ try {
+ anyResultManager.printAttribute(anySyncopeOperations.readAttribute(
+ input.firstParameter(), input.secondParameter(), input.thirdParameter()));
+ } catch (final SyncopeClientException ex) {
+ LOG.error("Error reading any object", ex);
+ anyResultManager.genericError(ex.getMessage());
+ } catch (final NumberFormatException ex) {
+ anyResultManager.numberFormatException("any object", input.firstParameter());
+ } catch (final IllegalArgumentException ex) {
+ LOG.error("Error reading schema", ex);
+ anyResultManager.typeNotValidError(
+ "schema", input.secondParameter(), CommandUtils.fromEnumToArray(SchemaType.class));
+ }
+ } else {
+ anyResultManager.commandOptionError(READ_HELP_MESSAGE);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/anyobject/AnyObjectReadAttributeBySchemaTypeAndSchemaName.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/anyobject/AnyObjectReadAttributeBySchemaTypeAndSchemaName.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/anyobject/AnyObjectReadAttributeBySchemaTypeAndSchemaName.java
deleted file mode 100644
index 8db0e21..0000000
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/anyobject/AnyObjectReadAttributeBySchemaTypeAndSchemaName.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.client.cli.commands.anyobject;
-
-import org.apache.syncope.client.cli.Input;
-import org.apache.syncope.client.cli.util.CommandUtils;
-import org.apache.syncope.common.lib.SyncopeClientException;
-import org.apache.syncope.common.lib.types.SchemaType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class AnyObjectReadAttributeBySchemaTypeAndSchemaName extends AbstractAnyObjectCommand {
-
- private static final Logger LOG = LoggerFactory.getLogger(AnyObjectReadAttributeBySchemaTypeAndSchemaName.class);
-
- private static final String READ_HELP_MESSAGE
- = "any --read-attr-by-schema {ANY-ID} {SCHEMA-TYPE} {SCHEMA-NAME}\n"
- + " Schema type: PLAIN / DERIVED / VIRTUAL";
-
- private final Input input;
-
- public AnyObjectReadAttributeBySchemaTypeAndSchemaName(final Input input) {
- this.input = input;
- }
-
- public void read() {
- if (input.parameterNumber() == 3) {
- try {
- anyResultManager.printAttribute(anySyncopeOperations.readAttribute(
- input.firstParameter(), input.secondParameter(), input.thirdParameter()));
- } catch (final SyncopeClientException ex) {
- LOG.error("Error reading any object", ex);
- anyResultManager.genericError(ex.getMessage());
- } catch (final NumberFormatException ex) {
- anyResultManager.numberFormatException("any object", input.firstParameter());
- } catch (final IllegalArgumentException ex) {
- LOG.error("Error reading schema", ex);
- anyResultManager.typeNotValidError(
- "schema", input.secondParameter(), CommandUtils.fromEnumToArray(SchemaType.class));
- }
- } else {
- anyResultManager.commandOptionError(READ_HELP_MESSAGE);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/anyobject/AnyObjectReadAttributesBySchemaType.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/anyobject/AnyObjectReadAttributesBySchemaType.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/anyobject/AnyObjectReadAttributesBySchemaType.java
index ff42b0a..c2ece79 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/anyobject/AnyObjectReadAttributesBySchemaType.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/anyobject/AnyObjectReadAttributesBySchemaType.java
@@ -29,7 +29,7 @@ public class AnyObjectReadAttributesBySchemaType extends AbstractAnyObjectComman
private static final Logger LOG = LoggerFactory.getLogger(AnyObjectReadAttributesBySchemaType.class);
- private static final String READ_HELP_MESSAGE = "any --read-attr-by-schema-type {ANY-ID} {SCHEMA-TYPE}\n"
+ private static final String READ_HELP_MESSAGE = "any --read-attr-by-schema-type {ANY_OBJECT-KEY} {SCHEMA-TYPE}\n"
+ " Schema type: PLAIN / DERIVED / VIRTUAL";
private final Input input;
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/anyobject/AnyObjectResultManager.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/anyobject/AnyObjectResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/anyobject/AnyObjectResultManager.java
index 4f89b23..a107239 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/anyobject/AnyObjectResultManager.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/anyobject/AnyObjectResultManager.java
@@ -30,12 +30,12 @@ public class AnyObjectResultManager extends CommonsResultManager {
public void printAnys(final List<AnyObjectTO> anyObjectTOs) {
System.out.println("");
for (final AnyObjectTO anyObjectTO : anyObjectTOs) {
- printGroup(anyObjectTO);
+ printAny(anyObjectTO);
}
}
- public void printGroup(final AnyObjectTO anyObjectTO) {
- System.out.println(" > ANY ID: " + anyObjectTO.getKey());
+ public void printAny(final AnyObjectTO anyObjectTO) {
+ System.out.println(" > ANY OBJECT KEY: " + anyObjectTO.getKey());
System.out.println(" type: " + anyObjectTO.getType());
System.out.println(" realm: " + anyObjectTO.getRealm());
System.out.println(" status: " + anyObjectTO.getStatus());
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorDelete.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorDelete.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorDelete.java
index 2abc5ba..4039c40 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorDelete.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorDelete.java
@@ -31,7 +31,7 @@ public class ConnectorDelete extends AbstractConnectorCommand {
private static final Logger LOG = LoggerFactory.getLogger(ConnectorDelete.class);
- private static final String DELETE_HELP_MESSAGE = "connector --delete {CONNECTOR-ID} {CONNECTOR-ID} [...]";
+ private static final String DELETE_HELP_MESSAGE = "connector --delete {CONNECTOR-KEY} {CONNECTOR-KEY} [...]";
private final Input input;
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorListConfigurationProperties.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorListConfigurationProperties.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorListConfigurationProperties.java
index da54e4a..d830f80 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorListConfigurationProperties.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorListConfigurationProperties.java
@@ -29,7 +29,7 @@ public class ConnectorListConfigurationProperties extends AbstractConnectorComma
private static final Logger LOG = LoggerFactory.getLogger(ConnectorListConfigurationProperties.class);
private static final String LIST_CONFIGURATION_HELP_MESSAGE
- = "connector --list-configuration-properties {CONNECTOR-ID} {CONNECTOR-ID} [...]";
+ = "connector --list-configuration-properties {CONNECTOR-KEY} {CONNECTOR-KEY} [...]";
private final Input input;
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorRead.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorRead.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorRead.java
index c332505..732b2ae 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorRead.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorRead.java
@@ -28,7 +28,7 @@ public class ConnectorRead extends AbstractConnectorCommand {
private static final Logger LOG = LoggerFactory.getLogger(ConnectorRead.class);
- private static final String READ_HELP_MESSAGE = "connector --read {CONNECTOR-ID} {CONNECTOR-ID} [...]";
+ private static final String READ_HELP_MESSAGE = "connector --read {CONNECTOR-KEY} {CONNECTOR-KEY} [...]";
private final Input input;
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorReadByResource.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorReadByResource.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorReadByResource.java
index 1dba6f1..c6c3345 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorReadByResource.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorReadByResource.java
@@ -28,8 +28,7 @@ public class ConnectorReadByResource extends AbstractConnectorCommand {
private static final Logger LOG = LoggerFactory.getLogger(ConnectorReadByResource.class);
- private static final String READ_HELP_MESSAGE
- = "connector --read-by-resource {RESOURCE-NAME} {RESOURCE-NAME} [...]";
+ private static final String READ_HELP_MESSAGE = "connector --read-by-resource {RESOURCE-KEY} {RESOURCE-KEY} [...]";
private final Input input;
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorResultManager.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorResultManager.java
index cf63632..157500f 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorResultManager.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorResultManager.java
@@ -39,7 +39,7 @@ public class ConnectorResultManager extends CommonsResultManager {
}
public void printConnector(final ConnInstanceTO connInstanceTO) {
- System.out.println(" > CONNECTOR ID: " + connInstanceTO.getKey());
+ System.out.println(" > CONNECTOR KEY: " + connInstanceTO.getKey());
System.out.println(" bundle name: " + connInstanceTO.getBundleName());
System.out.println(" connector name: " + connInstanceTO.getConnectorName());
System.out.println(" display name: " + connInstanceTO.getDisplayName());
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/domain/DomainResultManager.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/domain/DomainResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/domain/DomainResultManager.java
index 5f15dfe..6490f3f 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/domain/DomainResultManager.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/domain/DomainResultManager.java
@@ -33,7 +33,7 @@ public class DomainResultManager extends CommonsResultManager {
}
public void printDomain(final DomainTO domainTO) {
- System.out.println(" > DOIMAIN NAME: " + domainTO.getKey());
+ System.out.println(" > DOIMAIN KEY: " + domainTO.getKey());
System.out.println(" cipher algorithm: " + domainTO.getAdminCipherAlgorithm());
System.out.println("");
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/entitlement/EntitlementCommand.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/entitlement/EntitlementCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/entitlement/EntitlementCommand.java
index 42949a7..2c4420e 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/entitlement/EntitlementCommand.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/entitlement/EntitlementCommand.java
@@ -43,8 +43,8 @@ public class EntitlementCommand extends AbstractCommand {
case READ_BY_USERNAME:
new EntitlementReadByUsername(input).read();
break;
- case READ_BY_USERID:
- new EntitlementReadByUserId(input).read();
+ case READ_BY_USERKEY:
+ new EntitlementReadByUserKey(input).read();
break;
case SEARCH_BY_ROLE:
new EntitlementSearchByRole(input).search();
@@ -70,7 +70,7 @@ public class EntitlementCommand extends AbstractCommand {
HELP("--help"),
LIST("--list"),
READ_BY_USERNAME("--read-by-username"),
- READ_BY_USERID("--read-by-userid"),
+ READ_BY_USERKEY("--read-by-userkey"),
SEARCH_BY_ROLE("--search-by-role"),
LIST_ROLE("--list-role");
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/entitlement/EntitlementReadByUserId.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/entitlement/EntitlementReadByUserId.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/entitlement/EntitlementReadByUserId.java
deleted file mode 100644
index 51bc602..0000000
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/entitlement/EntitlementReadByUserId.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.client.cli.commands.entitlement;
-
-import javax.xml.ws.WebServiceException;
-import org.apache.syncope.client.cli.Input;
-import org.apache.syncope.common.lib.SyncopeClientException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class EntitlementReadByUserId extends AbstractEntitlementCommand {
-
- private static final Logger LOG = LoggerFactory.getLogger(EntitlementReadByUserId.class);
-
- private static final String READ_HELP_MESSAGE = "entitlement --read-by-userid {USER-ID}";
-
- private final Input input;
-
- public EntitlementReadByUserId(final Input input) {
- this.input = input;
- }
-
- public void read() {
- if (input.getParameters().length == 1) {
- try {
- entitlementResultManager.toView(
- entitlementSyncopeOperations.userIdEntitlements(input.firstParameter()));
- } catch (final SyncopeClientException | WebServiceException ex) {
- LOG.error("Error reading entitlement", ex);
- if (ex.getMessage().startsWith("NotFound")) {
- entitlementResultManager.notFoundError("User", input.firstParameter());
- } else {
- entitlementResultManager.genericError(ex.getMessage());
- }
- } catch (final NumberFormatException ex) {
- LOG.error("Error reading entitlement", ex);
- entitlementResultManager.numberFormatException("user", input.firstParameter());
- }
- } else {
- entitlementResultManager.commandOptionError(READ_HELP_MESSAGE);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/entitlement/EntitlementReadByUserKey.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/entitlement/EntitlementReadByUserKey.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/entitlement/EntitlementReadByUserKey.java
new file mode 100644
index 0000000..1cbc794
--- /dev/null
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/entitlement/EntitlementReadByUserKey.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.client.cli.commands.entitlement;
+
+import javax.xml.ws.WebServiceException;
+import org.apache.syncope.client.cli.Input;
+import org.apache.syncope.common.lib.SyncopeClientException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class EntitlementReadByUserKey extends AbstractEntitlementCommand {
+
+ private static final Logger LOG = LoggerFactory.getLogger(EntitlementReadByUserKey.class);
+
+ private static final String READ_HELP_MESSAGE = "entitlement --read-by-userkey {USER-KEY}";
+
+ private final Input input;
+
+ public EntitlementReadByUserKey(final Input input) {
+ this.input = input;
+ }
+
+ public void read() {
+ if (input.getParameters().length == 1) {
+ try {
+ entitlementResultManager.toView(
+ entitlementSyncopeOperations.userIdEntitlements(input.firstParameter()));
+ } catch (final SyncopeClientException | WebServiceException ex) {
+ LOG.error("Error reading entitlement", ex);
+ if (ex.getMessage().startsWith("NotFound")) {
+ entitlementResultManager.notFoundError("User", input.firstParameter());
+ } else {
+ entitlementResultManager.genericError(ex.getMessage());
+ }
+ } catch (final NumberFormatException ex) {
+ LOG.error("Error reading entitlement", ex);
+ entitlementResultManager.numberFormatException("user", input.firstParameter());
+ }
+ } else {
+ entitlementResultManager.commandOptionError(READ_HELP_MESSAGE);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/entitlement/EntitlementResultManager.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/entitlement/EntitlementResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/entitlement/EntitlementResultManager.java
index 02d3e67..bf871f6 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/entitlement/EntitlementResultManager.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/entitlement/EntitlementResultManager.java
@@ -40,7 +40,7 @@ public class EntitlementResultManager extends CommonsResultManager {
}
private void printRole(final RoleTO roleTO) {
- System.out.println(" > ROLE ID: " + roleTO.getKey());
+ System.out.println(" > ROLE KEY: " + roleTO.getKey());
System.out.println(" REALMS: ");
printRealms(roleTO.getRealms());
System.out.println("");
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/entitlement/EntitlementSearchByRole.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/entitlement/EntitlementSearchByRole.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/entitlement/EntitlementSearchByRole.java
index fec995c..30ec04b 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/entitlement/EntitlementSearchByRole.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/entitlement/EntitlementSearchByRole.java
@@ -28,7 +28,7 @@ public class EntitlementSearchByRole extends AbstractEntitlementCommand {
private static final Logger LOG = LoggerFactory.getLogger(EntitlementSearchByRole.class);
- private static final String READ_HELP_MESSAGE = "entitlement --search-by-role {ROLE-ID}";
+ private static final String READ_HELP_MESSAGE = "entitlement --search-by-role {ROLE-KEY}";
private final Input input;
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/group/GroupCommand.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/group/GroupCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/group/GroupCommand.java
index fee8252..1197a55 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/group/GroupCommand.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/group/GroupCommand.java
@@ -49,7 +49,7 @@ public class GroupCommand extends AbstractCommand {
new GroupReadAttributesBySchemaType(input).read();
break;
case READ_ATTRIBUTES_BY_SCHEMA:
- new GroupReadAttributeBySchemaTypeAndSchemaName(input).read();
+ new GroupReadAttributeBySchemaTypeAndSchemaKey(input).read();
break;
case DELETE:
new GroupDelete(input).delete();
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/group/GroupDelete.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/group/GroupDelete.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/group/GroupDelete.java
index 279f9b2..9e5d96c 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/group/GroupDelete.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/group/GroupDelete.java
@@ -27,7 +27,7 @@ public class GroupDelete extends AbstractGroupCommand {
private static final Logger LOG = LoggerFactory.getLogger(GroupDelete.class);
- private static final String DELETE_HELP_MESSAGE = "group --delete {GROUP-ID} {GROUP-ID} [...]";
+ private static final String DELETE_HELP_MESSAGE = "group --delete {GROUP-KEY} {GROUP-KEY} [...]";
private final Input input;
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/group/GroupRead.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/group/GroupRead.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/group/GroupRead.java
index 6adb8b7..c8c82cc 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/group/GroupRead.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/group/GroupRead.java
@@ -27,7 +27,7 @@ public class GroupRead extends AbstractGroupCommand {
private static final Logger LOG = LoggerFactory.getLogger(GroupRead.class);
- private static final String READ_HELP_MESSAGE = "group --read {GROUP-ID} {GROUP-ID} [...]";
+ private static final String READ_HELP_MESSAGE = "group --read {GROUP-KEY} {GROUP-KEY} [...]";
private final Input input;
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/group/GroupReadAttributeBySchemaTypeAndSchemaKey.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/group/GroupReadAttributeBySchemaTypeAndSchemaKey.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/group/GroupReadAttributeBySchemaTypeAndSchemaKey.java
new file mode 100644
index 0000000..18f8939
--- /dev/null
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/group/GroupReadAttributeBySchemaTypeAndSchemaKey.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.client.cli.commands.group;
+
+import org.apache.syncope.client.cli.Input;
+import org.apache.syncope.client.cli.util.CommandUtils;
+import org.apache.syncope.common.lib.SyncopeClientException;
+import org.apache.syncope.common.lib.types.SchemaType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class GroupReadAttributeBySchemaTypeAndSchemaKey extends AbstractGroupCommand {
+
+ private static final Logger LOG = LoggerFactory.getLogger(GroupReadAttributeBySchemaTypeAndSchemaKey.class);
+
+ private static final String READ_HELP_MESSAGE
+ = "group --read-attr-by-schema {GROUP-KEY} {SCHEMA-TYPE} {SCHEMA-KEY}\n"
+ + " Schema type: PLAIN / DERIVED / VIRTUAL";
+
+ private final Input input;
+
+ public GroupReadAttributeBySchemaTypeAndSchemaKey(final Input input) {
+ this.input = input;
+ }
+
+ public void read() {
+ if (input.parameterNumber() == 3) {
+ try {
+ groupResultManager.printAttribute(groupSyncopeOperations.readAttribute(
+ input.firstParameter(), input.secondParameter(), input.thirdParameter()));
+ } catch (final SyncopeClientException ex) {
+ LOG.error("Error reading group", ex);
+ groupResultManager.genericError(ex.getMessage());
+ } catch (final NumberFormatException ex) {
+ groupResultManager.numberFormatException("group", input.firstParameter());
+ } catch (final IllegalArgumentException ex) {
+ LOG.error("Error reading schema", ex);
+ groupResultManager.typeNotValidError(
+ "schema", input.secondParameter(), CommandUtils.fromEnumToArray(SchemaType.class));
+ }
+ } else {
+ groupResultManager.commandOptionError(READ_HELP_MESSAGE);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/group/GroupReadAttributeBySchemaTypeAndSchemaName.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/group/GroupReadAttributeBySchemaTypeAndSchemaName.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/group/GroupReadAttributeBySchemaTypeAndSchemaName.java
deleted file mode 100644
index 42432f3..0000000
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/group/GroupReadAttributeBySchemaTypeAndSchemaName.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.client.cli.commands.group;
-
-import org.apache.syncope.client.cli.Input;
-import org.apache.syncope.client.cli.util.CommandUtils;
-import org.apache.syncope.common.lib.SyncopeClientException;
-import org.apache.syncope.common.lib.types.SchemaType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class GroupReadAttributeBySchemaTypeAndSchemaName extends AbstractGroupCommand {
-
- private static final Logger LOG = LoggerFactory.getLogger(GroupReadAttributeBySchemaTypeAndSchemaName.class);
-
- private static final String READ_HELP_MESSAGE
- = "group --read-attr-by-schema {GROUP-ID} {SCHEMA-TYPE} {SCHEMA-NAME}\n"
- + " Schema type: PLAIN / DERIVED / VIRTUAL";
-
- private final Input input;
-
- public GroupReadAttributeBySchemaTypeAndSchemaName(final Input input) {
- this.input = input;
- }
-
- public void read() {
- if (input.parameterNumber() == 3) {
- try {
- groupResultManager.printAttribute(groupSyncopeOperations.readAttribute(
- input.firstParameter(), input.secondParameter(), input.thirdParameter()));
- } catch (final SyncopeClientException ex) {
- LOG.error("Error reading group", ex);
- groupResultManager.genericError(ex.getMessage());
- } catch (final NumberFormatException ex) {
- groupResultManager.numberFormatException("group", input.firstParameter());
- } catch (final IllegalArgumentException ex) {
- LOG.error("Error reading schema", ex);
- groupResultManager.typeNotValidError(
- "schema", input.secondParameter(), CommandUtils.fromEnumToArray(SchemaType.class));
- }
- } else {
- groupResultManager.commandOptionError(READ_HELP_MESSAGE);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/group/GroupReadAttributesBySchemaType.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/group/GroupReadAttributesBySchemaType.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/group/GroupReadAttributesBySchemaType.java
index a707a8c..df6dcc2 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/group/GroupReadAttributesBySchemaType.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/group/GroupReadAttributesBySchemaType.java
@@ -29,7 +29,7 @@ public class GroupReadAttributesBySchemaType extends AbstractGroupCommand {
private static final Logger LOG = LoggerFactory.getLogger(GroupReadAttributesBySchemaType.class);
- private static final String READ_HELP_MESSAGE = "group --read-attr-by-schema-type {GROUP-ID} {SCHEMA-TYPE}\n"
+ private static final String READ_HELP_MESSAGE = "group --read-attr-by-schema-type {GROUP-KEY} {SCHEMA-TYPE}\n"
+ " Schema type: PLAIN / DERIVED / VIRTUAL";
private final Input input;
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/group/GroupResultManager.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/group/GroupResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/group/GroupResultManager.java
index ecda625..db4796d 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/group/GroupResultManager.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/group/GroupResultManager.java
@@ -35,7 +35,7 @@ public class GroupResultManager extends CommonsResultManager {
}
public void printGroup(final GroupTO groupTO) {
- System.out.println(" > GROUP ID: " + groupTO.getKey());
+ System.out.println(" > GROUP KEY: " + groupTO.getKey());
System.out.println(" name: " + groupTO.getName());
System.out.println(" type: " + groupTO.getType());
System.out.println(" realm: " + groupTO.getRealm());
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/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 0909ff9..d684ec7 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
@@ -28,7 +28,8 @@ public class NotificationDelete extends AbstractNotificationCommand {
private static final Logger LOG = LoggerFactory.getLogger(NotificationDelete.class);
- private static final String DELETE_HELP_MESSAGE = "notification --delete {NOTIFICATION-ID} {NOTIFICATION-ID} [...]";
+ private static final String DELETE_HELP_MESSAGE =
+ "notification --delete {NOTIFICATION-KEY} {NOTIFICATION-KEY} [...]";
private final Input input;
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/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 7c45e86..c51c8ec 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
@@ -28,7 +28,7 @@ public class NotificationRead extends AbstractNotificationCommand {
private static final Logger LOG = LoggerFactory.getLogger(NotificationRead.class);
- private static final String READ_HELP_MESSAGE = "notification --read {NOTIFICATION-ID} {NOTIFICATION-ID} [...]";
+ private static final String READ_HELP_MESSAGE = "notification --read {NOTIFICATION-KEY} {NOTIFICATION-KEY} [...]";
private final Input input;
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationResultManager.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationResultManager.java
index a364316..49002c1 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationResultManager.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationResultManager.java
@@ -32,7 +32,7 @@ public class NotificationResultManager extends CommonsResultManager {
}
public void printNotification(final NotificationTO notificationTO) {
- System.out.println(" > NOTIFICATION ID: " + notificationTO.getKey());
+ System.out.println(" > NOTIFICATION KEY: " + notificationTO.getKey());
System.out.println(" events: " + notificationTO.getEvents());
System.out.println(" sender: " + notificationTO.getSender());
System.out.println(" subject: " + notificationTO.getSubject());
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/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 b73b770..c9f5ff9 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
@@ -28,7 +28,7 @@ public class PolicyDelete extends AbstractPolicyCommand {
private static final Logger LOG = LoggerFactory.getLogger(PolicyDelete.class);
- private static final String DELETE_HELP_MESSAGE = "policy --delete {POLICY-ID} {POLICY-ID} [...]";
+ private static final String DELETE_HELP_MESSAGE = "policy --delete {POLICY-KEY} {POLICY-KEY} [...]";
private final Input input;
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/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 2187492..f399457 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
@@ -30,7 +30,7 @@ public class PolicyRead extends AbstractPolicyCommand {
private static final Logger LOG = LoggerFactory.getLogger(PolicyRead.class);
- private static final String READ_HELP_MESSAGE = "policy --read {POLICY-ID} {POLICY-ID} [...]";
+ private static final String READ_HELP_MESSAGE = "policy --read {POLICY-KEY} {POLICY-KEY} [...]";
private final Input input;
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/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 460f4a6..a83ca1c 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
@@ -28,7 +28,7 @@ public class QuestionDelete extends AbstractQuestionCommand {
private static final Logger LOG = LoggerFactory.getLogger(QuestionDelete.class);
- private static final String DELETE_HELP_MESSAGE = "question --delete {QUESTION-ID} {QUESTION-ID} [...]";
+ private static final String DELETE_HELP_MESSAGE = "question --delete {QUESTION-KEY} {QUESTION-KEY} [...]";
private final Input input;
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/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 cfc99a5..6393774 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
@@ -31,7 +31,7 @@ public class QuestionRead extends AbstractQuestionCommand {
private static final Logger LOG = LoggerFactory.getLogger(QuestionRead.class);
- private static final String READ_HELP_MESSAGE = "question --read {QUESTION-ID} {QUESTION-ID} [...]";
+ private static final String READ_HELP_MESSAGE = "question --read {QUESTION-KEY} {QUESTION-KEY} [...]";
private final Input input;
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionResultManager.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionResultManager.java
index 5b691ff..d13a63e 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionResultManager.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionResultManager.java
@@ -32,7 +32,7 @@ public class QuestionResultManager extends CommonsResultManager {
}
public void printQuestion(final SecurityQuestionTO securityQuestionTO) {
- System.out.println(" > SECURITY QUESTION ID: " + securityQuestionTO.getKey());
+ System.out.println(" > SECURITY QUESTION KEY: " + securityQuestionTO.getKey());
System.out.println(" content: " + securityQuestionTO.getContent());
System.out.println("");
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmResultManager.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmResultManager.java
index 0bd564d..e9814f8 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmResultManager.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmResultManager.java
@@ -33,14 +33,14 @@ public class RealmResultManager extends CommonsResultManager {
}
private void printRealm(final RealmTO realmTO) {
- System.out.println(" > REALM ID: " + realmTO.getKey());
+ System.out.println(" > REALM KEY: " + realmTO.getKey());
System.out.println(" name: " + realmTO.getName());
System.out.println(" full path: " + realmTO.getFullPath());
System.out.println(" actions: " + realmTO.getActionsClassNames());
System.out.println(" templates: " + realmTO.getTemplates());
- System.out.println(" parent id: " + realmTO.getParent());
- System.out.println(" account policy id: " + realmTO.getAccountPolicy());
- System.out.println(" password policy id: " + realmTO.getPasswordPolicy());
+ System.out.println(" parent key: " + realmTO.getParent());
+ System.out.println(" account policy key: " + realmTO.getAccountPolicy());
+ System.out.println(" password policy key: " + realmTO.getPasswordPolicy());
System.out.println("");
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/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 c20ccc2..3da0810 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
@@ -28,7 +28,7 @@ public class ReportDelete extends AbstractReportCommand {
private static final Logger LOG = LoggerFactory.getLogger(ReportDelete.class);
- private static final String DELETE_HELP_MESSAGE = "report --delete {REPORT-ID} {REPORT-ID} [...]";
+ private static final String DELETE_HELP_MESSAGE = "report --delete {REPORT-KEY} {REPORT-KEY} [...]";
private final Input input;
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/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 653a475..4d0b261 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
@@ -29,7 +29,7 @@ public class ReportDeleteExecution extends AbstractReportCommand {
private static final Logger LOG = LoggerFactory.getLogger(ReportDeleteExecution.class);
private static final String DELETE_EXECUTION_HELP_MESSAGE
- = "report --delete-execution {EXECUTION-ID} {EXECUTION-ID} [...]";
+ = "report --delete-execution {EXECUTION-KEY} {EXECUTION-KEY} [...]";
private final Input input;
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/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 72bd9c8..c69a114 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
@@ -28,7 +28,7 @@ public class ReportExecute extends AbstractReportCommand {
private static final Logger LOG = LoggerFactory.getLogger(ReportExecute.class);
- private static final String EXECUTE_HELP_MESSAGE = "report --execute {REPORT-ID}";
+ private static final String EXECUTE_HELP_MESSAGE = "report --execute {REPORT-KEY}";
private final Input input;
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/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 87583c2..f520254 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
@@ -36,7 +36,7 @@ public class ReportExportExecution extends AbstractReportCommand {
private static final Logger LOG = LoggerFactory.getLogger(ReportExportExecution.class);
private static final String EXPORT_EXECUTION_HELP_MESSAGE
- = "report --export-execution-result {EXECUTION-ID} {EXECUTION-ID} [...] {FORMAT}\n"
+ = "report --export-execution-result {EXECUTION-KEY} {EXECUTION-KEY} [...] {FORMAT}\n"
+ " Format: CSV / HTML / PDF / XML / RTF";
private final Input input;
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/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 9ccebc8..5ca6ac6 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
@@ -31,7 +31,7 @@ public class ReportRead extends AbstractReportCommand {
private static final Logger LOG = LoggerFactory.getLogger(ReportRead.class);
- private static final String READ_HELP_MESSAGE = "report --read {REPORT-ID} {REPORT-ID} [...]";
+ private static final String READ_HELP_MESSAGE = "report --read {REPORT-KEY} {REPORT-KEY} [...]";
private final Input input;
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportResultManager.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportResultManager.java
index 7fd2a93..d33b84e 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportResultManager.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportResultManager.java
@@ -37,7 +37,7 @@ public class ReportResultManager extends CommonsResultManager {
}
private void printReport(final ReportTO reportTO) {
- System.out.println(" > REPORT ID: " + reportTO.getKey());
+ System.out.println(" > REPORT KEY: " + reportTO.getKey());
System.out.println(" name: " + reportTO.getName());
System.out.println(" cron expression: " + reportTO.getCronExpression());
System.out.println(" latest execution status: " + reportTO.getLatestExecStatus());
@@ -66,7 +66,7 @@ public class ReportResultManager extends CommonsResultManager {
public void printReportExecutions(final List<ExecTO> reportExecTOs) {
for (final ExecTO reportExecTO : reportExecTOs) {
- System.out.println(" REPORT EXEC ID: " + reportExecTO.getKey());
+ System.out.println(" REPORT EXEC KEY: " + reportExecTO.getKey());
System.out.println(" status: " + reportExecTO.getStatus());
System.out.println(" message: " + reportExecTO.getMessage());
System.out.println(" start date: " + reportExecTO.getStart());
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/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 a36ec6c..8651ec1 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
@@ -28,7 +28,7 @@ public class ResourceDelete extends AbstractResourceCommand {
private static final Logger LOG = LoggerFactory.getLogger(ResourceDelete.class);
- private static final String DELETE_HELP_MESSAGE = "resource --delete {RESOURCE-NAME} {RESOURCE-NAME} [...]";
+ private static final String DELETE_HELP_MESSAGE = "resource --delete {RESOURCE-KEY} {RESOURCE-KEY} [...]";
private final Input input;
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/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 fb0f133..471e864 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
@@ -31,7 +31,7 @@ public class ResourceRead extends AbstractResourceCommand {
private static final Logger LOG = LoggerFactory.getLogger(ResourceRead.class);
- private static final String READ_HELP_MESSAGE = "resource --read {RESOURCE-NAME} {RESOURCE-NAME} [...]";
+ private static final String READ_HELP_MESSAGE = "resource --read {RESOURCE-KEY} {RESOURCE-KEY} [...]";
private final Input input;
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/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 99704f6..aefb7c1 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
@@ -36,12 +36,12 @@ public class ResourceResultManager extends CommonsResultManager {
}
private void printResource(final ResourceTO resourceTO) {
- System.out.println(" > RESOURCE ID: " + resourceTO.getKey());
+ System.out.println(" > RESOURCE KEY: " + resourceTO.getKey());
System.out.println(" connector dispaly name: " + resourceTO.getConnectorDisplayName());
- System.out.println(" connector id: " + resourceTO.getConnector());
- System.out.println(" account policy id: " + resourceTO.getAccountPolicy());
- System.out.println(" password policy id: " + resourceTO.getPasswordPolicy());
- System.out.println(" pull policy id: " + resourceTO.getPullPolicy());
+ System.out.println(" connector key: " + resourceTO.getConnector());
+ System.out.println(" account policy key: " + resourceTO.getAccountPolicy());
+ System.out.println(" password policy key: " + resourceTO.getPasswordPolicy());
+ System.out.println(" pull policy key: " + resourceTO.getPullPolicy());
System.out.println(" propagation actions class: " + resourceTO.getPropagationActionsClassNames());
System.out.println(" propagation priority: " + resourceTO.getPropagationPriority());
System.out.println(" PROVISIONS:");
@@ -58,7 +58,7 @@ public class ResourceResultManager extends CommonsResultManager {
private void printProvision(final List<ProvisionTO> provisionTOs) {
for (final ProvisionTO provisionTO : provisionTOs) {
- System.out.println(" provision id: " + provisionTO.getKey());
+ System.out.println(" provision key: " + provisionTO.getKey());
System.out.println(" any type: " + provisionTO.getAnyType());
System.out.println(" object class: " + provisionTO.getObjectClass());
System.out.println(" sync token: " + provisionTO.getSyncToken());
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/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 0d5426d..36eb7ce 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
@@ -28,7 +28,7 @@ public class RoleDelete extends AbstractRoleCommand {
private static final Logger LOG = LoggerFactory.getLogger(RoleDelete.class);
- private static final String DELETE_HELP_MESSAGE = "role --delete {ROLE-NAME} {ROLE-NAME} [...]";
+ private static final String DELETE_HELP_MESSAGE = "role --delete {ROLE-KEY} {ROLE-KEY} [...]";
private final Input input;
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/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 f5f4aa7..f5f9e91 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
@@ -31,7 +31,7 @@ public class RoleRead extends AbstractRoleCommand {
private static final Logger LOG = LoggerFactory.getLogger(RoleRead.class);
- private static final String READ_HELP_MESSAGE = "role --read {ROLE-NAME} {ROLE-NAME} [...]";
+ private static final String READ_HELP_MESSAGE = "role --read {ROLE-KEY} {ROLE-KEY} [...]";
private final Input input;
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleResultManager.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleResultManager.java
index 4ca13da..9d39f19 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleResultManager.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleResultManager.java
@@ -34,7 +34,7 @@ public class RoleResultManager extends CommonsResultManager {
}
private void printRole(final RoleTO roleTO) {
- System.out.println(" > ROLE ID: " + roleTO.getKey());
+ System.out.println(" > ROLE KEY: " + roleTO.getKey());
System.out.println(" REALMS: ");
printRealms(roleTO.getRealms());
System.out.println(" ENTITLEMENTS:");
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaResultManager.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaResultManager.java
index b90c381..0692ccd 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaResultManager.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaResultManager.java
@@ -55,7 +55,7 @@ public class SchemaResultManager extends CommonsResultManager {
}
private void printPlanSchemaDetailed(final PlainSchemaTO schemaTO) {
- System.out.println(" > SCHEMA ID: " + schemaTO.getKey());
+ System.out.println(" > SCHEMA KEY: " + schemaTO.getKey());
System.out.println(" type: " + schemaTO.getType().toString());
System.out.println(" any type class: " + schemaTO.getAnyTypeClass());
System.out.println(" conversion pattern: " + schemaTO.getConversionPattern());
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/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 d5fbfef..8516507 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
@@ -28,7 +28,7 @@ public class TaskDelete extends AbstractTaskCommand {
private static final Logger LOG = LoggerFactory.getLogger(TaskDelete.class);
- private static final String DELETE_HELP_MESSAGE = "task --delete {TASK-ID} {TASK-ID} [...]";
+ private static final String DELETE_HELP_MESSAGE = "task --delete {TASK-KEY} {TASK-KEY} [...]";
private final Input input;
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/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 b139832..493525d 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
@@ -29,7 +29,7 @@ public class TaskExecute extends AbstractTaskCommand {
private static final Logger LOG = LoggerFactory.getLogger(TaskExecute.class);
- private static final String EXECUTE_HELP_MESSAGE = "task --execute {TASK-ID} {DRY-RUN}\n"
+ private static final String EXECUTE_HELP_MESSAGE = "task --execute {TASK-KEY} {DRY-RUN}\n"
+ " Dry run: true / false";
private final Input input;
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/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 a39ba6a..3d8264b 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
@@ -29,7 +29,7 @@ public class TaskExecutionDelete extends AbstractTaskCommand {
private static final Logger LOG = LoggerFactory.getLogger(TaskExecutionDelete.class);
private static final String DELETE_HELP_MESSAGE = "task --delete-execution "
- + "{TASK-EXEC-ID} {TASK-EXEC-ID} [...]";
+ + "{TASK-EXEC-KEY} {TASK-EXEC-KEY} [...]";
private final Input input;
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskRead.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskRead.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskRead.java
index f50f1f7..b1fd01a 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskRead.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskRead.java
@@ -30,7 +30,7 @@ public class TaskRead extends AbstractTaskCommand {
private static final Logger LOG = LoggerFactory.getLogger(TaskRead.class);
- private static final String READ_HELP_MESSAGE = "task --read {TASK-ID} {TASK-ID} [...]";
+ private static final String READ_HELP_MESSAGE = "task --read {TASK-KEY} {TASK-KEY} [...]";
private final Input input;
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserCommand.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserCommand.java
index 22737c6..35688c7 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserCommand.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserCommand.java
@@ -43,8 +43,8 @@ public class UserCommand extends AbstractCommand {
case LIST:
new UserList(input).list();
break;
- case READ_BY_ID:
- new UserReadByUserId(input).read();
+ case READ_BY_KEY:
+ new UserReadByUserKey(input).read();
break;
case READ_BY_USERNAME:
new UserReadByUsername(input).read();
@@ -85,7 +85,7 @@ public class UserCommand extends AbstractCommand {
HELP("--help"),
DETAILS("--details"),
LIST("--list"),
- READ_BY_ID("--read-by-userid"),
+ READ_BY_KEY("--read-by-userkey"),
READ_BY_USERNAME("--read-by-username"),
SEARCH_BY_ATTRIBUTE("--search-by-attribute"),
SEARCH_BY_ROLE("--search-by-role"),
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserDelete.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserDelete.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserDelete.java
index f338844..a5278d6 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserDelete.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserDelete.java
@@ -28,7 +28,7 @@ public class UserDelete extends AbstractUserCommand {
private static final Logger LOG = LoggerFactory.getLogger(UserDelete.class);
- private static final String DELETE_HELP_MESSAGE = "user --delete {USER-ID} {USER-ID} [...]";
+ private static final String DELETE_HELP_MESSAGE = "user --delete {USER-KEY} {USER-KEY} [...]";
private final Input input;
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserReadByUserId.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserReadByUserId.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserReadByUserId.java
deleted file mode 100644
index 93a4712..0000000
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserReadByUserId.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.client.cli.commands.user;
-
-import java.util.ArrayList;
-import java.util.List;
-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.UserTO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class UserReadByUserId extends AbstractUserCommand {
-
- private static final Logger LOG = LoggerFactory.getLogger(UserReadByUserId.class);
-
- private static final String READ_HELP_MESSAGE = "user --read-by-userid {USER-ID} {USER-ID} [...]";
-
- private final Input input;
-
- public UserReadByUserId(final Input input) {
- this.input = input;
- }
-
- public void read() {
- if (input.getParameters().length >= 1) {
- final List<UserTO> userTOs = new ArrayList<>();
- for (final String parameter : input.getParameters()) {
- try {
- userTOs.add(userSyncopeOperations.read(parameter));
- } catch (final SyncopeClientException | WebServiceException ex) {
- LOG.error("Error reading user", ex);
- if (ex.getMessage().startsWith("NotFound")) {
- userResultManager.notFoundError("User", parameter);
- } else {
- userResultManager.genericError(ex.getMessage());
- }
- break;
- } catch (final NumberFormatException ex) {
- LOG.error("Error reading user", ex);
- userResultManager.numberFormatException("user", parameter);
- }
- }
- userResultManager.printUsers(userTOs);
- } else {
- userResultManager.commandOptionError(READ_HELP_MESSAGE);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/syncope/blob/d18bdbd5/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserReadByUserKey.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserReadByUserKey.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserReadByUserKey.java
new file mode 100644
index 0000000..d848037
--- /dev/null
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserReadByUserKey.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.client.cli.commands.user;
+
+import java.util.ArrayList;
+import java.util.List;
+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.UserTO;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class UserReadByUserKey extends AbstractUserCommand {
+
+ private static final Logger LOG = LoggerFactory.getLogger(UserReadByUserKey.class);
+
+ private static final String READ_HELP_MESSAGE = "user --read-by-userkey {USER-KEY} {USER-KEY} [...]";
+
+ private final Input input;
+
+ public UserReadByUserKey(final Input input) {
+ this.input = input;
+ }
+
+ public void read() {
+ if (input.getParameters().length >= 1) {
+ final List<UserTO> userTOs = new ArrayList<>();
+ for (final String parameter : input.getParameters()) {
+ try {
+ userTOs.add(userSyncopeOperations.read(parameter));
+ } catch (final SyncopeClientException | WebServiceException ex) {
+ LOG.error("Error reading user", ex);
+ if (ex.getMessage().startsWith("NotFound")) {
+ userResultManager.notFoundError("User", parameter);
+ } else {
+ userResultManager.genericError(ex.getMessage());
+ }
+ break;
+ } catch (final NumberFormatException ex) {
+ LOG.error("Error reading user", ex);
+ userResultManager.numberFormatException("user", parameter);
+ }
+ }
+ userResultManager.printUsers(userTOs);
+ } else {
+ userResultManager.commandOptionError(READ_HELP_MESSAGE);
+ }
+ }
+}