refactor(converter): use dynamic dispatch for Result / LookupElements converter traits

Author: jeysal

src/main/groovy/com/github/jeysal/intellij/plugin/livetemplate/scriptenginemacro/conversion/generic/BaseStreamConverter.groovy

@@ -8,10 +8,8 @@ import java.util.stream.BaseStream
  * @author seckinger
  * @since 10/17/16
  */
-trait BaseStreamConverter<R> implements Converter<Object, R> {
-    R convert(final obj) {
-        obj instanceof BaseStream ?
-                convert(obj.spliterator()) :
-                super.convert(obj)
+trait BaseStreamConverter<R> implements Converter<BaseStream, R> {
+    R convert(final BaseStream stream) {
+        convert(stream.spliterator())
     }
 }

src/main/groovy/com/github/jeysal/intellij/plugin/livetemplate/scriptenginemacro/conversion/generic/InputStreamConverter.groovy

@@ -8,10 +8,8 @@ import static com.github.jeysal.java.util.function.SupplierUtils.trying
  * @author seckinger
  * @since 10/18/16
  */
-trait InputStreamConverter<R> implements Converter<Object, R> {
-    R convert(final obj) {
-        obj instanceof InputStream ?
-                convert(trying(obj.&getText).get().orElse(null)) :
-                super.convert(obj)
+trait InputStreamConverter<R> implements Converter<InputStream, R> {
+    R convert(final InputStream inputStream) {
+        convert(trying(inputStream.&getText).get().orElse(null))
     }
 }

src/main/groovy/com/github/jeysal/intellij/plugin/livetemplate/scriptenginemacro/conversion/generic/IterableConverter.groovy

@@ -6,10 +6,8 @@ import com.github.jeysal.intellij.plugin.livetemplate.scriptenginemacro.conversi
  * @author seckinger
  * @since 10/17/16
  */
-trait IterableConverter<R> implements Converter<Object, R> {
-    R convert(final obj) {
-        obj instanceof Iterable ?
-                convert(obj.spliterator()) :
-                super.convert(obj)
+trait IterableConverter<R> implements Converter<Iterable, R> {
+    R convert(final Iterable iterable) {
+        convert(iterable.spliterator())
     }
 }

src/main/groovy/com/github/jeysal/intellij/plugin/livetemplate/scriptenginemacro/conversion/generic/IteratorConverter.groovy

@@ -6,10 +6,8 @@ import com.github.jeysal.intellij.plugin.livetemplate.scriptenginemacro.conversi
  * @author seckinger
  * @since 10/17/16
  */
-trait IteratorConverter<R> implements Converter<Object, R> {
-    R convert(final obj) {
-        obj instanceof Iterator ?
-                convert(Spliterators.spliteratorUnknownSize(obj, 0)) :
-                super.convert(obj)
+trait IteratorConverter<R> implements Converter<Iterator, R> {
+    R convert(final Iterator iterator) {
+        convert(Spliterators.spliteratorUnknownSize(iterator, 0))
     }
 }

src/main/groovy/com/github/jeysal/intellij/plugin/livetemplate/scriptenginemacro/conversion/generic/MapConverter.groovy

@@ -6,10 +6,8 @@ import com.github.jeysal.intellij.plugin.livetemplate.scriptenginemacro.conversi
  * @author seckinger
  * @since 10/17/16
  */
-trait MapConverter<R> implements Converter<Object, R> {
-    R convert(final obj) {
-        obj instanceof Map ?
-                convert(obj.values().spliterator()) :
-                super.convert(obj)
+trait MapConverter<R> implements Converter<Map, R> {
+    R convert(final Map map) {
+        convert(map.values().spliterator())
     }
 }

src/main/groovy/com/github/jeysal/intellij/plugin/livetemplate/scriptenginemacro/conversion/generic/OptionalConverter.groovy

@@ -6,10 +6,8 @@ import com.github.jeysal.intellij.plugin.livetemplate.scriptenginemacro.conversi
  * @author seckinger
  * @since 10/17/16
  */
-trait OptionalConverter<R> implements Converter<Object, R> {
-    R convert(final obj) {
-        obj instanceof Optional ?
-                convert(obj.orElse('empty')) :
-                super.convert(obj)
+trait OptionalConverter<R> implements Converter<Optional, R> {
+    R convert(final Optional optional) {
+        convert(optional.orElse('empty'))
     }
 }

src/main/groovy/com/github/jeysal/intellij/plugin/livetemplate/scriptenginemacro/conversion/generic/ReaderConverter.groovy

@@ -8,10 +8,8 @@ import static com.github.jeysal.java.util.function.SupplierUtils.trying
  * @author seckinger
  * @since 10/18/16
  */
-trait ReaderConverter<R> implements Converter<Object, R> {
-    R convert(final obj) {
-        obj instanceof Reader ?
-                convert(trying(obj.&getText).get().orElse(null)) :
-                super.convert(obj)
+trait ReaderConverter<R> implements Converter<Reader, R> {
+    R convert(final Reader reader) {
+        convert(trying(reader.&getText).get().orElse(null))
     }
 }

src/main/groovy/com/github/jeysal/intellij/plugin/livetemplate/scriptenginemacro/conversion/generic/SupplierConverter.groovy

@@ -8,10 +8,8 @@ import java.util.function.Supplier
  * @author seckinger
  * @since 10/17/16
  */
-trait SupplierConverter<R> implements Converter<Object, R> {
-    R convert(final obj) {
-        obj instanceof Supplier ?
-                convert(obj.get()) :
-                super.convert(obj)
+trait SupplierConverter<R> implements Converter<Supplier, R> {
+    R convert(final Supplier supplier) {
+        convert(supplier.get())
     }
 }

src/main/groovy/com/github/jeysal/intellij/plugin/livetemplate/scriptenginemacro/conversion/lookupelements/DefaultLookupElementsConverter.groovy

@@ -7,7 +7,7 @@ import com.intellij.codeInsight.lookup.LookupElementBuilder
  * @author seckinger
  * @since 10/18/16
  */
-class DefaultLookupElementsConverter implements LookupElementsConverter {
+class DefaultLookupElementsConverter implements LookupElementsConverter<Object> {
     @Override
     LookupElement[] convert(final obj) {
         obj == null ?

src/main/groovy/com/github/jeysal/intellij/plugin/livetemplate/scriptenginemacro/conversion/lookupelements/LookupElementsConverter.java

@@ -8,5 +8,5 @@
  * @since 1/6/17
  */
 @FunctionalInterface
-public interface LookupElementsConverter extends Converter<Object, LookupElement[]> {
+public interface LookupElementsConverter<T> extends Converter<T, LookupElement[]> {
 }

src/main/groovy/com/github/jeysal/intellij/plugin/livetemplate/scriptenginemacro/conversion/lookupelements/LookupElementsConverterImpl.groovy

@@ -1,21 +1,22 @@
 package com.github.jeysal.intellij.plugin.livetemplate.scriptenginemacro.conversion.lookupelements
 
 import com.github.jeysal.intellij.plugin.livetemplate.scriptenginemacro.conversion.generic.*
+import com.intellij.codeInsight.lookup.LookupElement
 
 /**
  * @author seckinger
  * @since 10/18/16
  */
 class LookupElementsConverterImpl extends DefaultLookupElementsConverter implements
-        ArrayConverter,
-        BaseStreamConverter,
-        InputStreamConverter,
-        IterableConverter,
-        IteratorConverter,
-        MapConverter,
-        OptionalConverter,
-        ReaderConverter,
-        SupplierConverter,
+        ArrayConverter<LookupElement[]>,
+        BaseStreamConverter<LookupElement[]>,
+        InputStreamConverter<LookupElement[]>,
+        IterableConverter<LookupElement[]>,
+        IteratorConverter<LookupElement[]>,
+        MapConverter<LookupElement[]>,
+        OptionalConverter<LookupElement[]>,
+        ReaderConverter<LookupElement[]>,
+        SupplierConverter<LookupElement[]>,
         SingleLookupElementConverter,
         SpliteratorLookupElementsConverter {
 }

src/main/groovy/com/github/jeysal/intellij/plugin/livetemplate/scriptenginemacro/conversion/lookupelements/SingleLookupElementConverter.groovy

@@ -6,11 +6,9 @@ import com.intellij.codeInsight.lookup.LookupElement
  * @author seckinger
  * @since 10/22/16
  */
-trait SingleLookupElementConverter implements LookupElementsConverter {
+trait SingleLookupElementConverter implements LookupElementsConverter<LookupElement> {
     @Override
-    LookupElement[] convert(final obj) {
-        obj instanceof LookupElement ?
-                [obj] as LookupElement[] :
-                super.convert(obj)
+    LookupElement[] convert(final LookupElement elem) {
+        [elem] as LookupElement[]
     }
 }

src/main/groovy/com/github/jeysal/intellij/plugin/livetemplate/scriptenginemacro/conversion/lookupelements/SpliteratorLookupElementsConverter.groovy

@@ -9,10 +9,8 @@ import java.util.stream.StreamSupport
  * @author seckinger
  * @since 10/22/16
  */
-trait SpliteratorLookupElementsConverter implements LookupElementsConverter {
-    LookupElement[] convert(final obj) {
-        obj instanceof Spliterator ?
-                StreamSupport.stream(obj, false).map(this.&convert).collect(Collectors.toList()).flatten() as LookupElement[] :
-                super.convert(obj)
+trait SpliteratorLookupElementsConverter implements LookupElementsConverter<Spliterator> {
+    LookupElement[] convert(final Spliterator spliterator) {
+        StreamSupport.stream(spliterator, false).map(this.&convert).collect(Collectors.toList()).flatten() as LookupElement[]
     }
 }

src/main/groovy/com/github/jeysal/intellij/plugin/livetemplate/scriptenginemacro/conversion/result/DefaultResultConverter.groovy

@@ -7,7 +7,7 @@ import com.intellij.codeInsight.template.TextResult
  * @author seckinger
  * @since 10/17/16
  */
-class DefaultResultConverter implements ResultConverter {
+class DefaultResultConverter implements ResultConverter<Object> {
     @Override
     Result convert(final obj) {
         new TextResult(Objects.toString(obj))

src/main/groovy/com/github/jeysal/intellij/plugin/livetemplate/scriptenginemacro/conversion/result/IdentityResultConverter.groovy

@@ -6,11 +6,9 @@ import com.intellij.codeInsight.template.Result
  * @author seckinger
  * @since 10/17/16
  */
-trait IdentityResultConverter implements ResultConverter {
+trait IdentityResultConverter implements ResultConverter<Result> {
     @Override
-    Result convert(final obj) {
-        obj instanceof Result ?
-                obj :
-                super.convert(obj)
+    Result convert(final Result res) {
+        res
     }
 }

src/main/groovy/com/github/jeysal/intellij/plugin/livetemplate/scriptenginemacro/conversion/result/ResultConverter.java

@@ -8,5 +8,5 @@
  * @since 1/6/17
  */
 @FunctionalInterface
-public interface ResultConverter extends Converter<Object, Result> {
+public interface ResultConverter<T> extends Converter<T, Result> {
 }

src/main/groovy/com/github/jeysal/intellij/plugin/livetemplate/scriptenginemacro/conversion/result/ResultConverterImpl.groovy

@@ -1,21 +1,22 @@
 package com.github.jeysal.intellij.plugin.livetemplate.scriptenginemacro.conversion.result
 
 import com.github.jeysal.intellij.plugin.livetemplate.scriptenginemacro.conversion.generic.*
+import com.intellij.codeInsight.template.Result
 
 /**
  * @author seckinger
  * @since 10/17/16
  */
 class ResultConverterImpl extends DefaultResultConverter implements
-        ArrayConverter,
-        BaseStreamConverter,
-        InputStreamConverter,
-        IterableConverter,
-        IteratorConverter,
-        MapConverter,
-        OptionalConverter,
-        ReaderConverter,
-        SupplierConverter,
+        ArrayConverter<Result>,
+        BaseStreamConverter<Result>,
+        InputStreamConverter<Result>,
+        IterableConverter<Result>,
+        IteratorConverter<Result>,
+        MapConverter<Result>,
+        OptionalConverter<Result>,
+        ReaderConverter<Result>,
+        SupplierConverter<Result>,
         IdentityResultConverter,
         SpliteratorResultConverter {
 }

src/main/groovy/com/github/jeysal/intellij/plugin/livetemplate/scriptenginemacro/conversion/result/SpliteratorResultConverter.groovy

@@ -8,11 +8,9 @@ import java.util.stream.StreamSupport
  * @author seckinger
  * @since 10/17/16
  */
-trait SpliteratorResultConverter implements ResultConverter {
+trait SpliteratorResultConverter implements ResultConverter<Spliterator> {
     @Override
-    Result convert(final obj) {
-        obj instanceof Spliterator ?
-                convert(StreamSupport.stream(obj, false).findFirst().orElse(null)) :
-                super.convert(obj)
+    Result convert(final Spliterator spliterator) {
+        convert(StreamSupport.stream(spliterator, false).findFirst().orElse(null))
     }
 }