feat: update keyvlaue api

Signed-off-by: Otavio Santana <otaviopolianasantana@gmail.com>
eclipse · Mar 11, 2024 · c24e04f · c24e04f
1 parent 52aaf32
commit c24e04f
Show file tree

Hide file tree

Showing 16 changed files with 29 additions and 17 deletions.
diff --git a/...key-value/src/main/java/org/eclipse/jnosql/mapping/keyvalue/AbstractKeyValueTemplate.java b/...key-value/src/main/java/org/eclipse/jnosql/mapping/keyvalue/AbstractKeyValueTemplate.java
@@ -18,7 +18,6 @@
 import jakarta.data.exceptions.NonUniqueResultException;
 import org.eclipse.jnosql.mapping.PreparedStatement;
 import jakarta.nosql.QueryMapper;
-import jakarta.nosql.keyvalue.KeyValueTemplate;
 import org.eclipse.jnosql.communication.Value;
 import org.eclipse.jnosql.communication.keyvalue.BucketManager;
 import org.eclipse.jnosql.communication.keyvalue.KeyValueEntity;

diff --git a/...mapping-key-value/src/main/java/org/eclipse/jnosql/mapping/keyvalue/KeyValueTemplate.java b/...mapping-key-value/src/main/java/org/eclipse/jnosql/mapping/keyvalue/KeyValueTemplate.java
@@ -1,3 +1,17 @@
+/*
+ *  Copyright (c) 2024 Contributors to the Eclipse Foundation
+ *   All rights reserved. This program and the accompanying materials
+ *   are made available under the terms of the Eclipse Public License v1.0
+ *   and Apache License v2.0 which accompanies this distribution.
+ *   The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ *   and the Apache License v2.0 is available at http://www.opensource.org/licenses/apache2.0.php.
+ *
+ *   You may elect to redistribute this code under either of these licenses.
+ *
+ *   Contributors:
+ *
+ *   Otavio Santana
+ */
 package org.eclipse.jnosql.mapping.keyvalue;
 
 import jakarta.nosql.Template;
