style: organize imports

otaviojava · otaviojava · commit 033fd11aed5b · 2023-08-29T22:33:17.000+01:00
Signed-off-by: Otavio Santana &lt;otaviopolianasantana@gmail.com&gt;
diff --git a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/communication/ArangoDBDocumentManagerTest.java b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/communication/ArangoDBDocumentManagerTest.java
@@ -42,7 +42,10 @@
 import static org.eclipse.jnosql.communication.document.DocumentQuery.select;
 import static org.eclipse.jnosql.communication.driver.IntegrationTest.MATCHES;
 import static org.eclipse.jnosql.communication.driver.IntegrationTest.NAMED;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @EnabledIfSystemProperty(named = NAMED, matches = MATCHES)
 public class ArangoDBDocumentManagerTest {
diff --git a/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/communication/ArangoDBKeyValueEntityManagerTest.java b/jnosql-arangodb/src/test/java/org/eclipse/jnosql/databases/arangodb/communication/ArangoDBKeyValueEntityManagerTest.java
@@ -32,7 +32,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.eclipse.jnosql.communication.driver.IntegrationTest.MATCHES;
 import static org.eclipse.jnosql.communication.driver.IntegrationTest.NAMED;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @EnabledIfSystemProperty(named = NAMED, matches = MATCHES)
 public class ArangoDBKeyValueEntityManagerTest {
diff --git a/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/communication/CassandraColumnManagerTest.java b/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/communication/CassandraColumnManagerTest.java
@@ -52,7 +52,11 @@
 import static org.eclipse.jnosql.communication.column.ColumnQuery.select;
 import static org.eclipse.jnosql.communication.driver.IntegrationTest.MATCHES;
 import static org.eclipse.jnosql.communication.driver.IntegrationTest.NAMED;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @EnabledIfSystemProperty(named = NAMED, matches = MATCHES)
 public class CassandraColumnManagerTest {
diff --git a/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/CassandraColumnEntityConverterTest.java b/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/CassandraColumnEntityConverterTest.java
@@ -58,7 +58,9 @@
 import static java.util.Arrays.asList;
 import static java.util.Collections.singleton;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @EnableAutoWeld
 @AddPackages(value = {Converters.class, JNoSQLColumnTemplate.class,
diff --git a/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/DefaultCassandraTemplateTest.java b/jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/DefaultCassandraTemplateTest.java
@@ -50,7 +50,9 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.eclipse.jnosql.communication.column.ColumnQuery.select;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 @EnableAutoWeld
 @AddPackages(value = {Converters.class, ColumnEntityConverter.class,
diff --git a/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/communication/CouchbaseBucketManagerTest.java b/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/communication/CouchbaseBucketManagerTest.java
@@ -35,7 +35,10 @@
 import static java.util.Collections.singleton;
 import static org.eclipse.jnosql.communication.driver.IntegrationTest.MATCHES;
 import static org.eclipse.jnosql.communication.driver.IntegrationTest.NAMED;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 @EnabledIfSystemProperty(named = NAMED, matches = MATCHES)
 public class CouchbaseBucketManagerTest {
 
diff --git a/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/communication/CouchbaseDocumentManagerTest.java b/jnosql-couchbase/src/test/java/org/eclipse/jnosql/databases/couchbase/communication/CouchbaseDocumentManagerTest.java
@@ -46,7 +46,9 @@
 import static org.eclipse.jnosql.communication.document.DocumentQuery.select;
 import static org.eclipse.jnosql.communication.driver.IntegrationTest.MATCHES;
 import static org.eclipse.jnosql.communication.driver.IntegrationTest.NAMED;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 
 @EnabledIfSystemProperty(named = NAMED, matches = MATCHES)
diff --git a/jnosql-couchdb/src/main/java/org/eclipse/jnosql/databases/couchdb/communication/CouchDBDocumentConfiguration.java b/jnosql-couchdb/src/main/java/org/eclipse/jnosql/databases/couchdb/communication/CouchDBDocumentConfiguration.java
@@ -23,7 +23,14 @@
 import java.util.Arrays;
 import java.util.Objects;
 
-import static org.eclipse.jnosql.databases.couchdb.communication.CouchDBConfigurations.*;
+import static org.eclipse.jnosql.databases.couchdb.communication.CouchDBConfigurations.COMPRESSION;
+import static org.eclipse.jnosql.databases.couchdb.communication.CouchDBConfigurations.CONNECTION_TIMEOUT;
+import static org.eclipse.jnosql.databases.couchdb.communication.CouchDBConfigurations.ENABLE_SSL;
+import static org.eclipse.jnosql.databases.couchdb.communication.CouchDBConfigurations.MAX_CACHE_ENTRIES;
+import static org.eclipse.jnosql.databases.couchdb.communication.CouchDBConfigurations.MAX_CONNECTIONS;
+import static org.eclipse.jnosql.databases.couchdb.communication.CouchDBConfigurations.MAX_OBJECT_SIZE_BYTES;
+import static org.eclipse.jnosql.databases.couchdb.communication.CouchDBConfigurations.PORT;
+import static org.eclipse.jnosql.databases.couchdb.communication.CouchDBConfigurations.SOCKET_TIMEOUT;
 
 /**
  * The CouchDB implementation of {@link DocumentConfiguration}  that returns
diff --git a/jnosql-couchdb/src/test/java/org/eclipse/jnosql/databases/couchdb/communication/DefaultCouchDBDocumentManagerTest.java b/jnosql-couchdb/src/test/java/org/eclipse/jnosql/databases/couchdb/communication/DefaultCouchDBDocumentManagerTest.java
@@ -44,7 +44,12 @@
 import static org.eclipse.jnosql.communication.document.DocumentQuery.select;
 import static org.eclipse.jnosql.communication.driver.IntegrationTest.MATCHES;
 import static org.eclipse.jnosql.communication.driver.IntegrationTest.NAMED;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @EnabledIfSystemProperty(named = NAMED, matches = MATCHES)
 class DefaultCouchDBDocumentManagerTest {
diff --git a/jnosql-dynamodb/src/test/java/org/eclipse/jnosql/databases/dynamodb/communication/DynamoDBKeyValueEntityManagerTest.java b/jnosql-dynamodb/src/test/java/org/eclipse/jnosql/databases/dynamodb/communication/DynamoDBKeyValueEntityManagerTest.java
@@ -32,7 +32,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.eclipse.jnosql.communication.driver.IntegrationTest.MATCHES;
 import static org.eclipse.jnosql.communication.driver.IntegrationTest.NAMED;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @EnabledIfSystemProperty(named = NAMED, matches = MATCHES)
 public class DynamoDBKeyValueEntityManagerTest {
diff --git a/jnosql-elasticsearch/src/test/java/org/eclipse/jnosql/databases/elasticsearch/communication/ElasticsearchDocumentManagerTest.java b/jnosql-elasticsearch/src/test/java/org/eclipse/jnosql/databases/elasticsearch/communication/ElasticsearchDocumentManagerTest.java
@@ -44,8 +44,15 @@
 import static org.eclipse.jnosql.communication.document.DocumentQuery.select;
 import static org.eclipse.jnosql.communication.driver.IntegrationTest.MATCHES;
 import static org.eclipse.jnosql.communication.driver.IntegrationTest.NAMED;
-import static org.hamcrest.Matchers.*;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.hasSize;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @EnabledIfSystemProperty(named = NAMED, matches = MATCHES)
 public class ElasticsearchDocumentManagerTest {
diff --git a/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/communication/HazelcastBucketManagerQueryTest.java b/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/communication/HazelcastBucketManagerQueryTest.java
@@ -26,7 +26,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import static com.hazelcast.query.Predicates.*;
+import static com.hazelcast.query.Predicates.and;
+import static com.hazelcast.query.Predicates.equal;
+import static com.hazelcast.query.Predicates.greaterEqual;
 import static java.util.Collections.singletonMap;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
diff --git a/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/communication/HazelcastBucketManagerTest.java b/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/communication/HazelcastBucketManagerTest.java
@@ -32,7 +32,10 @@
 
 import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class HazelcastBucketManagerTest {
 
diff --git a/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/communication/ListTest.java b/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/communication/ListTest.java
@@ -26,7 +26,10 @@
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class ListTest {
 
diff --git a/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/communication/MapTest.java b/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/communication/MapTest.java
@@ -27,7 +27,11 @@
 import java.util.Map;
 import java.util.Set;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class MapTest {
 
diff --git a/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/communication/QueueTest.java b/jnosql-hazelcast/src/test/java/org/eclipse/jnosql/databases/hazelcast/communication/QueueTest.java
@@ -26,7 +26,10 @@
 import java.util.NoSuchElementException;
 import java.util.Queue;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class QueueTest {
 
diff --git a/jnosql-hbase/src/main/java/org/eclipse/jnosql/databases/hbase/communication/EntityUnit.java b/jnosql-hbase/src/main/java/org/eclipse/jnosql/databases/hbase/communication/EntityUnit.java
@@ -23,7 +23,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.apache.hadoop.hbase.CellUtil.*;
+import static org.apache.hadoop.hbase.CellUtil.cloneFamily;
+import static org.apache.hadoop.hbase.CellUtil.cloneQualifier;
+import static org.apache.hadoop.hbase.CellUtil.cloneRow;
+import static org.apache.hadoop.hbase.CellUtil.cloneValue;
 
 class EntityUnit {
 
diff --git a/jnosql-hbase/src/main/java/org/eclipse/jnosql/databases/hbase/communication/HBaseColumnManager.java b/jnosql-hbase/src/main/java/org/eclipse/jnosql/databases/hbase/communication/HBaseColumnManager.java
@@ -45,7 +45,9 @@
 import java.util.stream.StreamSupport;
 
 import static java.util.stream.Collectors.toList;
-import static org.eclipse.jnosql.communication.Condition.*;
+import static org.eclipse.jnosql.communication.Condition.EQUALS;
+import static org.eclipse.jnosql.communication.Condition.IN;
+import static org.eclipse.jnosql.communication.Condition.OR;
 
 /**
  * The Hbase implementation to {@link ColumnManager}.
diff --git a/jnosql-hbase/src/test/java/org/eclipse/jnosql/databases/hbase/communication/HBaseFamilyManagerTest.java b/jnosql-hbase/src/test/java/org/eclipse/jnosql/databases/hbase/communication/HBaseFamilyManagerTest.java
@@ -34,7 +34,11 @@
 import static org.eclipse.jnosql.communication.column.ColumnQuery.select;
 import static org.eclipse.jnosql.communication.driver.IntegrationTest.MATCHES;
 import static org.eclipse.jnosql.communication.driver.IntegrationTest.NAMED;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @EnabledIfSystemProperty(named = NAMED, matches = MATCHES)
 public class HBaseFamilyManagerTest {
diff --git a/jnosql-infinispan/src/test/java/org/eclipse/jnosql/databases/infinispan/communication/KeyValueEntityManagerTest.java b/jnosql-infinispan/src/test/java/org/eclipse/jnosql/databases/infinispan/communication/KeyValueEntityManagerTest.java
@@ -31,7 +31,10 @@
 
 import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class KeyValueEntityManagerTest {
 
diff --git a/jnosql-infinispan/src/test/java/org/eclipse/jnosql/databases/infinispan/communication/MapTest.java b/jnosql-infinispan/src/test/java/org/eclipse/jnosql/databases/infinispan/communication/MapTest.java
@@ -27,7 +27,11 @@
 import java.util.Map;
 import java.util.Set;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class MapTest {
 
diff --git a/jnosql-memcached/src/test/java/org/eclipse/jnosql/databases/memcached/communication/MemcachedBucketManagerTest.java b/jnosql-memcached/src/test/java/org/eclipse/jnosql/databases/memcached/communication/MemcachedBucketManagerTest.java
@@ -35,7 +35,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.eclipse.jnosql.communication.driver.IntegrationTest.MATCHES;
 import static org.eclipse.jnosql.communication.driver.IntegrationTest.NAMED;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @EnabledIfSystemProperty(named = NAMED, matches = MATCHES)
 public class MemcachedBucketManagerTest {
diff --git a/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/communication/BinaryValueReaderTest.java b/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/communication/BinaryValueReaderTest.java
@@ -21,7 +21,9 @@
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class BinaryValueReaderTest {
 
diff --git a/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/communication/MongoAuthenticationTest.java b/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/communication/MongoAuthenticationTest.java
@@ -20,9 +20,17 @@
 import org.eclipse.jnosql.communication.Settings;
 import org.junit.jupiter.api.Test;
 
-import static com.mongodb.AuthenticationMechanism.*;
-import static org.eclipse.jnosql.databases.mongodb.communication.MongoDBDocumentConfigurations.*;
-import static org.junit.jupiter.api.Assertions.*;
+import static com.mongodb.AuthenticationMechanism.GSSAPI;
+import static com.mongodb.AuthenticationMechanism.SCRAM_SHA_1;
+import static com.mongodb.AuthenticationMechanism.SCRAM_SHA_256;
+import static org.eclipse.jnosql.databases.mongodb.communication.MongoDBDocumentConfigurations.AUTHENTICATION_MECHANISM;
+import static org.eclipse.jnosql.databases.mongodb.communication.MongoDBDocumentConfigurations.AUTHENTICATION_SOURCE;
+import static org.eclipse.jnosql.databases.mongodb.communication.MongoDBDocumentConfigurations.PASSWORD;
+import static org.eclipse.jnosql.databases.mongodb.communication.MongoDBDocumentConfigurations.USER;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 class MongoAuthenticationTest {
 
diff --git a/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/communication/MongoDBDocumentManagerTest.java b/jnosql-mongodb/src/test/java/org/eclipse/jnosql/databases/mongodb/communication/MongoDBDocumentManagerTest.java
@@ -53,7 +53,12 @@
 import static org.eclipse.jnosql.communication.document.DocumentQuery.select;
 import static org.eclipse.jnosql.communication.driver.IntegrationTest.MATCHES;
 import static org.eclipse.jnosql.communication.driver.IntegrationTest.NAMED;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @EnabledIfSystemProperty(named = NAMED, matches = MATCHES)
 public class MongoDBDocumentManagerTest {
diff --git a/jnosql-orientdb/src/main/java/org/eclipse/jnosql/databases/orientdb/communication/DefaultOrientDBDocumentManager.java b/jnosql-orientdb/src/main/java/org/eclipse/jnosql/databases/orientdb/communication/DefaultOrientDBDocumentManager.java
@@ -39,7 +39,10 @@
 
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.toList;
-import static org.eclipse.jnosql.databases.orientdb.communication.OrientDBConverter.*;
+import static org.eclipse.jnosql.databases.orientdb.communication.OrientDBConverter.ID_FIELD;
+import static org.eclipse.jnosql.databases.orientdb.communication.OrientDBConverter.RID_FIELD;
+import static org.eclipse.jnosql.databases.orientdb.communication.OrientDBConverter.VERSION_FIELD;
+import static org.eclipse.jnosql.databases.orientdb.communication.OrientDBConverter.toMap;
 
 class DefaultOrientDBDocumentManager implements OrientDBDocumentManager {
 
diff --git a/jnosql-orientdb/src/test/java/org/eclipse/jnosql/databases/orientdb/communication/OrientDBDocumentManagerTest.java b/jnosql-orientdb/src/test/java/org/eclipse/jnosql/databases/orientdb/communication/OrientDBDocumentManagerTest.java
@@ -49,7 +49,11 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @EnabledIfSystemProperty(named = NAMED, matches = MATCHES)
 public class OrientDBDocumentManagerTest {
diff --git a/jnosql-ravendb/src/test/java/org/eclipse/jnosql/databases/ravendb/communication/RavenDBDocumentManagerTest.java b/jnosql-ravendb/src/test/java/org/eclipse/jnosql/databases/ravendb/communication/RavenDBDocumentManagerTest.java
@@ -45,7 +45,10 @@
 import static org.eclipse.jnosql.communication.document.DocumentQuery.select;
 import static org.eclipse.jnosql.communication.driver.IntegrationTest.MATCHES;
 import static org.eclipse.jnosql.communication.driver.IntegrationTest.NAMED;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @EnabledIfSystemProperty(named = NAMED, matches = MATCHES)
 public class RavenDBDocumentManagerTest {
diff --git a/jnosql-redis/src/test/java/org/eclipse/jnosql/databases/redis/communication/DefaultSortedSetTest.java b/jnosql-redis/src/test/java/org/eclipse/jnosql/databases/redis/communication/DefaultSortedSetTest.java
@@ -25,7 +25,9 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.eclipse.jnosql.communication.driver.IntegrationTest.MATCHES;
 import static org.eclipse.jnosql.communication.driver.IntegrationTest.NAMED;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @EnabledIfSystemProperty(named = NAMED, matches = MATCHES)
 public class DefaultSortedSetTest {
diff --git a/jnosql-redis/src/test/java/org/eclipse/jnosql/databases/redis/communication/RedisBucketManagerTest.java b/jnosql-redis/src/test/java/org/eclipse/jnosql/databases/redis/communication/RedisBucketManagerTest.java
@@ -35,7 +35,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.eclipse.jnosql.communication.driver.IntegrationTest.MATCHES;
 import static org.eclipse.jnosql.communication.driver.IntegrationTest.NAMED;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @EnabledIfSystemProperty(named = NAMED, matches = MATCHES)
 public class RedisBucketManagerTest {
diff --git a/jnosql-redis/src/test/java/org/eclipse/jnosql/databases/redis/communication/RedisListStringTest.java b/jnosql-redis/src/test/java/org/eclipse/jnosql/databases/redis/communication/RedisListStringTest.java
@@ -27,7 +27,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.eclipse.jnosql.communication.driver.IntegrationTest.MATCHES;
 import static org.eclipse.jnosql.communication.driver.IntegrationTest.NAMED;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @EnabledIfSystemProperty(named = NAMED, matches = MATCHES)
 public class RedisListStringTest {
diff --git a/jnosql-redis/src/test/java/org/eclipse/jnosql/databases/redis/communication/RedisListTest.java b/jnosql-redis/src/test/java/org/eclipse/jnosql/databases/redis/communication/RedisListTest.java
diff --git a/jnosql-redis/src/test/java/org/eclipse/jnosql/databases/redis/communication/RedisMapStringTest.java b/jnosql-redis/src/test/java/org/eclipse/jnosql/databases/redis/communication/RedisMapStringTest.java
diff --git a/jnosql-redis/src/test/java/org/eclipse/jnosql/databases/redis/communication/RedisMapTest.java b/jnosql-redis/src/test/java/org/eclipse/jnosql/databases/redis/communication/RedisMapTest.java
diff --git a/jnosql-redis/src/test/java/org/eclipse/jnosql/databases/redis/communication/RedisQueueStringTest.java b/jnosql-redis/src/test/java/org/eclipse/jnosql/databases/redis/communication/RedisQueueStringTest.java
diff --git a/jnosql-redis/src/test/java/org/eclipse/jnosql/databases/redis/communication/RedisQueueTest.java b/jnosql-redis/src/test/java/org/eclipse/jnosql/databases/redis/communication/RedisQueueTest.java
diff --git a/jnosql-redis/src/test/java/org/eclipse/jnosql/databases/redis/communication/RedisSetTest.java b/jnosql-redis/src/test/java/org/eclipse/jnosql/databases/redis/communication/RedisSetTest.java
diff --git a/jnosql-riak/src/test/java/org/eclipse/jnosql/databases/riak/communication/RiakBucketManagerTest.java b/jnosql-riak/src/test/java/org/eclipse/jnosql/databases/riak/communication/RiakBucketManagerTest.java
diff --git a/jnosql-solr/src/test/java/org/eclipse/jnosql/databases/solr/communication/DefaultSolrDocumentManagerTest.java b/jnosql-solr/src/test/java/org/eclipse/jnosql/databases/solr/communication/DefaultSolrDocumentManagerTest.java
