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

Evolveum · Apr 28, 2020 · 3cd8b5f · 3cd8b5f
2 parents 7228f2b + a6ffc49
commit 3cd8b5f
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskTablePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskTablePanel.java
@@ -182,6 +182,7 @@ private void synchronizeTasksPerformed(AjaxRequestTarget target) {
         // refresh feedback and table
         refreshTable(TaskType.class, target);
         target.add(getTable());
+        clearCache();
     }
 
     private void taskDetailsPerformed(String oid) {
@@ -715,6 +716,8 @@ private void suspendTasksPerformed(AjaxRequestTarget target, IModel<SelectableBe
 
         //refresh feedback and table
         refreshTable(TaskType.class, target);
+        clearCache();
+
     }
 
     private void resumeTasksPerformed(AjaxRequestTarget target, IModel<SelectableBean<TaskType>> selectedTask) {
@@ -742,6 +745,8 @@ private void resumeTasksPerformed(AjaxRequestTarget target, IModel<SelectableBea
 
         //refresh feedback and table
         refreshTable(TaskType.class, target);
+        clearCache();
+
     }
 
     private boolean suspendPlainTasks(List<TaskType> plainTasks, OperationResult result, Task opTask)
@@ -805,6 +810,7 @@ private void scheduleTasksPerformed(AjaxRequestTarget target, IModel<SelectableB
 
         //refresh feedback and table
         refreshTable(TaskType.class, target);
+        clearCache();
 
     }
 
@@ -832,6 +838,7 @@ private void deleteTaskConfirmedPerformed(AjaxRequestTarget target, IModel<Selec
 
         // refresh feedback and table
         refreshTable(TaskType.class, target);
+        clearCache();
     }
 
     private void reconcileWorkersConfirmedPerformed(AjaxRequestTarget target, @NotNull IModel<SelectableBean<TaskType>> task) {
@@ -851,6 +858,7 @@ private void reconcileWorkersConfirmedPerformed(AjaxRequestTarget target, @NotNu
         showResult(result);
 
         refreshTable(TaskType.class, target);
+        clearCache();
     }
 
     private void suspendRootOnly(AjaxRequestTarget target, @NotNull IModel<SelectableBean<TaskType>> task) {
@@ -867,6 +875,7 @@ private void suspendRootOnly(AjaxRequestTarget target, @NotNull IModel<Selectabl
         showResult(result);
 
         refreshTable(TaskType.class, target);
+        clearCache();
     }
 
     private void resumeRootOnly(AjaxRequestTarget target, @NotNull IModel<SelectableBean<TaskType>> task) {
@@ -882,6 +891,7 @@ private void resumeRootOnly(AjaxRequestTarget target, @NotNull IModel<Selectable
         showResult(result);
 
         refreshTable(TaskType.class, target);
+        clearCache();
     }
 
     private void deleteWorkersAndWorkState(AjaxRequestTarget target, @NotNull IModel<SelectableBean<TaskType>> task) {
@@ -898,6 +908,7 @@ private void deleteWorkersAndWorkState(AjaxRequestTarget target, @NotNull IModel
         showResult(result);
 
         refreshTable(TaskType.class, target);
+        clearCache();
     }
 
     private void deleteWorkStatePerformed(AjaxRequestTarget target, IModel<SelectableBean<TaskType>> task) {
@@ -922,6 +933,7 @@ private void deleteWorkState(AjaxRequestTarget target, @NotNull TaskType task) {
         showResult(result);
 
         refreshTable(TaskType.class, target);
+        clearCache();
     }
 
     private void deleteAllClosedTasksConfirmedPerformed(AjaxRequestTarget target) {

diff --git a/infra/common/src/main/java/com/evolveum/midpoint/common/rest/MidpointAbstractProvider.java b/infra/common/src/main/java/com/evolveum/midpoint/common/rest/MidpointAbstractProvider.java
@@ -29,6 +29,8 @@
 import com.evolveum.midpoint.common.LocalizationService;
 import com.evolveum.midpoint.prism.*;
 import com.evolveum.midpoint.util.exception.SystemException;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
+
 import org.apache.cxf.jaxrs.model.ClassResourceInfo;
 import org.apache.cxf.jaxrs.provider.AbstractConfigurableProvider;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -84,7 +86,10 @@ public void writeTo(T object, Class<?> type, Type genericType,
                 .options(SerializationOptions.createSerializeReferenceNames());
 
         try {
-            if (object instanceof PrismObject) {
+            if (object instanceof ObjectType) {
+                ObjectType ot = (ObjectType) object;
+                serializedForm = serializer.serialize(ot.asPrismObject());
+            } else if (object instanceof PrismObject) {
                 serializedForm = serializer.serialize((PrismObject<?>) object);
             } else if (object instanceof OperationResult) {
                 Function<LocalizableMessage, String> resolveKeys = msg -> localizationService.translate(msg, Locale.US);

diff --git a/infra/schema/pom.xml b/infra/schema/pom.xml
@@ -220,7 +220,6 @@
                                     <extraargs>
                                         <extraarg>-impl</extraarg>
                                         <extraarg>-verbose</extraarg>
-                                        <!--<extraarg>-validate</extraarg> ERROR: Property 'http://javax.xml.XMLConstants/property/accessExternalSchema' is not recognized. -->
                                         <extraarg>-xjc-Xts</extraarg>
                                         <extraarg>-xjc-XhashCode</extraarg>
                                         <extraarg>
@@ -236,7 +235,6 @@
                                         <extraarg>http://prism.evolveum.com/xml/ns/public/annotation-3</extraarg>
                                         <extraarg>-nexclude</extraarg>
                                         <extraarg>http://prism.evolveum.com/xml/ns/public/query-3</extraarg>
-                                        <!--                                         <extraargs>-version</extraargs> -->
                                         <extraarg>-xjc-Xmidpoint</extraarg>
                                     </extraargs>
                                 </wsdlOption>
@@ -252,7 +250,6 @@
                                     <extraargs>
                                         <extraarg>-impl</extraarg>
                                         <extraarg>-verbose</extraarg>
-                                        <!--<extraarg>-validate</extraarg> ERROR: Property 'http://javax.xml.XMLConstants/property/accessExternalSchema' is not recognized. -->
                                         <extraarg>-xjc-Xts</extraarg>
                                         <extraarg>-xjc-XhashCode</extraarg>
                                         <extraarg>
@@ -268,11 +265,15 @@
                                         <extraarg>http://prism.evolveum.com/xml/ns/public/annotation-3</extraarg>
                                         <extraarg>-nexclude</extraarg>
                                         <extraarg>http://prism.evolveum.com/xml/ns/public/query-3</extraarg>
-                                        <!--                                         <extraargs>-version</extraargs> -->
                                         <extraarg>-xjc-Xmidpoint</extraarg>
                                     </extraargs>
                                 </wsdlOption>
                             </wsdlOptions>
+                            <!--
+                            This avoids going online for schema checking which may slow down the build sometimes extremely,
+                            e.g. when firewall is set to drop SYN packet silently during connection.
+                            -->
+                            <additionalJvmArgs>-Dcom.sun.tools.xjc.api.impl.s2j.SchemaCompilerImpl.noCorrectnessCheck=true</additionalJvmArgs>
                         </configuration>
                         <goals>
                             <goal>wsdl2java</goal>
@@ -350,4 +351,3 @@
         </resources>
     </build>
 </project>
-
diff --git a/.../test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java b/.../test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
@@ -534,8 +534,6 @@ public class AbstractConfiguredModelIntegrationTest extends AbstractEmptyModelIn
     protected static final String NOTIFIER_USER_PASSWORD_NAME = "userPasswordNotifier";
     protected static final String NOTIFIER_ACCOUNT_ACTIVATION_NAME = "accountActivationNotifier";
 
-    protected PrismObject<UserType> userAdministrator;
-
     public AbstractConfiguredModelIntegrationTest() {
         super();
     }