Merge branch 'feature/ldap-polystring'

Evolveum · Apr 3, 2019 · 7c189e5 · 7c189e5
2 parents c9b59a2 + 73f5d80
commit 7c189e5
Show file tree

Hide file tree

Showing 67 changed files with 1,680 additions and 338 deletions.
diff --git a/build-system/pom.xml b/build-system/pom.xml
@@ -684,7 +684,7 @@
             <dependency>
                 <groupId>com.evolveum.polygon</groupId>
                 <artifactId>connector-ldap</artifactId>
-                <version>2.0</version>
+                <version>2.1-SNAPSHOT</version>
             </dependency>
             <!-- End connectors -->
             <dependency>

diff --git a/infra/prism-api/src/main/java/com/evolveum/midpoint/prism/polystring/PolyString.java b/infra/prism-api/src/main/java/com/evolveum/midpoint/prism/polystring/PolyString.java
@@ -371,7 +371,7 @@ public boolean matches(String regex) {
 	 * Returns true in case that there are language mutations, translation, etc.
 	 */
 	public boolean isSimple() {
-		return translation == null;
+		return translation == null && lang == null;
 	}
 
 	@Override

diff --git a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismPropertyImpl.java b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismPropertyImpl.java
@@ -474,16 +474,26 @@ public String debugDump(int indent) {
 							dump = null;
 						} else {
 							T realValue = value.getValue();
-							if (realValue instanceof ShortDumpable) {
-								((ShortDumpable)realValue).shortDump(sb);
-							} else if (realValue instanceof DebugDumpable) {
+
+							if (DebugUtil.isDetailedDebugDump() && realValue instanceof DebugDumpable) {
+								// Override in case that the value is both DebugDumpable and ShortDumpable
+								// In that case we want to force debugDump as we are in detailedDebugMode here.
+								// This is important e.g. for PolyString, in detailedDebugMode we want to see
+								// all the PolyString details.
 								sb.append(((DebugDumpable)realValue).debugDump(indent + 1));
 							} else {
-								if (DebugUtil.isDetailedDebugDump()) {
-									PrismPrettyPrinter.debugDumpValue(sb, indent + 1, realValue, prismContext, getElementName(), null);
+								if (realValue instanceof ShortDumpable) {
+									DebugUtil.indentDebugDump(sb, indent + 1);
+									((ShortDumpable)realValue).shortDump(sb);
+								} else if (realValue instanceof DebugDumpable) {
+									sb.append(((DebugDumpable)realValue).debugDump(indent + 1));
 								} else {
-									sb.append("SS{"+realValue+"}");
-									PrettyPrinter.shortDump(sb, realValue);
+									if (DebugUtil.isDetailedDebugDump()) {
+										PrismPrettyPrinter.debugDumpValue(sb, indent + 1, realValue, prismContext, getElementName(), null);
+									} else {
+										sb.append("SS{"+realValue+"}");
+										PrettyPrinter.shortDump(sb, realValue);
+									}
 								}
 							}
 						}

diff --git a/...pl/src/main/java/com/evolveum/midpoint/prism/impl/match/PolyStringStrictMatchingRule.java b/...pl/src/main/java/com/evolveum/midpoint/prism/impl/match/PolyStringStrictMatchingRule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2018 Evolveum
+ * Copyright (c) 2010-2019 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -58,7 +58,9 @@ public boolean match(PolyString a, PolyString b) {
 		if (a == null || b == null) {
 			return false;
 		}
-		return MiscUtil.equals(a.getOrig(), b.getOrig()) && MiscUtil.equals(a.getNorm(), b.getNorm());
+		// Delegate to PolyString.equals(). This does it well. As we want to compare
+		// all aspects of polystring here: orig, norm, translations, langs
+		return a.equals(b);
 	}
 
 	/* (non-Javadoc)

diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
@@ -427,6 +427,9 @@ public abstract class SchemaConstants {
 	// be inverted, eventually (MID-356)
 	public static final String ICF_FRAMEWORK_URI = "http://midpoint.evolveum.com/xml/ns/public/connector/icf-1";
 	public static final String NS_ICF_CONFIGURATION = ICF_FRAMEWORK_URI + "/connector-schema-3";
+	public static final String NS_ICF_SUBTYPES = ICF_FRAMEWORK_URI + "/subtypes";
+	public static final QName ICF_SUBTYPES_POLYSTRING_QNAME = new QName(NS_ICF_SUBTYPES, "PolyString");
+	public static final String ICF_SUBTYPES_POLYSTRING_URI = QNameUtil.qNameToUri(ICF_SUBTYPES_POLYSTRING_QNAME);
 	public static final ItemName ICF_CONFIGURATION_PROPERTIES = new ItemName(NS_ICF_CONFIGURATION,
 			"configurationProperties");
 	public static final ItemName ICF_TIMEOUTS = new ItemName(NS_ICF_CONFIGURATION, "timeouts");

diff --git a/infra/test-util/src/main/java/com/evolveum/midpoint/test/ldap/OpenDJController.java b/infra/test-util/src/main/java/com/evolveum/midpoint/test/ldap/OpenDJController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2017 Evolveum
+ * Copyright (c) 2010-2019 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,11 +29,13 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Enumeration;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
@@ -553,16 +555,36 @@ public boolean isAccountEnabled(Entry ldapEntry) {
 	}
 
 	public static String getAttributeValue(Entry response, String name) {
+		return getAttributeValue(response, name, null);
+	}
+
+	public static String getAttributeValue(Entry response, String name, String option) {
 		List<Attribute> attrs = response.getAttribute(name.toLowerCase());
-		if (attrs == null || attrs.size() == 0) {
+		Attribute attribute = findAttribute(name, option, attrs);
+		if (attribute == null) {
 			return null;
 		}
-		assertEquals("Too many attributes for name "+name+": ",
-				1, attrs.size());
-		Attribute attribute = attrs.get(0);
 		return getAttributeValue(attribute);
 	}
 
+	private static Attribute findAttribute(String name, String option, List<Attribute> attributes) {
+		if (attributes == null || attributes.size() == 0) {
+			return null;
+		}
+		for (Attribute attr : attributes) {
+			if (option == null) {
+				if (attr.getOptions() == null || attr.getOptions().isEmpty()) {
+					return attr;
+				}
+			} else {
+				if (attr.getOptions() != null && attr.getOptions().contains(option)) {
+					return attr;
+				}
+			}
+		}
+		return null;
+	}
+
 	public static String getAttributeValue(Attribute attribute) {
 		return attribute.iterator().next().getValue().toString();
 	}
@@ -710,6 +732,43 @@ public static void assertNoAttribute(Entry response, String name) {
 		}
 		AssertJUnit.fail("Attribute "+name+" exists while not expecting it: "+attribute);
 	}
+
+	public static void assertAttributeLang(Entry entry, String attributeName, String expectedOrigValue, String... params) {
+		List<Attribute> attrs = entry.getAttribute(attributeName.toLowerCase());
+		if (attrs == null || attrs.size() == 0) {
+			AssertJUnit.fail("Attribute "+attributeName+" does not have any value");
+		}
+		Map<String,String> expectedLangs = MiscUtil.paramsToMap(params);
+		List<String> langsSeen = new ArrayList<>();
+		for (Attribute attr : attrs) {
+			if (attr.size() == 0) {
+				throw new IllegalArgumentException("No values in attribute "+attributeName+": "+attr);
+			}
+			if (attr.size() > 1) {
+				throw new IllegalArgumentException("Too many values in attribute "+attributeName+": "+attr);
+			}
+			String attrValue = attr.iterator().next().toString();
+			if (attr.getOptions() == null || attr.getOptions().isEmpty()) {
+				assertEquals("Wrong orig value in attribute '"+attributeName+" in entry "+entry.getDN(), expectedOrigValue, attrValue);
+			} else if (attr.getOptions().size() == 1) {
+				String option = attr.getOptions().iterator().next();
+				if (!option.startsWith("lang-")) {
+					throw new IllegalArgumentException("Non-lang option "+option+" in attribute "+attributeName+": "+attr);
+				}
+				String lang = option.substring("lang-".length());
+				String expectedValue = expectedLangs.get(lang);
+				assertEquals("Wrong "+option+" value in attribute '"+attributeName+" in entry "+entry.getDN(), expectedValue, attrValue);
+				langsSeen.add(lang);
+			} else {
+				throw new IllegalArgumentException("More than one option in attribute "+attributeName+": "+attr);
+			}
+		}
+		for (Map.Entry<String, String> expectedLangEntry : expectedLangs.entrySet()) {
+			if (!langsSeen.contains(expectedLangEntry.getKey())) {
+				AssertJUnit.fail("No lang "+expectedLangEntry.getKey()+" in attribute "+attributeName+" in entry "+entry.getDN()+"; expected "+expectedLangEntry.getValue());
+			}
+		}
+	}
 
 	public void assertActive(Entry response, boolean active) {
 		assertEquals("Unexpected activation of entry "+response, active, isAccountEnabled(response));

diff --git a/infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java b/infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
@@ -763,4 +763,11 @@ public static String takeThreadDump(@Nullable Thread thread) {
 		return dump.toString();
 	}
 
+	public static <K,V> Map<K, V> paramsToMap(Object[] params) {
+		Map<K, V> map = new HashMap<>();
+		for (int i=0; i < params.length; i+=2) {
+			map.put((K)params[i], (V)params[i+1]);
+		}
+		return map;
+	}
 }
diff --git a/...visioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java b/...visioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java
@@ -989,6 +989,10 @@ public void testConnectionConnector(ConnectorSpec connectorSpec, Map<String,Coll
 			modifyResourceAvailabilityStatus(connectorSpec.getResource(), AvailabilityStatusType.BROKEN, parentResult);
 			capabilitiesResult.recordFatalError("Configuration error", e);
 			return;
+		} catch (SchemaException e) {
+			modifyResourceAvailabilityStatus(connectorSpec.getResource(), AvailabilityStatusType.BROKEN, parentResult);
+			capabilitiesResult.recordFatalError("Schema error", e);
+			return;
 		} catch (RuntimeException | Error e) {
 			modifyResourceAvailabilityStatus(connectorSpec.getResource(), AvailabilityStatusType.BROKEN, parentResult);
 			capabilitiesResult.recordFatalError("Unexpected runtime error", e);

diff --git a/...impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/AbstractOpenDjTest.java b/...impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/AbstractOpenDjTest.java
@@ -69,7 +69,17 @@ public abstract class AbstractOpenDjTest extends AbstractIntegrationTest {
 	protected static final File ACCOUNT_WILL_FILE = new File(TEST_DIR, "account-will.xml");
 	protected static final String ACCOUNT_WILL_OID = "c0c010c0-d34d-b44f-f11d-333222123456";
 	protected static final String ACCOUNT_WILL_DN = "uid=will,ou=People,dc=example,dc=com";
-
+
+	protected static final File ACCOUNT_POLY_FILE = new File(TEST_DIR, "account-poly.xml");
+	protected static final String ACCOUNT_POLY_OID = "cef31578-5493-11e9-bbed-17f032005a6b";
+	protected static final String ACCOUNT_POLY_DN = "uid=poly,ou=People,dc=example,dc=com";
+	protected static final String ACCOUNT_POLY_DESCRIPTION_ORIG = "Poly the Parrot";
+	protected static final String ACCOUNT_POLY_DESCRIPTION_EN = "Polly the Parrot";
+	protected static final String ACCOUNT_POLY_DESCRIPTION_SK = "Papagáj Poly";
+	protected static final String ACCOUNT_POLY_DESCRIPTION_CZ = "Papoušek Poly";
+	protected static final String ACCOUNT_POLY_DESCRIPTION_HR = "Papiga Poly";
+	protected static final String ACCOUNT_POLY_DESCRIPTION_RU = "Попугай Поли";
+
 	protected static final File ACCOUNT_BAD_FILE = new File(TEST_DIR, "account-bad.xml");
 	protected static final String ACCOUNT_BAD_OID = "dbb0c37d-9ee6-44a4-8d39-016dbce1ffff";
 
@@ -140,6 +150,8 @@ public abstract class AbstractOpenDjTest extends AbstractIntegrationTest {
 	public static final QName RESOURCE_OPENDJ_ACCOUNT_OBJECTCLASS = new QName(RESOURCE_NS, "inetOrgPerson");
 	public static final QName RESOURCE_OPENDJ_GROUP_OBJECTCLASS = new QName(RESOURCE_NS, "groupOfUniqueNames");
 	public static final QName RESOURCE_OPENDJ_POSIX_ACCOUNT_OBJECTCLASS = new QName(RESOURCE_NS, "posixAccount");
+	public static final String ATTRIBUTE_DESCRIPTION_NAME = "description";
+	public static final ItemName ATTRIBUTE_DESCRIPTION_QNAME = new ItemName(RESOURCE_OPENDJ_NS, ATTRIBUTE_DESCRIPTION_NAME);
 
 	protected static final File QUERY_COMPLEX_FILTER_FILE = new File(TEST_DIR, "query-complex-filter.xml");
 	protected static final File QUERY_ALL_ACCOUNTS_FILE = new File(TEST_DIR, "query-filter-all-accounts.xml");