From 3dd397913d69e3526893134019e509cf74b5d5d5 Mon Sep 17 00:00:00 2001 From: Richard Richter Date: Mon, 29 Jun 2020 15:46:33 +0200 Subject: [PATCH] QNameUtil#getKey(Map, QName) renamed to getByQName (used only in repo) --- .../main/java/com/evolveum/midpoint/util/QNameUtil.java | 8 +++++++- .../midpoint/repo/sql/query/QueryDefinitionRegistry.java | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java b/infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java index 004223ba898..862dce4aa72 100644 --- a/infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java +++ b/infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java @@ -94,9 +94,15 @@ public static QName qualifyIfNeeded(QName name, String defaultNamespace) { return hasNamespace(name) ? name : new QName(defaultNamespace, name.getLocalPart()); + } - public static V getKey(@NotNull Map map, @NotNull QName key) { + /** + * Finds value in the map by QName key using {@link #match(QName, QName)}. + * Fails if multiple matches are found. + * Returns {@code null} if no match is found. + */ + public static V getByQName(@NotNull Map map, @NotNull QName key) { if (hasNamespace(key)) { return map.get(key); } diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryDefinitionRegistry.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryDefinitionRegistry.java index 004bcf1fe46..c208a485025 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryDefinitionRegistry.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryDefinitionRegistry.java @@ -155,7 +155,7 @@ public String debugDump(int indent) { public JpaEntityDefinition findEntityDefinition(QName typeName) { Validate.notNull(typeName, "Type name must not be null."); - JpaEntityDefinition def = QNameUtil.getKey(DEFINITIONS, typeName); + JpaEntityDefinition def = QNameUtil.getByQName(DEFINITIONS, typeName); if (def == null) { throw new IllegalStateException("Type " + typeName + " couldn't be found in type registry"); }