Merge remote-tracking branch 'origin/master'

config/sql/mysql-4.3-all-utf8mb4.sql → config/sql/mysql-4.4-all-utf8mb4.sql

@@ -598,6 +598,8 @@ CREATE TABLE m_task (
   taskIdentifier           VARCHAR(191),
   threadStopAction         INTEGER,
   waitingReason            INTEGER,
+  schedulingState          INTEGER,
+  autoScalingMode          INTEGER,
   oid                      VARCHAR(36)  CHARSET utf8 COLLATE utf8_bin NOT NULL,
   PRIMARY KEY (oid)
 )
@@ -810,6 +812,7 @@ CREATE TABLE m_node (
   name_norm      VARCHAR(191),
   name_orig      VARCHAR(191),
   nodeIdentifier VARCHAR(255),
+  operationalState INTEGER,
   oid            VARCHAR(36)  CHARSET utf8 COLLATE utf8_bin NOT NULL,
   PRIMARY KEY (oid)
 )
@@ -1414,7 +1417,7 @@ ALTER TABLE m_user
 ALTER TABLE m_value_policy
   ADD CONSTRAINT fk_value_policy FOREIGN KEY (oid) REFERENCES m_object (oid);
 
-INSERT INTO m_global_metadata VALUES ('databaseSchemaVersion', '4.3');
+INSERT INTO m_global_metadata VALUES ('databaseSchemaVersion', '4.4');
 
 -- By: Ron Cordell - roncordell
 -- I didn't see this anywhere, so I thought I'd post it here. This is the script from Quartz

config/sql/mysql-4.3-all.sql → config/sql/mysql-4.4-all.sql

@@ -597,6 +597,8 @@ CREATE TABLE m_task (
   taskIdentifier           VARCHAR(255),
   threadStopAction         INTEGER,
   waitingReason            INTEGER,
+  schedulingState          INTEGER,
+  autoScalingMode          INTEGER,
   oid                      VARCHAR(36) NOT NULL,
   PRIMARY KEY (oid)
 )
@@ -809,6 +811,7 @@ CREATE TABLE m_node (
   name_norm      VARCHAR(255),
   name_orig      VARCHAR(255),
   nodeIdentifier VARCHAR(255),
+  operationalState INTEGER,
   oid            VARCHAR(36) NOT NULL,
   PRIMARY KEY (oid)
 )
@@ -1414,7 +1417,7 @@ ALTER TABLE m_user
 ALTER TABLE m_value_policy
   ADD CONSTRAINT fk_value_policy FOREIGN KEY (oid) REFERENCES m_object (oid);
 
-INSERT INTO m_global_metadata VALUES ('databaseSchemaVersion', '4.3');
+INSERT INTO m_global_metadata VALUES ('databaseSchemaVersion', '4.4');
 
 -- By: Ron Cordell - roncordell
 -- I didn't see this anywhere, so I thought I'd post it here. This is the script from Quartz

config/sql/mysql-upgrade-4.0-4.4-utf8mb4.sql

@@ -3,8 +3,6 @@
 CREATE INDEX iOpExecTimestampValue
   ON m_operation_execution (timestampValue);
 
-UPDATE m_global_metadata SET value = '4.2' WHERE name = 'databaseSchemaVersion';
-
 -- 2020-06-25 11:35
 
 ALTER TABLE m_acc_cert_campaign CHANGE definitionRef_type definitionRef_targetType INTEGER;
@@ -60,15 +58,22 @@ ALTER TABLE m_object_policy_situation
   ADD CONSTRAINT fk_object_policy_situation FOREIGN KEY (object_oid) REFERENCES m_object (oid);
 
 COMMIT;
+
 -- 4.3+ Changes
 -- MID-6417
 ALTER TABLE m_operation_execution ADD COLUMN recordType INTEGER;
 
 -- MID-3669
 ALTER TABLE m_focus ADD COLUMN lockoutStatus INTEGER;
 
+-- 4.4+ Changes
+-- MID-7173
+ALTER TABLE m_task ADD COLUMN schedulingState INTEGER;
+ALTER TABLE m_task ADD COLUMN autoScalingMode INTEGER;
+ALTER TABLE m_node ADD COLUMN operationalState INTEGER;
+
 -- WRITE CHANGES ABOVE ^^
-UPDATE m_global_metadata SET value = '4.3' WHERE name = 'databaseSchemaVersion';
+UPDATE m_global_metadata SET value = '4.4' WHERE name = 'databaseSchemaVersion';
 
 -- MID-6974
 UPDATE QRTZ_JOB_DETAILS SET job_class_name = 'com.evolveum.midpoint.task.quartzimpl.run.JobExecutor'

config/sql/mysql-upgrade-4.0-4.4.sql

@@ -3,8 +3,6 @@
 CREATE INDEX iOpExecTimestampValue
   ON m_operation_execution (timestampValue);
 
