Fixed MID-1847 (serialization of SearchFilterType incorrect w.r.t. sc…

…hema)
Evolveum · Jul 11, 2014 · 6e351ed · 6e351ed
1 parent a5181ec
commit 6e351ed
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/SearchFilterType.java b/infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/SearchFilterType.java
@@ -74,7 +74,9 @@
 
 @XmlAccessorType(XmlAccessType.NONE)        // we select getters/fields to expose via JAXB individually
 @XmlType(name = "SearchFilterType", propOrder = {       // no prop order, because we serialize this class manually
+                                                        // BTW, the order is the following: description, filterClause
 })
+
 public class SearchFilterType implements Serializable, Cloneable, Equals, HashCode, DebugDumpable, Revivable
 {
     private final static long serialVersionUID = 201303040000L;
@@ -235,12 +237,14 @@ public MapXNode serializeToXNode(PrismContext prismContext) throws SchemaExcepti
     	if (description == null) {
     		return xmap;
     	} else {
-    		if (xmap == null) {
-    			xmap = new MapXNode();
-    		}
-    		xmap.put(SearchFilterType.F_DESCRIPTION, new PrimitiveXNode<>(description));
+            // we have to serialize the map in correct order (see MID-1847): description first, filter clause next
+            MapXNode newXMap = new MapXNode();
+    		newXMap.put(SearchFilterType.F_DESCRIPTION, new PrimitiveXNode<>(description));
+            if (xmap != null && !xmap.isEmpty()) {
+                newXMap.put(xmap.getSingleSubEntry("search filter"));
+            }
+            return newXMap;
     	}
-    	return xmap;
     }
 
     @Override