Merge branch 'post-3.7-fixes'

Evolveum · Feb 28, 2018 · a44bde9 · a44bde9
2 parents 6caa740 + 72f79ea
commit a44bde9
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 8 deletions.
diff --git a/...main/java/com/evolveum/midpoint/gui/api/component/autocomplete/AutoCompleteTextPanel.java b/...main/java/com/evolveum/midpoint/gui/api/component/autocomplete/AutoCompleteTextPanel.java
@@ -103,7 +103,9 @@ public void checkInputValue(AutoCompleteTextField input, AjaxRequestTarget targe
         if (input.getInput() == null || input.getInput().trim().equals("")){
             model.setObject(input.getInput());
         }
-        if (getIterator(input.getInput()).hasNext() && getIterator(input.getInput()).next() instanceof String) {
+        if (!getIterator(input.getInput()).hasNext()) {
+            updateFeedbackPanel(input, true, target);
+        } else {
             Iterator<String> lookupTableValuesIterator = (Iterator<String>) getIterator(input.getInput());
 
             String value = input.getInput();

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -408,6 +408,14 @@ public static <T extends ObjectType> IModel<ObjectWrapper<T>> adopt(
 		return objectWrapperModel;
 	}
 
+	public static void safeResultCleanup(OperationResult result, Trace logger) {
+		try {
+			result.cleanupResultDeeply();
+		} catch (Throwable t) {
+			LoggingUtils.logUnexpectedException(logger, "Couldn't clean up the operation result", t);
+		}
+	}
+
 	public enum Channel {
 		// TODO: move this to schema component
 		LIVE_SYNC(SchemaConstants.CHANGE_CHANNEL_LIVE_SYNC_URI),

diff --git a/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.java b/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.java
@@ -505,6 +505,7 @@ private void executeCampaignStateOperation(AjaxRequestTarget target, String acti
 			result.computeStatusIfUnknown();
 		}
 
+		WebComponentUtil.safeResultCleanup(result, LOGGER);
 		showResult(result);
 		statModel.reset();
 		campaignModel.reset();
@@ -513,7 +514,6 @@ private void executeCampaignStateOperation(AjaxRequestTarget target, String acti
 		target.add(getFeedbackPanel());
 	}
 
-
 	private ObjectQuery createCaseQuery() {
 		ObjectQuery query = new ObjectQuery();
 		return query;

diff --git a/...i/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaigns.java b/...i/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaigns.java
@@ -744,6 +744,7 @@ private void startRemediationPerformed(AjaxRequestTarget target,
 		} finally {
 			result.computeStatusIfUnknown();
 		}
+		WebComponentUtil.safeResultCleanup(result, LOGGER);
 		showResult(result);
 		target.add((Component) getCampaignsTable());
 		target.add(getFeedbackPanel());
@@ -762,6 +763,7 @@ private void openNextStagePerformed(AjaxRequestTarget target, AccessCertificatio
 		} finally {
 			result.computeStatusIfUnknown();
 		}
+		WebComponentUtil.safeResultCleanup(result, LOGGER);
 		showResult(result);
 		target.add((Component) getCampaignsTable());
 		target.add(getFeedbackPanel());
@@ -782,7 +784,7 @@ private void closeCampaignConfirmedPerformed(AjaxRequestTarget target,
 		} finally {
 			result.computeStatusIfUnknown();
 		}
-
+		WebComponentUtil.safeResultCleanup(result, LOGGER);
 		showResult(result);
 		target.add((Component) getCampaignsTable());
 		target.add(getFeedbackPanel());
@@ -802,7 +804,7 @@ private void closeStageConfirmedPerformed(AjaxRequestTarget target, CertCampaign
 		} finally {
 			result.computeStatusIfUnknown();
 		}
-
+		WebComponentUtil.safeResultCleanup(result, LOGGER);
 		showResult(result);
 		target.add((Component) getCampaignsTable());
 		target.add(getFeedbackPanel());
@@ -845,7 +847,7 @@ private void deleteCampaignsPerformed(AjaxRequestTarget target,
 		Table campaignsTable = getCampaignsTable();
 		ObjectDataProvider provider = (ObjectDataProvider) campaignsTable.getDataTable().getDataProvider();
 		provider.clearCache();
-
+		WebComponentUtil.safeResultCleanup(result, LOGGER);
 		showResult(result);
 		target.add(getFeedbackPanel(), (Component) campaignsTable);
 	}
@@ -893,7 +895,7 @@ private void actOnCampaignsPerformed(AjaxRequestTarget target, String operationN
 			result.recordStatus(OperationResultStatus.SUCCESS,
 					processed + " campaign(s) have been successfully processed.");      // todo i18n
 		}
-
+		WebComponentUtil.safeResultCleanup(result, LOGGER);
 		showResult(result);
 		target.add(getFeedbackPanel(), (Component) getCampaignsTable());
 	}

diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java
@@ -1474,6 +1474,12 @@ private OperationResult findSimilarSubresult(OperationResult subresult) {
 		return similar;
 	}
 
+	// experimental/temporary
+	public void cleanupResultDeeply() {
+		cleanupResult();
+		emptyIfNull(subresults).forEach(OperationResult::cleanupResultDeeply);
+	}
+
 	/**
 	 * Removes all the successful minor results. Also checks if the result is roughly consistent
 	 * and complete. (e.g. does not have unknown operation status, etc.)

diff --git a/infra/schema/src/main/resources/xml/ns/public/model/scripting/scripting-3.xsd b/infra/schema/src/main/resources/xml/ns/public/model/scripting/scripting-3.xsd
@@ -314,6 +314,18 @@
                             </xsd:documentation>
                         </xsd:annotation>
                     </xsd:element>
+                    <xsd:element name="aggregateOutput" type="xsd:boolean" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Whether to aggregate and pass forward the output of expression evaluations that are done
+                                for each object found. (Meaningful only if scriptingExpression is specified.)
+                                Default is true for compatibility reasons. Set to false to optimize memory consumption.
+                            </xsd:documentation>
+                            <xsd:appinfo>
+                                <a:since>3.7.1</a:since>
+                            </xsd:appinfo>
+                        </xsd:annotation>
+                    </xsd:element>
                 </xsd:sequence>
             </xsd:extension>
         </xsd:complexContent>

diff --git a/...src/main/java/com/evolveum/midpoint/model/impl/scripting/expressions/SearchEvaluator.java b/...src/main/java/com/evolveum/midpoint/model/impl/scripting/expressions/SearchEvaluator.java
@@ -44,6 +44,7 @@
 import com.evolveum.midpoint.xml.ns._public.model.scripting_3.SearchExpressionType;
 import org.apache.commons.lang.Validate;
 import org.apache.commons.lang.mutable.MutableBoolean;
+import org.apache.commons.lang3.BooleanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -137,9 +138,12 @@ public <T extends ObjectType> PipelineData evaluate(SearchExpressionType searchE
 				    }
 				    JAXBElement<?> childExpression = searchExpression.getScriptingExpression();
 				    try {
-					    outputData.addAllFrom(scriptingExpressionEvaluator.evaluateExpression(
+					    PipelineData expressionResult = scriptingExpressionEvaluator.evaluateExpression(
 							    (ScriptingExpressionType) childExpression.getValue(),
-							    PipelineData.create(object.getValue(), item.getVariables()), context, globalResult));
+							    PipelineData.create(object.getValue(), item.getVariables()), context, globalResult);
+					    if (!BooleanUtils.isFalse(searchExpression.isAggregateOutput())) {
+						    outputData.addAllFrom(expressionResult);
+					    }
 					    globalResult.setSummarizeSuccesses(true);
 					    globalResult.summarize();
 				    } catch (ScriptExecutionException e) {