Added wrapper utilities

Author: fugerit79

docgen/release-notes.txt

@@ -1,4 +1,8 @@
-0.7.4.7 (2021-01-01)
+0.7.4.8 (2021-01-XX)
+-------------------- 
++ Added wrappers utilities
+
+0.7.4.7 (2021-01-01)
 -------------------- 
 + Added ValidatorNumber for ValidatorCatalog A.P.I.
 

fj-core/src/main/java/org/fugerit/java/core/db/daogen/BasicWrapper.java

@@ -1,17 +1,22 @@
 package org.fugerit.java.core.db.daogen;
 
-public class BasicWrapper<T> extends BasicHelper {
+import org.fugerit.java.core.lang.helpers.Wrapper;
+import org.fugerit.java.core.lang.helpers.WrapperHelper;
+
+public class BasicWrapper<T> extends BasicHelper implements Wrapper<T> {
 	/**
 	 * 
 	 */
 	private static final long serialVersionUID = -2800606962171545339L;
 
 	private T wrapped;
 
+	@Override
 	public T unwrapModel() {
 		return wrapped;
 	}
 
+	@Override
 	public void wrapModel(T wrapped) {
 		this.wrapped = wrapped;
 	}
@@ -25,13 +30,9 @@ public String toString() {
 		return this.getClass().getSimpleName()+"[wraps:"+unwrapModel().toString()+"]";
 	}
 
-	@SuppressWarnings("unchecked")
+	@Override
 	public T unwrap() {
-		T res = this.unwrapModel();
-		while ( res instanceof BasicWrapper ) {
-			res = ((BasicWrapper<T>)res).unwrapModel();
-		}
-		return res;
+		return WrapperHelper.unwrap( this.wrapped );
 	}
 
 }

fj-core/src/main/java/org/fugerit/java/core/lang/helpers/Wrapper.java

@@ -0,0 +1,36 @@
+package org.fugerit.java.core.lang.helpers;
+
+/**
+ * 
+ * Interface for wrapping / unwrapping objects
+ * 
+ * @author Matteo a.k.a. Fugerit
+ * @since 0.7.4.8
+ *
+ * @param <T>	the type of the object to wrap
+ */
+public interface Wrapper<T> {
+
+	/**
+	 * Unwrap the underlying object
+	 * 
+	 * @return	the wrapped object
+	 */
+	public T unwrapModel();
+
+	/**
+	 * 
+	 * Wraps the give objects
+	 * 
+	 * @param wrapped	objects to wrap
+	 */
+	public void wrapModel(T wrapped);
+	
+	/**
+	 * Recursively unwrap the wrapped object until it is not instance of Wrapper anymore.
+	 * 
+	 * @return	the underlying object
+	 */
+	public T unwrap();
+	
+}

fj-core/src/main/java/org/fugerit/java/core/lang/helpers/WrapperHelper.java

@@ -0,0 +1,32 @@
+package org.fugerit.java.core.lang.helpers;
+
+/**
+ * 
+ * Collections of utility method for handling Wrappers.
+ * 
+ * @author Matteo a.k.a. Fugerit
+ * @since 0.7.4.8
+ * @see Wrapper
+ *
+ */
+public class WrapperHelper {
+
+	/**
+	 * Recursively unwrap one object as long as it's implementing Wrapper interface
+	 * 
+	 * @param <T>	the type of the object to be unwrapped
+	 * @param model	the object to be unwrapped
+	 * @return		the unwrapped model
+	 */
+	@SuppressWarnings("unchecked")
+	public static <T> T unwrap( T model ){
+		T res = model;
+		if ( res != null ) {
+			while ( res instanceof Wrapper ) {
+				res = ((Wrapper<T>)res).unwrapModel();
+			}
+		}
+		return res;
+	}
+	
+}

fj-core/src/main/java/org/fugerit/java/core/validator/ValidatorWrapper.java

@@ -0,0 +1,37 @@
+package org.fugerit.java.core.validator;
+
+import org.fugerit.java.core.lang.helpers.Wrapper;
+
+public class ValidatorWrapper extends BasicValidator implements Wrapper<BasicValidator> {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 2745412297380349295L;
+
+	private BasicValidator wrapped;
+	
+	public ValidatorWrapper( BasicValidator wrapped ) {
+		this.wrapped = wrapped;
+	}
+
+	@Override
+	public BasicValidator unwrapModel() {
+		return this.wrapped;
+	}
+
+	@Override
+	public void wrapModel(BasicValidator wrapped) {
+		this.wrapped = wrapped;
+	}
+
+	@Override
+	public BasicValidator unwrap() {
+		BasicValidator res = this.unwrapModel();
+		while ( res instanceof ValidatorWrapper ) {
+			res = ((ValidatorWrapper)res).unwrapModel();
+		}
+		return res;
+	}
+	
+}