Feature/patch#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WJY-JY wants to merge 24 commits into
base:master
Choose a base branch
from
Open

Feature/patch #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
bf2e796
全面兼容FeignClient注解
Jun 28, 2022
a9816ba
KatoUndeclaredException 增加构造函数，在Client时会调用单String构造函数实例化
Jun 28, 2022
dee58c5
解决当response是空时，json反序列化错误问题；
Jul 1, 2022
823f849
解决当response是空时，json反序列化错误问题；
Jul 1, 2022
7443be1
增加MultiRequestBody.java注解，支持对象展开接收
Jul 6, 2022
9631b5f
优化解析参数逻辑
Jul 6, 2022
dcf3775
argument解析迁移到server
Jul 6, 2022
b1a9ff2
自动配置迁移到@EnableKatoServer中
Jul 6, 2022
c4cd41b
MultiRequestBody注解支持默认不写形式
Jul 6, 2022
8d048b4
添加单元测试工程
Jul 6, 2022
d7a9923
增加kotlin可控类型支持
Jul 6, 2022
543d104
增加kotlin可控类型支持
Jul 6, 2022
162eded
增加kotlin可控类型支持
Jul 6, 2022
7853b03
增加日志追踪打印
Jul 7, 2022
7d1f577
增加日志追踪打印
Jul 7, 2022
89fc590
指定配置名为全限定类名
Jul 8, 2022
3ae6d24
全面兼容EnableFeignClients注解
Jul 8, 2022
d943a87
删除无用的自定义Decoder
Jul 8, 2022
c103d38
增加client单元测试
Jul 8, 2022
2473cc6
修改测试名称
Jul 8, 2022
cdbf79d
temp
Jul 8, 2022
ea921d6
自定义constract，实现参数自动解析为MultiRequestBody参数
Jul 8, 2022
c6ac473
对自定义construct和encode增加RequestParam参数测试
Jul 8, 2022
c90f44d
解决javadoc构建警告
Jul 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions client/src/main/java/me/danwi/kato/client/ImportKatoClients.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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 {};

}
28 changes: 26 additions & 2 deletions client/src/main/java/me/danwi/kato/client/KatoClient.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
}
75 changes: 68 additions & 7 deletions client/src/main/java/me/danwi/kato/client/KatoClientConfig.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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);
}

}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Feature/patch#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WJY-JY wants to merge 24 commits into
base:master
Choose a base branch
from
Open

Feature/patch #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
bf2e796
全面兼容FeignClient注解
Jun 28, 2022
a9816ba
KatoUndeclaredException 增加构造函数，在Client时会调用单String构造函数实例化
Jun 28, 2022
dee58c5
解决当response是空时，json反序列化错误问题；
Jul 1, 2022
823f849
解决当response是空时，json反序列化错误问题；
Jul 1, 2022
7443be1
增加MultiRequestBody.java注解，支持对象展开接收
Jul 6, 2022
9631b5f
优化解析参数逻辑
Jul 6, 2022
dcf3775
argument解析迁移到server
Jul 6, 2022
b1a9ff2
自动配置迁移到@EnableKatoServer中
Jul 6, 2022
c4cd41b
MultiRequestBody注解支持默认不写形式
Jul 6, 2022
8d048b4
添加单元测试工程
Jul 6, 2022
d7a9923
增加kotlin可控类型支持
Jul 6, 2022
543d104
增加kotlin可控类型支持
Jul 6, 2022
162eded
增加kotlin可控类型支持
Jul 6, 2022
7853b03
增加日志追踪打印
Jul 7, 2022
7d1f577
增加日志追踪打印
Jul 7, 2022
89fc590
指定配置名为全限定类名
Jul 8, 2022
3ae6d24
全面兼容EnableFeignClients注解
Jul 8, 2022
d943a87
删除无用的自定义Decoder
Jul 8, 2022
c103d38
增加client单元测试
Jul 8, 2022
2473cc6
修改测试名称
Jul 8, 2022
cdbf79d
temp
Jul 8, 2022
ea921d6
自定义constract，实现参数自动解析为MultiRequestBody参数
Jul 8, 2022
c6ac473
对自定义construct和encode增加RequestParam参数测试
Jul 8, 2022
c90f44d
解决javadoc构建警告
Jul 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions client/src/main/java/me/danwi/kato/client/ImportKatoClients.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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 {};

}
28 changes: 26 additions & 2 deletions client/src/main/java/me/danwi/kato/client/KatoClient.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
}
75 changes: 68 additions & 7 deletions client/src/main/java/me/danwi/kato/client/KatoClientConfig.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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);
}

}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Feature/patch#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WJY-JY wants to merge 24 commits into
base:master
Choose a base branch
from
Open