-UPDATE m_global_metadata SET value = '4.2' WHERE name = 'databaseSchemaVersion';
-
 -- 2020-06-25 11:35
 
 ALTER TABLE m_acc_cert_campaign CHANGE definitionRef_type definitionRef_targetType INTEGER;
@@ -62,15 +60,22 @@ ALTER TABLE m_object_policy_situation
   ADD CONSTRAINT fk_object_policy_situation FOREIGN KEY (object_oid) REFERENCES m_object (oid);
 
 COMMIT;
+
 -- 4.3+ Changes
 -- MID-6417
 ALTER TABLE m_operation_execution ADD COLUMN recordType INTEGER;
 
 -- MID-3669
 ALTER TABLE m_focus ADD COLUMN lockoutStatus INTEGER;
 
+-- 4.4+ Changes
+-- MID-7173
+ALTER TABLE m_task ADD COLUMN schedulingState INTEGER;
+ALTER TABLE m_task ADD COLUMN autoScalingMode INTEGER;
+ALTER TABLE m_node ADD COLUMN operationalState INTEGER;
+
 -- WRITE CHANGES ABOVE ^^
-UPDATE m_global_metadata SET value = '4.3' WHERE name = 'databaseSchemaVersion';
+UPDATE m_global_metadata SET value = '4.4' WHERE name = 'databaseSchemaVersion';
 
 -- MID-6974
 UPDATE QRTZ_JOB_DETAILS SET job_class_name = 'com.evolveum.midpoint.task.quartzimpl.run.JobExecutor'

config/sql/mysql-upgrade-4.2-4.3-utf8mb4.sql → config/sql/mysql-upgrade-4.3-4.4-utf8mb4.sql

@@ -1,11 +1,10 @@
--- MID-6417
-ALTER TABLE m_operation_execution ADD COLUMN recordType INTEGER;
-
--- MID-3669
-ALTER TABLE m_focus ADD COLUMN lockoutStatus INTEGER;
+-- MID-7173
+ALTER TABLE m_task ADD COLUMN schedulingState INTEGER;
+ALTER TABLE m_task ADD COLUMN autoScalingMode INTEGER;
+ALTER TABLE m_node ADD COLUMN operationalState INTEGER;
 
 -- WRITE CHANGES ABOVE ^^
-UPDATE m_global_metadata SET value = '4.3' WHERE name = 'databaseSchemaVersion';
+UPDATE m_global_metadata SET value = '4.4' WHERE name = 'databaseSchemaVersion';
 
 -- MID-6974
 UPDATE QRTZ_JOB_DETAILS SET job_class_name = 'com.evolveum.midpoint.task.quartzimpl.run.JobExecutor'

config/sql/mysql-upgrade-4.2-4.3.sql → config/sql/mysql-upgrade-4.3-4.4.sql

@@ -1,11 +1,10 @@
--- MID-6417
-ALTER TABLE m_operation_execution ADD COLUMN recordType INTEGER;
-
--- MID-3669
-ALTER TABLE m_focus ADD COLUMN lockoutStatus INTEGER;
+-- MID-7173
+ALTER TABLE m_task ADD COLUMN schedulingState INTEGER;
+ALTER TABLE m_task ADD COLUMN autoScalingMode INTEGER;
+ALTER TABLE m_node ADD COLUMN operationalState INTEGER;
 
 -- WRITE CHANGES ABOVE ^^
-UPDATE m_global_metadata SET value = '4.3' WHERE name = 'databaseSchemaVersion';
+UPDATE m_global_metadata SET value = '4.4' WHERE name = 'databaseSchemaVersion';
 
 -- MID-6974
 UPDATE QRTZ_JOB_DETAILS SET job_class_name = 'com.evolveum.midpoint.task.quartzimpl.run.JobExecutor'

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

@@ -157,16 +157,25 @@ protected List<Component> createToolbarButtonsList(String buttonId) {
         return buttonsList;
     }
 
