Merge pull request #169 from jakartaee/revert-168-update-template

Revert "Change Template repository with new two delete methods"

CHANGELOG.adoc

@@ -8,14 +8,6 @@ and this project adheres to https://semver.org/spec/v2.0.0.html[Semantic Version
 
 == [Unreleased]
 
-=== Added
-
-* Add Delete by entity at Template
-
-=== Changed
-
-* Change the KeyValueTemplate method to use deleteByKey
-
 == [1.0.0-b7] - 2023-06-22
 
 === Added

api/nosql-core/src/main/java/jakarta/nosql/Template.java

@@ -190,22 +190,6 @@ public interface Template {
      */
     <T, K> void delete(Class<T> type, K id);
 
-    /**
-     * Deletes a given entity. Deletion is performed by matching the Id.
-     *
-     * @param entity must not be {@literal null}.
-     * @throws NullPointerException when the entity is null
-     */
-    <T> void delete(T entity);
-
-    /**
-     * Deletes the given entities. Deletion of each entity is performed by matching the Id.
-     *
-     * @param entities must not be {@literal null}. Must not contain {@literal null} elements.
-     * @throws NullPointerException when either the iterable is null or contains null elements
-     */
-    <T> void delete(Iterable<? extends T> entities);
-
     /**
      * It starts a query using the fluent-API journey. It is a mutable and non-thread-safe instance.
      *

api/nosql-key-value/src/main/java/jakarta/nosql/keyvalue/KeyValueTemplate.java

@@ -183,7 +183,7 @@ default <T> Iterable<T> put(Iterable<T> entities, Duration ttl) {
      * @param <K> the key type
      * @throws NullPointerException when the key is null
      */
-    <K> void deleteByKey(K key);
+    <K> void delete(K key);
 
     /**
      * Removes entities from keys
@@ -192,6 +192,6 @@ default <T> Iterable<T> put(Iterable<T> entities, Duration ttl) {
      * @param <K>  the key type
      * @throws NullPointerException when the key is null
      */
-    <K> void deleteByKey(Iterable<K> keys);
+    <K> void delete(Iterable<K> keys);
 
 }