Feature/patch #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
bf2e796
全面兼容FeignClient注解
Jun 28, 2022
a9816ba
KatoUndeclaredException 增加构造函数，在Client时会调用单String构造函数实例化
Jun 28, 2022
dee58c5
解决当response是空时，json反序列化错误问题；
Jul 1, 2022
823f849
解决当response是空时，json反序列化错误问题；
Jul 1, 2022
7443be1
增加MultiRequestBody.java注解，支持对象展开接收
Jul 6, 2022
9631b5f
优化解析参数逻辑
Jul 6, 2022
dcf3775
argument解析迁移到server
Jul 6, 2022
b1a9ff2
自动配置迁移到@EnableKatoServer中
Jul 6, 2022
c4cd41b
MultiRequestBody注解支持默认不写形式
Jul 6, 2022
8d048b4
添加单元测试工程
Jul 6, 2022
d7a9923
增加kotlin可控类型支持
Jul 6, 2022
543d104
增加kotlin可控类型支持
Jul 6, 2022
162eded
增加kotlin可控类型支持
Jul 6, 2022
7853b03
增加日志追踪打印
Jul 7, 2022
7d1f577
增加日志追踪打印
Jul 7, 2022
89fc590
指定配置名为全限定类名
Jul 8, 2022
3ae6d24
全面兼容EnableFeignClients注解
Jul 8, 2022
d943a87
删除无用的自定义Decoder
Jul 8, 2022
c103d38
增加client单元测试
Jul 8, 2022
2473cc6
修改测试名称
Jul 8, 2022
cdbf79d
temp
Jul 8, 2022
ea921d6
自定义constract，实现参数自动解析为MultiRequestBody参数
Jul 8, 2022
c6ac473
对自定义construct和encode增加RequestParam参数测试
Jul 8, 2022
c90f44d
解决javadoc构建警告
Jul 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions client/src/main/java/me/danwi/kato/client/ImportKatoClients.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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 {};

}
28 changes: 26 additions & 2 deletions client/src/main/java/me/danwi/kato/client/KatoClient.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
}
75 changes: 68 additions & 7 deletions client/src/main/java/me/danwi/kato/client/KatoClientConfig.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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);
}

}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Feature/patch#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WJY-JY wants to merge 24 commits into
base:master
Choose a base branch
from
Open

Feature/patch #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
bf2e796
全面兼容FeignClient注解
Jun 28, 2022
a9816ba
KatoUndeclaredException 增加构造函数，在Client时会调用单String构造函数实例化
Jun 28, 2022
dee58c5
解决当response是空时，json反序列化错误问题；
Jul 1, 2022
823f849
解决当response是空时，json反序列化错误问题；
Jul 1, 2022
7443be1
增加MultiRequestBody.java注解，支持对象展开接收
Jul 6, 2022
9631b5f
优化解析参数逻辑
Jul 6, 2022
dcf3775
argument解析迁移到server
Jul 6, 2022
b1a9ff2
自动配置迁移到@EnableKatoServer中
Jul 6, 2022
c4cd41b
MultiRequestBody注解支持默认不写形式
Jul 6, 2022
8d048b4
添加单元测试工程
Jul 6, 2022
d7a9923
增加kotlin可控类型支持
Jul 6, 2022
543d104
增加kotlin可控类型支持
Jul 6, 2022
162eded
增加kotlin可控类型支持
Jul 6, 2022
7853b03
增加日志追踪打印
Jul 7, 2022
7d1f577
增加日志追踪打印
Jul 7, 2022
89fc590
指定配置名为全限定类名
Jul 8, 2022
3ae6d24
全面兼容EnableFeignClients注解
Jul 8, 2022
d943a87
删除无用的自定义Decoder
Jul 8, 2022
c103d38
增加client单元测试
Jul 8, 2022
2473cc6
修改测试名称
Jul 8, 2022
cdbf79d
temp
Jul 8, 2022
ea921d6
自定义constract，实现参数自动解析为MultiRequestBody参数
Jul 8, 2022
c6ac473
对自定义construct和encode增加RequestParam参数测试
Jul 8, 2022
c90f44d
解决javadoc构建警告
Jul 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions client/src/main/java/me/danwi/kato/client/ImportKatoClients.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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 {};

}
28 changes: 26 additions & 2 deletions client/src/main/java/me/danwi/kato/client/KatoClient.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
}
75 changes: 68 additions & 7 deletions client/src/main/java/me/danwi/kato/client/KatoClientConfig.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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);
}

}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Feature/patch#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WJY-JY wants to merge 24 commits into
base:master
Choose a base branch
from
Open

