geat: merge from GluuFederation ORM #1851

jans-bom/pom.xml

@@ -710,7 +710,7 @@
 			<dependency>
 				<groupId>com.couchbase.client</groupId>
 				<artifactId>java-client</artifactId>
-				<version>2.7.22</version>
+				<version>3.3.2</version>
 			</dependency>
 
 			<!-- SQL JDBC Drivers -->
@@ -744,7 +744,7 @@
 			<dependency>
 				<groupId>com.github.jsqlparser</groupId>
 				<artifactId>jsqlparser</artifactId>
-				<version>4.2</version>
+				<version>4.3</version>
 			</dependency>
 
 			<!-- Cloud Spanner -->

jans-core/script/src/main/java/io/jans/model/custom/script/type/persistence/PersistenceType.java

@@ -10,7 +10,7 @@
 
 import io.jans.model.SimpleCustomProperty;
 import io.jans.model.custom.script.type.BaseExternalType;
-import io.jans.orm.exception.extension.PersistenceExtension;
+import io.jans.orm.extension.PersistenceExtension;
 
 /**
  * Base interface for persistence script

jans-core/service/src/main/java/io/jans/service/external/ExternalPersistenceExtensionService.java

@@ -21,7 +21,7 @@
 import io.jans.model.custom.script.conf.CustomScriptConfiguration;
 import io.jans.model.custom.script.type.persistence.PersistenceType;
 import io.jans.orm.PersistenceEntryManager;
-import io.jans.orm.exception.extension.PersistenceExtension;
+import io.jans.orm.extension.PersistenceExtension;
 import io.jans.service.custom.script.ExternalScriptService;
 
 /**

jans-orm/.gitignore

@@ -1,4 +1,5 @@
 # Eclipse project files
+.dbeaver
 .settings
 .project
 .classpath

jans-orm/core/src/main/java/io/jans/orm/PersistenceEntryManager.java

@@ -25,8 +25,9 @@
 import jakarta.persistence.criteria.CriteriaUpdate;
 import jakarta.persistence.metamodel.Metamodel;
 import io.jans.orm.event.DeleteNotifier;
-import io.jans.orm.exception.extension.PersistenceExtension;
+import io.jans.orm.extension.PersistenceExtension;
 import io.jans.orm.model.AttributeData;
+import io.jans.orm.model.AttributeType;
 import io.jans.orm.model.BatchOperation;
 import io.jans.orm.model.PagedResult;
 import io.jans.orm.model.SearchScope;
@@ -94,6 +95,7 @@ <T> PagedResult<T> findPagedEntries(String primaryKey, Class<T> entryClass, Filt
 
 	@Deprecated
 	void remove(String dn);
+	<T> void removeByDn(String dn, String[] objectClasses);
 	<T> void remove(String primaryKey, Class<T> entryClass);
 
 	<T> int remove(String primaryKey, Class<T> entryClass, Filter filter, int count);
@@ -102,6 +104,7 @@ <T> PagedResult<T> findPagedEntries(String primaryKey, Class<T> entryClass, Filt
     void removeRecursively(String primaryKey);
 
 	<T> void removeRecursively(String primaryKey, Class<T> entryClass);
+	<T> void removeRecursivelyFromDn(String primaryKey, String[] objectClasses);
 
     boolean hasBranchesSupport(String primaryKey);
     boolean hasExpirationSupport(String primaryKey);
@@ -126,7 +129,7 @@ <T> Map<T, List<T>> groupListByProperties(Class<T> entryClass, List<T> entries,
     @Deprecated
     List<AttributeData> exportEntry(String dn);
 
-    List<AttributeData> exportEntry(String dn, String objectClass);
+	<T> List<AttributeData> exportEntry(String dn, String objectClass);
 
     <T> void importEntry(String dn, Class<T> entryClass, List<AttributeData> data);
 
@@ -135,6 +138,8 @@ <T> Map<T, List<T>> groupListByProperties(Class<T> entryClass, List<T> entries,
 
     void setPersistenceExtension(PersistenceExtension persistenceExtension);
 
+    <T> AttributeType getAttributeType(String primaryKey, Class<T> entryClass, String propertyName);
+
     boolean destroy();
 
     default void clear() {

jans-orm/core/src/main/java/io/jans/orm/exception/extension/PersistenceExtension.java → jans-orm/core/src/main/java/io/jans/orm/extension/PersistenceExtension.java

@@ -4,7 +4,7 @@
  * Copyright (c) 2020, Janssen Project
  */
 