-    private AjaxIconButton createNewObjectButton(String buttonId) {
-        AjaxIconButton newObjectButton = new AjaxIconButton(buttonId, new Model<>(GuiStyleConstants.CLASS_ADD_NEW_OBJECT),
-                createStringResource("MainObjectListPanel.newObject")) {
+    private Component createNewObjectButton(String buttonId) {
+        DisplayType newObjectButtonDisplayType = getNewObjectButtonStandardDisplayType();
+        CompositedIconBuilder builder = new CompositedIconBuilder();
+        builder.setBasicIcon(WebComponentUtil.getIconCssClass(newObjectButtonDisplayType), IconCssStyle.IN_ROW_STYLE)
+                .appendColorHtmlValue(WebComponentUtil.getIconColor(newObjectButtonDisplayType));
+        if (isCollectionViewPanel()) {
+            IconType plusIcon = new IconType();
+            plusIcon.setCssClass(GuiStyleConstants.CLASS_ADD_NEW_OBJECT);
+            plusIcon.setColor("green");
+            builder.appendLayerIcon(plusIcon, LayeredIconCssStyle.BOTTOM_RIGHT_STYLE);
+        }
+        String iconTitle = WebComponentUtil.getDisplayTypeTitle(newObjectButtonDisplayType);
+        AjaxCompositedIconButton createNewObjectButton = new AjaxCompositedIconButton(buttonId, builder.build(),
+                createStringResource(StringUtils.isEmpty(iconTitle) ? "MainObjectListPanel.newObject" : iconTitle)) {
 
             private static final long serialVersionUID = 1L;
 
             @Override
             public void onClick(AjaxRequestTarget target) {
-
-
                 if (isCollectionViewPanelForCompiledView()) {
                     newObjectPerformed(target, null, getObjectCollectionView());
                     return;
@@ -185,10 +194,11 @@ protected void buttonClickPerformed(AjaxRequestTarget target, AssignmentObjectRe
 
                 getPageBase().showMainPopup(buttonsPanel, target);
 //                navigateToNew(compiledObjectCollectionViews, target);
-            }
+                }
         };
-        newObjectButton.add(AttributeAppender.append("class", "btn btn-default btn-sm"));
-        return newObjectButton;
+        createNewObjectButton.add(new VisibleBehaviour(this::isCreateNewObjectEnabled));
+        createNewObjectButton.add(AttributeAppender.append("class", "btn btn-default btn-sm"));
+        return createNewObjectButton;
     }
 
     protected LoadableModel<MultiFunctinalButtonDto> loadButtonDescriptions() {

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskBasicTabPanel.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2020 Evolveum and contributors
+ * Copyright (C) 2010-2021 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
@@ -135,10 +135,6 @@ public boolean isVisible() {
     }
 
     private ItemVisibility getBasicTabVisibility(ItemPath path) {
-//        if (ItemPath.create(TaskType.F_EXTENSION, SchemaConstants.MODEL_EXTENSION_CLEANUP_POLICIES).equivalent(path)) {
-//            return ItemVisibility.HIDDEN;
-//        }
-
         if (TaskType.F_SUBTASK_REF.equivalent(path)) {
             return ItemVisibility.HIDDEN;
         }
@@ -207,8 +203,6 @@ private ItemVisibility getBasicTabVisibility(ItemPath path) {
                     ItemPath.create(TaskType.F_EXTENSION, SchemaConstants.JDBC_PING_JDBC_USERNAME_QNAME),
                     ItemPath.create(TaskType.F_EXTENSION, SchemaConstants.JDBC_PING_JDBC_PASSWORD_QNAME),
                     ItemPath.create(TaskType.F_EXTENSION, SchemaConstants.JDBC_PING_LOG_ON_INFO_LEVEL_QNAME));
-        } else if (taskHandler.endsWith("model/auditReindex/handler-3")) {
-            //no extension attributes
         } else if (taskHandler.endsWith("task/lightweight-partitioning/handler-3")
                 || taskHandler.endsWith("model/partitioned-focus-validity-scanner/handler-3")
                 || taskHandler.endsWith("model/synchronization/task/partitioned-reconciliation/handler-3")

infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationConstants.java

@@ -1,54 +1,16 @@
 /*
- * Copyright (c) 2010-2017 Evolveum and contributors
+ * Copyright (C) 2010-2021 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
  */
 package com.evolveum.midpoint.schema.result;
 
-/**
- * @author Radovan Semancik
- *
- */
 public class OperationConstants {
 
     public static final String PREFIX = "com.evolveum.midpoint.common.operation";
 
-    public static final String LIVE_SYNC = PREFIX + ".liveSync";
     public static final String LIVE_SYNC_STATISTICS = PREFIX + ".liveSync.statistics";
-    public static final String ASYNC_UPDATE = PREFIX + ".asyncUpdate";
-    public static final String ASYNC_UPDATE_STATISTICS = PREFIX + ".asyncUpdate.statistics";
-    public static final String RECONCILIATION = PREFIX + ".reconciliation";
-    public static final String RECONCILE_ACCOUNT = PREFIX + ".reconciliation.account";
-    public static final String RECOMPUTE = PREFIX + ".recompute";
-    public static final String RECOMPUTE_USER = PREFIX + ".recompute.user";
-    public static final String RECOMPUTE_STATISTICS = PREFIX + ".recompute.statistics";
-    public static final String CLEANUP = PREFIX + ".cleanup";
-
-    public static final String EXECUTE = PREFIX + ".execute";
-    public static final String EXECUTE_SCRIPT = PREFIX + ".executeScript";
-
-    public static final String IMPORT_ACCOUNTS_FROM_RESOURCE = PREFIX + ".import.accountsFromResource";
-    public static final String IMPORT_ACCOUNTS_FROM_RESOURCE_STATISTICS = PREFIX + ".import.accountsFromResource.statistics";
-    public static final String IMPORT_OBJECTS_FROM_FILE = PREFIX + ".import.objectsFromFile";
-    public static final String IMPORT_OBJECTS_FROM_CAMEL = PREFIX + ".import.objectsFromCamel";
-    public static final String IMPORT_OBJECTS_FROM_STREAM = PREFIX + ".import.objectsFromStream";
     public static final String IMPORT_OBJECT = PREFIX + ".import.object";
-
-    public static final String FOCUS_VALIDITY_SCAN = PREFIX + ".focusValidityScan";
-    public static final String TRIGGER_SCAN = PREFIX + ".triggerScan";
-
-    public static final String CREATE_REPORT_FILE = PREFIX + ".createReportFile";
-
-    public static final String CHECK_SHADOW_INTEGRITY = PREFIX + ".checkShadowIntegrity";
-    public static final String CHECK_OBJECT_INTEGRITY = PREFIX + ".checkObjectIntegrity";
-    public static final String REINDEX = PREFIX + ".reindex";
-    public static final String AUDIT_REINDEX = PREFIX + ".auditReindex";
-    public static final String SHADOW_REFRESH = PREFIX + ".shadowRefresh";
-
-    public static final String PROVISIONING_PROPAGATION = "com.evolveum.midpoint.provisioning.propagation";
-
     public static final String OPERATION_SEARCH_RESULT = "com.evolveum.midpoint.schema.result.searchResult";
-
-    public static final String DELETE_NOT_UPDATED_SHADOWS = PREFIX + ".delNotUpdatedShadows";
 }

infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/ConnectorOperationalStatus.java

@@ -39,6 +39,7 @@ public class ConnectorOperationalStatus implements DebugDumpable, Serializable {
     private Integer poolConfigMaxIdle;
     private Long poolConfigWaitTimeout;
     private Long poolConfigMinEvictableIdleTime;
+    private Long poolConfigMaxIdleTime;
 
     // pool status
     private Integer poolStatusNumIdle;
@@ -108,6 +109,14 @@ public void setPoolConfigMinEvictableIdleTime(Long poolConfigMinEvictableIdleTim
         this.poolConfigMinEvictableIdleTime = poolConfigMinEvictableIdleTime;
     }
 
+    public Long getPoolConfigMaxIdleTime() {
+        return poolConfigMaxIdleTime;
+    }
+
+    public void setPoolConfigMaxIdleTime(Long poolConfigMaxIdleTime) {
+        this.poolConfigMaxIdleTime = poolConfigMaxIdleTime;
+    }
+
     public Integer getPoolStatusNumIdle() {
         return poolStatusNumIdle;
     }

infra/schema/src/main/resources/xml/ns/public/connector/icf-1/connector-schema-3.xsd

@@ -101,6 +101,13 @@
                     </xsd:documentation>
                 </xsd:annotation>
             </xsd:element>
+            <xsd:element name="maxIdleTimeMillis" type="xsd:int" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        TODO
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
         </xsd:sequence>
     </xsd:complexType>
 

model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelPublicConstants.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2015 Evolveum and contributors
+ * Copyright (C) 2010-2021 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
@@ -17,12 +17,11 @@
  */
 public class ModelPublicConstants {
 
-    private static final String NS_SYNCHRONIZATION_PREFIX = SchemaConstants.NS_MODEL +"/synchronization";
+    private static final String NS_SYNCHRONIZATION_PREFIX = SchemaConstants.NS_MODEL + "/synchronization";
     public static final String NS_SYNCHRONIZATION_TASK_PREFIX = NS_SYNCHRONIZATION_PREFIX + "/task";
 
     public static final String DELETE_TASK_HANDLER_URI = NS_SYNCHRONIZATION_TASK_PREFIX + "/delete/handler-3"; // TODO why "synchronization"?
     public static final String REINDEX_TASK_HANDLER_URI = SchemaConstants.NS_MODEL + "/reindex/handler-3";
-    public static final String AUDIT_REINDEX_TASK_HANDLER_URI = SchemaConstants.NS_MODEL + "/auditReindex/handler-3";
     public static final String CLEANUP_TASK_HANDLER_URI = SchemaConstants.NS_MODEL + "/cleanup/handler-3";
     public static final String SHADOW_INTEGRITY_CHECK_TASK_HANDLER_URI = SchemaConstants.NS_MODEL + "/shadow-integrity-check/handler-3";
     public static final String OBJECT_INTEGRITY_CHECK_TASK_HANDLER_URI = SchemaConstants.NS_MODEL + "/object-integrity-check/handler-3";