Merge remote-tracking branch 'refs/remotes/origin/master'

.editorconfig

@@ -108,8 +108,8 @@ ij_java_doc_add_blank_line_after_description = true
 ij_java_doc_add_blank_line_after_param_comments = false
 ij_java_doc_add_blank_line_after_return = false
 ij_java_doc_add_p_tag_on_empty_lines = true
-ij_java_doc_align_exception_comments = true
-ij_java_doc_align_param_comments = true
+ij_java_doc_align_exception_comments = false
+ij_java_doc_align_param_comments = false
 ij_java_doc_do_not_wrap_if_one_line = false
 ij_java_doc_enable_formatting = true
 ij_java_doc_enable_leading_asterisks = true

config/checkstyle/checkstyle.xml

@@ -33,11 +33,7 @@
     <module name="TreeWalker">
 
         <module name="ConstantName"/>
-        <module name="LocalFinalVariableName">
-            <!-- mostly due to TEST_NAME used a lot in the tests -->
-            <!-- Maybe we need to change that to lowercase convention later -->
-            <property name="format" value="^[a-zA-Z0-9_]+$"/>
-        </module>
+        <module name="LocalFinalVariableName"/>
         <module name="LocalVariableName"/>
         <module name="MemberName"/>
         <module name="MethodName"/>

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/ComponentConstants.java

@@ -93,4 +93,37 @@ public class ComponentConstants {
     public static final QName UI_CASE_TAB_OVERVIEW_APPROVAL = new QName(NS_COMPONENTS_PREFIX, "caseTabOverviewApproval");
     public static final String UI_CASE_TAB_OVERVIEW_APPROVAL_URL = QNameUtil.qNameToUri(UI_CASE_TAB_OVERVIEW_APPROVAL);
 
+    public static final QName UI_TASK_TAB_BASIC = new QName(NS_COMPONENTS_PREFIX, "taskTabBasic");
+    public static final String UI_TASK_TAB_BASIC_URL = QNameUtil.qNameToUri(UI_TASK_TAB_BASIC);
+
+    public static final QName UI_TASK_TAB_SCHEDULE = new QName(NS_COMPONENTS_PREFIX, "taskTabSchedule");
+    public static final String UI_TASK_TAB_SCHEDULE_URL = QNameUtil.qNameToUri(UI_TASK_TAB_SCHEDULE);
+
+    public static final QName UI_TASK_TAB_WORK_MANAGEMENT = new QName(NS_COMPONENTS_PREFIX, "taskTabWorkManagement");
+    public static final String UI_TASK_TAB_WORK_MANAGEMENT_URL = QNameUtil.qNameToUri(UI_TASK_TAB_WORK_MANAGEMENT);
+
+    public static final QName UI_TASK_TAB_CLEANUP_POLICIES = new QName(NS_COMPONENTS_PREFIX, "taskTabCleanupPolicies");
+    public static final String UI_TASK_TAB_CLEANUP_POLICIES_URL = QNameUtil.qNameToUri(UI_TASK_TAB_CLEANUP_POLICIES);
+
+    public static final QName UI_TASK_TAB_SUBTASKS = new QName(NS_COMPONENTS_PREFIX, "taskTabSubtasks");
+    public static final String UI_TASK_TAB_SUBTASKS_URL = QNameUtil.qNameToUri(UI_TASK_TAB_SUBTASKS);
+
+    public static final QName UI_TASK_TAB_OPERATION_STATISTICS = new QName(NS_COMPONENTS_PREFIX, "taskTabOperationStatistics");
+    public static final String UI_TASK_TAB_OPERATION_STATISTICS_URL = QNameUtil.qNameToUri(UI_TASK_TAB_OPERATION_STATISTICS);
+
+    public static final QName UI_TASK_TAB_ENVIRONMENTAL_PERFORMANCE = new QName(NS_COMPONENTS_PREFIX, "taskTabEnvironmentalPerformance");
+    public static final String UI_TASK_TAB_ENVIRONMENTAL_PERFORMANCE_URL = QNameUtil.qNameToUri(UI_TASK_TAB_ENVIRONMENTAL_PERFORMANCE);
+
+    public static final QName UI_TASK_TAB_OPERATION = new QName(NS_COMPONENTS_PREFIX, "taskTabOperation");
+    public static final String UI_TASK_TAB_OPERATION_URL = QNameUtil.qNameToUri(UI_TASK_TAB_OPERATION);
+
+    public static final QName UI_TASK_TAB_INTERNAL_PERFORMANCE = new QName(NS_COMPONENTS_PREFIX, "taskTabInternalPerformance");
+    public static final String UI_TASK_TAB_INTERNAL_PERFORMANCE_URL = QNameUtil.qNameToUri(UI_TASK_TAB_INTERNAL_PERFORMANCE);
+
+    public static final QName UI_TASK_TAB_RESULT = new QName(NS_COMPONENTS_PREFIX, "taskTabResult");
+    public static final String UI_TASK_TAB_RESULT_URL = QNameUtil.qNameToUri(UI_TASK_TAB_RESULT);
+
+    public static final QName UI_TASK_TAB_ERRORS = new QName(NS_COMPONENTS_PREFIX, "taskTabErrors");
+    public static final String UI_TASK_TAB_ERRORS_URL = QNameUtil.qNameToUri(UI_TASK_TAB_ERRORS);
+
 }

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ContainerableListPanel.java

