Merge branch 'master' of https://github.com/Evolveum/midpoint

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/impl/factory/ItemWrapperFactoryImpl.java

@@ -84,7 +84,7 @@ private ItemStatus getStatus(I childItem) {
     public IW createWrapper(Item childItem, ItemStatus status, WrapperContext context) throws SchemaException {
         return createWrapper(null, (I) childItem, status, context);
 
-    };
+    }
 
     private IW createWrapper(PrismContainerValueWrapper<?> parent, I childItem, ItemStatus status, WrapperContext context) throws SchemaException {
         IW itemWrapper = createWrapper(parent, childItem, status);

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/WrapperContext.java

@@ -76,7 +76,7 @@ public boolean isCreateIfEmpty() {
 
     public void setCreateIfEmpty(boolean createIfEmpty) {
         this.createIfEmpty = createIfEmpty;
-    };
+    }
 
     public Boolean getReadOnly() {
         return readOnly;

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/ListContainersPopup.java

@@ -98,7 +98,7 @@ protected void populateItem(ListItem<ContainersPopupDto> item) {
 
                     protected boolean getLabelVisible() {
                         return false;
-                    };
+                    }
 
                 };
                 checkFormGroup.getCheck().add(new EmptyOnChangeAjaxFormUpdatingBehavior());

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.java

@@ -490,7 +490,7 @@ public boolean isEnabled(){
         body.add(allowTransitive);
 
         addAjaxOnUpdateBehavior(body);
-    };
+    }
 
     private void addPrivilegesPanel(WebMarkupContainer body){
         privilegesNames = getPrivilegesNamesList();

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.java

@@ -141,7 +141,7 @@ private int computeRefreshInterval() {
 
     public int getAutoRefreshInterval() {
         return 0;
-    };
+    }
 
     public boolean isAutoRefreshEnabled() {
         return false;

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/DoubleButtonColumn.java

@@ -116,7 +116,7 @@ public boolean isSecondEnabled(IModel<T> model){
     }
 
     public void firstClicked(AjaxRequestTarget target, IModel<T> model){}
-    public void secondClicked(AjaxRequestTarget target, IModel<T> model){};
+    public void secondClicked(AjaxRequestTarget target, IModel<T> model){}
 
     public String getFirstSizeCssClass(){
         return ButtonSizeClass.SMALL.toString();

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/FeedbackListView.java

@@ -53,15 +53,15 @@ public void close(AjaxRequestTarget target) {
                 protected void onAfterRender() {
                     opResult.setAlreadyShown(true);
                     super.onAfterRender();
-                };
+                }
             };
             panel.add(new VisibleEnableBehaviour() {
 
                 private static final long serialVersionUID = 1L;
 
                 public boolean isVisible() {
                     return !opResult.isAlreadyShown();
-                };
+                }
             });
 
             panel.setOutputMarkupId(true);

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/UserDelegationsTabPanel.java

@@ -92,7 +92,7 @@ public String getExcludeOid() {
 
             public IModel<String> getLabel() {
                 return createStringResource("FocusType.delegations");
-            };
+            }
 
             @Override
             protected List<InlineMenuItem> createAssignmentMenu() {

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsCountersPanel.java

@@ -80,7 +80,7 @@ public void onClick(AjaxRequestTarget target) {
                             public void yesPerformed(AjaxRequestTarget target) {
                                 getPageBase().getCounterManager().removeCounter(counter);
                                 target.add(InternalsCountersPanel.this);
-                            };
+                            }
                         };
                         getPageBase().showMainPopup(confirmPanel, target);
                         target.add(InternalsCountersPanel.this);

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsDebugUtilPanel.java

@@ -63,7 +63,7 @@ protected void onError(AjaxRequestTarget target) {
             }
         };
         form.add(update);
-    };
+    }
 
      private void updateDebugPerformed(AjaxRequestTarget target){
             getModelObject().saveDebugUtil();

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsTracesPanel.java

@@ -83,7 +83,7 @@ protected void onError(AjaxRequestTarget target) {
             }
         };
         form.add(update);
