fixes instead of

eclipse · Feb 24, 2019 · 0bca34f · 0bca34f
1 parent 566cd23
commit 0bca34f
Show file tree

Hide file tree

Showing 36 changed files with 152 additions and 152 deletions.
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
@@ -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
@@ -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/...umn/src/main/java/org/jnosql/artemis/column/query/AbstractColumnRepositoryAsyncProxy.java b/...umn/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/...emis-column/src/main/java/org/jnosql/artemis/column/query/ColumnRepositoryAsyncProxy.java b/...emis-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/...g/artemis-column/src/main/java/org/jnosql/artemis/column/query/ColumnRepositoryProxy.java b/...g/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/...temis-column/src/test/java/org/jnosql/artemis/column/ColumnConfigurationProducerTest.java b/...temis-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/...is-column/src/test/java/org/jnosql/artemis/column/ColumnConfigurationProducerXMLTest.java b/...is-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/...artemis-column/src/test/java/org/jnosql/artemis/column/TemplateConfigurationProducer.java b/...artemis-column/src/test/java/org/jnosql/artemis/column/TemplateConfigurationProducer.java
@@ -50,30 +50,30 @@ 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);
 
     }
 
     @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);
 
     }
 
     @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
@@ -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/...temis-core/src/main/java/org/jnosql/artemis/reflection/DynamicAsyncQueryMethodReturn.java b/...temis-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
@@ -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
@@ -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/...rtemis-core/src/test/java/org/jnosql/artemis/reflection/DynamicQueryMethodReturnTest.java b/...rtemis-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());
     }