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/02/08 14:48:03 UTC
[1/2] syncope git commit: Fixing mailing list page links
Repository: syncope
Updated Branches:
refs/heads/master dbfb792c0 -> 4cc46deba
Fixing mailing list page links
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/1565803e
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/1565803e
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/1565803e
Branch: refs/heads/master
Commit: 1565803ef0d64aaf9437c8cd370db98856aa631e
Parents: dbfb792
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Feb 8 12:47:57 2016 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Feb 8 12:47:57 2016 +0100
----------------------------------------------------------------------
src/site/xdoc/contributing.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/1565803e/src/site/xdoc/contributing.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/contributing.xml b/src/site/xdoc/contributing.xml
index 7793b42..6f2503d 100644
--- a/src/site/xdoc/contributing.xml
+++ b/src/site/xdoc/contributing.xml
@@ -42,7 +42,7 @@ under the License.
<subsection name="Code">
<ul>
<li>If you have found an issue or you want to propose a new feature, post a message to the
- <a href="mail-lists.html">Syncope User's list</a> to discuss it.
+ <a href="mailing-lists.html">Syncope User's list</a> to discuss it.
</li>
<li>Search existing
<a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa" rel="nofollow">issues</a> to see
@@ -82,7 +82,7 @@ under the License.
<ul>
<li>
Discussion occurs on the
- <a href="mail-lists.html">mailing lists</a>
+ <a href="mailing-lists.html">mailing lists</a>
</li>
<li>
Information on accessing the project source code is
[2/2] syncope git commit: Some clean up
Posted by il...@apache.org.
Some clean up
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/4cc46deb
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/4cc46deb
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/4cc46deb
Branch: refs/heads/master
Commit: 4cc46deba44f82aab3df3235bd43fa41aa6cc5e5
Parents: 1565803
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Feb 8 14:47:51 2016 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Feb 8 14:47:51 2016 +0100
----------------------------------------------------------------------
.../client/console/commons/Constants.java | 16 ++---
.../pages/AnyDisplayAttributesModalPage.java | 72 --------------------
.../AnyObjectDisplayAttributesModalPage.java | 72 ++++++++++++++++++++
.../pages/DisplayAttributesModalPage.java | 14 ++--
.../pages/GroupDisplayAttributesModalPage.java | 10 +--
.../pages/UserDisplayAttributesModalPage.java | 10 +--
.../console/panels/AbstractResourceModal.java | 4 +-
.../panels/AnyObjectSearchResultPanel.java | 31 +++++----
.../console/panels/AnySearchResultPanel.java | 6 +-
.../console/panels/GroupSearchResultPanel.java | 8 +--
.../console/panels/UserSearchResultPanel.java | 8 +--
.../AnyObjectSelectionSearchResultPanel.java | 6 +-
.../search/AnySelectionSearchResultPanel.java | 8 +--
.../search/GroupSelectionSearchResultPanel.java | 4 +-
.../search/UserSelectionSearchResultPanel.java | 4 +-
.../console/rest/AbstractAnyRestClient.java | 2 +
.../console/rest/AnyObjectRestClient.java | 14 +---
.../client/console/rest/GroupRestClient.java | 1 +
.../client/console/rest/UserRestClient.java | 12 +---
.../console/tasks/TaskExecutionDetails.java | 2 +-
20 files changed, 147 insertions(+), 157 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/4cc46deb/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java b/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java
index 1d6c028..978a860 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java
@@ -44,9 +44,9 @@ public final class Constants {
public static final String PREF_USERS_DETAILS_VIEW = "users.details.view";
- public static final String PREF_USERS_ATTRIBUTES_VIEW = "users.attributes.view";
+ public static final String PREF_USERS_PLAIN_ATTRS_VIEW = "users.plain.attrs.view";
- public static final String PREF_USERS_DERIVED_ATTRIBUTES_VIEW = "users.derived.attributes.view";
+ public static final String PREF_USERS_DER_ATTRS_VIEW = "users.der.attrs.view";
public static final String PREF_CONF_SCHEMA_PAGINATOR_ROWS = "conf.schema.paginator.rows";
@@ -66,9 +66,9 @@ public final class Constants {
public static final String PREF_GROUP_DETAILS_VIEW = "group.details.view";
- public static final String PREF_GROUP_ATTRIBUTES_VIEW = "group.attributes.view";
+ public static final String PREF_GROUP_PLAIN_ATTRS_VIEW = "group.plain.attrs.view";
- public static final String PREF_GROUP_DERIVED_ATTRIBUTES_VIEW = "group.derived.attributes.view";
+ public static final String PREF_GROUP_DER_ATTRS_VIEW = "group.der.attrs.view";
public static final String PREF_GROUP_PLAIN_SCHEMA_PAGINATOR_ROWS = "group.schema.paginator.rows";
@@ -118,11 +118,11 @@ public final class Constants {
public static final String PREF_POLICY_PAGINATOR_ROWS = "policy.paginator.rows";
- public static final String PREF_ANY_DETAILS_VIEW = "any.%s.details.view";
+ public static final String PREF_ANY_OBJECT_DETAILS_VIEW = "anyobject.%s.details.view";
- public static final String PREF_ANY_ATTRIBUTES_VIEW = "any.%s.attributes.view";
+ public static final String PREF_ANY_OBJECT_PLAIN_ATTRS_VIEW = "anyobject.%s.plain.attrs.view";
- public static final String PREF_ANY_DERIVED_ATTRIBUTES_VIEW = "any.%s.derived.attributes.view";
+ public static final String PREF_ANY_OBJECT_DER_ATTRS_VIEW = "anyobject.%s.der.attrs.view";
public static final String SUSPENDED_ICON = "glyphicon glyphicon-ban-circle";
@@ -132,8 +132,6 @@ public final class Constants {
public static final String NOT_FOUND_ICON = "glyphicon glyphicon-remove-circle";
- ;
-
/**
* ConnId's GuardedString is not in the classpath.
*/
http://git-wip-us.apache.org/repos/asf/syncope/blob/4cc46deb/client/console/src/main/java/org/apache/syncope/client/console/pages/AnyDisplayAttributesModalPage.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/AnyDisplayAttributesModalPage.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/AnyDisplayAttributesModalPage.java
deleted file mode 100644
index ec43ddc..0000000
--- a/client/console/src/main/java/org/apache/syncope/client/console/pages/AnyDisplayAttributesModalPage.java
+++ /dev/null
@@ -1,72 +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.console.pages;
-
-import java.io.Serializable;
-import java.util.List;
-import org.apache.syncope.client.console.commons.Constants;
-import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
-import org.apache.syncope.common.lib.to.AnyObjectTO;
-import org.apache.syncope.common.lib.to.AnyTO;
-import org.apache.wicket.PageReference;
-
-/**
- * Modal window with Display user attributes form.
- *
- * @param <T> anyTO
- */
-public class AnyDisplayAttributesModalPage<T extends Serializable> extends DisplayAttributesModalPage<T> {
-
- private static final long serialVersionUID = 5194630813773543054L;
-
- public static final String[] ANY_DEFAULT_SELECTION = { "key" };
-
- private final String type;
-
- public AnyDisplayAttributesModalPage(
- final BaseModal<T> modal,
- final PageReference pageRef,
- final List<String> schemaNames,
- final List<String> dSchemaNames,
- final String type) {
-
- super(modal, pageRef, schemaNames, dSchemaNames);
- this.type = type;
- }
-
- @Override
- public String getPrefDetailView() {
- return String.format(Constants.PREF_ANY_DETAILS_VIEW, type);
- }
-
- @Override
- public String getPrefAttributeView() {
- return String.format(Constants.PREF_ANY_ATTRIBUTES_VIEW, type);
- }
-
- @Override
- public String getPrefDerivedAttributeView() {
- return String.format(Constants.PREF_ANY_DERIVED_ATTRIBUTES_VIEW, type);
- }
-
- @Override
- public Class<? extends AnyTO> getTOClass() {
- return AnyObjectTO.class;
- }
-}
http://git-wip-us.apache.org/repos/asf/syncope/blob/4cc46deb/client/console/src/main/java/org/apache/syncope/client/console/pages/AnyObjectDisplayAttributesModalPage.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/AnyObjectDisplayAttributesModalPage.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/AnyObjectDisplayAttributesModalPage.java
new file mode 100644
index 0000000..1505819
--- /dev/null
+++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/AnyObjectDisplayAttributesModalPage.java
@@ -0,0 +1,72 @@
+/*
+ * 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.console.pages;
+
+import java.io.Serializable;
+import java.util.List;
+import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
+import org.apache.syncope.common.lib.to.AnyObjectTO;
+import org.apache.wicket.PageReference;
+
+/**
+ * Modal window with Display user attributes form.
+ *
+ * @param <T> can be {@link org.apache.syncope.common.lib.to.AnyTO} or
+ * {@link org.apache.syncope.client.console.wizards.any.AnyHandler}
+ */
+public class AnyObjectDisplayAttributesModalPage<T extends Serializable> extends DisplayAttributesModalPage<T> {
+
+ private static final long serialVersionUID = 5194630813773543054L;
+
+ public static final String[] ANY_OBJECT_DEFAULT_SELECTION = { "key" };
+
+ private final String type;
+
+ public AnyObjectDisplayAttributesModalPage(
+ final BaseModal<T> modal,
+ final PageReference pageRef,
+ final List<String> schemaNames,
+ final List<String> dSchemaNames,
+ final String type) {
+
+ super(modal, pageRef, schemaNames, dSchemaNames);
+ this.type = type;
+ }
+
+ @Override
+ public String getPrefDetailView() {
+ return String.format(Constants.PREF_ANY_OBJECT_DETAILS_VIEW, type);
+ }
+
+ @Override
+ public String getPrefAttributeView() {
+ return String.format(Constants.PREF_ANY_OBJECT_PLAIN_ATTRS_VIEW, type);
+ }
+
+ @Override
+ public String getPrefDerivedAttributeView() {
+ return String.format(Constants.PREF_ANY_OBJECT_DER_ATTRS_VIEW, type);
+ }
+
+ @Override
+ public Class<AnyObjectTO> getTOClass() {
+ return AnyObjectTO.class;
+ }
+}
http://git-wip-us.apache.org/repos/asf/syncope/blob/4cc46deb/client/console/src/main/java/org/apache/syncope/client/console/pages/DisplayAttributesModalPage.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/DisplayAttributesModalPage.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/DisplayAttributesModalPage.java
index a1ea8b9..5ce7bea 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/pages/DisplayAttributesModalPage.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/DisplayAttributesModalPage.java
@@ -48,7 +48,7 @@ import org.apache.wicket.model.ResourceModel;
/**
* Modal window with Display attributes form.
*
- * @param <T> anyTO
+ * @param <T> can be {@link AnyTO} or {@link org.apache.syncope.client.console.wizards.any.AnyHandler}
*/
public abstract class DisplayAttributesModalPage<T extends Serializable> extends AbstractModalPanel<T> {
@@ -114,8 +114,8 @@ public abstract class DisplayAttributesModalPage<T extends Serializable> extends
selectedDerSchemas = prefMan.getList(getRequest(), getPrefDerivedAttributeView());
- final CheckGroup<String> dgroup
- = new CheckGroup<>("dCheckGroup", new PropertyModel<List<String>>(this, "selectedDetails"));
+ final CheckGroup<String> dgroup =
+ new CheckGroup<>("dCheckGroup", new PropertyModel<List<String>>(this, "selectedDetails"));
form.add(dgroup);
final ListView<String> details = new ListView<String>("details", fnames) {
@@ -139,8 +139,8 @@ public abstract class DisplayAttributesModalPage<T extends Serializable> extends
final Fragment fragment = new Fragment("plainSchemas", "sfragment", form);
form.add(fragment);
- final CheckGroup<String> sgroup
- = new CheckGroup<>("psCheckGroup", new PropertyModel<List<String>>(this, "selectedPlainSchemas"));
+ final CheckGroup<String> sgroup =
+ new CheckGroup<>("psCheckGroup", new PropertyModel<List<String>>(this, "selectedPlainSchemas"));
fragment.add(sgroup);
final ListView<String> schemas = new ListView<String>("plainSchemas", names) {
@@ -165,8 +165,8 @@ public abstract class DisplayAttributesModalPage<T extends Serializable> extends
final Fragment fragment = new Fragment("dschemas", "dsfragment", form);
form.add(fragment);
- final CheckGroup<String> dsgroup
- = new CheckGroup<>("dsCheckGroup", new PropertyModel<List<String>>(this, "selectedDerSchemas"));
+ final CheckGroup<String> dsgroup =
+ new CheckGroup<>("dsCheckGroup", new PropertyModel<List<String>>(this, "selectedDerSchemas"));
fragment.add(dsgroup);
final ListView<String> derSchemas = new ListView<String>("derSchemas", dsnames) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/4cc46deb/client/console/src/main/java/org/apache/syncope/client/console/pages/GroupDisplayAttributesModalPage.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/GroupDisplayAttributesModalPage.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/GroupDisplayAttributesModalPage.java
index 6167c99..6ca51ad 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/pages/GroupDisplayAttributesModalPage.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/GroupDisplayAttributesModalPage.java
@@ -22,14 +22,14 @@ import java.io.Serializable;
import java.util.List;
import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
-import org.apache.syncope.common.lib.to.AnyTO;
import org.apache.syncope.common.lib.to.GroupTO;
import org.apache.wicket.PageReference;
/**
* Modal window with Display group attributes form.
*
- * @param <T>
+ * @param <T> can be {@link org.apache.syncope.common.lib.to.AnyTO} or
+ * {@link org.apache.syncope.client.console.wizards.any.AnyHandler}
*/
public class GroupDisplayAttributesModalPage<T extends Serializable> extends DisplayAttributesModalPage<T> {
@@ -52,16 +52,16 @@ public class GroupDisplayAttributesModalPage<T extends Serializable> extends Dis
@Override
public String getPrefAttributeView() {
- return Constants.PREF_GROUP_ATTRIBUTES_VIEW;
+ return Constants.PREF_GROUP_PLAIN_ATTRS_VIEW;
}
@Override
public String getPrefDerivedAttributeView() {
- return Constants.PREF_GROUP_DERIVED_ATTRIBUTES_VIEW;
+ return Constants.PREF_GROUP_DER_ATTRS_VIEW;
}
@Override
- public Class<? extends AnyTO> getTOClass() {
+ public Class<GroupTO> getTOClass() {
return GroupTO.class;
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/4cc46deb/client/console/src/main/java/org/apache/syncope/client/console/pages/UserDisplayAttributesModalPage.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/UserDisplayAttributesModalPage.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/UserDisplayAttributesModalPage.java
index 307e61c..2442697 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/pages/UserDisplayAttributesModalPage.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/UserDisplayAttributesModalPage.java
@@ -22,14 +22,14 @@ import java.io.Serializable;
import java.util.List;
import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
-import org.apache.syncope.common.lib.to.AnyTO;
import org.apache.syncope.common.lib.to.UserTO;
import org.apache.wicket.PageReference;
/**
* Modal window with Display user attributes form.
*
- * @param <T>
+ * @param <T> can be {@link org.apache.syncope.common.lib.to.AnyTO} or
+ * {@link org.apache.syncope.client.console.wizards.any.AnyHandler}
*/
public class UserDisplayAttributesModalPage<T extends Serializable> extends DisplayAttributesModalPage<T> {
@@ -52,16 +52,16 @@ public class UserDisplayAttributesModalPage<T extends Serializable> extends Disp
@Override
public String getPrefAttributeView() {
- return Constants.PREF_USERS_ATTRIBUTES_VIEW;
+ return Constants.PREF_USERS_PLAIN_ATTRS_VIEW;
}
@Override
public String getPrefDerivedAttributeView() {
- return Constants.PREF_USERS_DERIVED_ATTRIBUTES_VIEW;
+ return Constants.PREF_USERS_DER_ATTRS_VIEW;
}
@Override
- public Class<? extends AnyTO> getTOClass() {
+ public Class<UserTO> getTOClass() {
return UserTO.class;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/4cc46deb/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractResourceModal.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractResourceModal.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractResourceModal.java
index a4446ff..2ecb7de 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractResourceModal.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractResourceModal.java
@@ -46,7 +46,7 @@ public abstract class AbstractResourceModal<T extends Serializable> extends Abst
super(modal, pageRef);
this.tabs = new ArrayList<>();
- add(new AjaxBootstrapTabbedPanel<ITab>("tabbedPanel", tabs));
+ add(new AjaxBootstrapTabbedPanel<>("tabbedPanel", tabs));
}
private class AjaxBootstrapTabbedPanel<T extends ITab>
@@ -62,7 +62,7 @@ public abstract class AbstractResourceModal<T extends Serializable> extends Abst
protected WebMarkupContainer newLink(final String linkId, final int index) {
return new AjaxSubmitLink(linkId) {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 530608535790823587L;
@Override
protected void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/4cc46deb/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectSearchResultPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectSearchResultPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectSearchResultPanel.java
index c47b9c6..375675b 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectSearchResultPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectSearchResultPanel.java
@@ -25,7 +25,7 @@ import java.util.Date;
import java.util.List;
import org.apache.commons.lang3.SerializationUtils;
import org.apache.syncope.client.console.commons.Constants;
-import org.apache.syncope.client.console.pages.AnyDisplayAttributesModalPage;
+import org.apache.syncope.client.console.pages.AnyObjectDisplayAttributesModalPage;
import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.rest.AnyObjectRestClient;
import org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.ActionColumn;
@@ -67,7 +67,9 @@ public class AnyObjectSearchResultPanel extends AnySearchResultPanel<AnyObjectTO
protected List<IColumn<AnyObjectTO, String>> getColumns() {
final List<IColumn<AnyObjectTO, String>> columns = new ArrayList<>();
- for (String name : prefMan.getList(getRequest(), String.format(Constants.PREF_ANY_DETAILS_VIEW, type))) {
+ for (String name : prefMan.getList(
+ getRequest(), String.format(Constants.PREF_ANY_OBJECT_DETAILS_VIEW, type))) {
+
final Field field = ReflectionUtils.findField(AnyObjectTO.class, name);
if ("token".equalsIgnoreCase(name)) {
@@ -79,14 +81,17 @@ public class AnyObjectSearchResultPanel extends AnySearchResultPanel<AnyObjectTO
}
}
- for (String name : prefMan.getList(getRequest(), String.format(Constants.PREF_ANY_ATTRIBUTES_VIEW, type))) {
- if (schemaNames.contains(name)) {
+ for (String name : prefMan.getList(
+ getRequest(), String.format(Constants.PREF_ANY_OBJECT_PLAIN_ATTRS_VIEW, type))) {
+
+ if (pSchemaNames.contains(name)) {
columns.add(new AttrColumn<AnyObjectTO>(name, SchemaType.PLAIN));
}
}
- for (String name
- : prefMan.getList(getRequest(), String.format(Constants.PREF_ANY_DERIVED_ATTRIBUTES_VIEW, type))) {
+ for (String name : prefMan.getList(
+ getRequest(), String.format(Constants.PREF_ANY_OBJECT_DER_ATTRS_VIEW, type))) {
+
if (dSchemaNames.contains(name)) {
columns.add(new AttrColumn<AnyObjectTO>(name, SchemaType.DERIVED));
}
@@ -94,7 +99,7 @@ public class AnyObjectSearchResultPanel extends AnySearchResultPanel<AnyObjectTO
// Add defaults in case of no selection
if (columns.isEmpty()) {
- for (String name : AnyDisplayAttributesModalPage.ANY_DEFAULT_SELECTION) {
+ for (String name : AnyObjectDisplayAttributesModalPage.ANY_OBJECT_DEFAULT_SELECTION) {
columns.add(new PropertyColumn<AnyObjectTO, String>(new ResourceModel(name, name), name, name));
}
@@ -115,9 +120,8 @@ public class AnyObjectSearchResultPanel extends AnySearchResultPanel<AnyObjectTO
@Override
public void onClick(final AjaxRequestTarget target, final AnyObjectTO ignore) {
send(AnyObjectSearchResultPanel.this, Broadcast.EXACT,
- new AjaxWizard.EditItemActionEvent<AnyHandler<AnyObjectTO>>(
- new AnyHandler<AnyObjectTO>(new AnyObjectRestClient().<AnyObjectTO>read(
- model.getObject().getKey())),
+ new AjaxWizard.EditItemActionEvent<>(
+ new AnyHandler<>(new AnyObjectRestClient().read(model.getObject().getKey())),
target));
}
}, ActionLink.ActionType.EDIT, String.format("%s_%s", type, AnyEntitlement.READ)).add(
@@ -130,8 +134,7 @@ public class AnyObjectSearchResultPanel extends AnySearchResultPanel<AnyObjectTO
final AnyObjectTO clone = SerializationUtils.clone(model.getObject());
clone.setKey(0L);
send(AnyObjectSearchResultPanel.this, Broadcast.EXACT,
- new AjaxWizard.NewItemActionEvent<AnyHandler<AnyObjectTO>>(new AnyHandler<AnyObjectTO>(
- clone), target));
+ new AjaxWizard.NewItemActionEvent<>(new AnyHandler<>(clone), target));
}
}, ActionLink.ActionType.CLONE, StandardEntitlement.USER_CREATE).add(new ActionLink<AnyObjectTO>() {
@@ -165,8 +168,8 @@ public class AnyObjectSearchResultPanel extends AnySearchResultPanel<AnyObjectTO
@Override
public void onClick(final AjaxRequestTarget target, final Serializable ignore) {
// still missing content
- target.add(modal.setContent(new AnyDisplayAttributesModalPage<>(
- modal, page.getPageReference(), schemaNames, dSchemaNames, type)));
+ target.add(modal.setContent(new AnyObjectDisplayAttributesModalPage<>(
+ modal, page.getPageReference(), pSchemaNames, dSchemaNames, type)));
modal.header(new ResourceModel("any.attr.display", ""));
modal.show(true);
http://git-wip-us.apache.org/repos/asf/syncope/blob/4cc46deb/client/console/src/main/java/org/apache/syncope/client/console/panels/AnySearchResultPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnySearchResultPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnySearchResultPanel.java
index cbfc211..100afbd 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnySearchResultPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnySearchResultPanel.java
@@ -51,7 +51,7 @@ public abstract class AnySearchResultPanel<T extends AnyTO>
protected final SchemaRestClient schemaRestClient = new SchemaRestClient();
- protected final List<String> schemaNames;
+ protected final List<String> pSchemaNames;
protected final List<String> dSchemaNames;
@@ -78,9 +78,9 @@ public abstract class AnySearchResultPanel<T extends AnyTO>
modal.size(Modal.Size.Large);
- this.schemaNames = new ArrayList<>();
+ this.pSchemaNames = new ArrayList<>();
for (AnyTypeClassTO anyTypeClassTO : AnySearchResultPanelBuilder.class.cast(builder).getAnyTypeClassTOs()) {
- this.schemaNames.addAll(anyTypeClassTO.getPlainSchemas());
+ this.pSchemaNames.addAll(anyTypeClassTO.getPlainSchemas());
}
this.dSchemaNames = new ArrayList<>();
for (AnyTypeClassTO anyTypeClassTO : AnySearchResultPanelBuilder.class.cast(builder).getAnyTypeClassTOs()) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/4cc46deb/client/console/src/main/java/org/apache/syncope/client/console/panels/GroupSearchResultPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/GroupSearchResultPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/GroupSearchResultPanel.java
index 2349c12..53a69b3 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/GroupSearchResultPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/GroupSearchResultPanel.java
@@ -80,13 +80,13 @@ public class GroupSearchResultPanel extends AnySearchResultPanel<GroupTO> {
}
}
- for (String name : prefMan.getList(getRequest(), Constants.PREF_GROUP_ATTRIBUTES_VIEW)) {
- if (schemaNames.contains(name)) {
+ for (String name : prefMan.getList(getRequest(), Constants.PREF_GROUP_PLAIN_ATTRS_VIEW)) {
+ if (pSchemaNames.contains(name)) {
columns.add(new AttrColumn<GroupTO>(name, SchemaType.PLAIN));
}
}
- for (String name : prefMan.getList(getRequest(), Constants.PREF_GROUP_DERIVED_ATTRIBUTES_VIEW)) {
+ for (String name : prefMan.getList(getRequest(), Constants.PREF_GROUP_DER_ATTRS_VIEW)) {
if (dSchemaNames.contains(name)) {
columns.add(new AttrColumn<GroupTO>(name, SchemaType.DERIVED));
}
@@ -164,7 +164,7 @@ public class GroupSearchResultPanel extends AnySearchResultPanel<GroupTO> {
@Override
public void onClick(final AjaxRequestTarget target, final Serializable ignore) {
target.add(modal.setContent(new GroupDisplayAttributesModalPage<>(
- modal, page.getPageReference(), schemaNames, dSchemaNames)));
+ modal, page.getPageReference(), pSchemaNames, dSchemaNames)));
modal.header(new ResourceModel("any.attr.display", ""));
modal.show(true);
http://git-wip-us.apache.org/repos/asf/syncope/blob/4cc46deb/client/console/src/main/java/org/apache/syncope/client/console/panels/UserSearchResultPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/UserSearchResultPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/UserSearchResultPanel.java
index a99c957..1b41bda 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/UserSearchResultPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/UserSearchResultPanel.java
@@ -83,13 +83,13 @@ public class UserSearchResultPanel extends AnySearchResultPanel<UserTO> {
}
}
- for (String name : prefMan.getList(getRequest(), Constants.PREF_USERS_ATTRIBUTES_VIEW)) {
- if (schemaNames.contains(name)) {
+ for (String name : prefMan.getList(getRequest(), Constants.PREF_USERS_PLAIN_ATTRS_VIEW)) {
+ if (pSchemaNames.contains(name)) {
columns.add(new AttrColumn<UserTO>(name, SchemaType.PLAIN));
}
}
- for (String name : prefMan.getList(getRequest(), Constants.PREF_USERS_DERIVED_ATTRIBUTES_VIEW)) {
+ for (String name : prefMan.getList(getRequest(), Constants.PREF_USERS_DER_ATTRS_VIEW)) {
if (dSchemaNames.contains(name)) {
columns.add(new AttrColumn<UserTO>(name, SchemaType.DERIVED));
}
@@ -205,7 +205,7 @@ public class UserSearchResultPanel extends AnySearchResultPanel<UserTO> {
@Override
public void onClick(final AjaxRequestTarget target, final Serializable ignore) {
target.add(modal.setContent(new UserDisplayAttributesModalPage<>(
- modal, page.getPageReference(), schemaNames, dSchemaNames)));
+ modal, page.getPageReference(), pSchemaNames, dSchemaNames)));
modal.header(new ResourceModel("any.attr.display", ""));
modal.show(true);
http://git-wip-us.apache.org/repos/asf/syncope/blob/4cc46deb/client/console/src/main/java/org/apache/syncope/client/console/panels/search/AnyObjectSelectionSearchResultPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/AnyObjectSelectionSearchResultPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/AnyObjectSelectionSearchResultPanel.java
index e9312e2..4213084 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/AnyObjectSelectionSearchResultPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/AnyObjectSelectionSearchResultPanel.java
@@ -49,17 +49,17 @@ public final class AnyObjectSelectionSearchResultPanel extends AnySelectionSearc
@Override
public String getPrefDetailsView() {
- return String.format(Constants.PREF_ANY_DETAILS_VIEW, type);
+ return String.format(Constants.PREF_ANY_OBJECT_DETAILS_VIEW, type);
}
@Override
public String getPrefAttributesView() {
- return String.format(Constants.PREF_ANY_ATTRIBUTES_VIEW, type);
+ return String.format(Constants.PREF_ANY_OBJECT_PLAIN_ATTRS_VIEW, type);
}
@Override
public String getPrefDerivedAttributesView() {
- return String.format(Constants.PREF_ANY_DERIVED_ATTRIBUTES_VIEW, type);
+ return String.format(Constants.PREF_ANY_OBJECT_DER_ATTRS_VIEW, type);
}
public static final class Builder extends AnySelectionSearchResultPanel.Builder<AnyObjectTO> {
http://git-wip-us.apache.org/repos/asf/syncope/blob/4cc46deb/client/console/src/main/java/org/apache/syncope/client/console/panels/search/AnySelectionSearchResultPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/AnySelectionSearchResultPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/AnySelectionSearchResultPanel.java
index d013179..eea91f0 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/AnySelectionSearchResultPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/AnySelectionSearchResultPanel.java
@@ -26,7 +26,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.List;
-import org.apache.syncope.client.console.pages.AnyDisplayAttributesModalPage;
+import org.apache.syncope.client.console.pages.AnyObjectDisplayAttributesModalPage;
import org.apache.syncope.client.console.panels.AnySearchResultPanel;
import org.apache.syncope.client.console.rest.AbstractAnyRestClient;
import org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.ActionColumn;
@@ -73,7 +73,7 @@ public abstract class AnySelectionSearchResultPanel<T extends AnyTO> extends Any
}
for (String name : prefMan.getList(getRequest(), getPrefAttributesView())) {
- if (schemaNames.contains(name)) {
+ if (pSchemaNames.contains(name)) {
columns.add(new AttrColumn<T>(name, SchemaType.PLAIN));
}
}
@@ -129,8 +129,8 @@ public abstract class AnySelectionSearchResultPanel<T extends AnyTO> extends Any
@Override
public void onClick(final AjaxRequestTarget target, final T ignore) {
// still missing content
- target.add(modal.setContent(new AnyDisplayAttributesModalPage<>(
- modal, page.getPageReference(), schemaNames, dSchemaNames, type)));
+ target.add(modal.setContent(new AnyObjectDisplayAttributesModalPage<>(
+ modal, page.getPageReference(), pSchemaNames, dSchemaNames, type)));
modal.header(new ResourceModel("any.attr.display", ""));
modal.show(true);
http://git-wip-us.apache.org/repos/asf/syncope/blob/4cc46deb/client/console/src/main/java/org/apache/syncope/client/console/panels/search/GroupSelectionSearchResultPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/GroupSelectionSearchResultPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/GroupSelectionSearchResultPanel.java
index 77ecf4b..2fd3edb 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/GroupSelectionSearchResultPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/GroupSelectionSearchResultPanel.java
@@ -54,12 +54,12 @@ public final class GroupSelectionSearchResultPanel extends AnySelectionSearchRes
@Override
public String getPrefAttributesView() {
- return Constants.PREF_GROUP_ATTRIBUTES_VIEW;
+ return Constants.PREF_GROUP_PLAIN_ATTRS_VIEW;
}
@Override
public String getPrefDerivedAttributesView() {
- return Constants.PREF_GROUP_DERIVED_ATTRIBUTES_VIEW;
+ return Constants.PREF_GROUP_DER_ATTRS_VIEW;
}
public static final class Builder extends AnySelectionSearchResultPanel.Builder<GroupTO> {
http://git-wip-us.apache.org/repos/asf/syncope/blob/4cc46deb/client/console/src/main/java/org/apache/syncope/client/console/panels/search/UserSelectionSearchResultPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/UserSelectionSearchResultPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/UserSelectionSearchResultPanel.java
index 52fbeb2..f523c6a 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/UserSelectionSearchResultPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/UserSelectionSearchResultPanel.java
@@ -54,12 +54,12 @@ public final class UserSelectionSearchResultPanel extends AnySelectionSearchResu
@Override
protected String getPrefAttributesView() {
- return Constants.PREF_USERS_ATTRIBUTES_VIEW;
+ return Constants.PREF_USERS_PLAIN_ATTRS_VIEW;
}
@Override
protected String getPrefDerivedAttributesView() {
- return Constants.PREF_USERS_DERIVED_ATTRIBUTES_VIEW;
+ return Constants.PREF_USERS_DER_ATTRS_VIEW;
}
public static final class Builder extends AnySelectionSearchResultPanel.Builder<UserTO> {
http://git-wip-us.apache.org/repos/asf/syncope/blob/4cc46deb/client/console/src/main/java/org/apache/syncope/client/console/rest/AbstractAnyRestClient.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/AbstractAnyRestClient.java b/client/console/src/main/java/org/apache/syncope/client/console/rest/AbstractAnyRestClient.java
index b477544..e1271b0 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/rest/AbstractAnyRestClient.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/AbstractAnyRestClient.java
@@ -50,6 +50,8 @@ public abstract class AbstractAnyRestClient<T extends AnyTO> extends BaseRestCli
public abstract ConnObjectTO readConnObject(String resourceName, Long key);
+ public abstract T read(final Long key);
+
public abstract ProvisioningResult<T> delete(String etag, Long key);
protected <E extends AnyService<T, ?>> ProvisioningResult<T> delete(
http://git-wip-us.apache.org/repos/asf/syncope/blob/4cc46deb/client/console/src/main/java/org/apache/syncope/client/console/rest/AnyObjectRestClient.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/AnyObjectRestClient.java b/client/console/src/main/java/org/apache/syncope/client/console/rest/AnyObjectRestClient.java
index 53201ba..9007011 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/rest/AnyObjectRestClient.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/AnyObjectRestClient.java
@@ -21,10 +21,8 @@ package org.apache.syncope.client.console.rest;
import java.util.List;
import javax.ws.rs.core.GenericType;
import javax.ws.rs.core.Response;
-import org.apache.syncope.common.lib.SyncopeClientException;
import org.apache.syncope.common.lib.patch.AnyObjectPatch;
import org.apache.syncope.common.lib.to.AnyObjectTO;
-import org.apache.syncope.common.lib.to.AnyTO;
import org.apache.syncope.common.lib.to.BulkAction;
import org.apache.syncope.common.lib.to.BulkActionResult;
import org.apache.syncope.common.lib.to.ConnObjectTO;
@@ -88,15 +86,9 @@ public class AnyObjectRestClient extends AbstractAnyRestClient<AnyObjectTO> {
throw new UnsupportedOperationException("Not supported yet.");
}
- @SuppressWarnings("unchecked")
- public <T extends AnyTO> T read(final long id) {
- T anyObjectTO = null;
- try {
- anyObjectTO = (T) getService(AnyObjectService.class).read(id);
- } catch (SyncopeClientException e) {
- LOG.error("While reading any object", e);
- }
- return anyObjectTO;
+ @Override
+ public AnyObjectTO read(final Long key) {
+ return getService(AnyObjectService.class).read(key);
}
public ProvisioningResult<AnyObjectTO> create(final AnyObjectTO anyObjectTO) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/4cc46deb/client/console/src/main/java/org/apache/syncope/client/console/rest/GroupRestClient.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/GroupRestClient.java b/client/console/src/main/java/org/apache/syncope/client/console/rest/GroupRestClient.java
index 63f8b93..ece8ad7 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/rest/GroupRestClient.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/GroupRestClient.java
@@ -93,6 +93,7 @@ public class GroupRestClient extends AbstractAnyRestClient<GroupTO> {
});
}
+ @Override
public GroupTO read(final Long key) {
return getService(GroupService.class).read(key);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/4cc46deb/client/console/src/main/java/org/apache/syncope/client/console/rest/UserRestClient.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/UserRestClient.java b/client/console/src/main/java/org/apache/syncope/client/console/rest/UserRestClient.java
index b4b879b..ff4b2fa 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/rest/UserRestClient.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/UserRestClient.java
@@ -23,7 +23,6 @@ import javax.ws.rs.core.GenericType;
import javax.ws.rs.core.Response;
import org.apache.syncope.client.console.commons.status.StatusBean;
import org.apache.syncope.client.console.commons.status.StatusUtils;
-import org.apache.syncope.common.lib.SyncopeClientException;
import org.apache.syncope.common.lib.patch.StatusPatch;
import org.apache.syncope.common.lib.patch.UserPatch;
import org.apache.syncope.common.lib.to.BulkAction;
@@ -89,14 +88,9 @@ public class UserRestClient extends AbstractAnyRestClient<UserTO> {
return delete(UserService.class, UserTO.class, etag, key);
}
- public UserTO read(final Long id) {
- UserTO userTO = null;
- try {
- userTO = getService(UserService.class).read(id);
- } catch (SyncopeClientException e) {
- LOG.error("While reading a user", e);
- }
- return userTO;
+ @Override
+ public UserTO read(final Long key) {
+ return getService(UserService.class).read(key);
}
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/4cc46deb/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskExecutionDetails.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskExecutionDetails.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskExecutionDetails.java
index 811ae9d..8b6e447 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskExecutionDetails.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskExecutionDetails.java
@@ -26,7 +26,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
/**
* Modal window with Task form (to stop and start execution).
*
- * @param <T>
+ * @param <T> actual type of task
*/
public class TaskExecutionDetails<T extends AbstractTaskTO> extends MultilevelPanel.SecondLevel {