-    };
+    }
 
     private void updateTraces(AjaxRequestTarget target){
         for (Entry<String, Boolean> entry: tracesMap.entrySet()) {

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/dto/PasswordQuestionsDto.java

@@ -29,7 +29,7 @@ public class PasswordQuestionsDto implements Serializable{
     }*/
     public PasswordQuestionsDto(){
 
-    };
+    }
 
     public PasswordQuestionsDto(String passwQuestion, String passAnswer){
         this.passwQuestion = passwQuestion;

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReports.java

@@ -227,7 +227,7 @@ protected void runConfirmPerformed(AjaxRequestTarget target, ReportType reportTy
                 PageReports.this.runConfirmPerformed(target, reportType, reportParam);
                 hideMainPopup(target);
 
-            };
+            }
         };
         showMainPopup(runReportPopupPanel, target);
 

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java

@@ -525,7 +525,7 @@ private List<TaskType> getTasksForKind(List<PrismObject<TaskType>> tasks) {
 
     protected void initCustomLayout() {
         // Nothing to do, for subclass extension
-    };
+    }
 
     protected ObjectQuery createQuery() {
         ObjectQuery baseQuery = null;

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/AbstractRoleMemberPanel.java

@@ -855,7 +855,7 @@ protected String getNullValidDisplayValue(){
 
             protected void onUpdate(AjaxRequestTarget target) {
                 refreshAll(target);
-            };
+            }
 
         });
 

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemDetailsPanel.java

@@ -203,7 +203,7 @@ private void initLayout(){
 
             public boolean isVisible() {
                 return (level != null && level.getFormRef() != null && level.getFormRef().getOid() != null);
-            };
+            }
         });
 
         if (level != null && level.getFormRef() != null && level.getFormRef().getOid() != null) {

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.java

@@ -144,7 +144,7 @@ public boolean isVisible() {
 
             public boolean isVisible() {
                 return getResetPasswordPolicy().getResetMethod() == ResetMethod.SECURITY_QUESTIONS;
-            };
+            }
         });
 
         WebMarkupContainer emailContainer = new WebMarkupContainer(ID_EMAIL_CONTAINER);
@@ -161,7 +161,7 @@ public boolean isVisible() {
             public boolean isVisible() {
                 ResetMethod resetMethod = getResetPasswordPolicy().getResetMethod();
                 return resetMethod == ResetMethod.SECURITY_QUESTIONS || resetMethod == ResetMethod.MAIL;
-            };
+            }
         });
 
     }

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.java

@@ -112,7 +112,7 @@ public boolean isVisible() {
 
             public boolean isVisible() {
                 return oldPasswordVisible;
-            };
+            }
         });
 
         PasswordPanel passwordPanel = new PasswordPanel(ID_PASSWORD_PANEL, new PropertyModel<>(model, MyPasswordsDto.F_PASSWORD));

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/DashboardSearchPanel.java

@@ -99,7 +99,7 @@ protected void initLayout() {
 
             public IModel<?> getBody() {
                 return searchTypes.get(selectedSearchType);
-            };
+            }
 
             @Override
             protected void onSubmit(AjaxRequestTarget target) {

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/factory/module/AbstractCredentialModuleFactory.java

@@ -102,7 +102,7 @@ protected AuthenticationProvider getProvider(AbstractCredentialAuthenticationMod
         }
 
         return getObjectObjectPostProcessor().postProcess(createProvider(usedPolicy));
-    };
+    }
 
     protected abstract ModuleAuthentication createEmptyModuleAuthentication(AbstractAuthenticationModuleType moduleType, C configuration);
 

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/factory/module/LdapModuleFactory.java

