Feature/patch

client/src/main/java/me/danwi/kato/client/ImportKatoClients.java

@@ -17,4 +17,14 @@
 
     @AliasFor(annotation = EnableFeignClients.class)
     Class<?>[] clients() default {};
+
+    @AliasFor(annotation = EnableFeignClients.class)
+    String[] basePackages() default {};
+
+    @AliasFor(annotation = EnableFeignClients.class)
+    Class<?>[] basePackageClasses() default {};
+
+    @AliasFor(annotation = EnableFeignClients.class)
+    Class<?>[] defaultConfiguration() default {};
+
 }

client/src/main/java/me/danwi/kato/client/KatoClient.java

@@ -13,8 +13,32 @@
 @FeignClient(configuration = KatoClientConfig.class)
 public @interface KatoClient {
     @AliasFor(annotation = FeignClient.class)
-    String value();
+    String value() default "";
 
     @AliasFor(annotation = FeignClient.class)
-    String url();
+    String contextId() default "";
+
+    @AliasFor(annotation = FeignClient.class)
+    String name() default "";
+
+    @AliasFor(annotation = FeignClient.class)
+    String[] qualifiers() default {};
+
+    @AliasFor(annotation = FeignClient.class)
+    String url() default "";
+
+    @AliasFor(annotation = FeignClient.class)
+    boolean decode404() default false;
+
+    @AliasFor(annotation = FeignClient.class)
+    Class<?> fallback() default void.class;
+
+    @AliasFor(annotation = FeignClient.class)
+    Class<?> fallbackFactory() default void.class;
+
+    @AliasFor(annotation = FeignClient.class)
+    String path() default "";
+
+    @AliasFor(annotation = FeignClient.class)
+    boolean primary() default true;
 }

client/src/main/java/me/danwi/kato/client/KatoClientConfig.java

@@ -1,19 +1,80 @@
 package me.danwi.kato.client;
 
-import feign.codec.Decoder;
+import feign.Contract;
+import feign.codec.Encoder;
 import feign.codec.ErrorDecoder;
+import feign.form.MultipartFormContentProcessor;
+import feign.form.spring.SpringFormEncoder;
+import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
+import org.springframework.cloud.openfeign.AnnotatedParameterProcessor;
+import org.springframework.cloud.openfeign.FeignClientProperties;
+import org.springframework.cloud.openfeign.support.AbstractFormWriter;
+import org.springframework.cloud.openfeign.support.FeignEncoderProperties;
+import org.springframework.cloud.openfeign.support.HttpMessageConverterCustomizer;
+import org.springframework.cloud.openfeign.support.SpringEncoder;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.core.convert.ConversionService;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static feign.form.ContentType.MULTIPART;
 
-@Configuration("me.danwi.kato.client.Config")
 public class KatoClientConfig {
-    @Bean("me.danwi.kato.client.ResultDecoder")
-    Decoder resultDecoder() {
-        return new KatoResultDecoder();
-    }
+
+    @Autowired
+    private ObjectFactory<HttpMessageConverters> messageConverters;
+    @Autowired(required = false)
+    private FeignEncoderProperties encoderProperties;
 
     @Bean("me.danwi.kato.client.ErrorDecoder")
     ErrorDecoder errorDecoder() {
         return new KatoErrorDecoder();
     }
+
+    @Bean
+    public Encoder katoEncoder(
+            ObjectProvider<AbstractFormWriter> formWriterProvider,
+            ObjectProvider<HttpMessageConverterCustomizer> customizer
+    ) {
+        return new KatoEncoder(springEncoder(formWriterProvider, encoderProperties, customizer));
+    }
+
+    @Bean
+    public Contract katoContract(ObjectProvider<List<AnnotatedParameterProcessor>> parameterProcessors, ObjectProvider<FeignClientProperties> feignClientProperties, ConversionService feignConversionService) {
+        AtomicBoolean decodeSlash = new AtomicBoolean(true);
+        feignClientProperties.ifAvailable(fc -> decodeSlash.set(fc.isDecodeSlash()));
+
+        List<AnnotatedParameterProcessor> processors = new ArrayList<>();
+        parameterProcessors.ifAvailable(processors::addAll);
+
+        return new KatoContract(processors, feignConversionService, decodeSlash.get());
+    }
+
+    private Encoder springEncoder(ObjectProvider<AbstractFormWriter> formWriterProvider,
+                                  FeignEncoderProperties encoderProperties, ObjectProvider<HttpMessageConverterCustomizer> customizers) {
+        AbstractFormWriter formWriter = formWriterProvider.getIfAvailable();
+
+        if (formWriter != null) {
+            return new SpringEncoder(new SpringPojoFormEncoder(formWriter), messageConverters, encoderProperties,
+                    customizers);
+        } else {
+            return new SpringEncoder(new SpringFormEncoder(), messageConverters, encoderProperties, customizers);
+        }
+    }
+
+    private static class SpringPojoFormEncoder extends SpringFormEncoder {
+
+        SpringPojoFormEncoder(AbstractFormWriter formWriter) {
+            super();
+
+            MultipartFormContentProcessor processor = (MultipartFormContentProcessor) getContentProcessor(MULTIPART);
+            processor.addFirstWriter(formWriter);
+        }
+
+    }
 }