#87 Rename updateFrom by filter

antelopesystems · Apr 8, 2021 · 69aca94 · 69aca94
1 parent 090b341
commit 69aca94
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/...amework-core/src/main/java/com/antelopesystem/crudframework/crud/handler/CrudHandler.java b/...amework-core/src/main/java/com/antelopesystem/crudframework/crud/handler/CrudHandler.java
@@ -179,10 +179,30 @@ <ID extends Serializable, Entity extends BaseCrudEntity<ID>> MassUpdateCRUDReque
 	<ID extends Serializable, Entity extends BaseCrudEntity<ID>, RO> MassUpdateCRUDRequestBuilder<CRUDPreUpdateHook<ID, Entity>, CRUDOnUpdateHook<ID, Entity>, CRUDPostUpdateHook<ID, Entity>, List<RO>> update(
 			List<Entity> entities, Class<RO> toClazz);
 
-	<ID extends Serializable, Entity extends BaseCrudEntity<ID>> MassUpdateCRUDRequestBuilder<CRUDPreUpdateHook<ID, Entity>, CRUDOnUpdateHook<ID, Entity>, CRUDPostUpdateHook<ID, Entity>, List<Entity>> updateFrom(
+	/**
+	 * @deprecated name changed, see below for new method
+	 * @see {@link CrudHandler#updateByFilter(DynamicModelFilter, Class)}
+	 */
+	@Deprecated
+	default <ID extends Serializable, Entity extends BaseCrudEntity<ID>> MassUpdateCRUDRequestBuilder<CRUDPreUpdateHook<ID, Entity>, CRUDOnUpdateHook<ID, Entity>, CRUDPostUpdateHook<ID, Entity>, List<Entity>> updateFrom(
+			DynamicModelFilter filter, Class<Entity> entityClazz) {
+		return updateByFilter(filter, entityClazz);
+	}
+
+	/**
+	 * @deprecated name changed, see below for new method
+	 * @see {@link CrudHandler#updateByFilter(DynamicModelFilter, Class, Class)}
+	 */
+	@Deprecated
+	default <ID extends Serializable, Entity extends BaseCrudEntity<ID>, RO> MassUpdateCRUDRequestBuilder<CRUDPreUpdateHook<ID, Entity>, CRUDOnUpdateHook<ID, Entity>, CRUDPostUpdateHook<ID, Entity>, List<RO>> updateFrom(
+			DynamicModelFilter filter, Class<Entity> entityClazz, Class<RO> toClazz) {
+		return updateByFilter(filter, entityClazz, toClazz);
+	}
+
+	<ID extends Serializable, Entity extends BaseCrudEntity<ID>> MassUpdateCRUDRequestBuilder<CRUDPreUpdateHook<ID, Entity>, CRUDOnUpdateHook<ID, Entity>, CRUDPostUpdateHook<ID, Entity>, List<Entity>> updateByFilter(
 			DynamicModelFilter filter, Class<Entity> entityClazz);
 
-	<ID extends Serializable, Entity extends BaseCrudEntity<ID>, RO> MassUpdateCRUDRequestBuilder<CRUDPreUpdateHook<ID, Entity>, CRUDOnUpdateHook<ID, Entity>, CRUDPostUpdateHook<ID, Entity>, List<RO>> updateFrom(
+	<ID extends Serializable, Entity extends BaseCrudEntity<ID>, RO> MassUpdateCRUDRequestBuilder<CRUDPreUpdateHook<ID, Entity>, CRUDOnUpdateHook<ID, Entity>, CRUDPostUpdateHook<ID, Entity>, List<RO>> updateByFilter(
 			DynamicModelFilter filter, Class<Entity> entityClazz, Class<RO> toClazz);
 
 	<ID extends Serializable, Entity extends BaseCrudEntity<ID>, Filter extends DynamicModelFilter> ReadCRUDRequestBuilder<CRUDPreShowByHook<ID, Entity, Filter>, CRUDOnShowByHook<ID, Entity>, CRUDPostShowByHook<ID, Entity>, Entity> showBy(

diff --git a/...ork-core/src/main/java/com/antelopesystem/crudframework/crud/handler/CrudHandlerImpl.java b/...ork-core/src/main/java/com/antelopesystem/crudframework/crud/handler/CrudHandlerImpl.java
@@ -144,13 +144,13 @@ public <ID extends Serializable, Entity extends BaseCrudEntity<ID>, RO> MassUpda
 	}
 
 	@Override
-	public <ID extends Serializable, Entity extends BaseCrudEntity<ID>> MassUpdateCRUDRequestBuilder<CRUDPreUpdateHook<ID, Entity>, CRUDOnUpdateHook<ID, Entity>, CRUDPostUpdateHook<ID, Entity>, List<Entity>> updateFrom(
+	public <ID extends Serializable, Entity extends BaseCrudEntity<ID>> MassUpdateCRUDRequestBuilder<CRUDPreUpdateHook<ID, Entity>, CRUDOnUpdateHook<ID, Entity>, CRUDPostUpdateHook<ID, Entity>, List<Entity>> updateByFilter(
 			DynamicModelFilter filter, Class<Entity> entityClazz) {
 		return new MassUpdateCRUDRequestBuilder<>((hooks, persistCopy, accessorDTO) -> crudUpdateHandler.updateByFilterTransactional(filter, entityClazz, hooks, persistCopy, accessorDTO));
 	}
 
 	@Override
-	public <ID extends Serializable, Entity extends BaseCrudEntity<ID>, RO> MassUpdateCRUDRequestBuilder<CRUDPreUpdateHook<ID, Entity>, CRUDOnUpdateHook<ID, Entity>, CRUDPostUpdateHook<ID, Entity>, List<RO>> updateFrom(
+	public <ID extends Serializable, Entity extends BaseCrudEntity<ID>, RO> MassUpdateCRUDRequestBuilder<CRUDPreUpdateHook<ID, Entity>, CRUDOnUpdateHook<ID, Entity>, CRUDPostUpdateHook<ID, Entity>, List<RO>> updateByFilter(
 			DynamicModelFilter filter, Class<Entity> entityClazz, Class<RO> toClazz) {
 		return new MassUpdateCRUDRequestBuilder<>((hooks, persistCopy, accessorDTO) -> {
 			List<Entity> result = crudUpdateHandler.updateByFilterTransactional(filter, entityClazz, hooks, persistCopy, accessorDTO);