Skip to content

Commit

Permalink
page descriptor cleanup (deprecated)
Browse files Browse the repository at this point in the history
  • Loading branch information
katkav committed Jun 10, 2021
1 parent 904b0c0 commit e2a114d
Show file tree
Hide file tree
Showing 66 changed files with 393 additions and 93 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,6 @@ private void loadActions(PageDescriptor descriptor) {
}

private void foreachUrl(PageDescriptor descriptor, Consumer<String> urlConsumer) {
for (String url : descriptor.url()) {
urlConsumer.accept(buildPrefixUrl(url));
}

for (Url url : descriptor.urls()) {
String urlForSecurity = url.matchUrlForSecurity();
if (StringUtils.isEmpty(urlForSecurity)) {
Expand All @@ -193,17 +189,6 @@ public String buildPrefixUrl(String url) {
private void mountPage(PageDescriptor descriptor, Class clazz, MidPointApplication application)
throws InstantiationException, IllegalAccessException {

//todo remove for cycle later
for (String url : descriptor.url()) {
IPageParametersEncoder encoder = descriptor.encoder().newInstance();

LOGGER.trace("Mounting page '{}' to url '{}' with encoder '{}'.",
clazz.getName(), url, encoder.getClass().getSimpleName());

application.mount(new ExactMatchMountedMapper(url, clazz, encoder));
urlClassMap.put(url, clazz);
}

for (Url url : descriptor.urls()) {
IPageParametersEncoder encoder = descriptor.encoder().newInstance();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,6 @@
@Retention(RetentionPolicy.RUNTIME)
public @interface PageDescriptor {

/**
* Please use {@link PageDescriptor#urls()}
* @return
*/
@Deprecated
String[] url() default {};

Url[] urls() default {};

Class<? extends IPageParametersEncoder> encoder() default PageParametersEncoder.class;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.web.application.AuthorizationAction;
import com.evolveum.midpoint.web.application.PageDescriptor;
import com.evolveum.midpoint.web.application.Url;
import com.evolveum.midpoint.web.component.AjaxButton;
import com.evolveum.midpoint.web.component.TabbedPanel;
import com.evolveum.midpoint.web.component.breadcrumbs.Breadcrumb;
Expand Down Expand Up @@ -47,9 +48,14 @@
/**
* @author mederly
*/
@PageDescriptor(url = "/admin/previewChanges", encoder = OnePageParameterEncoder.class, action = {
@AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_PREVIEW_CHANGES_URL, label = "PageAdmin.auth.previewChanges.label", description = "PageAdmin.auth.previewChanges.description")
})
@PageDescriptor(
urls = {
@Url (mountUrl = "/admin/previewChanges", matchUrlForSecurity = "/admin/previewChanges"),
},
encoder = OnePageParameterEncoder.class,
action = {
@AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_PREVIEW_CHANGES_URL, label = "PageAdmin.auth.previewChanges.label", description = "PageAdmin.auth.previewChanges.description")
})
public class PagePreviewChanges<O extends ObjectType> extends PageAdmin {
private static final long serialVersionUID = 1L;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@
import com.evolveum.midpoint.util.logging.Trace;
import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.web.application.PageDescriptor;
import com.evolveum.midpoint.web.application.Url;

/**
* Page with no authorizations. It is used for testing: to make sure that nobody can access this page.
*/
@PageDescriptor(url = "/noautz")
@PageDescriptor(urls = {@Url (mountUrl = "/noautz", matchUrlForSecurity = "/noautz")})
public class PageTestNoAuthorizations extends PageBase {
private static final long serialVersionUID = 1L;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import java.util.List;

import com.evolveum.midpoint.gui.api.page.PageBase;
import com.evolveum.midpoint.web.application.Url;
import com.evolveum.midpoint.web.page.admin.configuration.PageAdminConfiguration;

import org.apache.wicket.Page;
Expand Down Expand Up @@ -37,7 +38,9 @@
import com.evolveum.midpoint.xml.ns._public.common.common_3.ArchetypeType;

@PageDescriptor(
url = "/admin/archetype",
urls = {
@Url(mountUrl = "/admin/archetype", matchUrlForSecurity = "/admin/archetype")
},
encoder = OnePageParameterEncoder.class,
action = {
@AuthorizationAction(actionUri = PageAdminConfiguration.AUTH_CONFIGURATION_ALL,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import java.util.List;

import com.evolveum.midpoint.gui.api.component.MainObjectListPanel;
import com.evolveum.midpoint.web.application.Url;
import com.evolveum.midpoint.web.component.form.MidpointForm;
import com.evolveum.midpoint.web.component.util.SelectableBean;
import com.evolveum.midpoint.web.page.admin.PageAdmin;
Expand All @@ -29,7 +30,10 @@
import com.evolveum.midpoint.xml.ns._public.common.common_3.ArchetypeType;

@PageDescriptor(
url = "/admin/archetypes", action = {
urls = {
@Url(mountUrl = "/admin/archetypes", matchUrlForSecurity = "/admin/archetypes")
},
action = {
@AuthorizationAction(actionUri = PageAdminConfiguration.AUTH_CONFIGURATION_ALL,
label = PageAdminConfiguration.AUTH_CONFIGURATION_ALL_LABEL,
description = PageAdminConfiguration.AUTH_CONFIGURATION_ALL_DESCRIPTION),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
import java.util.Collection;
import java.util.List;

import com.evolveum.midpoint.web.application.Url;

import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.ajax.AjaxRequestTarget;
Expand Down Expand Up @@ -40,7 +42,11 @@
import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
import com.evolveum.midpoint.xml.ns._public.common.common_3.*;

@PageDescriptor(url = "/admin/case", encoder = OnePageParameterEncoder.class, action = {
@PageDescriptor(
urls = {
@Url(mountUrl = "/admin/case", matchUrlForSecurity = "/admin/case")
},
encoder = OnePageParameterEncoder.class, action = {
@AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_CASES_ALL_URL,
label = "PageAdminCases.auth.casesAll.label",
description = "PageAdminCases.auth.casesAll.description"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,19 @@
import com.evolveum.midpoint.security.api.AuthorizationConstants;
import com.evolveum.midpoint.web.application.AuthorizationAction;
import com.evolveum.midpoint.web.application.PageDescriptor;
import com.evolveum.midpoint.web.application.Url;
import com.evolveum.midpoint.web.page.admin.workflow.PageAdminWorkItems;
import com.evolveum.midpoint.xml.ns._public.common.common_3.CaseType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.CaseWorkItemType;

/**
* @author bpowers
*/
@PageDescriptor(url = "/admin/allWorkItems", action = {
@PageDescriptor(
urls = {
@Url(mountUrl = "/admin/allWorkItems", matchUrlForSecurity = "/admin/allWorkItems")
},
action = {
@AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_ALL_WORK_ITEMS_URL,
label = PageAdminWorkItems.AUTH_APPROVALS_ALL_LABEL,
description = PageAdminWorkItems.AUTH_APPROVALS_ALL_DESCRIPTION),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import com.evolveum.midpoint.security.api.AuthorizationConstants;
import com.evolveum.midpoint.web.application.AuthorizationAction;
import com.evolveum.midpoint.web.application.PageDescriptor;
import com.evolveum.midpoint.web.application.Url;
import com.evolveum.midpoint.web.component.breadcrumbs.Breadcrumb;
import com.evolveum.midpoint.web.security.util.SecurityUtils;
import com.evolveum.midpoint.wf.util.QueryUtils;
Expand All @@ -22,7 +23,11 @@
/**
* @author bpowers
*/
@PageDescriptor(url = "/admin/myWorkItems", action = {
@PageDescriptor(
urls = {
@Url(mountUrl = "/admin/myWorkItems", matchUrlForSecurity = "/admin/myWorkItems")
},
action = {
@AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_MY_WORK_ITEMS_URL,
label = PageAdminCaseWorkItems.AUTH_CASE_WORK_ITEMS_ALLOCATED_TO_ME_LABEL,
description = PageAdminCaseWorkItems.AUTH_CASE_WORK_ITEMS_ALLOCATED_TO_ME_DESCRIPTION),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import com.evolveum.midpoint.util.exception.*;
import com.evolveum.midpoint.web.application.AuthorizationAction;
import com.evolveum.midpoint.web.application.PageDescriptor;
import com.evolveum.midpoint.web.application.Url;
import com.evolveum.midpoint.web.component.breadcrumbs.Breadcrumb;
import com.evolveum.midpoint.web.component.data.column.ColumnMenuAction;
import com.evolveum.midpoint.web.component.menu.cog.ButtonInlineMenuItem;
Expand All @@ -39,7 +40,11 @@
/**
* @author lazyman
*/
@PageDescriptor(url = "/admin/claimableWorkItems", action = {
@PageDescriptor(
urls = {
@Url(mountUrl = "/admin/claimableWorkItems", matchUrlForSecurity = "/admin/claimableWorkItems")
},
action = {
@AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_WORK_ITEMS_ALL_URL,
label = PageAdminWorkItems.AUTH_APPROVALS_ALL_LABEL,
description = PageAdminWorkItems.AUTH_APPROVALS_ALL_DESCRIPTION),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.web.application.AuthorizationAction;
import com.evolveum.midpoint.web.application.PageDescriptor;
import com.evolveum.midpoint.web.application.Url;
import com.evolveum.midpoint.web.component.AjaxButton;
import com.evolveum.midpoint.web.component.AjaxIconButton;
import com.evolveum.midpoint.web.component.AjaxSubmitButton;
Expand Down Expand Up @@ -69,7 +70,10 @@
/**
* @author mederly
*/
@PageDescriptor(url = "/admin/certification/campaign",
@PageDescriptor(
urls = {
@Url(mountUrl = "/admin/certification/campaign", matchUrlForSecurity = "/admin/certification/campaign")
},
action = {
@AuthorizationAction(actionUri = PageAdminCertification.AUTH_CERTIFICATION_ALL,
label = PageAdminCertification.AUTH_CERTIFICATION_ALL_LABEL,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.web.application.AuthorizationAction;
import com.evolveum.midpoint.web.application.PageDescriptor;
import com.evolveum.midpoint.web.application.Url;
import com.evolveum.midpoint.web.component.AjaxSubmitButton;
import com.evolveum.midpoint.web.component.data.BoxedTablePanel;
import com.evolveum.midpoint.web.component.data.ObjectDataProvider;
Expand Down Expand Up @@ -74,7 +75,11 @@
/**
* @author mederly
*/
@PageDescriptor(url = "/admin/certification/campaigns", encoder = OnePageParameterEncoder.class, action = {
@PageDescriptor(
urls = {
@Url(mountUrl = "/admin/certification/campaigns", matchUrlForSecurity = "/admin/certification/campaigns")
},
encoder = OnePageParameterEncoder.class, action = {
@AuthorizationAction(actionUri = PageAdminCertification.AUTH_CERTIFICATION_ALL, label = PageAdminCertification.AUTH_CERTIFICATION_ALL_LABEL, description = PageAdminCertification.AUTH_CERTIFICATION_ALL_DESCRIPTION),
@AuthorizationAction(actionUri = PageAdminCertification.AUTH_CERTIFICATION_CAMPAIGNS, label = PageAdminCertification.AUTH_CERTIFICATION_CAMPAIGNS_LABEL, description = PageAdminCertification.AUTH_CERTIFICATION_CAMPAIGNS_DESCRIPTION) })

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.web.application.AuthorizationAction;
import com.evolveum.midpoint.web.application.PageDescriptor;
import com.evolveum.midpoint.web.application.Url;
import com.evolveum.midpoint.web.component.AjaxIconButton;
import com.evolveum.midpoint.web.component.data.BoxedTablePanel;
import com.evolveum.midpoint.web.component.data.MultiButtonPanel;
Expand Down Expand Up @@ -68,7 +69,10 @@
import static com.evolveum.midpoint.web.page.admin.certification.CertDecisionHelper.WhichObject.TARGET;
import static com.evolveum.midpoint.xml.ns._public.common.common_3.AccessCertificationResponseType.*;

@PageDescriptor(url = "/admin/certification/decisions",
@PageDescriptor(
urls = {
@Url(mountUrl = "/admin/certification/decisions", matchUrlForSecurity = "/admin/certification/decisions")
},
action = {
@AuthorizationAction(actionUri = PageAdminCertification.AUTH_CERTIFICATION_ALL,
label = PageAdminCertification.AUTH_CERTIFICATION_ALL_LABEL,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,17 @@

import com.evolveum.midpoint.web.application.AuthorizationAction;
import com.evolveum.midpoint.web.application.PageDescriptor;
import com.evolveum.midpoint.web.application.Url;

/**
* Displays all certification decisions.
*
* Note: The ultimate authorization check is done in certification-impl module.
*/
@PageDescriptor(url = "/admin/certification/decisionsAll",
@PageDescriptor(
urls = {
@Url(mountUrl = "/admin/certification/decisionsAll", matchUrlForSecurity = "/admin/certification/decisionsAll")
},
action = {
@AuthorizationAction(actionUri = PageAdminCertification.AUTH_CERTIFICATION_ALL,
label = PageAdminCertification.AUTH_CERTIFICATION_ALL_LABEL,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
import java.util.Collection;
import java.util.List;

import com.evolveum.midpoint.web.application.Url;

import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.extensions.markup.html.tabs.AbstractTab;
Expand Down Expand Up @@ -53,7 +55,10 @@
import com.evolveum.midpoint.xml.ns._public.common.common_3.AccessCertificationReviewerSpecificationType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.AccessCertificationStageDefinitionType;

@PageDescriptor(url = "/admin/certification/definition",
@PageDescriptor(
urls = {
@Url(mountUrl = "/admin/certification/definition", matchUrlForSecurity = "/admin/certification/definition")
},
action = {
@AuthorizationAction(actionUri = PageAdminCertification.AUTH_CERTIFICATION_ALL,
label = PageAdminCertification.AUTH_CERTIFICATION_ALL_LABEL,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.web.application.AuthorizationAction;
import com.evolveum.midpoint.web.application.PageDescriptor;
import com.evolveum.midpoint.web.application.Url;
import com.evolveum.midpoint.web.component.data.column.*;
import com.evolveum.midpoint.web.component.dialog.ConfirmationPanel;
import com.evolveum.midpoint.web.component.dialog.Popupable;
Expand Down Expand Up @@ -54,7 +55,11 @@
* @author katkav
* @author lazyman
*/
@PageDescriptor(url = "/admin/certification/definitions", action = {
@PageDescriptor(
urls = {
@Url(mountUrl = "/admin/certification/definitions", matchUrlForSecurity = "/admin/certification/definitions")
},
action = {
@AuthorizationAction(actionUri = PageAdminCertification.AUTH_CERTIFICATION_ALL,
label = PageAdminCertification.AUTH_CERTIFICATION_ALL_LABEL,
description = PageAdminCertification.AUTH_CERTIFICATION_ALL_DESCRIPTION),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import java.util.concurrent.TimeUnit;
import javax.xml.namespace.QName;

import com.evolveum.midpoint.web.application.Url;
import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemObjectsType;

import org.apache.catalina.util.ServerInfo;
Expand Down Expand Up @@ -71,7 +72,11 @@
/**
* @author lazyman
*/
@PageDescriptor(url = "/admin/config/about", action = {
@PageDescriptor(
urls = {
@Url(mountUrl = "/admin/config/about", matchUrlForSecurity = "/admin/config/about")
},
action = {
@AuthorizationAction(actionUri = PageAdminConfiguration.AUTH_CONFIGURATION_ALL,
label = PageAdminConfiguration.AUTH_CONFIGURATION_ALL_LABEL, description = PageAdminConfiguration.AUTH_CONFIGURATION_ALL_DESCRIPTION),
@AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_CONFIGURATION_ABOUT_URL,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
*/
package com.evolveum.midpoint.web.page.admin.configuration;

import com.evolveum.midpoint.web.application.Url;

import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.form.CheckBox;
Expand Down Expand Up @@ -37,7 +39,11 @@
/**
* @author lazyman
*/
@PageDescriptor(url = "/admin/config/bulk", action = {
@PageDescriptor(
urls = {
@Url(mountUrl = "/admin/config/bulk", matchUrlForSecurity = "/admin/config/bulk")
},
action = {
@AuthorizationAction(actionUri = PageAdminConfiguration.AUTH_CONFIGURATION_ALL,
label = PageAdminConfiguration.AUTH_CONFIGURATION_ALL_LABEL, description = PageAdminConfiguration.AUTH_CONFIGURATION_ALL_DESCRIPTION),
@AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_BULK_ACTION_URL,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
import java.util.Collection;
import javax.xml.namespace.QName;

import com.evolveum.midpoint.web.application.Url;

import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.RestartResponseException;
Expand Down Expand Up @@ -49,7 +51,11 @@
import com.evolveum.midpoint.web.security.MidPointApplication;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;

@PageDescriptor(url = "/admin/config/debug", action = {
@PageDescriptor(
urls = {
@Url(mountUrl = "/admin/config/debug", matchUrlForSecurity = "/admin/config/debug")
},
action = {
@AuthorizationAction(actionUri = PageAdminConfiguration.AUTH_CONFIGURATION_ALL,
label = PageAdminConfiguration.AUTH_CONFIGURATION_ALL_LABEL, description = PageAdminConfiguration.AUTH_CONFIGURATION_ALL_DESCRIPTION),
@AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_CONFIGURATION_DEBUG_URL,
Expand Down

0 comments on commit e2a114d

Please sign in to comment.