Partially reverting commit 2b4660c, as the obvioysly the entrySet() o…

…ptimization does not work everywhere.
Evolveum · Apr 9, 2018 · e4c7ec2 · e4c7ec2
1 parent 5679841
commit e4c7ec2
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/schema/SchemaProcessor.java b/tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/schema/SchemaProcessor.java
@@ -1117,9 +1117,9 @@ private void updateFields(Outline outline) {
 
 			print("Updating fields and get/set methods: " + classOutline.implClass.fullName());
 
-            for (Map.Entry<String, JFieldVar> field : fields.entrySet()) {
-                JFieldVar fieldVar = field.getValue();
-                // marks a:rawType fields with @Raw - this has to be executed for any bean, not only for prism containers
+			for (Map.Entry<String, JFieldVar> field : fields.entrySet()) {
+				JFieldVar fieldVar = field.getValue();
+				// marks a:rawType fields with @Raw - this has to be executed for any bean, not only for prism containers
                 if (hasAnnotation(classOutline, fieldVar, A_RAW_TYPE) != null) {
                     annotateFieldAsRaw(fieldVar);
                 }
@@ -1148,8 +1148,9 @@ private void processContainerFields(ClassOutline classOutline, Map<JDefinedClass
 		boolean isObject = hasAnnotation(classOutline, A_PRISM_OBJECT);
 
 		List<JFieldVar> fieldsToBeRemoved = new ArrayList<>();
-        for (Map.Entry<String, JFieldVar> field : fields.entrySet()) {
-			JFieldVar fieldVar = field.getValue();
+		// WARNING: cannot change to entrySet. For some reason entrySet does not work here.
+		for (String field : fields.keySet()) {
+			JFieldVar fieldVar = fields.get(field);
 			if (isAuxiliaryField(fieldVar)) {
 				continue;
 			}
@@ -1183,8 +1184,8 @@ private void processContainerFields(ClassOutline classOutline, Map<JDefinedClass
 
 	private void createFluentFieldMethods(ClassOutline targetClass, ClassOutline sourceClass) {
 		Map<String, JFieldVar> fields = sourceClass.implClass.fields();
-        for (Map.Entry<String, JFieldVar> field : fields.entrySet()) {
-            JFieldVar fieldVar = field.getValue();
+		for (Map.Entry<String, JFieldVar> field : fields.entrySet()) {
+			JFieldVar fieldVar = field.getValue();
 			if (!isAuxiliaryField(fieldVar) && !hasAnnotationClass(fieldVar, XmlAnyElement.class)) {
 				createFluentFieldMethods(fieldVar, targetClass, sourceClass);
 			}