Feature/patch #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
bf2e796
全面兼容FeignClient注解
Jun 28, 2022
a9816ba
KatoUndeclaredException 增加构造函数，在Client时会调用单String构造函数实例化
Jun 28, 2022
dee58c5
解决当response是空时，json反序列化错误问题；
Jul 1, 2022
823f849
解决当response是空时，json反序列化错误问题；
Jul 1, 2022
7443be1
增加MultiRequestBody.java注解，支持对象展开接收
Jul 6, 2022
9631b5f
优化解析参数逻辑
Jul 6, 2022
dcf3775
argument解析迁移到server
Jul 6, 2022
b1a9ff2
自动配置迁移到@EnableKatoServer中
Jul 6, 2022
c4cd41b
MultiRequestBody注解支持默认不写形式
Jul 6, 2022
8d048b4
添加单元测试工程
Jul 6, 2022
d7a9923
增加kotlin可控类型支持
Jul 6, 2022
543d104
增加kotlin可控类型支持
Jul 6, 2022
162eded
增加kotlin可控类型支持
Jul 6, 2022
7853b03
增加日志追踪打印
Jul 7, 2022
7d1f577
增加日志追踪打印
Jul 7, 2022
89fc590
指定配置名为全限定类名
Jul 8, 2022
3ae6d24
全面兼容EnableFeignClients注解
Jul 8, 2022
d943a87
删除无用的自定义Decoder
Jul 8, 2022
c103d38
增加client单元测试
Jul 8, 2022
2473cc6
修改测试名称
Jul 8, 2022
cdbf79d
temp
Jul 8, 2022
ea921d6
自定义constract，实现参数自动解析为MultiRequestBody参数
Jul 8, 2022
c6ac473
对自定义construct和encode增加RequestParam参数测试
Jul 8, 2022
c90f44d
解决javadoc构建警告
Jul 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions client/src/main/java/me/danwi/kato/client/ImportKatoClients.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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 {};

}
28 changes: 26 additions & 2 deletions client/src/main/java/me/danwi/kato/client/KatoClient.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
}
75 changes: 68 additions & 7 deletions client/src/main/java/me/danwi/kato/client/KatoClientConfig.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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);
}

}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Feature/patch#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WJY-JY wants to merge 24 commits into
base:master
Choose a base branch
from
Open

Feature/patch #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
bf2e796
全面兼容FeignClient注解
Jun 28, 2022
a9816ba
KatoUndeclaredException 增加构造函数，在Client时会调用单String构造函数实例化
Jun 28, 2022
dee58c5
解决当response是空时，json反序列化错误问题；
Jul 1, 2022
823f849
解决当response是空时，json反序列化错误问题；
Jul 1, 2022
7443be1
增加MultiRequestBody.java注解，支持对象展开接收
Jul 6, 2022
9631b5f
优化解析参数逻辑
Jul 6, 2022
dcf3775
argument解析迁移到server
Jul 6, 2022
b1a9ff2
自动配置迁移到@EnableKatoServer中
Jul 6, 2022
c4cd41b
MultiRequestBody注解支持默认不写形式
Jul 6, 2022
8d048b4
添加单元测试工程
Jul 6, 2022
d7a9923
增加kotlin可控类型支持
Jul 6, 2022
543d104
增加kotlin可控类型支持
Jul 6, 2022
162eded
增加kotlin可控类型支持
Jul 6, 2022
7853b03
增加日志追踪打印
Jul 7, 2022
7d1f577
增加日志追踪打印
Jul 7, 2022
89fc590
指定配置名为全限定类名
Jul 8, 2022
3ae6d24
全面兼容EnableFeignClients注解
Jul 8, 2022
d943a87
删除无用的自定义Decoder
Jul 8, 2022
c103d38
增加client单元测试
Jul 8, 2022
2473cc6
修改测试名称
Jul 8, 2022
cdbf79d
temp
Jul 8, 2022
ea921d6
自定义constract，实现参数自动解析为MultiRequestBody参数
Jul 8, 2022
c6ac473
对自定义construct和encode增加RequestParam参数测试
Jul 8, 2022
c90f44d
解决javadoc构建警告
Jul 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions client/src/main/java/me/danwi/kato/client/ImportKatoClients.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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 {};

}
28 changes: 26 additions & 2 deletions client/src/main/java/me/danwi/kato/client/KatoClient.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
}
75 changes: 68 additions & 7 deletions client/src/main/java/me/danwi/kato/client/KatoClientConfig.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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);
}

}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Feature/patch#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WJY-JY wants to merge 24 commits into
base:master
Choose a base branch
from
Open