@@ -123,7 +123,7 @@ protected AuthenticationProvider getProvider(AuthenticationModuleLdapType module
         getObjectObjectPostProcessor().postProcess(provider);
 
         return provider;
-    };
+    }
 
     protected ModuleWebSecurityConfig createModule(ModuleWebSecurityConfiguration configuration) {
         return  getObjectObjectPostProcessor().postProcess(new LdapWebSecurityConfig((LdapModuleWebSecurityConfiguration) configuration));

infra/common/src/main/java/com/evolveum/midpoint/common/validator/LegacyValidationMessage.java

@@ -17,7 +17,7 @@ public class LegacyValidationMessage {
 
     public enum Type {
         WARNING, ERROR
-    };
+    }
 
     public Type type;
     public String oid;

infra/prism-api/src/main/java/com/evolveum/midpoint/prism/LocalDefinitionStore.java

@@ -36,7 +36,7 @@ public interface LocalDefinitionStore {
     @SuppressWarnings("unchecked")
     default <ID extends ItemDefinition> ID findLocalItemDefinition(@NotNull QName name) {
         return (ID) findLocalItemDefinition(name, ItemDefinition.class, false);
-    };
+    }
 
     @SuppressWarnings("unchecked")
     default <ID extends ItemDefinition> ID findItemDefinition(@NotNull ItemPath path) {

infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConverter.java

@@ -700,12 +700,13 @@ public void test700Exists() throws Exception {
         checkQueryRoundtripFile(AccessCertificationCaseType.class, q);
     }
 
+    public static final String TEST_900_910_FILE_NAME = TEST_DIR + "/test900TypeWrong.xml";
+
     @Test
     public void test900TypeWrong() throws Exception {
-        final String TEST_NAME = "test900TypeWrong";
-        String fileName = TEST_DIR + "/" + TEST_NAME + ".xml";
         try {
-            toQueryType(FileUtils.readFileToString(new File(fileName), StandardCharsets.UTF_8));
+            toQueryType(FileUtils.readFileToString(
+                    new File(TEST_900_910_FILE_NAME), StandardCharsets.UTF_8));
             fail("Unexpected success!");
         } catch (SchemaException e) {
             System.out.println("Got expected exception: " + e.getMessage());
@@ -714,10 +715,8 @@ public void test900TypeWrong() throws Exception {
 
     @Test
     public void test910TypeWrongCompat() throws Exception {
-        final String TEST_NAME = "test900TypeWrong";
-        String fileName = TEST_DIR + "/" + TEST_NAME + ".xml";
-        QueryType jaxb = toQueryTypeCompat(
-                FileUtils.readFileToString(new File(fileName), StandardCharsets.UTF_8));
+        QueryType jaxb = toQueryTypeCompat(FileUtils.readFileToString(
+                new File(TEST_900_910_FILE_NAME), StandardCharsets.UTF_8));
         displayQueryType(jaxb);
         try {
             ObjectQuery query = toObjectQuery(ObjectType.class, jaxb);

infra/schema/src/test/java/com/evolveum/midpoint/schema/validator/TestObjectValidator.java

@@ -25,7 +25,6 @@
 
 /**
  * @author semancik
- *
  */
 public class TestObjectValidator extends AbstractSchemaTest {
 
@@ -41,10 +40,7 @@ public class TestObjectValidator extends AbstractSchemaTest {
 
     @Test
     public void testValidateRoleOneDefault() throws Exception {
-        final String TEST_NAME = "testValidateRoleOneDefault";
-
         // GIVEN
-
         ObjectValidator validator = createValidator();
 
         PrismObject<RoleType> object = PrismTestUtil.getPrismContext().parseObject(ROLE_ONE_FILE);
@@ -63,8 +59,6 @@ public void testValidateRoleOneDefault() throws Exception {
 
     @Test
     public void testValidateRoleOneDeprecated() throws Exception {
-        final String TEST_NAME = "testValidateRoleOneDeprecated";
-
         // GIVEN
 
         ObjectValidator validator = createValidator();
@@ -90,8 +84,6 @@ public void testValidateRoleOneDeprecated() throws Exception {
      */
     @Test
     public void testValidateRoleOneLegacyCompat() throws Exception {
-        final String TEST_NAME = "testValidateRoleOneLegacyCompat";
-
         // GIVEN
 
         ObjectValidator validator = createValidator();
@@ -120,8 +112,6 @@ public void testValidateRoleOneLegacyCompat() throws Exception {
      */
     @Test
     public void testValidateRoleOneLegacyStrict() throws Exception {
-        final String TEST_NAME = "testValidateRoleOneLegacyStrict";
-
         // GIVEN
 
         ObjectValidator validator = createValidator();
@@ -144,11 +134,7 @@ public void testValidateRoleOneLegacyStrict() throws Exception {
     // We have no planned removal annotations in 4.0. Nothing to test.
 //    @Test
 //    public void testValidateRoleOnePlannedRemoval() throws Exception {
-//        final String TEST_NAME = "testValidateRoleOnePlannedRemoval";
-//        displayTestTile(TEST_NAME);
-//
 //        // GIVEN
-//
 //        ObjectValidator validator = createValidator();
 //        validator.setWarnPlannedRemoval(true);
 //
@@ -179,7 +165,7 @@ private void assertWarnings(ValidationResult validationResult, Object... expecte
             if (expectedItem instanceof ItemPath) {
                 expectedPath = (ItemPath)expectedItem;
             } else if (expectedItem instanceof QName) {
-                expectedPath = ItemPath.create((QName)expectedItem);
+                expectedPath = ItemPath.create(expectedItem);
             } else {
                 throw new IllegalArgumentException("What? "+expectedItem);
             }

model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

@@ -5976,10 +5976,7 @@ protected ShadowAsserter<Void> assertModelShadow(String oid) throws ObjectNotFou
 
     protected ShadowAsserter<Void> assertModelShadowNoFetch(String oid) throws ObjectNotFoundException, SchemaException, SecurityViolationException, CommunicationException, ConfigurationException, ExpressionEvaluationException {
         PrismObject<ShadowType> repoShadow = getShadowModelNoFetch(oid);
-        ShadowAsserter<Void> asserter = ShadowAsserter.forShadow(repoShadow, "model(noFetch)");
-        asserter
-                .display();
-        return asserter;
+        return ShadowAsserter.forShadow(repoShadow, "model(noFetch)").display();
     }
 
     protected ShadowAsserter<Void> assertModelShadowFuture(String oid) throws ObjectNotFoundException, SchemaException, SecurityViolationException, CommunicationException, ConfigurationException, ExpressionEvaluationException {

model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleReportNotifier.java

@@ -138,6 +138,6 @@ protected Trace getLogger() {
 
     protected String getContentType() {
         return "text/html";
-    };
+    }
 
 }

model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/JRMidpointEvaluator.java

@@ -264,7 +264,7 @@ private Object getVariableValue(String name, Mode mode) {
         }
     }
 
-    enum Mode { DEFAULT, OLD, ESTIMATED };
+    enum Mode { DEFAULT, OLD, ESTIMATED }
 
     // NOT USED
 

model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/association/TestAddAssociation.java

@@ -303,9 +303,7 @@ boolean decideOnApproval(CaseType subcase,
      */
     @Test
     public void test100AddJackToGuests() throws Exception {
-        final String TEST_NAME = "test100AddJackToGuests";
-
-        Task modelTask = taskManager.createTaskInstance(TEST_NAME);
+        Task modelTask = getTestTask();
         OperationResult result = createOperationResult();
         modelTask.setOwner(repositoryService.getObject(UserType.class, USER_ADMINISTRATOR_OID, null, result));
 
@@ -362,7 +360,7 @@ void assertsAfterImmediateExecutionFinished(CaseType task, OperationResult resul
         void assertsRootCaseFinishes(CaseType aCase, List<CaseType> subcases, Task opTask,
                 OperationResult result) throws Exception { }
         boolean decideOnApproval(CaseType subcase, ApprovalContextType wfContext) throws Exception { return true; }
-        String getObjectOid(CaseType task, OperationResult result) throws SchemaException { return null; };
+        String getObjectOid(CaseType task, OperationResult result) throws SchemaException { return null; }
         boolean removeAssignmentsBeforeTest() { return true; }
     }
 

pom.xml

@@ -146,7 +146,6 @@
         <!-- Dependencies global versions -->
         <commons.io.version>2.6</commons.io.version>
         <commons.lang.version>2.6</commons.lang.version>
-        <commons.lang3.version>3.7</commons.lang3.version>
         <commons.cli>1.2</commons.cli>
         <cxf.version>3.3.1</cxf.version>
         <cxf-xjc.version>3.3.0</cxf-xjc.version>
@@ -567,11 +566,6 @@
                 <artifactId>commons-lang</artifactId>
                 <version>${commons.lang.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-lang3</artifactId>
-                <version>${commons.lang3.version}</version>
-            </dependency>
             <dependency>
                 <groupId>commons-pool</groupId>
                 <artifactId>commons-pool</artifactId>