-package io.jans.orm.exception.extension;
+package io.jans.orm.extension;
 
 /**
  * Base interface for persistence script

jans-orm/core/src/main/java/io/jans/orm/impl/BaseEntryManager.java

@@ -6,18 +6,52 @@
 
 package io.jans.orm.impl;
 
+import java.io.Serializable;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.IdentityHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.apache.commons.codec.binary.Base64;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
+
 import io.jans.orm.PersistenceEntryManager;
-import io.jans.orm.annotation.*;
+import io.jans.orm.annotation.AttributeEnum;
+import io.jans.orm.annotation.AttributeName;
+import io.jans.orm.annotation.AttributesList;
+import io.jans.orm.annotation.CustomObjectClass;
+import io.jans.orm.annotation.DN;
+import io.jans.orm.annotation.DataEntry;
+import io.jans.orm.annotation.Expiration;
+import io.jans.orm.annotation.JsonObject;
+import io.jans.orm.annotation.LanguageTag;
+import io.jans.orm.annotation.ObjectClass;
+import io.jans.orm.annotation.SchemaEntry;
 import io.jans.orm.exception.EntryPersistenceException;
 import io.jans.orm.exception.InvalidArgumentException;
 import io.jans.orm.exception.MappingException;
-import io.jans.orm.exception.extension.PersistenceExtension;
+import io.jans.orm.extension.PersistenceExtension;
 import io.jans.orm.model.AttributeData;
 import io.jans.orm.model.AttributeDataModification;
-import io.jans.orm.model.AttributeDataModification.AttributeModificationType;
+import io.jans.orm.model.AttributeType;
 import io.jans.orm.model.SearchScope;
 import io.jans.orm.model.base.LocalizedString;
+import io.jans.orm.model.AttributeDataModification.AttributeModificationType;
 import io.jans.orm.operation.PersistenceOperationService;
 import io.jans.orm.reflect.property.Getter;
 import io.jans.orm.reflect.property.PropertyAnnotation;
@@ -26,24 +60,13 @@
 import io.jans.orm.search.filter.Filter;
 import io.jans.orm.util.ArrayHelper;
 import io.jans.orm.util.StringHelper;
-import org.apache.commons.codec.binary.Base64;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.Serializable;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.stream.Collectors;
 
 /**
  * Abstract Entry Manager
  *
- * @author Yuriy Movchan
- * @version April 25, 2022
+ * @author Yuriy Movchan Date: 10.07.2010
  */
