This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new ec845fd Fixing a few CodeQL warnings (#253)
ec845fd is described below
commit ec845fd4c4d24b3fa69d57c7ef675eb402bcb884
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Sun Mar 28 08:19:45 2021 +0200
Fixing a few CodeQL warnings (#253)
---
.../IdMAnyDirectoryPanelAdditionalActionsProvider.java | 9 ++++-----
.../org/apache/syncope/client/console/panels/ConnObjects.java | 5 ++---
.../org/apache/syncope/client/console/PreferenceManager.java | 11 +++++------
.../syncope/client/console/audit/AuditHistoryDetails.java | 4 +---
.../client/console/audit/AuditHistoryDirectoryPanel.java | 7 +------
.../java/org/apache/syncope/client/console/pages/Reports.java | 2 +-
.../syncope/client/console/panels/AnyDirectoryPanel.java | 6 +++---
.../org/apache/syncope/client/console/panels/AnyPanel.java | 3 +--
.../apache/syncope/client/console/panels/DirectoryPanel.java | 2 +-
.../client/console/panels/DisplayAttributesModalPanel.java | 9 +++------
.../syncope/client/console/reports/ReportDirectoryPanel.java | 2 +-
.../apache/syncope/client/console/wizards/WizardMgtPanel.java | 2 +-
.../client/console/panels/SCIMConfEnterpriseUserPanel.java | 8 +++-----
.../syncope/client/console/panels/SCIMConfGeneralPanel.java | 4 ++--
.../syncope/client/console/panels/SCIMConfTabPanel.java | 5 +----
.../syncope/client/console/panels/SCIMConfUserPanel.java | 2 +-
16 files changed, 31 insertions(+), 50 deletions(-)
diff --git
a/client/idm/console/src/main/java/org/apache/syncope/client/console/commons/IdMAnyDirectoryPanelAdditionalActionsProvider.java
b/client/idm/console/src/main/java/org/apache/syncope/client/console/commons/IdMAnyDirectoryPanelAdditionalActionsProvider.java
index 5563321..588bee6 100644
---
a/client/idm/console/src/main/java/org/apache/syncope/client/console/commons/IdMAnyDirectoryPanelAdditionalActionsProvider.java
+++
b/client/idm/console/src/main/java/org/apache/syncope/client/console/commons/IdMAnyDirectoryPanelAdditionalActionsProvider.java
@@ -137,7 +137,7 @@ public class IdMAnyDirectoryPanelAdditionalActionsProvider
implements AnyDirecto
@Override
public void onClick(final AjaxRequestTarget target) {
- CSVPushSpec spec = csvPushSpec(type, panel, pSchemaNames,
dSchemaNames);
+ CSVPushSpec spec = csvPushSpec(type, pSchemaNames,
dSchemaNames);
AnyQuery query = csvAnyQuery(realm, fiql, rows,
panel.getDataProvider());
target.add(modal.setContent(new CSVPushWizardBuilder(spec,
query, csvDownloadBehavior, pageRef).
@@ -176,19 +176,18 @@ public class
IdMAnyDirectoryPanelAdditionalActionsProvider implements AnyDirecto
protected CSVPushSpec csvPushSpec(
final String type,
- final AnyDirectoryPanel<?, ?> panel,
final List<String> pSchemaNames,
final List<String> dSchemaNames) {
CSVPushSpec spec = new CSVPushSpec.Builder(type).build();
- spec.setFields(PreferenceManager.getList(panel.getRequest(),
+ spec.setFields(PreferenceManager.getList(
DisplayAttributesModalPanel.getPrefDetailView(type)).
stream().filter(name ->
!Constants.KEY_FIELD_NAME.equalsIgnoreCase(name)).
collect(Collectors.toList()));
spec.setPlainAttrs(PreferenceManager.getList(
- panel.getRequest(),
DisplayAttributesModalPanel.getPrefPlainAttributeView(type)).
+ DisplayAttributesModalPanel.getPrefPlainAttributeView(type)).
stream().filter(name ->
pSchemaNames.contains(name)).collect(Collectors.toList()));
- spec.setDerAttrs(PreferenceManager.getList(panel.getRequest(),
+ spec.setDerAttrs(PreferenceManager.getList(
DisplayAttributesModalPanel.getPrefPlainAttributeView(type)).
stream().filter(name ->
dSchemaNames.contains(name)).collect(Collectors.toList()));
return spec;
diff --git
a/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjects.java
b/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjects.java
index 4af0ea9..af00066 100644
---
a/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjects.java
+++
b/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjects.java
@@ -85,7 +85,7 @@ public class ConnObjects extends Panel implements ModalPanel {
};
connObjects.setFirstLevel(new NextableConnObjectDirectoryPanel(
- connObjects, resource, anyTypes.getField().getModelObject(),
pageRef));
+ resource, anyTypes.getField().getModelObject(), pageRef));
connObjects.setOutputMarkupId(true);
add(connObjects);
@@ -96,7 +96,7 @@ public class ConnObjects extends Panel implements ModalPanel {
@Override
protected void onUpdate(final AjaxRequestTarget target) {
connObjects.setFirstLevel(new NextableConnObjectDirectoryPanel(
- connObjects, resource,
anyTypes.getField().getModelObject(), pageRef));
+ resource, anyTypes.getField().getModelObject(),
pageRef));
target.add(connObjects);
}
});
@@ -107,7 +107,6 @@ public class ConnObjects extends Panel implements
ModalPanel {
private static final long serialVersionUID = 956427874406567048L;
NextableConnObjectDirectoryPanel(
- final MultilevelPanel multiLevelPanelRef,
final ResourceTO resource,
final String anyType,
final PageReference pageRef) {
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/PreferenceManager.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/PreferenceManager.java
index f420ad8..838132f 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/PreferenceManager.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/PreferenceManager.java
@@ -30,7 +30,6 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
-import org.apache.wicket.request.Request;
import org.apache.wicket.util.cookies.CookieDefaults;
import org.apache.wicket.util.cookies.CookieUtils;
import org.slf4j.Logger;
@@ -88,7 +87,7 @@ public final class PreferenceManager implements Serializable {
return writer.toString();
}
- public static String get(final Request request, final String key) {
+ public static String get(final String key) {
String result = null;
String prefString = COOKIE_UTILS.load(COOKIE_NAME);
@@ -100,10 +99,10 @@ public final class PreferenceManager implements
Serializable {
return result;
}
- public static Integer getPaginatorRows(final Request request, final String
key) {
+ public static Integer getPaginatorRows(final String key) {
Integer result = getPaginatorChoices().get(0);
- String value = get(request, key);
+ String value = get(key);
if (value != null) {
result = NumberUtils.toInt(value, 10);
}
@@ -111,10 +110,10 @@ public final class PreferenceManager implements
Serializable {
return result;
}
- public static List<String> getList(final Request request, final String
key) {
+ public static List<String> getList(final String key) {
final List<String> result = new ArrayList<>();
- final String compound = get(request, key);
+ final String compound = get(key);
if (StringUtils.isNotBlank(compound)) {
String[] items = compound.split(";");
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/audit/AuditHistoryDetails.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/audit/AuditHistoryDetails.java
index b5fad0a..11cc048 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/audit/AuditHistoryDetails.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/audit/AuditHistoryDetails.java
@@ -29,7 +29,6 @@ import org.apache.syncope.common.lib.log.AuditEntry;
import org.apache.syncope.common.lib.to.AnyTO;
import org.apache.syncope.common.lib.to.EntityTO;
import org.apache.syncope.common.lib.to.UserTO;
-import org.apache.wicket.PageReference;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -51,8 +50,7 @@ public abstract class AuditHistoryDetails<T extends
Serializable> extends Multil
final MultilevelPanel mlp,
final AuditEntry selected,
final EntityTO currentEntity,
- final String auditRestoreEntitlement,
- final PageReference pageRef) {
+ final String auditRestoreEntitlement) {
super();
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/audit/AuditHistoryDirectoryPanel.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/audit/AuditHistoryDirectoryPanel.java
index 7b43498..c0c5703 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/audit/AuditHistoryDirectoryPanel.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/audit/AuditHistoryDirectoryPanel.java
@@ -133,12 +133,7 @@ public abstract class AuditHistoryDirectoryPanel<T extends
Serializable> extends
mlp.next(
new StringResourceModel("audit.diff.view",
AuditHistoryDirectoryPanel.this).getObject(),
- new AuditHistoryDetails<T>(
- mlp,
- modelObject,
- entity,
- auditRestoreEntitlement,
- pageRef) {
+ new AuditHistoryDetails<T>(mlp, modelObject, entity,
auditRestoreEntitlement) {
private static final long serialVersionUID =
-5311898419151367494L;
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/Reports.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/Reports.java
index 889559d..4676316 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/Reports.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/Reports.java
@@ -63,7 +63,7 @@ public class Reports extends BasePage {
@Override
public Panel getPanel(final String panelId) {
MultilevelPanel mlp = new MultilevelPanel(panelId);
- mlp.setFirstLevel(new ReportDirectoryPanel(mlp,
getPageReference()) {
+ mlp.setFirstLevel(new ReportDirectoryPanel(getPageReference())
{
private static final long serialVersionUID =
-2195387360323687302L;
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/AnyDirectoryPanel.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/AnyDirectoryPanel.java
index 4c0d712..c20b256 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/AnyDirectoryPanel.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/AnyDirectoryPanel.java
@@ -134,18 +134,18 @@ public abstract class AnyDirectoryPanel<A extends AnyTO,
E extends AbstractAnyRe
new ResourceModel(Constants.KEY_FIELD_NAME,
Constants.KEY_FIELD_NAME), Constants.KEY_FIELD_NAME));
List<IColumn<A, String>> prefcolumns = new ArrayList<>();
- PreferenceManager.getList(getRequest(),
DisplayAttributesModalPanel.getPrefDetailView(type)).stream().
+
PreferenceManager.getList(DisplayAttributesModalPanel.getPrefDetailView(type)).stream().
filter(name ->
!Constants.KEY_FIELD_NAME.equalsIgnoreCase(name)).
forEach(name -> addPropertyColumn(
name,
ReflectionUtils.findField(DisplayAttributesModalPanel.getTOClass(type), name),
prefcolumns));
- PreferenceManager.getList(getRequest(),
DisplayAttributesModalPanel.getPrefPlainAttributeView(type)).stream().
+
PreferenceManager.getList(DisplayAttributesModalPanel.getPrefPlainAttributeView(type)).stream().
filter(name -> pSchemaNames.contains(name)).
forEach(name -> prefcolumns.add(new AttrColumn<>(name,
SchemaType.PLAIN)));
- PreferenceManager.getList(getRequest(),
DisplayAttributesModalPanel.getPrefDerivedAttributeView(type)).stream().
+
PreferenceManager.getList(DisplayAttributesModalPanel.getPrefDerivedAttributeView(type)).stream().
filter(name -> (dSchemaNames.contains(name))).
forEach(name -> prefcolumns.add(new AttrColumn<>(name,
SchemaType.DERIVED)));
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/AnyPanel.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/AnyPanel.java
index 7c6bda1..bf1b571 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/AnyPanel.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/AnyPanel.java
@@ -236,7 +236,7 @@ public class AnyPanel extends Panel implements ModalPanel {
accordion.setOutputMarkupId(true);
add(accordion.setEnabled(enableSearch).setVisible(enableSearch));
- directoryPanel = createDirectoryPanel(anyTypeTO, realmTO, anyLayout,
enableSearch, directoryPanelSupplier);
+ directoryPanel = createDirectoryPanel(anyTypeTO, realmTO, anyLayout,
directoryPanelSupplier);
add(directoryPanel);
// ------------------------
}
@@ -245,7 +245,6 @@ public class AnyPanel extends Panel implements ModalPanel {
final AnyTypeTO anyTypeTO,
final RealmTO realmTO,
final AnyLayout anyLayout,
- final boolean enableSearch,
final DirectoryPanelSupplier directoryPanelSupplier) {
return directoryPanelSupplier.supply(DIRECTORY_PANEL_ID, anyTypeTO,
realmTO, anyLayout, pageRef);
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/DirectoryPanel.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/DirectoryPanel.java
index 4bf3724..29c8447 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/DirectoryPanel.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/DirectoryPanel.java
@@ -165,7 +165,7 @@ public abstract class DirectoryPanel<
container.setOutputMarkupId(true);
addInnerObject(container);
- rows = PreferenceManager.getPaginatorRows(getRequest(),
paginatorRowsKey());
+ rows = PreferenceManager.getPaginatorRows(paginatorRowsKey());
modal.setWindowClosedCallback(target -> {
if (actionTogglePanel.isVisibleInHierarchy() && modal.getContent()
instanceof WizardModalPanel) {
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/DisplayAttributesModalPanel.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/DisplayAttributesModalPanel.java
index 78f611b..2f09e35 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/DisplayAttributesModalPanel.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/DisplayAttributesModalPanel.java
@@ -112,12 +112,9 @@ public abstract class DisplayAttributesModalPanel<T
extends Serializable> extend
}
};
- selectedDetails =
- PreferenceManager.getList(getRequest(),
DisplayAttributesModalPanel.getPrefDetailView(type));
- selectedPlainSchemas =
- PreferenceManager.getList(getRequest(),
DisplayAttributesModalPanel.getPrefPlainAttributeView(type));
- selectedDerSchemas =
- PreferenceManager.getList(getRequest(),
DisplayAttributesModalPanel.getPrefDerivedAttributeView(type));
+ selectedDetails =
PreferenceManager.getList(DisplayAttributesModalPanel.getPrefDetailView(type));
+ selectedPlainSchemas =
PreferenceManager.getList(DisplayAttributesModalPanel.getPrefPlainAttributeView(type));
+ selectedDerSchemas =
PreferenceManager.getList(DisplayAttributesModalPanel.getPrefDerivedAttributeView(type));
// remove old schemas from selected lists
selectedPlainSchemas.retainAll(pSchemaNames);
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java
index 8ae9c67..bb38d79 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java
@@ -77,7 +77,7 @@ public abstract class ReportDirectoryPanel
private final ReportStartAtTogglePanel startAt;
- protected ReportDirectoryPanel(final MultilevelPanel multiLevelPanelRef,
final PageReference pageRef) {
+ protected ReportDirectoryPanel(final PageReference pageRef) {
super(MultilevelPanel.FIRST_LEVEL_ID, pageRef, true);
this.restClient = new ReportRestClient();
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java
index 24e7041..099ea90 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java
@@ -361,7 +361,7 @@ public abstract class WizardMgtPanel<T extends
Serializable> extends AbstractWiz
}
protected WizardMgtPanel<T> addNotificationPanel(final NotificationPanel
notificationPanel) {
- this.notificationPanel = ((BasePage)
pageRef.getPage()).getNotificationPanel();
+ this.notificationPanel = notificationPanel;
return this;
}
diff --git
a/ext/scimv2/client-console/src/main/java/org/apache/syncope/client/console/panels/SCIMConfEnterpriseUserPanel.java
b/ext/scimv2/client-console/src/main/java/org/apache/syncope/client/console/panels/SCIMConfEnterpriseUserPanel.java
index 5056bb0..35e00d0 100644
---
a/ext/scimv2/client-console/src/main/java/org/apache/syncope/client/console/panels/SCIMConfEnterpriseUserPanel.java
+++
b/ext/scimv2/client-console/src/main/java/org/apache/syncope/client/console/panels/SCIMConfEnterpriseUserPanel.java
@@ -44,10 +44,8 @@ public class SCIMConfEnterpriseUserPanel extends
SCIMConfTabPanel {
private final SCIMEnterpriseUserConf scimEnterpriseUserConf;
- public SCIMConfEnterpriseUserPanel(
- final String id,
- final SCIMConf scimConf) {
- super(id, scimConf);
+ public SCIMConfEnterpriseUserPanel(final String id, final SCIMConf
scimConf) {
+ super(id);
if (scimConf.getEnterpriseUserConf() == null) {
scimConf.setEnterpriseUserConf(new SCIMEnterpriseUserConf());
@@ -226,7 +224,7 @@ public class SCIMConfEnterpriseUserPanel extends
SCIMConfTabPanel {
panelList.add(managerKeyPanel);
panelList.add(managerDisplaNamePanel);
-
+
add(new Label("managerLabel", Model.of("manager")));
return new SCIMConfAccordionContainer(panelId, panelList);
diff --git
a/ext/scimv2/client-console/src/main/java/org/apache/syncope/client/console/panels/SCIMConfGeneralPanel.java
b/ext/scimv2/client-console/src/main/java/org/apache/syncope/client/console/panels/SCIMConfGeneralPanel.java
index 7bd0e5b..d6d6449 100644
---
a/ext/scimv2/client-console/src/main/java/org/apache/syncope/client/console/panels/SCIMConfGeneralPanel.java
+++
b/ext/scimv2/client-console/src/main/java/org/apache/syncope/client/console/panels/SCIMConfGeneralPanel.java
@@ -37,9 +37,9 @@ public class SCIMConfGeneralPanel extends SCIMConfTabPanel {
private static final Logger LOG =
LoggerFactory.getLogger(SCIMConfGeneralPanel.class);
public SCIMConfGeneralPanel(final String id, final SCIMConf scimConf) {
- super(id, scimConf);
+ super(id);
- final SCIMGeneralConf scimGeneralConf = scimConf.getGeneralConf();
+ SCIMGeneralConf scimGeneralConf = scimConf.getGeneralConf();
AjaxDateTimeFieldPanel creationDatePanel =
new AjaxDateTimeFieldPanel("creationDate", "creationDate", new
Model<Date>() {
diff --git
a/ext/scimv2/client-console/src/main/java/org/apache/syncope/client/console/panels/SCIMConfTabPanel.java
b/ext/scimv2/client-console/src/main/java/org/apache/syncope/client/console/panels/SCIMConfTabPanel.java
index 14e4547..6ac28e1 100644
---
a/ext/scimv2/client-console/src/main/java/org/apache/syncope/client/console/panels/SCIMConfTabPanel.java
+++
b/ext/scimv2/client-console/src/main/java/org/apache/syncope/client/console/panels/SCIMConfTabPanel.java
@@ -22,7 +22,6 @@ import java.util.List;
import java.util.stream.Collectors;
import org.apache.syncope.client.console.rest.SchemaRestClient;
import org.apache.syncope.client.ui.commons.panels.ModalPanel;
-import org.apache.syncope.common.lib.scim.SCIMConf;
import org.apache.syncope.common.lib.to.SchemaTO;
import org.apache.syncope.common.lib.types.AnyTypeKind;
import org.apache.syncope.common.lib.types.SchemaType;
@@ -34,9 +33,7 @@ public class SCIMConfTabPanel extends Panel implements
ModalPanel {
protected final List<String> plainSchemaNames = getPlainSchemas();
- public SCIMConfTabPanel(
- final String id,
- final SCIMConf scimConf) {
+ public SCIMConfTabPanel(final String id) {
super(id);
}
diff --git
a/ext/scimv2/client-console/src/main/java/org/apache/syncope/client/console/panels/SCIMConfUserPanel.java
b/ext/scimv2/client-console/src/main/java/org/apache/syncope/client/console/panels/SCIMConfUserPanel.java
index 125907e..202abd0 100644
---
a/ext/scimv2/client-console/src/main/java/org/apache/syncope/client/console/panels/SCIMConfUserPanel.java
+++
b/ext/scimv2/client-console/src/main/java/org/apache/syncope/client/console/panels/SCIMConfUserPanel.java
@@ -55,7 +55,7 @@ public class SCIMConfUserPanel extends SCIMConfTabPanel {
private final SCIMUserConf scimUserConf;
public SCIMConfUserPanel(final String id, final SCIMConf scimConf) {
- super(id, scimConf);
+ super(id);
if (scimConf.getUserConf() == null) {
scimConf.setUserConf(new SCIMUserConf());