@@ -56,7 +70,7 @@ public interface KeyValueTemplate extends Template {
      */
     default <T> Iterable<T> put(Iterable<T> entities) {
         Objects.requireNonNull(entities, "entities is required");
-        return StreamSupport.stream(entities.spliterator(), false).map(this::put).collect(Collectors.toList());
+        return StreamSupport.stream(entities.spliterator(), false).map(this::put).toList();
     }
 
     /**
@@ -72,7 +86,7 @@ default <T> Iterable<T> put(Iterable<T> entities) {
     default <T> Iterable<T> put(Iterable<T> entities, Duration ttl) {
         Objects.requireNonNull(entities, "entities is required");
         Objects.requireNonNull(ttl, "ttl is required");
-        return StreamSupport.stream(entities.spliterator(), false).map(d -> put(d, ttl)).collect(toList());
+        return StreamSupport.stream(entities.spliterator(), false).map(d -> put(d, ttl)).toList();
     }
 
     /**

diff --git a/...key-value/src/main/java/org/eclipse/jnosql/mapping/keyvalue/KeyValueTemplateProducer.java b/...key-value/src/main/java/org/eclipse/jnosql/mapping/keyvalue/KeyValueTemplateProducer.java
@@ -17,7 +17,6 @@
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.inject.Vetoed;
 import jakarta.inject.Inject;
-import jakarta.nosql.keyvalue.KeyValueTemplate;
 import org.eclipse.jnosql.communication.keyvalue.BucketManager;
 
 import java.util.Objects;

diff --git a/...e/src/main/java/org/eclipse/jnosql/mapping/keyvalue/query/AbstractKeyValueRepository.java b/...e/src/main/java/org/eclipse/jnosql/mapping/keyvalue/query/AbstractKeyValueRepository.java
@@ -15,7 +15,7 @@
 package org.eclipse.jnosql.mapping.keyvalue.query;
 
 
-import jakarta.nosql.keyvalue.KeyValueTemplate;
+import org.eclipse.jnosql.mapping.keyvalue.KeyValueTemplate;
 import org.eclipse.jnosql.mapping.core.query.AbstractRepository;
 
 /**

diff --git a/.../main/java/org/eclipse/jnosql/mapping/keyvalue/query/AbstractKeyValueRepositoryProxy.java b/.../main/java/org/eclipse/jnosql/mapping/keyvalue/query/AbstractKeyValueRepositoryProxy.java
@@ -14,7 +14,7 @@
  */
 package org.eclipse.jnosql.mapping.keyvalue.query;
 
-import jakarta.nosql.keyvalue.KeyValueTemplate;
+import org.eclipse.jnosql.mapping.keyvalue.KeyValueTemplate;
 import org.eclipse.jnosql.mapping.core.query.AbstractRepositoryProxy;
 import org.eclipse.jnosql.mapping.core.repository.DynamicQueryMethodReturn;
 

diff --git a/...ue/src/main/java/org/eclipse/jnosql/mapping/keyvalue/query/DefaultKeyValueRepository.java b/...ue/src/main/java/org/eclipse/jnosql/mapping/keyvalue/query/DefaultKeyValueRepository.java
@@ -15,7 +15,7 @@
 package org.eclipse.jnosql.mapping.keyvalue.query;
 
 
-import jakarta.nosql.keyvalue.KeyValueTemplate;
+import org.eclipse.jnosql.mapping.keyvalue.KeyValueTemplate;
 import org.eclipse.jnosql.mapping.metadata.EntityMetadata;
 
 import java.util.Objects;

diff --git a/...e/src/main/java/org/eclipse/jnosql/mapping/keyvalue/query/KeyValueRepositoryProducer.java b/...e/src/main/java/org/eclipse/jnosql/mapping/keyvalue/query/KeyValueRepositoryProducer.java
@@ -18,7 +18,7 @@
 import jakarta.data.repository.BasicRepository;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
-import jakarta.nosql.keyvalue.KeyValueTemplate;
+import org.eclipse.jnosql.mapping.keyvalue.KeyValueTemplate;
 import org.eclipse.jnosql.communication.keyvalue.BucketManager;
 import org.eclipse.jnosql.mapping.keyvalue.KeyValueTemplateProducer;
 import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata;

diff --git a/...alue/src/main/java/org/eclipse/jnosql/mapping/keyvalue/query/KeyValueRepositoryProxy.java b/...alue/src/main/java/org/eclipse/jnosql/mapping/keyvalue/query/KeyValueRepositoryProxy.java
@@ -15,7 +15,7 @@
 package org.eclipse.jnosql.mapping.keyvalue.query;
 
 
-import jakarta.nosql.keyvalue.KeyValueTemplate;
+import org.eclipse.jnosql.mapping.keyvalue.KeyValueTemplate;
 import org.eclipse.jnosql.mapping.core.query.AbstractRepository;
 import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata;
 import org.eclipse.jnosql.mapping.metadata.EntityMetadata;

diff --git a/...value/src/main/java/org/eclipse/jnosql/mapping/keyvalue/query/RepositoryKeyValueBean.java b/...value/src/main/java/org/eclipse/jnosql/mapping/keyvalue/query/RepositoryKeyValueBean.java
@@ -16,7 +16,7 @@
 
 import jakarta.data.repository.CrudRepository;
 import jakarta.enterprise.context.spi.CreationalContext;
-import jakarta.nosql.keyvalue.KeyValueTemplate;
+import org.eclipse.jnosql.mapping.keyvalue.KeyValueTemplate;
 import org.eclipse.jnosql.mapping.DatabaseQualifier;
 import org.eclipse.jnosql.mapping.DatabaseType;
 import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata;

diff --git a/...mapping-key-value/src/main/java/org/eclipse/jnosql/mapping/keyvalue/spi/TemplateBean.java b/...mapping-key-value/src/main/java/org/eclipse/jnosql/mapping/keyvalue/spi/TemplateBean.java
@@ -16,7 +16,7 @@
 
 
 import jakarta.enterprise.context.spi.CreationalContext;
-import jakarta.nosql.keyvalue.KeyValueTemplate;
+import org.eclipse.jnosql.mapping.keyvalue.KeyValueTemplate;
 import org.eclipse.jnosql.communication.keyvalue.BucketManager;
 import org.eclipse.jnosql.mapping.DatabaseQualifier;
 import org.eclipse.jnosql.mapping.DatabaseType;

diff --git a/...-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/DefaultKeyValueTemplateTest.java b/...-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/DefaultKeyValueTemplateTest.java
@@ -18,7 +18,7 @@
 import jakarta.enterprise.inject.Instance;
 import jakarta.inject.Inject;
 import org.eclipse.jnosql.mapping.PreparedStatement;
-import jakarta.nosql.keyvalue.KeyValueTemplate;
+import org.eclipse.jnosql.mapping.keyvalue.KeyValueTemplate;
 import org.eclipse.jnosql.communication.Value;
 import org.eclipse.jnosql.communication.keyvalue.BucketManager;
 import org.eclipse.jnosql.communication.keyvalue.KeyValueEntity;

diff --git a/...value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/KeyValueTemplateProducerTest.java b/...value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/KeyValueTemplateProducerTest.java
@@ -15,7 +15,7 @@
 package org.eclipse.jnosql.mapping.keyvalue;
 
 import jakarta.inject.Inject;
-import jakarta.nosql.keyvalue.KeyValueTemplate;
+import org.eclipse.jnosql.mapping.keyvalue.KeyValueTemplate;
 import org.eclipse.jnosql.communication.keyvalue.BucketManager;
 import org.eclipse.jnosql.mapping.core.Converters;
 import org.eclipse.jnosql.mapping.keyvalue.spi.KeyValueExtension;

diff --git a/...rc/test/java/org/eclipse/jnosql/mapping/keyvalue/query/DefaultKeyValueRepositoryTest.java b/...rc/test/java/org/eclipse/jnosql/mapping/keyvalue/query/DefaultKeyValueRepositoryTest.java
@@ -14,7 +14,7 @@
  */
 package org.eclipse.jnosql.mapping.keyvalue.query;
 
-import jakarta.nosql.keyvalue.KeyValueTemplate;
+import org.eclipse.jnosql.mapping.keyvalue.KeyValueTemplate;
 import org.eclipse.jnosql.mapping.metadata.EntityMetadata;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;

diff --git a/...c/test/java/org/eclipse/jnosql/mapping/keyvalue/query/KeyValueRepositoryProducerTest.java b/...c/test/java/org/eclipse/jnosql/mapping/keyvalue/query/KeyValueRepositoryProducerTest.java
@@ -15,7 +15,7 @@
 package org.eclipse.jnosql.mapping.keyvalue.query;
 
 import jakarta.inject.Inject;
-import jakarta.nosql.keyvalue.KeyValueTemplate;
+import org.eclipse.jnosql.mapping.keyvalue.KeyValueTemplate;
 import org.eclipse.jnosql.communication.keyvalue.BucketManager;
 import org.eclipse.jnosql.mapping.core.Converters;
 import org.eclipse.jnosql.mapping.keyvalue.KeyValueEntityConverter;

diff --git a/.../src/test/java/org/eclipse/jnosql/mapping/keyvalue/query/KeyValueRepositoryProxyTest.java b/.../src/test/java/org/eclipse/jnosql/mapping/keyvalue/query/KeyValueRepositoryProxyTest.java
@@ -24,7 +24,7 @@
 import jakarta.data.repository.Update;
 import jakarta.inject.Inject;
 import org.eclipse.jnosql.mapping.PreparedStatement;
-import jakarta.nosql.keyvalue.KeyValueTemplate;
+import org.eclipse.jnosql.mapping.keyvalue.KeyValueTemplate;
 import org.assertj.core.api.SoftAssertions;
 import org.eclipse.jnosql.mapping.NoSQLRepository;
 import org.eclipse.jnosql.mapping.core.Converters;

diff --git a/...ey-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/spi/KeyValueExtensionTest.java b/...ey-value/src/test/java/org/eclipse/jnosql/mapping/keyvalue/spi/KeyValueExtensionTest.java
@@ -15,7 +15,7 @@
 package org.eclipse.jnosql.mapping.keyvalue.spi;
 
 import jakarta.inject.Inject;
-import jakarta.nosql.keyvalue.KeyValueTemplate;
+import org.eclipse.jnosql.mapping.keyvalue.KeyValueTemplate;
 import org.eclipse.jnosql.mapping.core.Converters;
 import org.eclipse.jnosql.mapping.Database;
 import org.eclipse.jnosql.mapping.DatabaseType;