-public abstract class BaseEntryManager implements PersistenceEntryManager {
+public abstract class BaseEntryManager<O extends PersistenceOperationService> implements PersistenceEntryManager {
 
 	private static final Logger LOG = LoggerFactory.getLogger(BaseEntryManager.class);
 
@@ -80,7 +103,7 @@ public abstract class BaseEntryManager implements PersistenceEntryManager {
 
 	protected static final int DEFAULT_PAGINATION_SIZE = 100;
 
-	protected PersistenceOperationService operationService = null;
+	protected O operationService = null;
 	protected PersistenceExtension persistenceExtension = null;
 
 	@Override
@@ -447,7 +470,7 @@ protected boolean isEmptyAttributeValues(AttributeData attributeData) {
 
 	protected abstract void merge(String dn, String[] objectClasses, List<AttributeDataModification> attributeDataModifications, Integer expiration);
 
-	protected abstract <T> void removeByDn(String dn, String[] objectClasses);
+	public abstract <T> void removeByDn(String dn, String[] objectClasses);
 
 	@Deprecated
 	public void remove(String primaryKey) {
@@ -467,7 +490,7 @@ public <T> void remove(String primaryKey, Class<T> entryClass) {
 		removeByDn(primaryKey, objectClasses);
 	}
 
-	protected abstract <T> void removeRecursivelyFromDn(String primaryKey, String[] objectClasses);
+	public abstract <T> void removeRecursivelyFromDn(String primaryKey, String[] objectClasses);
 
 	@Deprecated
 	public void removeRecursively(String primaryKey) {
@@ -2226,6 +2249,11 @@ public void setPersistenceExtension(PersistenceExtension persistenceExtension) {
 		}
 	}
 
+	@Override
+	public <T> AttributeType getAttributeType(String primaryKey, Class<T> entryClass, String propertyName) {
+        throw new UnsupportedOperationException("Method not implemented.");
+	}
+
 	protected static final class PropertyComparator<T> implements Comparator<T>, Serializable {
 
 		private static final long serialVersionUID = 574848841116711467L;

jans-orm/core/src/main/java/io/jans/orm/model/AttributeType.java

@@ -0,0 +1,46 @@
+/*
+ * 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.model;
+
+/**
+ * DB Attribute Type
+ *
+ * @author Yuriy Movchan Date: 07/04/2022
+ */
+public class AttributeType {
+    private final String name;
+    private final String type;
+    private final Boolean multiValued;
+
+    public AttributeType(String name, String type) {
+		this(name, type, null);
+	}
+
+	public AttributeType(String name, String type, Boolean multiValued) {
+		this.name = name;
+		this.type = type;
+		this.multiValued = multiValued;
+	}
+
+	public Boolean getMultiValued() {
+		return multiValued;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	@Override
+	public String toString() {
+		return "AttributeType [name=" + name + ", type=" + type + ", multiValued=" + multiValued + "]";
+	}
+
+}

jans-orm/core/src/main/java/io/jans/orm/model/Sort.java

@@ -33,6 +33,18 @@ public SortOrder getSortOrder() {
 		return sortOrder;
 	}
 
+	public static Sort desc(String name) {
+		return new Sort(name, SortOrder.DESCENDING);
+	}
+
+	public static Sort asc(String name) {
+		return new Sort(name, SortOrder.ASCENDING);
+	}
+
+	public static Sort def(String name) {
+		return new Sort(name, SortOrder.DEFAULT);
+	}
+
 	@Override
 	public int hashCode() {
 		final int prime = 31;

jans-orm/core/src/main/java/io/jans/orm/model/SortOrder.java

@@ -12,14 +12,18 @@
 import io.jans.orm.annotation.AttributeEnum;
 
 /**
- * @author Val Pecaoco
+ * Sort order
+ *
+ * @author Yuriy Movchan Date: 04/22/2021
  */
 public enum SortOrder implements AttributeEnum {
 
-    ASCENDING("ascending"),
-    DESCENDING("descending");
+    ASCENDING("ascending", "asc"),
+    DESCENDING("descending", "desc"),
+    DEFAULT("default", "def");
 
     private String value;
+    private String shortValue;
 
     private static Map<String, SortOrder> MAP_BY_VALUES = new HashMap<String, SortOrder>();
 
@@ -29,15 +33,20 @@ public enum SortOrder implements AttributeEnum {
         }
     }
 
-    SortOrder(String value) {
+    SortOrder(String value, String shortValue) {
         this.value = value;
+        this.shortValue = shortValue;
     }
 
     @Override
     public String getValue() {
         return value;
     }
 
+    public String getShortValue() {
+		return shortValue;
+	}
+
     public static SortOrder getByValue(String value) {
         return MAP_BY_VALUES.get(value);
     }

jans-orm/core/src/main/java/io/jans/orm/operation/PersistenceOperationService.java

@@ -7,10 +7,10 @@
 package io.jans.orm.operation;
 
 import io.jans.orm.exception.AuthenticationException;
-import io.jans.orm.exception.extension.PersistenceExtension;
 import io.jans.orm.exception.operation.ConnectionException;
 import io.jans.orm.exception.operation.EntryConvertationException;
 import io.jans.orm.exception.operation.SearchException;
+import io.jans.orm.extension.PersistenceExtension;
 
 /**
  * Base interface for Operation Service