Feature/patch #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
bf2e796
全面兼容FeignClient注解
Jun 28, 2022
a9816ba
KatoUndeclaredException 增加构造函数，在Client时会调用单String构造函数实例化
Jun 28, 2022
dee58c5
解决当response是空时，json反序列化错误问题；
Jul 1, 2022
823f849
解决当response是空时，json反序列化错误问题；
Jul 1, 2022
7443be1
增加MultiRequestBody.java注解，支持对象展开接收
Jul 6, 2022
9631b5f
优化解析参数逻辑
Jul 6, 2022
dcf3775
argument解析迁移到server
Jul 6, 2022
b1a9ff2
自动配置迁移到@EnableKatoServer中
Jul 6, 2022
c4cd41b
MultiRequestBody注解支持默认不写形式
Jul 6, 2022
8d048b4
添加单元测试工程
Jul 6, 2022
d7a9923
增加kotlin可控类型支持
Jul 6, 2022
543d104
增加kotlin可控类型支持
Jul 6, 2022
162eded
增加kotlin可控类型支持
Jul 6, 2022
7853b03
增加日志追踪打印
Jul 7, 2022
7d1f577
增加日志追踪打印
Jul 7, 2022
89fc590
指定配置名为全限定类名
Jul 8, 2022
3ae6d24
全面兼容EnableFeignClients注解
Jul 8, 2022
d943a87
删除无用的自定义Decoder
Jul 8, 2022
c103d38
增加client单元测试
Jul 8, 2022
2473cc6
修改测试名称
Jul 8, 2022
cdbf79d
temp
Jul 8, 2022
ea921d6
自定义constract，实现参数自动解析为MultiRequestBody参数
Jul 8, 2022
c6ac473
对自定义construct和encode增加RequestParam参数测试
Jul 8, 2022
c90f44d
解决javadoc构建警告
Jul 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions client/src/main/java/me/danwi/kato/client/ImportKatoClients.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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 {};

}
28 changes: 26 additions & 2 deletions client/src/main/java/me/danwi/kato/client/KatoClient.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
}
75 changes: 68 additions & 7 deletions client/src/main/java/me/danwi/kato/client/KatoClientConfig.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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);
}

}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Feature/patch#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WJY-JY wants to merge 24 commits into
base:master
Choose a base branch
from
Open

Feature/patch #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
bf2e796
全面兼容FeignClient注解
Jun 28, 2022
a9816ba
KatoUndeclaredException 增加构造函数，在Client时会调用单String构造函数实例化
Jun 28, 2022
dee58c5
解决当response是空时，json反序列化错误问题；
Jul 1, 2022
823f849
解决当response是空时，json反序列化错误问题；
Jul 1, 2022
7443be1
增加MultiRequestBody.java注解，支持对象展开接收
Jul 6, 2022
9631b5f
优化解析参数逻辑
Jul 6, 2022
dcf3775
argument解析迁移到server
Jul 6, 2022
b1a9ff2
自动配置迁移到@EnableKatoServer中
Jul 6, 2022
c4cd41b
MultiRequestBody注解支持默认不写形式
Jul 6, 2022
8d048b4
添加单元测试工程
Jul 6, 2022
d7a9923
增加kotlin可控类型支持
Jul 6, 2022
543d104
增加kotlin可控类型支持
Jul 6, 2022
162eded
增加kotlin可控类型支持
Jul 6, 2022
7853b03
增加日志追踪打印
Jul 7, 2022
7d1f577
增加日志追踪打印
Jul 7, 2022
89fc590
指定配置名为全限定类名
Jul 8, 2022
3ae6d24
全面兼容EnableFeignClients注解
Jul 8, 2022
d943a87
删除无用的自定义Decoder
Jul 8, 2022
c103d38
增加client单元测试
Jul 8, 2022
2473cc6
修改测试名称
Jul 8, 2022
cdbf79d
temp
Jul 8, 2022
ea921d6
自定义constract，实现参数自动解析为MultiRequestBody参数
Jul 8, 2022
c6ac473
对自定义construct和encode增加RequestParam参数测试
Jul 8, 2022
c90f44d
解决javadoc构建警告
Jul 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions client/src/main/java/me/danwi/kato/client/ImportKatoClients.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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 {};

}
28 changes: 26 additions & 2 deletions client/src/main/java/me/danwi/kato/client/KatoClient.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
}
75 changes: 68 additions & 7 deletions client/src/main/java/me/danwi/kato/client/KatoClientConfig.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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);
}

}
}
Loading