feat: problems with handling custom attributes #2752 (#3378)

Co-authored-by: Yuriy Movchan <Yuriy.Movchan@gmail.com>
JanssenProject · Dec 21, 2022 · 3028a94 · 3028a94
1 parent 2fe2f8b
commit 3028a94
Show file tree

Hide file tree

Showing 12 changed files with 605 additions and 462 deletions.
diff --git a/jans-orm/core/src/main/java/io/jans/orm/exception/SearchEntryException.java b/jans-orm/core/src/main/java/io/jans/orm/exception/SearchEntryException.java
@@ -0,0 +1,30 @@
+/*
+ * Janssen Project software is available under the Apache License (2004). See http://www.apache.org/licenses/ for full text.
+ *
+ * Copyright (c) 2020, Janssen Project
+ */
+
+package io.jans.orm.exception;
+
+/**
+ * An exception is a result if search operation fails
+ *
+ * @author Yuriy Movchan Date: 2022/11/04
+ */
+public class SearchEntryException extends BasePersistenceException {
+
+    private static final long serialVersionUID = 1321766232087075304L;
+
+    public SearchEntryException(Throwable root) {
+        super(root);
+    }
+
+    public SearchEntryException(String string, Throwable root) {
+        super(string, root);
+    }
+
+    public SearchEntryException(String s) {
+        super(s);
+    }
+
+}
diff --git a/jans-orm/core/src/main/java/io/jans/orm/model/EntryData.java b/jans-orm/core/src/main/java/io/jans/orm/model/EntryData.java
@@ -15,21 +15,26 @@
  */
 public class EntryData {
     private final List<AttributeData> attributeData;
+	private String dn;
 
     public EntryData(List<AttributeData> attributeData) {
         this.attributeData = attributeData;
     }
 
+    public EntryData(String dn, List<AttributeData> attributeData) {
+        this.dn = dn;
+        this.attributeData = attributeData;
+    }
+
 	public List<AttributeData> getAttributeData() {
 		return attributeData;
 	}
 
-	@Override
-	public String toString() {
-		return "EntryData [attributeData=" + attributeData + "]";
+	public String getDN() {
+		return dn;
 	}
 
-	public AttributeData getAttributeDate(String internalAttribute) {
+	public AttributeData getAttributeData(String internalAttribute) {
 		if (attributeData == null) {
 			return null;
 		}
@@ -43,4 +48,9 @@ public AttributeData getAttributeDate(String internalAttribute) {
 		return null;
 	}
 
+	@Override
+	public String toString() {
+		return "EntryData [attributeData=" + attributeData + ", dn=" + dn + "]";
+	}
+
 }
diff --git a/jans-orm/ldap/src/main/java/io/jans/orm/ldap/impl/LdapBatchOperationWraper.java b/jans-orm/ldap/src/main/java/io/jans/orm/ldap/impl/LdapBatchOperationWraper.java
@@ -9,6 +9,7 @@
 import com.unboundid.ldap.sdk.SearchResult;
 import com.unboundid.ldap.sdk.SearchResultEntry;
 import io.jans.orm.model.BatchOperation;
+import io.jans.orm.model.EntryData;
 import io.jans.orm.reflect.property.PropertyAnnotation;
 
 import java.util.ArrayList;
@@ -43,14 +44,12 @@ public final BatchOperation<T> getBatchOperation() {
         return batchOperation;
     }
 
-    public List<T> createEntities(SearchResult searchResult) {
+    public List<T> createEntities(List<EntryData> entryDataList) {
         if (ldapEntryManager == null) {
             return new ArrayList<T>(0);
         }
-        SearchResultEntry[] searchResultEntry = searchResult.getSearchEntries()
-                .toArray(new SearchResultEntry[searchResult.getSearchEntries().size()]);
 
-        return ldapEntryManager.createEntities(entryClass, propertiesAnnotations, searchResultEntry);
+        return ldapEntryManager.createEntities(entryClass, propertiesAnnotations, entryDataList);
     }
 
 }