diff --git a/mapping/artemis-column/src/main/java/org/jnosql/artemis/column/ColumnFieldConverters.java b/mapping/artemis-column/src/main/java/org/jnosql/artemis/column/ColumnFieldConverters.java
index 059f44e8b..8bc631b5f 100644
--- a/mapping/artemis-column/src/main/java/org/jnosql/artemis/column/ColumnFieldConverters.java
+++ b/mapping/artemis-column/src/main/java/org/jnosql/artemis/column/ColumnFieldConverters.java
@@ -56,7 +56,7 @@ ColumnFieldConverter get(FieldMapping field) {
         }
 
         private boolean isCollectionEmbeddable(FieldMapping field) {
-            return COLLECTION.equals(field.getType()) && GenericFieldMapping.class.cast(field).isEmbeddable();
+            return COLLECTION.equals(field.getType()) && ((GenericFieldMapping) field).isEmbeddable();
         }
     }
 
@@ -70,8 +70,8 @@ public <T> void convert(T instance, List<Column> columns, Optional<Column> colum
             if (column.isPresent()) {
                 Column subColumn = column.get();
                 Object value = subColumn.get();
-                if (Map.class.isInstance(value)) {
-                    Map map = Map.class.cast(value);
+                if (value instanceof Map) {
+                    Map map = (Map) value;
                     List<Column> embeddedColumns = new ArrayList<>();
 
                     for (Map.Entry entry : (Set<Map.Entry>) map.entrySet()) {
@@ -138,7 +138,7 @@ public <T> void convert(T instance, List<Column> columns, Optional<Column> colum
 
         private <T> Consumer<Column> convertColumn(T instance, FieldMapping field, AbstractColumnEntityConverter converter) {
             return column -> {
-                GenericFieldMapping genericField = GenericFieldMapping.class.cast(field);
+                GenericFieldMapping genericField = (GenericFieldMapping) field;
                 Collection collection = genericField.getCollectionInstance();
                 List<List<Column>> embeddable = (List<List<Column>>) column.get();
                 for (List<Column> columnList : embeddable) {
diff --git a/mapping/artemis-column/src/main/java/org/jnosql/artemis/column/DefaultColumnFieldValue.java b/mapping/artemis-column/src/main/java/org/jnosql/artemis/column/DefaultColumnFieldValue.java
index 7a917363f..c088d3a84 100644
--- a/mapping/artemis-column/src/main/java/org/jnosql/artemis/column/DefaultColumnFieldValue.java
+++ b/mapping/artemis-column/src/main/java/org/jnosql/artemis/column/DefaultColumnFieldValue.java
@@ -74,7 +74,7 @@ public List<Column> toColumn(ColumnEntityConverter converter, Converters convert
 
     private List<List<Column>> getColumns(ColumnEntityConverter converter) {
         List<List<Column>> columns = new ArrayList<>();
-        for (Object element : Iterable.class.cast(getValue())) {
+        for (Object element : (Iterable) getValue()) {
             columns.add(converter.toColumn(element).getColumns());
         }
         return columns;
@@ -93,7 +93,7 @@ private String getName() {
     }
 
     private boolean isEmbeddableElement() {
-        return GenericFieldMapping.class.cast(getField()).isEmbeddable();
+        return ((GenericFieldMapping) getField()).isEmbeddable();
     }
 
     @Override
diff --git a/mapping/artemis-column/src/main/java/org/jnosql/artemis/column/query/AbstractColumnRepositoryAsyncProxy.java b/mapping/artemis-column/src/main/java/org/jnosql/artemis/column/query/AbstractColumnRepositoryAsyncProxy.java
index 60b3c035b..497ffc1d2 100644
--- a/mapping/artemis-column/src/main/java/org/jnosql/artemis/column/query/AbstractColumnRepositoryAsyncProxy.java
+++ b/mapping/artemis-column/src/main/java/org/jnosql/artemis/column/query/AbstractColumnRepositoryAsyncProxy.java
@@ -76,8 +76,8 @@ public Object invoke(Object instance, Method method, Object[] args) throws Throw
 
 
     private Object executeDelete(Object arg, ColumnDeleteQuery deleteQuery) {
-        if (Consumer.class.isInstance(arg)) {
-            getTemplate().delete(deleteQuery, Consumer.class.cast(arg));
+        if (arg instanceof Consumer) {
+            getTemplate().delete(deleteQuery, (Consumer) arg);
             return Void.class;
         }
         getTemplate().delete(deleteQuery);
@@ -92,8 +92,8 @@ private Object getCallback(Object[] args) {
     }
 
     private Object executeQuery(Object arg, ColumnQuery query) {
-        if (Consumer.class.isInstance(arg)) {
-            getTemplate().select(query, Consumer.class.cast(arg));
+        if (arg instanceof Consumer) {
+            getTemplate().select(query, (Consumer) arg);
             return null;
         }
 
diff --git a/mapping/artemis-column/src/main/java/org/jnosql/artemis/column/query/ColumnRepositoryAsyncProxy.java b/mapping/artemis-column/src/main/java/org/jnosql/artemis/column/query/ColumnRepositoryAsyncProxy.java
index bdc13759e..e04e038ba 100644
--- a/mapping/artemis-column/src/main/java/org/jnosql/artemis/column/query/ColumnRepositoryAsyncProxy.java
+++ b/mapping/artemis-column/src/main/java/org/jnosql/artemis/column/query/ColumnRepositoryAsyncProxy.java
@@ -43,8 +43,8 @@ class ColumnRepositoryAsyncProxy<T> extends AbstractColumnRepositoryAsyncProxy<T
                                Class<?> repositoryType, Converters converters) {
 
         this.template = template;
-        Class<T> typeClass = Class.class.cast(ParameterizedType.class.cast(repositoryType.getGenericInterfaces()[0])
-                .getActualTypeArguments()[0]);
+        Class<T> typeClass = (Class) ((ParameterizedType) repositoryType.getGenericInterfaces()[0])
+                .getActualTypeArguments()[0];
         this.classMapping = classMappings.get(typeClass);
         this.repository = new ColumnRepositoryAsync(template, classMapping);
         this.converters = converters;
diff --git a/mapping/artemis-column/src/main/java/org/jnosql/artemis/column/query/ColumnRepositoryProxy.java b/mapping/artemis-column/src/main/java/org/jnosql/artemis/column/query/ColumnRepositoryProxy.java
index 9af2d5208..1e6d62fc9 100644
--- a/mapping/artemis-column/src/main/java/org/jnosql/artemis/column/query/ColumnRepositoryProxy.java
+++ b/mapping/artemis-column/src/main/java/org/jnosql/artemis/column/query/ColumnRepositoryProxy.java
@@ -45,8 +45,8 @@ class ColumnRepositoryProxy<T, ID> extends AbstractColumnRepositoryProxy {
     ColumnRepositoryProxy(ColumnTemplate template, ClassMappings classMappings, Class<?> repositoryType,
                           Converters converters) {
         this.template = template;
-        Class<T> typeClass = Class.class.cast(ParameterizedType.class.cast(repositoryType.getGenericInterfaces()[0])
-                .getActualTypeArguments()[0]);
+        Class<T> typeClass = (Class) ((ParameterizedType) repositoryType.getGenericInterfaces()[0])
+                .getActualTypeArguments()[0];
         this.classMapping = classMappings.get(typeClass);
         this.repository = new ColumnRepository(template, classMapping);
         this.converters = converters;
diff --git a/mapping/artemis-column/src/test/java/org/jnosql/artemis/column/ColumnConfigurationProducerTest.java b/mapping/artemis-column/src/test/java/org/jnosql/artemis/column/ColumnConfigurationProducerTest.java
index 49e737516..3e5cbe926 100644
--- a/mapping/artemis-column/src/test/java/org/jnosql/artemis/column/ColumnConfigurationProducerTest.java
+++ b/mapping/artemis-column/src/test/java/org/jnosql/artemis/column/ColumnConfigurationProducerTest.java
@@ -52,8 +52,8 @@ public class ColumnConfigurationProducerTest {
     @Test
     public void shouldReadInjectColumnFamily() {
         factoryA.get("database");
-        assertTrue(ColumnFamilyManagerMock.MockFamilyManager.class.isInstance(factoryA));
-        ColumnFamilyManagerMock.MockFamilyManager mock = ColumnFamilyManagerMock.MockFamilyManager.class.cast(factoryA);
+        assertTrue(factoryA instanceof ColumnFamilyManagerMock.MockFamilyManager);
+        ColumnFamilyManagerMock.MockFamilyManager mock = (ColumnFamilyManagerMock.MockFamilyManager) factoryA;
         Map<String, Object> settings = mock.getSettings();
         assertEquals("value", settings.get("key"));
         assertEquals("value2", settings.get("key2"));
@@ -63,8 +63,8 @@ public void shouldReadInjectColumnFamily() {
     @Test
     public void shouldReadInjectColumnFamilyB() {
         factoryB.get("database");
-        assertTrue(ColumnFamilyManagerMock.MockFamilyManager.class.isInstance(factoryB));
-        ColumnFamilyManagerMock.MockFamilyManager mock = ColumnFamilyManagerMock.MockFamilyManager.class.cast(factoryB);
+        assertTrue(factoryB instanceof ColumnFamilyManagerMock.MockFamilyManager);
+        ColumnFamilyManagerMock.MockFamilyManager mock = (ColumnFamilyManagerMock.MockFamilyManager) factoryB;
         Map<String, Object> settings = mock.getSettings();
         assertEquals("value", settings.get("key"));
         assertEquals("value2", settings.get("key2"));
@@ -75,8 +75,8 @@ public void shouldReadInjectColumnFamilyB() {
     @Test
     public void shouldReadInjectColumnFamilyAsync() {
         factoryAsyncA.getAsync("database");
-        assertTrue(ColumnFamilyManagerMock.MockFamilyManager.class.isInstance(factoryAsyncA));
-        ColumnFamilyManagerMock.MockFamilyManager mock = ColumnFamilyManagerMock.MockFamilyManager.class.cast(factoryAsyncA);
+        assertTrue(factoryAsyncA instanceof ColumnFamilyManagerMock.MockFamilyManager);
+        ColumnFamilyManagerMock.MockFamilyManager mock = (ColumnFamilyManagerMock.MockFamilyManager) factoryAsyncA;
         Map<String, Object> settings = mock.getSettings();
         assertEquals("value", settings.get("key"));
         assertEquals("value2", settings.get("key2"));
@@ -85,8 +85,8 @@ public void shouldReadInjectColumnFamilyAsync() {
     @Test
     public void shouldReadInjectColumnFamilyBAsync() {
         factoryAsyncB.getAsync("database");
-        assertTrue(ColumnFamilyManagerMock.MockFamilyManager.class.isInstance(factoryAsyncB));
-        ColumnFamilyManagerMock.MockFamilyManager mock = ColumnFamilyManagerMock.MockFamilyManager.class.cast(factoryAsyncB);
+        assertTrue(factoryAsyncB instanceof ColumnFamilyManagerMock.MockFamilyManager);
+        ColumnFamilyManagerMock.MockFamilyManager mock = (ColumnFamilyManagerMock.MockFamilyManager) factoryAsyncB;
         Map<String, Object> settings = mock.getSettings();
         assertEquals("value", settings.get("key"));
         assertEquals("value2", settings.get("key2"));
diff --git a/mapping/artemis-column/src/test/java/org/jnosql/artemis/column/ColumnConfigurationProducerXMLTest.java b/mapping/artemis-column/src/test/java/org/jnosql/artemis/column/ColumnConfigurationProducerXMLTest.java
index 6c4b50638..47af5f49d 100644
--- a/mapping/artemis-column/src/test/java/org/jnosql/artemis/column/ColumnConfigurationProducerXMLTest.java
+++ b/mapping/artemis-column/src/test/java/org/jnosql/artemis/column/ColumnConfigurationProducerXMLTest.java
@@ -52,8 +52,8 @@ public class ColumnConfigurationProducerXMLTest {
     @Test
     public void shouldReadInjectColumnFamily() {
         factoryA.get("database");
-        assertTrue(ColumnFamilyManagerMock.MockFamilyManager.class.isInstance(factoryA));
-        ColumnFamilyManagerMock.MockFamilyManager mock = ColumnFamilyManagerMock.MockFamilyManager.class.cast(factoryA);
+        assertTrue(factoryA instanceof ColumnFamilyManagerMock.MockFamilyManager);
+        ColumnFamilyManagerMock.MockFamilyManager mock = (ColumnFamilyManagerMock.MockFamilyManager) factoryA;
         Map<String, Object> settings = mock.getSettings();
         assertEquals("value", settings.get("key"));
         assertEquals("value2", settings.get("key2"));
@@ -62,8 +62,8 @@ public void shouldReadInjectColumnFamily() {
     @Test
     public void shouldReadInjectColumnFamilyB() {
         factoryB.get("database");
-        assertTrue(ColumnFamilyManagerMock.MockFamilyManager.class.isInstance(factoryB));
-        ColumnFamilyManagerMock.MockFamilyManager mock = ColumnFamilyManagerMock.MockFamilyManager.class.cast(factoryB);
+        assertTrue(factoryB instanceof ColumnFamilyManagerMock.MockFamilyManager);
+        ColumnFamilyManagerMock.MockFamilyManager mock = (ColumnFamilyManagerMock.MockFamilyManager) factoryB;
         Map<String, Object> settings = mock.getSettings();
         assertEquals("value", settings.get("key"));
         assertEquals("value2", settings.get("key2"));
@@ -73,8 +73,8 @@ public void shouldReadInjectColumnFamilyB() {
     @Test
     public void shouldReadInjectColumnFamilyAsync() {
         factoryAsyncA.getAsync("database");
-        assertTrue(ColumnFamilyManagerMock.MockFamilyManager.class.isInstance(factoryAsyncA));
-        ColumnFamilyManagerMock.MockFamilyManager mock = ColumnFamilyManagerMock.MockFamilyManager.class.cast(factoryAsyncA);
+        assertTrue(factoryAsyncA instanceof ColumnFamilyManagerMock.MockFamilyManager);
+        ColumnFamilyManagerMock.MockFamilyManager mock = (ColumnFamilyManagerMock.MockFamilyManager) factoryAsyncA;
         Map<String, Object> settings = mock.getSettings();
         assertEquals("value", settings.get("key"));
         assertEquals("value2", settings.get("key2"));
@@ -83,8 +83,8 @@ public void shouldReadInjectColumnFamilyAsync() {
     @Test
     public void shouldReadInjectColumnFamilyBAsync() {
         factoryAsyncB.getAsync("database");
-        assertTrue(ColumnFamilyManagerMock.MockFamilyManager.class.isInstance(factoryAsyncB));
-        ColumnFamilyManagerMock.MockFamilyManager mock = ColumnFamilyManagerMock.MockFamilyManager.class.cast(factoryAsyncB);
+        assertTrue(factoryAsyncB instanceof ColumnFamilyManagerMock.MockFamilyManager);
+        ColumnFamilyManagerMock.MockFamilyManager mock = (ColumnFamilyManagerMock.MockFamilyManager) factoryAsyncB;
         Map<String, Object> settings = mock.getSettings();
         assertEquals("value", settings.get("key"));
         assertEquals("value2", settings.get("key2"));
diff --git a/mapping/artemis-column/src/test/java/org/jnosql/artemis/column/TemplateConfigurationProducer.java b/mapping/artemis-column/src/test/java/org/jnosql/artemis/column/TemplateConfigurationProducer.java
index c6345ab74..9563349a6 100644
--- a/mapping/artemis-column/src/test/java/org/jnosql/artemis/column/TemplateConfigurationProducer.java
+++ b/mapping/artemis-column/src/test/java/org/jnosql/artemis/column/TemplateConfigurationProducer.java
@@ -50,7 +50,7 @@ public class TemplateConfigurationProducer {
     @Test
     public void shouldTemplate() {
         Assertions.assertNotNull(templateA);
-        ColumnFamilyManager manager = AbstractColumnTemplate.class.cast(templateA).getManager();
+        ColumnFamilyManager manager = ((AbstractColumnTemplate) templateA).getManager();
         Assertions.assertNotNull(manager);
 
     }
@@ -58,14 +58,14 @@ public void shouldTemplate() {
     @Test
     public void shouldTemplateB() {
         Assertions.assertNotNull(templateB);
-        ColumnFamilyManager manager = AbstractColumnTemplate.class.cast(templateB).getManager();
+        ColumnFamilyManager manager = ((AbstractColumnTemplate) templateB).getManager();
         Assertions.assertNotNull(manager);
     }
 
     @Test
     public void shouldTemplateAsync() {
         Assertions.assertNotNull(templateA);
-        ColumnFamilyManagerAsync manager = AbstractColumnTemplateAsync.class.cast(templateAsyncA).getManager();
+        ColumnFamilyManagerAsync manager = ((AbstractColumnTemplateAsync) templateAsyncA).getManager();
         Assertions.assertNotNull(manager);
 
     }
@@ -73,7 +73,7 @@ public void shouldTemplateAsync() {
     @Test
     public void shouldTemplateAsyncB() {
         Assertions.assertNotNull(templateB);
-        ColumnFamilyManagerAsync manager = AbstractColumnTemplateAsync.class.cast(templateAsyncB).getManager();
+        ColumnFamilyManagerAsync manager = ((AbstractColumnTemplateAsync) templateAsyncB).getManager();
         Assertions.assertNotNull(manager);
     }
 }
diff --git a/mapping/artemis-core/src/main/java/org/jnosql/artemis/reflection/ClassConverter.java b/mapping/artemis-core/src/main/java/org/jnosql/artemis/reflection/ClassConverter.java
index bd3e1d254..af2abe99c 100644
--- a/mapping/artemis-core/src/main/java/org/jnosql/artemis/reflection/ClassConverter.java
+++ b/mapping/artemis-core/src/main/java/org/jnosql/artemis/reflection/ClassConverter.java
@@ -117,8 +117,8 @@ private void appendValue(Map<String, NativeMapping> nativeFieldGroupByJavaField,
                 appendFields(nativeFieldGroupByJavaField, field, javaField, nativeField);
                 return;
             case COLLECTION:
-                if (GenericFieldMapping.class.cast(field).isEmbeddable()) {
-                    Class<?> entityClass = GenericFieldMapping.class.cast(field).getElementType();
+                if (((GenericFieldMapping) field).isEmbeddable()) {
+                    Class<?> entityClass = ((GenericFieldMapping) field).getElementType();
                     String nativeFieldAppended = appendPreparePrefix(nativeField, field.getName());
                     appendFields(nativeFieldGroupByJavaField, field, javaField, nativeFieldAppended, entityClass);
                     return;
diff --git a/mapping/artemis-core/src/main/java/org/jnosql/artemis/reflection/DynamicAsyncQueryMethodReturn.java b/mapping/artemis-core/src/main/java/org/jnosql/artemis/reflection/DynamicAsyncQueryMethodReturn.java
index 1e1d085a4..52b96fcc1 100644
--- a/mapping/artemis-core/src/main/java/org/jnosql/artemis/reflection/DynamicAsyncQueryMethodReturn.java
+++ b/mapping/artemis-core/src/main/java/org/jnosql/artemis/reflection/DynamicAsyncQueryMethodReturn.java
@@ -80,7 +80,7 @@ private <T> Consumer<List<T>> getConsumer(Object[] args) {
         Consumer<List<T>> consumer;
         Object callBack = getCallback(args);
         if (callBack instanceof Consumer) {
-            consumer = Consumer.class.cast(callBack);
+            consumer = (Consumer) callBack;
         } else {
             consumer = l -> {
             };
diff --git a/mapping/artemis-core/src/main/java/org/jnosql/artemis/reflection/GenericFieldMapping.java b/mapping/artemis-core/src/main/java/org/jnosql/artemis/reflection/GenericFieldMapping.java
index c08509dbe..c7e9747e5 100644
--- a/mapping/artemis-core/src/main/java/org/jnosql/artemis/reflection/GenericFieldMapping.java
+++ b/mapping/artemis-core/src/main/java/org/jnosql/artemis/reflection/GenericFieldMapping.java
@@ -89,16 +89,16 @@ private boolean isEmbeddableField() {
     }
 
     private boolean hasFieldAnnotation(Class<?> annotation) {
-        return Class.class.cast(ParameterizedType.class.cast(getNativeField()
+        return ((Class) ((ParameterizedType) getNativeField()
                 .getGenericType())
                 .getActualTypeArguments()[0])
                 .getAnnotation(annotation) != null;
     }
 
     public Class getElementType() {
-        return Class.class.cast(ParameterizedType.class.cast(getNativeField()
+        return (Class) ((ParameterizedType) getNativeField()
                 .getGenericType())
-                .getActualTypeArguments()[0]);
+                .getActualTypeArguments()[0];
     }
 
     public Collection getCollectionInstance() {
diff --git a/mapping/artemis-core/src/main/java/org/jnosql/artemis/util/ConverterUtil.java b/mapping/artemis-core/src/main/java/org/jnosql/artemis/util/ConverterUtil.java
index 2722e5138..e14e73ea3 100644
--- a/mapping/artemis-core/src/main/java/org/jnosql/artemis/util/ConverterUtil.java
+++ b/mapping/artemis-core/src/main/java/org/jnosql/artemis/util/ConverterUtil.java
@@ -92,7 +92,7 @@ private static Predicate<AttributeConverter> isNative(Object value) {
     private static ParameterizedType getGenericInterface(AttributeConverter a) {
         for (Type genericInterface : a.getClass().getGenericInterfaces()) {
             if (ParameterizedType.class.isAssignableFrom(genericInterface.getClass()) &&
-                    ParameterizedType.class.cast(genericInterface).getRawType().equals(AttributeConverter.class)) {
+                    ((ParameterizedType) genericInterface).getRawType().equals(AttributeConverter.class)) {
                 return (ParameterizedType) genericInterface;
             }
         }
diff --git a/mapping/artemis-core/src/test/java/org/jnosql/artemis/reflection/DynamicQueryMethodReturnTest.java b/mapping/artemis-core/src/test/java/org/jnosql/artemis/reflection/DynamicQueryMethodReturnTest.java
index 9e2d57932..8996080f2 100644
--- a/mapping/artemis-core/src/test/java/org/jnosql/artemis/reflection/DynamicQueryMethodReturnTest.java
+++ b/mapping/artemis-core/src/test/java/org/jnosql/artemis/reflection/DynamicQueryMethodReturnTest.java
@@ -55,8 +55,8 @@ public void shouldReturnEmptyOptional() throws NoSuchMethodException {
                 .withPrepareConverter(s -> preparedStatement)
                 .build();
         Object execute = dynamicReturn.execute();
-        Assertions.assertTrue(Optional.class.isInstance(execute));
-        Optional<Person> optional = Optional.class.cast(execute);
+        Assertions.assertTrue(execute instanceof Optional);
+        Optional<Person> optional = (Optional) execute;
         Assertions.assertFalse(optional.isPresent());
     }
 
@@ -74,8 +74,8 @@ public void shouldReturnOptional() throws NoSuchMethodException {
                 .withPrepareConverter(s -> preparedStatement)
                 .build();
         Object execute = dynamicReturn.execute();
-        Assertions.assertTrue(Optional.class.isInstance(execute));
-        Optional<Person> optional = Optional.class.cast(execute);
+        Assertions.assertTrue(execute instanceof Optional);
+        Optional<Person> optional = (Optional) execute;
         Assertions.assertTrue(optional.isPresent());
         Assertions.assertEquals(new Person("Ada"), optional.get());
     }
@@ -113,8 +113,8 @@ public void shouldReturnAnInstance() throws NoSuchMethodException {
                 .withPrepareConverter(s -> preparedStatement)
                 .build();
         Object execute = dynamicReturn.execute();
-        Assertions.assertTrue(Person.class.isInstance(execute));
-        Person person = Person.class.cast(execute);
+        Assertions.assertTrue(execute instanceof Person);
+        Person person = (Person) execute;
         Assertions.assertEquals(new Person("Ada"), person);
     }
 
@@ -151,8 +151,8 @@ public void shouldReturnList() throws NoSuchMethodException {
                 .withPrepareConverter(s -> preparedStatement)
                 .build();
         Object execute = dynamicReturn.execute();
-        Assertions.assertTrue(List.class.isInstance(execute));
-        List<Person> persons = List.class.cast(execute);
+        Assertions.assertTrue(execute instanceof List);
+        List<Person> persons = (List) execute;
         Assertions.assertFalse(persons.isEmpty());
         Assertions.assertEquals(new Person("Ada"), persons.get(0));
     }
@@ -172,8 +172,8 @@ public void shouldReturnIterable() throws NoSuchMethodException {
                 .withPrepareConverter(s -> preparedStatement)
                 .build();
         Object execute = dynamicReturn.execute();
-        Assertions.assertTrue(Iterable.class.isInstance(execute));
-        Iterable<Person> persons = List.class.cast(execute);
+        Assertions.assertTrue(execute instanceof Iterable);
+        Iterable<Person> persons = (List) execute;
         Assertions.assertEquals(new Person("Ada"), persons.iterator().next());
     }
 
@@ -190,8 +190,8 @@ public void shouldReturnCollection() throws NoSuchMethodException {
                 .withPrepareConverter(s -> preparedStatement)
                 .build();
         Object execute = dynamicReturn.execute();
-        Assertions.assertTrue(Collection.class.isInstance(execute));
-        Collection<Person> persons = Collection.class.cast(execute);
+        Assertions.assertTrue(execute instanceof Collection);
+        Collection<Person> persons = (Collection) execute;
         Assertions.assertFalse(persons.isEmpty());
         Assertions.assertEquals(new Person("Ada"), persons.iterator().next());
     }
@@ -210,8 +210,8 @@ public void shouldReturnQueue() throws NoSuchMethodException {
                 .withPrepareConverter(s -> preparedStatement)
                 .build();
         Object execute = dynamicReturn.execute();
-        Assertions.assertTrue(Queue.class.isInstance(execute));
-        Queue<Person> persons = Queue.class.cast(execute);
+        Assertions.assertTrue(execute instanceof Queue);
+        Queue<Person> persons = (Queue) execute;
         Assertions.assertFalse(persons.isEmpty());
         Assertions.assertEquals(new Person("Ada"), persons.iterator().next());
     }
@@ -229,8 +229,8 @@ public void shouldReturnStream() throws NoSuchMethodException {
                 .withPrepareConverter(s -> preparedStatement)
                 .build();
         Object execute = dynamicReturn.execute();
-        Assertions.assertTrue(Stream.class.isInstance(execute));
-        Stream<Person> persons = Stream.class.cast(execute);
+        Assertions.assertTrue(execute instanceof Stream);
+        Stream<Person> persons = (Stream) execute;
         Assertions.assertEquals(new Person("Ada"), persons.iterator().next());
     }
 
@@ -252,8 +252,8 @@ public void shouldReturnFromPrepareStatment() throws NoSuchMethodException {
                 .withPrepareConverter(s -> preparedStatement)
                 .build();
         Object execute = dynamicReturn.execute();
-        Assertions.assertTrue(Iterable.class.isInstance(execute));
-        Iterable<Person> persons = List.class.cast(execute);
+        Assertions.assertTrue(execute instanceof Iterable);
+        Iterable<Person> persons = (List) execute;
         Assertions.assertEquals(new Person("Ada"), persons.iterator().next());
     }
 
diff --git a/mapping/artemis-core/src/test/java/org/jnosql/artemis/reflection/DynamicReturnTest.java b/mapping/artemis-core/src/test/java/org/jnosql/artemis/reflection/DynamicReturnTest.java
index d82db752f..711bf6bd1 100644
--- a/mapping/artemis-core/src/test/java/org/jnosql/artemis/reflection/DynamicReturnTest.java
+++ b/mapping/artemis-core/src/test/java/org/jnosql/artemis/reflection/DynamicReturnTest.java
@@ -46,8 +46,8 @@ public void shouldReturnEmptyOptional() throws NoSuchMethodException {
                 .withMethodSource(method).withList(list)
                 .withSingleResult(singlResult).build();
         Object execute = dynamicReturn.execute();
-        Assertions.assertTrue(Optional.class.isInstance(execute));
-        Optional<Person> optional = Optional.class.cast(execute);
+        Assertions.assertTrue(execute instanceof Optional);
+        Optional<Person> optional = (Optional) execute;
         Assertions.assertFalse(optional.isPresent());
     }
 
@@ -62,8 +62,8 @@ public void shouldReturnOptional() throws NoSuchMethodException {
                 .withMethodSource(method).withList(list)
                 .withSingleResult(singlResult).build();
         Object execute = dynamicReturn.execute();
-        Assertions.assertTrue(Optional.class.isInstance(execute));
-        Optional<Person> optional = Optional.class.cast(execute);
+        Assertions.assertTrue(execute instanceof Optional);
+        Optional<Person> optional = (Optional) execute;
         Assertions.assertTrue(optional.isPresent());
         Assertions.assertEquals(new Person("Ada"), optional.get());
     }
@@ -94,8 +94,8 @@ public void shouldReturnAnInstance() throws NoSuchMethodException {
                 .withMethodSource(method).withList(list)
                 .withSingleResult(singlResult).build();
         Object execute = dynamicReturn.execute();
-        Assertions.assertTrue(Person.class.isInstance(execute));
-        Person person = Person.class.cast(execute);
+        Assertions.assertTrue(execute instanceof Person);
+        Person person = (Person) execute;
         Assertions.assertEquals(new Person("Ada"), person);
     }
 
@@ -126,8 +126,8 @@ public void shouldReturnList() throws NoSuchMethodException {
                 .withMethodSource(method).withList(list)
                 .withSingleResult(singlResult).build();
         Object execute = dynamicReturn.execute();
-        Assertions.assertTrue(List.class.isInstance(execute));
-        List<Person> persons = List.class.cast(execute);
+        Assertions.assertTrue(execute instanceof List);
+        List<Person> persons = (List) execute;
         Assertions.assertFalse(persons.isEmpty());
         Assertions.assertEquals(new Person("Ada"), persons.get(0));
     }
@@ -143,8 +143,8 @@ public void shouldReturnIterable() throws NoSuchMethodException {
                 .withMethodSource(method).withList(list)
                 .withSingleResult(singlResult).build();
         Object execute = dynamicReturn.execute();
-        Assertions.assertTrue(Iterable.class.isInstance(execute));
-        Iterable<Person> persons = List.class.cast(execute);
+        Assertions.assertTrue(execute instanceof Iterable);
+        Iterable<Person> persons = (List) execute;
         Assertions.assertEquals(new Person("Ada"), persons.iterator().next());
     }
 
@@ -161,8 +161,8 @@ public void shouldReturnCollection() throws NoSuchMethodException {
                 .withMethodSource(method).withList(list)
                 .withSingleResult(singlResult).build();
         Object execute = dynamicReturn.execute();
-        Assertions.assertTrue(Collection.class.isInstance(execute));
-        Collection<Person> persons = Collection.class.cast(execute);
+        Assertions.assertTrue(execute instanceof Collection);
+        Collection<Person> persons = (Collection) execute;
         Assertions.assertFalse(persons.isEmpty());
         Assertions.assertEquals(new Person("Ada"), persons.iterator().next());
     }
@@ -178,8 +178,8 @@ public void shouldReturnSet() throws NoSuchMethodException {
                 .withMethodSource(method).withList(list)
                 .withSingleResult(singlResult).build();
         Object execute = dynamicReturn.execute();
-        Assertions.assertTrue(Set.class.isInstance(execute));
-        Set<Person> persons = Set.class.cast(execute);
+        Assertions.assertTrue(execute instanceof Set);
+        Set<Person> persons = (Set) execute;
         Assertions.assertFalse(persons.isEmpty());
         Assertions.assertEquals(new Person("Ada"), persons.iterator().next());
     }
@@ -195,8 +195,8 @@ public void shouldReturnQueue() throws NoSuchMethodException {
                 .withMethodSource(method).withList(list)
                 .withSingleResult(singlResult).build();
         Object execute = dynamicReturn.execute();
-        Assertions.assertTrue(Queue.class.isInstance(execute));
-        Queue<Person> persons = Queue.class.cast(execute);
+        Assertions.assertTrue(execute instanceof Queue);
+        Queue<Person> persons = (Queue) execute;
         Assertions.assertFalse(persons.isEmpty());
         Assertions.assertEquals(new Person("Ada"), persons.iterator().next());
     }
@@ -213,8 +213,8 @@ public void shouldReturnStream() throws NoSuchMethodException {
                 .withMethodSource(method).withList(list)
                 .withSingleResult(singlResult).build();
         Object execute = dynamicReturn.execute();
-        Assertions.assertTrue(Stream.class.isInstance(execute));
-        Stream<Person> persons = Stream.class.cast(execute);
+        Assertions.assertTrue(execute instanceof Stream);
+        Stream<Person> persons = (Stream) execute;
         Assertions.assertEquals(new Person("Ada"), persons.iterator().next());
     }
 
diff --git a/mapping/artemis-document/src/main/java/org/jnosql/artemis/document/DefaultDocumentFieldValue.java b/mapping/artemis-document/src/main/java/org/jnosql/artemis/document/DefaultDocumentFieldValue.java
index c914207ba..1c2e6a05d 100644
--- a/mapping/artemis-document/src/main/java/org/jnosql/artemis/document/DefaultDocumentFieldValue.java
+++ b/mapping/artemis-document/src/main/java/org/jnosql/artemis/document/DefaultDocumentFieldValue.java
@@ -68,7 +68,7 @@ public List<Document> toDocument(DocumentEntityConverter converter, Converters c
 
     private List<List<Document>> getDocuments(DocumentEntityConverter converter) {
         List<List<Document>> documents = new ArrayList<>();
-        for (Object element : Iterable.class.cast(getValue())) {
+        for (Object element : (Iterable) getValue()) {
             documents.add(converter.toDocument(element).getDocuments());
         }
         return documents;
@@ -88,7 +88,7 @@ private FieldType getType() {
     }
 
     private boolean isEmbeddableElement() {
-        return GenericFieldMapping.class.cast(getField()).isEmbeddable();
+        return ((GenericFieldMapping) getField()).isEmbeddable();
     }
 
     private String getName() {
diff --git a/mapping/artemis-document/src/main/java/org/jnosql/artemis/document/DocumentFieldConverters.java b/mapping/artemis-document/src/main/java/org/jnosql/artemis/document/DocumentFieldConverters.java
index 8dfa84347..cd8323695 100644
--- a/mapping/artemis-document/src/main/java/org/jnosql/artemis/document/DocumentFieldConverters.java
+++ b/mapping/artemis-document/src/main/java/org/jnosql/artemis/document/DocumentFieldConverters.java
@@ -56,7 +56,7 @@ DocumentFieldConverter get(FieldMapping field) {
         }
 
         private boolean isCollectionEmbeddable(FieldMapping field) {
-            return COLLECTION.equals(field.getType()) && GenericFieldMapping.class.cast(field).isEmbeddable();
+            return COLLECTION.equals(field.getType()) && ((GenericFieldMapping) field).isEmbeddable();
         }
     }
 
@@ -69,8 +69,8 @@ public <T> void convert(T instance, List<Document> documents, Optional<Document>
             if (document.isPresent()) {
                 Document sudDocument = document.get();
                 Object value = sudDocument.get();
-                if (Map.class.isInstance(value)) {
-                    Map map = Map.class.cast(value);
+                if (value instanceof Map) {
+                    Map map = (Map) value;
                     List<Document> embeddedDocument = new ArrayList<>();
 
                     for (Map.Entry entry : (Set<Map.Entry>) map.entrySet()) {
@@ -132,7 +132,7 @@ public <T> void convert(T instance, List<Document> documents, Optional<Document>
 
         private <T> Consumer<Document> convertDocument(T instance, FieldMapping field, AbstractDocumentEntityConverter converter) {
             return document -> {
-                GenericFieldMapping genericField = GenericFieldMapping.class.cast(field);
+                GenericFieldMapping genericField = (GenericFieldMapping) field;
                 Collection collection = genericField.getCollectionInstance();
                 List<List<Document>> embeddable = (List<List<Document>>) document.get();
                 for (List<Document> documentList : embeddable) {
diff --git a/mapping/artemis-document/src/main/java/org/jnosql/artemis/document/query/AbstractDocumentRepositoryAsyncProxy.java b/mapping/artemis-document/src/main/java/org/jnosql/artemis/document/query/AbstractDocumentRepositoryAsyncProxy.java
index 78c23a816..8279f71a0 100644
--- a/mapping/artemis-document/src/main/java/org/jnosql/artemis/document/query/AbstractDocumentRepositoryAsyncProxy.java
+++ b/mapping/artemis-document/src/main/java/org/jnosql/artemis/document/query/AbstractDocumentRepositoryAsyncProxy.java
@@ -74,8 +74,8 @@ public Object invoke(Object instance, Method method, Object[] args) throws Throw
 
     private Object executeDelete(Object[] args, DocumentDeleteQuery query1) {
         Object callBack = getCallBack(args);
-        if (Consumer.class.isInstance(callBack)) {
-            getTemplate().delete(query1, Consumer.class.cast(callBack));
+        if (callBack instanceof Consumer) {
+            getTemplate().delete(query1, (Consumer) callBack);
         } else {
             getTemplate().delete(query1);
         }
@@ -87,8 +87,8 @@ private Object getCallBack(Object[] args) {
     }
 
     private Object executeQuery(Object arg, DocumentQuery query) {
-        if (Consumer.class.isInstance(arg)) {
-            getTemplate().select(query, Consumer.class.cast(arg));
+        if (arg instanceof Consumer) {
+            getTemplate().select(query, (Consumer) arg);
         } else {
             throw new DynamicQueryException("On select async method you must put a java.util.function.Consumer" +
                     " as end parameter as callback");
diff --git a/mapping/artemis-document/src/main/java/org/jnosql/artemis/document/query/DocumentRepositoryAsyncProxy.java b/mapping/artemis-document/src/main/java/org/jnosql/artemis/document/query/DocumentRepositoryAsyncProxy.java
index 9ab1ec0b7..00035c80a 100644
--- a/mapping/artemis-document/src/main/java/org/jnosql/artemis/document/query/DocumentRepositoryAsyncProxy.java
+++ b/mapping/artemis-document/src/main/java/org/jnosql/artemis/document/query/DocumentRepositoryAsyncProxy.java
@@ -45,8 +45,8 @@ class DocumentRepositoryAsyncProxy<T> extends AbstractDocumentRepositoryAsyncPro
     DocumentRepositoryAsyncProxy(DocumentTemplateAsync template, ClassMappings classMappings,
                                  Class<?> repositoryType, Converters converters) {
         this.template = template;
-        Class<T> typeClass = Class.class.cast(ParameterizedType.class.cast(repositoryType.getGenericInterfaces()[0])
-                .getActualTypeArguments()[0]);
+        Class<T> typeClass = (Class) ((ParameterizedType) repositoryType.getGenericInterfaces()[0])
+                .getActualTypeArguments()[0];
         this.classMapping = classMappings.get(typeClass);
         this.repository = new DocumentRepositoryAsync(template, classMapping);
         this.converters = converters;
diff --git a/mapping/artemis-document/src/main/java/org/jnosql/artemis/document/query/DocumentRepositoryProxy.java b/mapping/artemis-document/src/main/java/org/jnosql/artemis/document/query/DocumentRepositoryProxy.java
index a53ca16e7..96998586d 100644
--- a/mapping/artemis-document/src/main/java/org/jnosql/artemis/document/query/DocumentRepositoryProxy.java
+++ b/mapping/artemis-document/src/main/java/org/jnosql/artemis/document/query/DocumentRepositoryProxy.java
@@ -43,8 +43,8 @@ class DocumentRepositoryProxy<T> extends AbstractDocumentRepositoryProxy<T> {
     DocumentRepositoryProxy(DocumentTemplate template, ClassMappings classMappings,
                             Class<?> repositoryType, Converters converters) {
         this.template = template;
-        Class<T> typeClass = Class.class.cast(ParameterizedType.class.cast(repositoryType.getGenericInterfaces()[0])
-                .getActualTypeArguments()[0]);
+        Class<T> typeClass = (Class) ((ParameterizedType) repositoryType.getGenericInterfaces()[0])
+                .getActualTypeArguments()[0];
         this.classMapping = classMappings.get(typeClass);
         this.repository = new DocumentRepository(template, classMapping);
         this.converters = converters;
diff --git a/mapping/artemis-document/src/test/java/org/jnosql/artemis/document/DocumentConfigurationProducerTest.java b/mapping/artemis-document/src/test/java/org/jnosql/artemis/document/DocumentConfigurationProducerTest.java
index 5212af170..dfb133ed4 100644
--- a/mapping/artemis-document/src/test/java/org/jnosql/artemis/document/DocumentConfigurationProducerTest.java
+++ b/mapping/artemis-document/src/test/java/org/jnosql/artemis/document/DocumentConfigurationProducerTest.java
@@ -51,8 +51,8 @@ public class DocumentConfigurationProducerTest {
     @Test
     public void shouldReadInjectDocumentCollection() {
         factoryA.get("database");
-        assertTrue(DocumentCollectionManagerMock.DocumentMock.class.isInstance(factoryA));
-        DocumentCollectionManagerMock.DocumentMock mock = DocumentCollectionManagerMock.DocumentMock.class.cast(factoryA);
+        assertTrue(factoryA instanceof DocumentCollectionManagerMock.DocumentMock);
+        DocumentCollectionManagerMock.DocumentMock mock = (DocumentCollectionManagerMock.DocumentMock) factoryA;
         Map<String, Object> settings = mock.getSettings();
         assertEquals("value", settings.get("key"));
         assertEquals("value2", settings.get("key2"));
@@ -61,8 +61,8 @@ public void shouldReadInjectDocumentCollection() {
     @Test
     public void shouldReadInjectDocumentCollectionB() {
         factoryB.get("database");
-        assertTrue(DocumentCollectionManagerMock.DocumentMock.class.isInstance(factoryB));
-        DocumentCollectionManagerMock.DocumentMock mock = DocumentCollectionManagerMock.DocumentMock.class.cast(factoryB);
+        assertTrue(factoryB instanceof DocumentCollectionManagerMock.DocumentMock);
+        DocumentCollectionManagerMock.DocumentMock mock = (DocumentCollectionManagerMock.DocumentMock) factoryB;
         Map<String, Object> settings = mock.getSettings();
         assertEquals("value", settings.get("key"));
         assertEquals("value2", settings.get("key2"));
@@ -72,8 +72,8 @@ public void shouldReadInjectDocumentCollectionB() {
     @Test
     public void shouldReadInjectDocumentCollectionAsync() {
         factoryAsyncA.getAsync("database");
-        assertTrue(DocumentCollectionManagerMock.DocumentMock.class.isInstance(factoryAsyncA));
-        DocumentCollectionManagerMock.DocumentMock mock = DocumentCollectionManagerMock.DocumentMock.class.cast(factoryAsyncA);
+        assertTrue(factoryAsyncA instanceof DocumentCollectionManagerMock.DocumentMock);
+        DocumentCollectionManagerMock.DocumentMock mock = (DocumentCollectionManagerMock.DocumentMock) factoryAsyncA;
         Map<String, Object> settings = mock.getSettings();
         assertEquals("value", settings.get("key"));
         assertEquals("value2", settings.get("key2"));
@@ -82,8 +82,8 @@ public void shouldReadInjectDocumentCollectionAsync() {
     @Test
     public void shouldReadInjectDocumentCollectionAsyncB() {
         factoryAsyncB.getAsync("database");
-        assertTrue(DocumentCollectionManagerMock.DocumentMock.class.isInstance(factoryAsyncB));
-        DocumentCollectionManagerMock.DocumentMock mock = DocumentCollectionManagerMock.DocumentMock.class.cast(factoryAsyncB);
+        assertTrue(factoryAsyncB instanceof DocumentCollectionManagerMock.DocumentMock);
+        DocumentCollectionManagerMock.DocumentMock mock = (DocumentCollectionManagerMock.DocumentMock) factoryAsyncB;
 
         Map<String, Object> settings = mock.getSettings();
         assertEquals("value", settings.get("key"));
diff --git a/mapping/artemis-document/src/test/java/org/jnosql/artemis/document/DocumentConfigurationProducerXMLTest.java b/mapping/artemis-document/src/test/java/org/jnosql/artemis/document/DocumentConfigurationProducerXMLTest.java
index d5f7fb159..4a7b9160c 100644
--- a/mapping/artemis-document/src/test/java/org/jnosql/artemis/document/DocumentConfigurationProducerXMLTest.java
+++ b/mapping/artemis-document/src/test/java/org/jnosql/artemis/document/DocumentConfigurationProducerXMLTest.java
@@ -51,8 +51,8 @@ public class DocumentConfigurationProducerXMLTest {
     @Test
     public void shouldReadInjectDocumentCollection() {
         factoryA.get("database");
-        assertTrue(DocumentCollectionManagerMock.DocumentMock.class.isInstance(factoryA));
-        DocumentCollectionManagerMock.DocumentMock mock = DocumentCollectionManagerMock.DocumentMock.class.cast(factoryA);
+        assertTrue(factoryA instanceof DocumentCollectionManagerMock.DocumentMock);
+        DocumentCollectionManagerMock.DocumentMock mock = (DocumentCollectionManagerMock.DocumentMock) factoryA;
         Map<String, Object> settings = mock.getSettings();
         assertEquals("value", settings.get("key"));
         assertEquals("value2", settings.get("key2"));
@@ -61,8 +61,8 @@ public void shouldReadInjectDocumentCollection() {
     @Test
     public void shouldReadInjectDocumentCollectionB() {
         factoryB.get("database");
-        assertTrue(DocumentCollectionManagerMock.DocumentMock.class.isInstance(factoryB));
-        DocumentCollectionManagerMock.DocumentMock mock = DocumentCollectionManagerMock.DocumentMock.class.cast(factoryB);
+        assertTrue(factoryB instanceof DocumentCollectionManagerMock.DocumentMock);
+        DocumentCollectionManagerMock.DocumentMock mock = (DocumentCollectionManagerMock.DocumentMock) factoryB;
         Map<String, Object> settings = mock.getSettings();
         assertEquals("value", settings.get("key"));
         assertEquals("value2", settings.get("key2"));
@@ -72,8 +72,8 @@ public void shouldReadInjectDocumentCollectionB() {
     @Test
     public void shouldReadInjectDocumentCollectionAsync() {
         factoryAsyncA.getAsync("database");
-        assertTrue(DocumentCollectionManagerMock.DocumentMock.class.isInstance(factoryAsyncA));
-        DocumentCollectionManagerMock.DocumentMock mock = DocumentCollectionManagerMock.DocumentMock.class.cast(factoryAsyncA);
+        assertTrue(factoryAsyncA instanceof DocumentCollectionManagerMock.DocumentMock);
+        DocumentCollectionManagerMock.DocumentMock mock = (DocumentCollectionManagerMock.DocumentMock) factoryAsyncA;
         Map<String, Object> settings = mock.getSettings();
         assertEquals("value", settings.get("key"));
         assertEquals("value2", settings.get("key2"));
@@ -82,8 +82,8 @@ public void shouldReadInjectDocumentCollectionAsync() {
     @Test
     public void shouldReadInjectDocumentCollectionAsyncB() {
         factoryAsyncB.getAsync("database");
-        assertTrue(DocumentCollectionManagerMock.DocumentMock.class.isInstance(factoryAsyncB));
-        DocumentCollectionManagerMock.DocumentMock mock = DocumentCollectionManagerMock.DocumentMock.class.cast(factoryAsyncB);
+        assertTrue(factoryAsyncB instanceof DocumentCollectionManagerMock.DocumentMock);
+        DocumentCollectionManagerMock.DocumentMock mock = (DocumentCollectionManagerMock.DocumentMock) factoryAsyncB;
         Map<String, Object> settings = mock.getSettings();
         assertEquals("value", settings.get("key"));
         assertEquals("value2", settings.get("key2"));
diff --git a/mapping/artemis-document/src/test/java/org/jnosql/artemis/document/TemplateConfigurationProducer.java b/mapping/artemis-document/src/test/java/org/jnosql/artemis/document/TemplateConfigurationProducer.java
index e9cc22eb9..858b73bdf 100644
--- a/mapping/artemis-document/src/test/java/org/jnosql/artemis/document/TemplateConfigurationProducer.java
+++ b/mapping/artemis-document/src/test/java/org/jnosql/artemis/document/TemplateConfigurationProducer.java
@@ -49,7 +49,7 @@ public class TemplateConfigurationProducer {
     @Test
     public void shouldTemplate() {
         Assertions.assertNotNull(templateA);
-        DocumentCollectionManager manager = AbstractDocumentTemplate.class.cast(templateA).getManager();
+        DocumentCollectionManager manager = ((AbstractDocumentTemplate) templateA).getManager();
         Assertions.assertNotNull(manager);
 
     }
@@ -57,14 +57,14 @@ public void shouldTemplate() {
     @Test
     public void shouldTemplateB() {
         Assertions.assertNotNull(templateB);
-        DocumentCollectionManager manager = AbstractDocumentTemplate.class.cast(templateB).getManager();
+        DocumentCollectionManager manager = ((AbstractDocumentTemplate) templateB).getManager();
         Assertions.assertNotNull(manager);
     }
 
     @Test
     public void shouldTemplateAsync() {
         Assertions.assertNotNull(templateA);
-        DocumentCollectionManagerAsync manager = AbstractDocumentTemplateAsync.class.cast(templateAsyncA).getManager();
+        DocumentCollectionManagerAsync manager = ((AbstractDocumentTemplateAsync) templateAsyncA).getManager();
         Assertions.assertNotNull(manager);
 
     }
@@ -72,7 +72,7 @@ public void shouldTemplateAsync() {
     @Test
     public void shouldTemplateAsyncB() {
         Assertions.assertNotNull(templateB);
-        DocumentCollectionManagerAsync manager = AbstractDocumentTemplateAsync.class.cast(templateAsyncB).getManager();
+        DocumentCollectionManagerAsync manager = ((AbstractDocumentTemplateAsync) templateAsyncB).getManager();
         Assertions.assertNotNull(manager);
     }
 
diff --git a/mapping/artemis-graph/src/main/java/org/jnosql/artemis/graph/GremlinExecutor.java b/mapping/artemis-graph/src/main/java/org/jnosql/artemis/graph/GremlinExecutor.java
index f497a3ace..b7786fa3f 100644
--- a/mapping/artemis-graph/src/main/java/org/jnosql/artemis/graph/GremlinExecutor.java
+++ b/mapping/artemis-graph/src/main/java/org/jnosql/artemis/graph/GremlinExecutor.java
@@ -51,10 +51,10 @@ <T> List<T> executeGremlin(GraphTraversalSource traversalSource, String gremlin,
 
             Object eval = ENGINE.eval(gremlin, bindings);
             if (eval instanceof GraphTraversal) {
-                return convertToList(GraphTraversal.class.cast(eval).toList());
+                return convertToList(((GraphTraversal) eval).toList());
             }
             if (eval instanceof Iterable) {
-                return convertToList(Iterable.class.cast(eval));
+                return convertToList((Iterable) eval);
             }
             return Collections.singletonList((T) eval);
         } catch (ScriptException e) {
@@ -73,11 +73,11 @@ private <T> List<T> convertToList(Iterable<?> iterable) {
 
     private Object getElement(Object entity) {
         if (entity instanceof Vertex) {
-            return converter.toEntity(Vertex.class.cast(entity));
+            return converter.toEntity((Vertex) entity);
         }
 
         if (entity instanceof Edge) {
-            return converter.toEdgeEntity(Edge.class.cast(entity));
+            return converter.toEdgeEntity((Edge) entity);
         }
         return entity;
     }
diff --git a/mapping/artemis-graph/src/main/java/org/jnosql/artemis/graph/query/AbstractQueryConvert.java b/mapping/artemis-graph/src/main/java/org/jnosql/artemis/graph/query/AbstractQueryConvert.java
index 01a8916c2..234b2e051 100644
--- a/mapping/artemis-graph/src/main/java/org/jnosql/artemis/graph/query/AbstractQueryConvert.java
+++ b/mapping/artemis-graph/src/main/java/org/jnosql/artemis/graph/query/AbstractQueryConvert.java
@@ -51,14 +51,14 @@ protected GraphTraversal<Vertex, Vertex> getPredicate(GraphQueryMethod graphQuer
             case IN:
                 return __.has(nativeName, P.within(graphQuery.getInValue(name)));
             case NOT:
-                Condition notCondition = ConditionValue.class.cast(condition.getValue()).get().get(0);
+                Condition notCondition = ((ConditionValue) condition.getValue()).get().get(0);
                 return __.not(getPredicate(graphQuery, notCondition, mapping));
             case AND:
-                return ConditionValue.class.cast(condition.getValue()).get().stream()
+                return ((ConditionValue) condition.getValue()).get().stream()
                         .map(c -> getPredicate(graphQuery, c, mapping)).reduce(GraphTraversal::and)
                         .orElseThrow(() -> new UnsupportedOperationException("There is an inconsistency at the AND operator"));
             case OR:
-                return ConditionValue.class.cast(condition.getValue()).get().stream()
+                return ((ConditionValue) condition.getValue()).get().stream()
                         .map(c -> getPredicate(graphQuery, c, mapping)).reduce(GraphTraversal::or)
                         .orElseThrow(() -> new UnsupportedOperationException("There is an inconsistency at the OR operator"));
             default:
diff --git a/mapping/artemis-graph/src/main/java/org/jnosql/artemis/graph/query/GraphQueryMethod.java b/mapping/artemis-graph/src/main/java/org/jnosql/artemis/graph/query/GraphQueryMethod.java
index 5881ee3ae..3e622bb2e 100644
--- a/mapping/artemis-graph/src/main/java/org/jnosql/artemis/graph/query/GraphQueryMethod.java
+++ b/mapping/artemis-graph/src/main/java/org/jnosql/artemis/graph/query/GraphQueryMethod.java
@@ -71,7 +71,7 @@ public Object getValue(String name) {
     public  Collection<?> getInValue(String name) {
         Object value = getValue();
         if(value instanceof Iterable<?>) {
-            return (Collection<?>) StreamSupport.stream(Iterable.class.cast(value).spliterator(), false)
+            return (Collection<?>) StreamSupport.stream(((Iterable) value).spliterator(), false)
                     .map(v -> ConverterUtil.getValue(v, mapping, name, converters))
                     .collect(Collectors.toList());
         }
diff --git a/mapping/artemis-graph/src/main/java/org/jnosql/artemis/graph/query/GraphRepositoryProxy.java b/mapping/artemis-graph/src/main/java/org/jnosql/artemis/graph/query/GraphRepositoryProxy.java
index a24f39842..1e91892a4 100644
--- a/mapping/artemis-graph/src/main/java/org/jnosql/artemis/graph/query/GraphRepositoryProxy.java
+++ b/mapping/artemis-graph/src/main/java/org/jnosql/artemis/graph/query/GraphRepositoryProxy.java
@@ -51,8 +51,8 @@ class GraphRepositoryProxy<T, ID> extends AbstractGraphRepositoryProxy<T, ID> {
                          Graph graph, GraphConverter converter,
                          Converters converters) {
 
-        Class<T> typeClass = Class.class.cast(ParameterizedType.class.cast(repositoryType.getGenericInterfaces()[0])
-                .getActualTypeArguments()[0]);
+        Class<T> typeClass = (Class) ((ParameterizedType) repositoryType.getGenericInterfaces()[0])
+                .getActualTypeArguments()[0];
 
         this.graph = graph;
         this.converter = converter;
diff --git a/mapping/artemis-graph/src/test/java/org/jnosql/artemis/graph/AbstractGraphConverterTest.java b/mapping/artemis-graph/src/test/java/org/jnosql/artemis/graph/AbstractGraphConverterTest.java
index a2ff0f28d..5f797078a 100644
--- a/mapping/artemis-graph/src/test/java/org/jnosql/artemis/graph/AbstractGraphConverterTest.java
+++ b/mapping/artemis-graph/src/test/java/org/jnosql/artemis/graph/AbstractGraphConverterTest.java
@@ -137,7 +137,7 @@ public void shouldConvertEntityToTinkerPopVertexUsingNativeName() {
         Vertex vertex = getConverter().toVertex(movie);
 
         assertEquals("movie", vertex.label());
-        assertEquals(1999, Number.class.cast(vertex.value("movie_year")).intValue());
+        assertEquals(1999, ((Number) vertex.value("movie_year")).intValue());
         assertEquals("Matrix", vertex.value("title"));
     }
 
diff --git a/mapping/artemis-graph/src/test/java/org/jnosql/artemis/graph/DefaultEdgeTraversalTest.java b/mapping/artemis-graph/src/test/java/org/jnosql/artemis/graph/DefaultEdgeTraversalTest.java
index 2c8d4f1e9..f902c6c52 100644
--- a/mapping/artemis-graph/src/test/java/org/jnosql/artemis/graph/DefaultEdgeTraversalTest.java
+++ b/mapping/artemis-graph/src/test/java/org/jnosql/artemis/graph/DefaultEdgeTraversalTest.java
@@ -64,7 +64,7 @@ public void shouldReturnEdgeId() {
     @Test
     public void shouldReturnOutE() {
         List<EdgeEntity> edges = graphTemplate.getTraversalVertex().outE(READS)
-                .<Person, Book>stream()
+                .stream()
                 .collect(toList());
 
         assertEquals(3, edges.size());
@@ -74,7 +74,7 @@ public void shouldReturnOutE() {
     @Test
     public void shouldReturnOutEWithSupplier() {
         List<EdgeEntity> edges = graphTemplate.getTraversalVertex().outE(() -> READS)
-                .<Person, Book>stream()
+                .stream()
                 .collect(toList());
 
         assertEquals(3, edges.size());
@@ -84,7 +84,7 @@ public void shouldReturnOutEWithSupplier() {
     @Test
     public void shouldReturnErrorOutEWhenIsNull() {
         assertThrows(NullPointerException.class, () -> graphTemplate.getTraversalVertex().outE((String) null)
-                .<Person, Book>stream()
+                .stream()
                 .collect(toList()));
 
 
@@ -93,7 +93,7 @@ public void shouldReturnErrorOutEWhenIsNull() {
     @Test
     public void shouldReturnInE() {
         List<EdgeEntity> edges = graphTemplate.getTraversalVertex().inE(READS)
-                .<Person, Book>stream()
+                .stream()
                 .collect(toList());
 
         assertEquals(3, edges.size());
@@ -103,7 +103,7 @@ public void shouldReturnInE() {
     @Test
     public void shouldReturnInEWitSupplier() {
         List<EdgeEntity> edges = graphTemplate.getTraversalVertex().inE(() -> READS)
-                .<Person, Book>stream()
+                .stream()
                 .collect(toList());
 
         assertEquals(3, edges.size());
@@ -114,7 +114,7 @@ public void shouldReturnInEWitSupplier() {
     @Test
     public void shouldReturnErrorWhenInEIsNull() {
         assertThrows(NullPointerException.class, () -> graphTemplate.getTraversalVertex().inE((String) null)
-                .<Person, Book>stream()
+                .stream()
                 .collect(toList()));
 
     }
@@ -122,7 +122,7 @@ public void shouldReturnErrorWhenInEIsNull() {
     @Test
     public void shouldReturnBothE() {
         List<EdgeEntity> edges = graphTemplate.getTraversalVertex().bothE(READS)
-                .<Person, Book>stream()
+                .stream()
                 .collect(toList());
 
         assertEquals(6, edges.size());
@@ -131,7 +131,7 @@ public void shouldReturnBothE() {
     @Test
     public void shouldReturnBothEWithSupplier() {
         List<EdgeEntity> edges = graphTemplate.getTraversalVertex().bothE(() -> READS)
-                .<Person, Book>stream()
+                .stream()
                 .collect(toList());
 
         assertEquals(6, edges.size());
@@ -140,7 +140,7 @@ public void shouldReturnBothEWithSupplier() {
     @Test
     public void shouldReturErrorWhennBothEIsNull() {
         assertThrows(NullPointerException.class, () -> graphTemplate.getTraversalVertex().bothE((String) null)
-                .<Person, Book>stream()
+                .stream()
                 .collect(toList()));
     }
 
@@ -242,7 +242,7 @@ public void shouldReturnErrorWhenHasPropertyWhenValueIsNull() {
     public void shouldHasNot() {
         List<EdgeEntity> edgeEntities = graphTemplate.getTraversalVertex()
                 .outE(READS).hasNot("language")
-                .<Person, Book>stream()
+                .stream()
                 .collect(toList());
 
         assertEquals(2, edgeEntities.size());
diff --git a/mapping/artemis-graph/src/test/java/org/jnosql/artemis/graph/DefaultValueMapTraversalTest.java b/mapping/artemis-graph/src/test/java/org/jnosql/artemis/graph/DefaultValueMapTraversalTest.java
index 1da2b9f31..147790e90 100644
--- a/mapping/artemis-graph/src/test/java/org/jnosql/artemis/graph/DefaultValueMapTraversalTest.java
+++ b/mapping/artemis-graph/src/test/java/org/jnosql/artemis/graph/DefaultValueMapTraversalTest.java
@@ -93,6 +93,6 @@ public void shouldReturnSingleResult() {
         String name = "Poliana";
         Optional<Map<String, Object>> poliana = graphTemplate.getTraversalVertex().hasLabel("Person").
                 has("name", name).valueMap("name").getSingleResult();
-        assertEquals(name, poliana.map(m -> List.class.cast(m.get("name")).get(0)).orElse(""));
+        assertEquals(name, poliana.map(m -> ((List) m.get("name")).get(0)).orElse(""));
     }
 }
\ No newline at end of file
diff --git a/mapping/artemis-graph/src/test/java/org/jnosql/artemis/graph/DefaultVertexTraversalTest.java b/mapping/artemis-graph/src/test/java/org/jnosql/artemis/graph/DefaultVertexTraversalTest.java
index 740379f13..e187c8c92 100644
--- a/mapping/artemis-graph/src/test/java/org/jnosql/artemis/graph/DefaultVertexTraversalTest.java
+++ b/mapping/artemis-graph/src/test/java/org/jnosql/artemis/graph/DefaultVertexTraversalTest.java
@@ -263,7 +263,7 @@ public void shouldMapValuesAsStream() {
 
         List<String> names = new ArrayList<>();
 
-        maps.forEach(m -> names.add(List.class.cast(m.get("name")).get(0).toString()));
+        maps.forEach(m -> names.add(((List) m.get("name")).get(0).toString()));
 
         assertThat(names, containsInAnyOrder("Otavio", "Poliana", "Paulo"));
     }
diff --git a/mapping/artemis-graph/src/test/java/org/jnosql/artemis/graph/GraphConfigurationProducerTest.java b/mapping/artemis-graph/src/test/java/org/jnosql/artemis/graph/GraphConfigurationProducerTest.java
index 4e74c3dc6..3f8eccb78 100644
--- a/mapping/artemis-graph/src/test/java/org/jnosql/artemis/graph/GraphConfigurationProducerTest.java
+++ b/mapping/artemis-graph/src/test/java/org/jnosql/artemis/graph/GraphConfigurationProducerTest.java
@@ -40,8 +40,8 @@ class GraphConfigurationProducerTest {
 
     @Test
     public void shouldInjectGraphA() {
-        Assertions.assertTrue(GraphMockA.class.isInstance(graphA));
-        GraphMockA graphmock = GraphMockA.class.cast(graphA);
+        Assertions.assertTrue(graphA instanceof GraphMockA);
+        GraphMockA graphmock = (GraphMockA) graphA;
         Assertions.assertEquals("valueA", graphmock.get("key"));
         Assertions.assertEquals("value2A", graphmock.get("key2"));
 
@@ -49,8 +49,8 @@ public void shouldInjectGraphA() {
 
     @Test
     public void shouldInjectGraphB() {
-        Assertions.assertTrue(GraphMockB.class.isInstance(graphB));
-        GraphMockB graphmock = GraphMockB.class.cast(graphB);
+        Assertions.assertTrue(graphB instanceof GraphMockB);
+        GraphMockB graphmock = (GraphMockB) graphB;
         Assertions.assertEquals("valueB", graphmock.get("key"));
         Assertions.assertEquals("value2B", graphmock.get("key2"));
 
diff --git a/mapping/artemis-graph/src/test/java/org/jnosql/artemis/graph/TemplateConfigurationProducer.java b/mapping/artemis-graph/src/test/java/org/jnosql/artemis/graph/TemplateConfigurationProducer.java
index 110cbd2ea..74fa8b3ba 100644
--- a/mapping/artemis-graph/src/test/java/org/jnosql/artemis/graph/TemplateConfigurationProducer.java
+++ b/mapping/artemis-graph/src/test/java/org/jnosql/artemis/graph/TemplateConfigurationProducer.java
@@ -41,14 +41,14 @@ public class TemplateConfigurationProducer {
     @Test
     public void shouldTemplate() {
         Assertions.assertNotNull(templateA);
-        Graph graph = AbstractGraphTemplate.class.cast(templateA).getGraph();
+        Graph graph = ((AbstractGraphTemplate) templateA).getGraph();
         Assertions.assertNotNull(graph);
     }
 
     @Test
     public void shouldTemplateB() {
         Assertions.assertNotNull(templateB);
-        Graph graph = AbstractGraphTemplate.class.cast(templateB).getGraph();
+        Graph graph = ((AbstractGraphTemplate) templateB).getGraph();
         Assertions.assertNotNull(graph);
     }
 }
diff --git a/mapping/artemis-key-value/src/main/java/org/jnosql/artemis/key/query/KeyValueRepositoryProxy.java b/mapping/artemis-key-value/src/main/java/org/jnosql/artemis/key/query/KeyValueRepositoryProxy.java
index 748a4eddd..4c06140a7 100644
--- a/mapping/artemis-key-value/src/main/java/org/jnosql/artemis/key/query/KeyValueRepositoryProxy.java
+++ b/mapping/artemis-key-value/src/main/java/org/jnosql/artemis/key/query/KeyValueRepositoryProxy.java
@@ -39,8 +39,8 @@ class KeyValueRepositoryProxy<T> extends AbstractKeyValueRepositoryProxy<T> {
     }
 
     KeyValueRepositoryProxy(Class<?> repositoryType, KeyValueTemplate template) {
-        Class<T> typeClass = Class.class.cast(ParameterizedType.class.cast(repositoryType.getGenericInterfaces()[0])
-                .getActualTypeArguments()[0]);
+        Class<T> typeClass = (Class) ((ParameterizedType) repositoryType.getGenericInterfaces()[0])
+                .getActualTypeArguments()[0];
         this.repository = new DefaultKeyValueRepository(typeClass, template);
         this.template = template;
         this.entityClass = typeClass;
diff --git a/mapping/artemis-key-value/src/test/java/org/jnosql/artemis/key/KeyValueConfigurationProducerTest.java b/mapping/artemis-key-value/src/test/java/org/jnosql/artemis/key/KeyValueConfigurationProducerTest.java
index 01b8cb45e..ba6cdb1ab 100644
--- a/mapping/artemis-key-value/src/test/java/org/jnosql/artemis/key/KeyValueConfigurationProducerTest.java
+++ b/mapping/artemis-key-value/src/test/java/org/jnosql/artemis/key/KeyValueConfigurationProducerTest.java
@@ -41,8 +41,8 @@ public class KeyValueConfigurationProducerTest {
     @Test
     public void shouldReadBucketManager() {
         factoryA.getBucketManager("database");
-        assertTrue(KeyValueConfigurationMock.BucketManagerFactoryMock.class.isInstance(factoryA));
-        KeyValueConfigurationMock.BucketManagerFactoryMock mock = KeyValueConfigurationMock.BucketManagerFactoryMock.class.cast(factoryA);
+        assertTrue(factoryA instanceof KeyValueConfigurationMock.BucketManagerFactoryMock);
+        KeyValueConfigurationMock.BucketManagerFactoryMock mock = (KeyValueConfigurationMock.BucketManagerFactoryMock) factoryA;
         Map<String, Object> settings = mock.getSettings();
         assertEquals("value", settings.get("key"));
         assertEquals("value2", settings.get("key2"));
@@ -51,8 +51,8 @@ public void shouldReadBucketManager() {
     @Test
     public void shouldReadBucketManagerB() {
         factoryB.getBucketManager("database");
-        assertTrue(KeyValueConfigurationMock.BucketManagerFactoryMock.class.isInstance(factoryB));
-        KeyValueConfigurationMock.BucketManagerFactoryMock mock = KeyValueConfigurationMock.BucketManagerFactoryMock.class.cast(factoryB);
+        assertTrue(factoryB instanceof KeyValueConfigurationMock.BucketManagerFactoryMock);
+        KeyValueConfigurationMock.BucketManagerFactoryMock mock = (KeyValueConfigurationMock.BucketManagerFactoryMock) factoryB;
         Map<String, Object> settings = mock.getSettings();
         assertEquals("value", settings.get("key"));
         assertEquals("value2", settings.get("key2"));
diff --git a/mapping/artemis-key-value/src/test/java/org/jnosql/artemis/key/KeyValueConfigurationProducerXMLTest.java b/mapping/artemis-key-value/src/test/java/org/jnosql/artemis/key/KeyValueConfigurationProducerXMLTest.java
index 906ac0708..8b6a26362 100644
--- a/mapping/artemis-key-value/src/test/java/org/jnosql/artemis/key/KeyValueConfigurationProducerXMLTest.java
+++ b/mapping/artemis-key-value/src/test/java/org/jnosql/artemis/key/KeyValueConfigurationProducerXMLTest.java
@@ -41,8 +41,8 @@ public class KeyValueConfigurationProducerXMLTest {
     @Test
     public void shouldReadBucketManager() {
         factoryA.getBucketManager("database");
-        assertTrue(KeyValueConfigurationMock.BucketManagerFactoryMock.class.isInstance(factoryA));
-        KeyValueConfigurationMock.BucketManagerFactoryMock mock = KeyValueConfigurationMock.BucketManagerFactoryMock.class.cast(factoryA);
+        assertTrue(factoryA instanceof KeyValueConfigurationMock.BucketManagerFactoryMock);
+        KeyValueConfigurationMock.BucketManagerFactoryMock mock = (KeyValueConfigurationMock.BucketManagerFactoryMock) factoryA;
         Map<String, Object> settings = mock.getSettings();
         assertEquals("value", settings.get("key"));
         assertEquals("value2", settings.get("key2"));
@@ -51,8 +51,8 @@ public void shouldReadBucketManager() {
     @Test
     public void shouldReadBucketManagerB() {
         factoryB.getBucketManager("database");
-        assertTrue(KeyValueConfigurationMock.BucketManagerFactoryMock.class.isInstance(factoryB));
-        KeyValueConfigurationMock.BucketManagerFactoryMock mock = KeyValueConfigurationMock.BucketManagerFactoryMock.class.cast(factoryB);
+        assertTrue(factoryB instanceof KeyValueConfigurationMock.BucketManagerFactoryMock);
+        KeyValueConfigurationMock.BucketManagerFactoryMock mock = (KeyValueConfigurationMock.BucketManagerFactoryMock) factoryB;
         Map<String, Object> settings = mock.getSettings();
         assertEquals("value", settings.get("key"));
         assertEquals("value2", settings.get("key2"));
diff --git a/mapping/artemis-key-value/src/test/java/org/jnosql/artemis/key/TemplateConfigurationProducerTest.java b/mapping/artemis-key-value/src/test/java/org/jnosql/artemis/key/TemplateConfigurationProducerTest.java
index 766cf75e5..e22777bf9 100644
--- a/mapping/artemis-key-value/src/test/java/org/jnosql/artemis/key/TemplateConfigurationProducerTest.java
+++ b/mapping/artemis-key-value/src/test/java/org/jnosql/artemis/key/TemplateConfigurationProducerTest.java
@@ -37,7 +37,7 @@ class TemplateConfigurationProducerTest {
     @Test
     public void shouldTemplate() {
         Assertions.assertNotNull(templateA);
-        BucketManager manager = AbstractKeyValueTemplate.class.cast(templateA).getManager();
+        BucketManager manager = ((AbstractKeyValueTemplate) templateA).getManager();
         Assertions.assertNotNull(manager);
 
     }
@@ -45,7 +45,7 @@ public void shouldTemplate() {
     @Test
     public void shouldTemplateB() {
         Assertions.assertNotNull(templateB);
-        BucketManager manager = AbstractKeyValueTemplate.class.cast(templateA).getManager();
+        BucketManager manager = ((AbstractKeyValueTemplate) templateA).getManager();
         Assertions.assertNotNull(manager);
     }