@@ -7,11 +7,8 @@
 package com.evolveum.midpoint.gui.api.component;
 
 import com.evolveum.midpoint.gui.api.model.LoadableModel;
-import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.gui.impl.prism.PrismContainerValueWrapper;
-import com.evolveum.midpoint.model.api.ModelAuthorizationAction;
 import com.evolveum.midpoint.prism.Containerable;
-import com.evolveum.midpoint.prism.PrismConstants;
 import com.evolveum.midpoint.prism.query.ObjectFilter;
 import com.evolveum.midpoint.prism.query.ObjectPaging;
 import com.evolveum.midpoint.prism.query.ObjectQuery;
@@ -126,6 +123,7 @@ protected void saveProviderPaging(ObjectQuery query, ObjectPaging paging) {
             @Override
             public ObjectQuery getQuery() {
                 try {
+                    // TODO this seems to throw now checked exception (see unused throws lower)
                     return createQuery();
                 } catch (SchemaException | ObjectNotFoundException | ExpressionEvaluationException | CommunicationException
                         | ConfigurationException | SecurityViolationException e) {
@@ -141,7 +139,7 @@ public ObjectQuery getQuery() {
     protected abstract Class<C> getType();
 
     protected void setDefaultSorting(ContainerListDataProvider<C> provider){
-        //should be overridded if needed
+        //should be overridden if needed
     }
 
     public long getItemsPerPage() {

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/PopupObjectListPanel.java

@@ -62,7 +62,7 @@ protected IColumn<SelectableBean<O>, String> createCheckboxColumn() {
                 protected void onUpdateRow(AjaxRequestTarget target, DataTable table, IModel<SelectableBean<O>> rowModel, IModel<Boolean> selected) {
                     super.onUpdateRow(target, table, rowModel, selected);
                     onUpdateCheckbox(target, rowModel);
-                };
+                }
 
                 @Override
                 protected void onUpdateHeader(AjaxRequestTarget target, boolean selected, DataTable table) {

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java

@@ -15,13 +15,12 @@
 import javax.management.ObjectName;
 import javax.xml.namespace.QName;
 
-import com.evolveum.midpoint.model.api.authentication.GuiProfiledPrincipal;
+import com.evolveum.midpoint.web.page.admin.PageAdminObjectDetails;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.Validate;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.wicket.*;
-import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
 import org.apache.wicket.ajax.AjaxChannel;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
@@ -35,8 +34,6 @@
 import org.apache.wicket.markup.ComponentTag;
 import org.apache.wicket.markup.head.CssHeaderItem;
 import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
 import org.apache.wicket.markup.html.TransparentWebMarkupContainer;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.WebPage;
@@ -80,10 +77,14 @@
 import com.evolveum.midpoint.gui.impl.factory.ItemWrapperFactory;
 import com.evolveum.midpoint.gui.impl.factory.PrismObjectWrapperFactory;
 import com.evolveum.midpoint.gui.impl.factory.WrapperContext;
-import com.evolveum.midpoint.gui.impl.prism.*;
+import com.evolveum.midpoint.gui.impl.prism.ItemPanelSettings;
+import com.evolveum.midpoint.gui.impl.prism.PrismContainerValuePanel;
+import com.evolveum.midpoint.gui.impl.prism.PrismContainerValueWrapper;
+import com.evolveum.midpoint.gui.impl.prism.PrismValueWrapper;
 import com.evolveum.midpoint.model.api.*;
-import com.evolveum.midpoint.model.api.authentication.CompiledObjectCollectionView;
 import com.evolveum.midpoint.model.api.authentication.CompiledGuiProfile;
+import com.evolveum.midpoint.model.api.authentication.CompiledObjectCollectionView;
+import com.evolveum.midpoint.model.api.authentication.GuiProfiledPrincipal;
 import com.evolveum.midpoint.model.api.expr.MidpointFunctions;
 import com.evolveum.midpoint.model.api.interaction.DashboardService;
 import com.evolveum.midpoint.model.api.validator.ResourceValidator;
@@ -159,15 +160,16 @@
 import com.evolveum.midpoint.web.page.admin.resources.*;
 import com.evolveum.midpoint.web.page.admin.roles.PageRole;
 import com.evolveum.midpoint.web.page.admin.roles.PageRoles;
-import com.evolveum.midpoint.web.page.admin.server.*;
+import com.evolveum.midpoint.web.page.admin.server.PageNodes;
+import com.evolveum.midpoint.web.page.admin.server.PageTask;
+import com.evolveum.midpoint.web.page.admin.server.PageTasks;
+import com.evolveum.midpoint.web.page.admin.server.PageTasksCertScheduling;
 import com.evolveum.midpoint.web.page.admin.services.PageService;
 import com.evolveum.midpoint.web.page.admin.services.PageServices;
 import com.evolveum.midpoint.web.page.admin.users.PageOrgTree;
 import com.evolveum.midpoint.web.page.admin.users.PageOrgUnit;
 import com.evolveum.midpoint.web.page.admin.users.PageUser;
 import com.evolveum.midpoint.web.page.admin.users.PageUsers;
-import com.evolveum.midpoint.web.page.admin.valuePolicy.PageValuePolicies;
-import com.evolveum.midpoint.web.page.admin.valuePolicy.PageValuePolicy;
 import com.evolveum.midpoint.web.page.admin.workflow.PageAttorneySelection;
 import com.evolveum.midpoint.web.page.admin.workflow.PageWorkItemsAttorney;
 import com.evolveum.midpoint.web.page.login.PageLogin;
@@ -686,19 +688,6 @@ public <O extends ObjectType, T extends ObjectType> void authorize(String operat
         getSecurityEnforcer().authorize(operationUrl, phase, params, ownerResolver, getPageTask(), result);
     }
 
-    public <O extends ObjectType, T extends ObjectType> void authorize(String operationUrl, AuthorizationPhaseType phase,
-                                                                       PrismObject<O> object, ObjectDelta<O> delta, PrismObject<T> target, OwnerResolver ownerResolver)
-            throws SecurityViolationException, SchemaException, ObjectNotFoundException, ExpressionEvaluationException, CommunicationException, ConfigurationException {
-        Task task = getPageTask();
-        AuthorizationParameters<O, T> params = new AuthorizationParameters.Builder<O, T>()
-                .oldObject(object)
-                .delta(delta)
-                .target(target)
-                .build();
-        getSecurityEnforcer().authorize(operationUrl, phase, params, ownerResolver, task, task.getResult());
-    }
-
-
     public MidpointFormValidatorRegistry getFormValidatorRegistry() {
         return formValidatorRegistry;
     }
@@ -1185,10 +1174,6 @@ public String getMainPopupBodyId() {
         return getMainPopup().getContentId();
     }
 
-    public void setMainPopupTitle(IModel<String> title) {
-        getMainPopup().setTitle(title);
-    }
-
     public void showMainPopup(Popupable popupable, AjaxRequestTarget target) {
         getMainPopup().setTitle(popupable.getTitle());
         getMainPopup().setInitialHeight(popupable.getHeight());
@@ -1542,61 +1527,6 @@ public String getDescribe() {
         return getString("pageBase.unknownBuildNumber");
     }
 
-    protected ModalWindow createModalWindow(final String id, IModel<String> title, int width, int height) {
-        final ModalWindow modal = new ModalWindow(id);
-        add(modal);
-
-        modal.setResizable(false);
-        modal.setTitle(title);
-        modal.setCookieName(PageBase.class.getSimpleName() + ((int) (Math.random() * 100)));
-
-        modal.setInitialWidth(width);
-        modal.setWidthUnit("px");
-        modal.setInitialHeight(height);
-        modal.setHeightUnit("px");
-
-        modal.setCloseButtonCallback(new ModalWindow.CloseButtonCallback() {
-
-            private static final long serialVersionUID = 1L;
-
-            @Override
-            public boolean onCloseButtonClicked(AjaxRequestTarget target) {
-                return true;
-            }
-        });
-
-        modal.setWindowClosedCallback(new ModalWindow.WindowClosedCallback() {
-
-            private static final long serialVersionUID = 1L;
-
-            @Override
-            public void onClose(AjaxRequestTarget target) {
-                modal.close(target);
-            }
-        });
-
-        modal.add(new AbstractDefaultAjaxBehavior() {
-
-            private static final long serialVersionUID = 1L;
-
-            @Override
-            public void renderHead(Component component, IHeaderResponse response) {
-                response.render(OnDomReadyHeaderItem.forScript("Wicket.Window.unloadConfirmation = false;"));
-                response.render(JavaScriptHeaderItem
-                        .forScript("$(document).ready(function() {\n" + "  $(document).bind('keyup', function(evt) {\n"
-                                + "    if (evt.keyCode == 27) {\n" + getCallbackScript() + "\n"
-                                + "        evt.preventDefault();\n" + "    }\n" + "  });\n" + "});", id));
-            }
-
-            @Override
-            protected void respond(AjaxRequestTarget target) {
-                modal.close(target);
-            }
-        });
-
-        return modal;
-    }
-
     // returns to previous page via restart response exception
     public RestartResponseException getRestartResponseException(Class<? extends Page> defaultBackPageClass) {
         return new RestartResponseException(defaultBackPageClass);
@@ -1755,11 +1685,6 @@ protected List<SideBarMenuItem> createMenuItems() {
                 AuthorizationConstants.AUTZ_UI_RESOURCE_EDIT_URL, AuthorizationConstants.AUTZ_UI_RESOURCES_VIEW_URL)) {
             items.add(createResourcesItems());
         }
-        //TODO uncomment after ValuePolicies pages are finished
-//        if (WebComponentUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_VALUE_POLICIES_URL, AuthorizationConstants.AUTZ_GUI_ALL_URL,
-//                AuthorizationConstants.AUTZ_UI_VALUE_POLICIES_ALL_URL, AuthorizationConstants.AUTZ_GUI_ALL_DEPRECATED_URL)) {
-//            items.add(createValuePolicieItems());
-//        }
 
         if (WebComponentUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_MY_WORK_ITEMS_URL,
                 AuthorizationConstants.AUTZ_UI_ATTORNEY_WORK_ITEMS_URL,
@@ -1953,16 +1878,8 @@ private MainMenuItem createServerTasksItems() {
 
         addMenuItem(item, "PageAdmin.menu.top.serverTasks.nodes", PageNodes.class);
 
-        //should we support archetype view for TaskType?
-//        addCollectionsMenuItems(item.getItems(), TaskType.COMPLEX_TYPE);
-        MenuItem newTaskMenu = new MenuItem(createStringResource("PageAdmin.menu.top.serverTasks.new"), GuiStyleConstants.CLASS_PLUS_CIRCLE, PageTask.class, null,
-                new VisibleEnableBehaviour());
-        item.getItems().add(newTaskMenu);
-
-        MenuItem menuItem = new MenuItem(createStringResource("PageAdmin.menu.top.serverTasks.edit"),
-                PageTask.class, null, createVisibleDisabledBehaviorForEditMenu(PageTask.class));
-        item.getItems().add(menuItem);
-
+        createFocusPageNewEditMenu(item.getItems(), "PageAdmin.menu.top.serverTasks.new", "PageAdmin.menu.top.serverTasks.edit",
+                PageTask.class, false);
 
 
         return item;
@@ -1990,16 +1907,6 @@ private MainMenuItem createResourcesItems() {
         return item;
     }
 
-    // Izolated until the referenced value policies pages are fully implemented
-    private MainMenuItem createValuePolicieItems() {
-        MainMenuItem item = new MainMenuItem("fa fa-asterisk", createStringResource("PageAdmin.menu.top.valuePolicies"), null);
-
-        addMenuItem(item, "PageAdmin.menu.top.valuePolicies.list", PageValuePolicies.class);
-        addMenuItem(item, "PageAdmin.menu.top.valuePolicies.new", PageValuePolicy.class);
-
-        return item;
-    }
-
     private MainMenuItem createReportsItems() {
         MainMenuItem item = new MainMenuItem("fa fa-pie-chart", createStringResource("PageAdmin.menu.top.reports"),
                 null);
@@ -2163,8 +2070,8 @@ public boolean isVisible() {
                     return false;
                 }
 
-                if (getPage() instanceof PageAdminFocus) {
-                    PageAdminFocus page = (PageAdminFocus) getPage();
+                if (getPage() instanceof PageAdminObjectDetails) {
+                    PageAdminObjectDetails page = (PageAdminObjectDetails) getPage();
                     return page.isOidParameterExists() || page.isEditingFocus();
                 } else if (getPage() instanceof PageResourceWizard) {
                     PageResourceWizard page = (PageResourceWizard) getPage();
@@ -2191,8 +2098,8 @@ protected boolean isMenuActive() {
                     return false;
                 }
 
-                if (PageBase.this.getPage() instanceof PageAdminFocus) {
-                    PageAdminFocus page = (PageAdminFocus) PageBase.this.getPage();
+                if (PageBase.this.getPage() instanceof PageAdminObjectDetails) {
+                    PageAdminObjectDetails page = (PageAdminObjectDetails) PageBase.this.getPage();
                     return !page.isOidParameterExists() && !page.isEditingFocus();
                 } else if (PageBase.this.getPage() instanceof PageResourceWizard) {
                     PageResourceWizard page = (PageResourceWizard) PageBase.this.getPage();
@@ -2428,20 +2335,6 @@ public boolean isEnabled() {
         };
     }
 
-    public DeploymentInformationType loadDeploymentInformationType() {
-        DeploymentInformationType deploymentInformationType = null;
-        OperationResult result = new OperationResult(OPERATION_GET_DEPLOYMENT_INFORMATION);
-        try {
-            deploymentInformationType = getModelInteractionService().getDeploymentInformationConfiguration(result);
-            LOGGER.trace("Deployment information : {}", deploymentInformationType);
-            result.recordSuccess();
-        } catch (Exception ex) {
-            LoggingUtils.logUnexpectedException(LOGGER, "Couldn't load deployment information", ex);
-            result.recordFatalError(createStringResource("PageBase.message.loadDeploymentInformationType.fatalError").getString(), ex);
-        }
-        return deploymentInformationType;
-    }
-
     public boolean canRedirectBack() {
         return canRedirectBack(DEFAULT_BREADCRUMB_STEP);
     }
@@ -2777,16 +2670,10 @@ public <IW extends ItemWrapper> Panel initItemPanel(String panelId, QName typeNa
 
     public <CVW extends PrismContainerValueWrapper<C>, C extends Containerable> Panel initContainerValuePanel(String id, IModel<CVW> model,
             ItemPanelSettings settings) {
-            //ItemVisibilityHandler visibilityHandler, ItemEditabilityHandler editabilityHandler) {
         //TODO find from registry first
         return new PrismContainerValuePanel<>(id, model, settings);
     }
 
-    public <C extends Containerable> Panel getBasicContainerValuePanel(String idPanel, IModel<PrismContainerValueWrapper<C>> model, ItemPanelSettings settings){
-        Panel containerValue = initContainerValuePanel(idPanel, model, settings);
-        return containerValue;
-    }
-
     public Clock getClock() {
         return clock;
     }