Merge pull request #14 from zenuo/feature_remove_spring

remove spring

Author: zenuo

gogo-server/application.yml

@@ -1,11 +1,4 @@
-# 全局配置
----
-spring:
-  application.name: gogo
-...
-
 # HTTP客户端设置
----
 http.client:
   #最大连接数
   maxTotal: 40
@@ -17,10 +10,8 @@ http.client:
   connectionRequestTimeout: 500
   #数据传输的最长时间
   socketTimeout: 500
-...
 
 # Gogo配置
----
 gogo:
   # 监听端口
   port: 4999
@@ -32,5 +23,4 @@ gogo:
   slogan: 欢迎<a href="https://github.com/zenuo/gogo">star</a>，蟹蟹支持🥳
   # 搜索结果替换规则
   substitute:
-    - https://zh.wikipedia.org#https://176.122.157.73:3457
-...
+    - https://zh.wikipedia.org#https://176.122.157.73:3457

gogo-server/pom.xml

@@ -6,27 +6,17 @@
 
     <groupId>zenuo</groupId>
     <artifactId>gogo</artifactId>
-    <version>1.7.3</version>
+    <version>1.7.4</version>
 
     <packaging>jar</packaging>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.4.RELEASE</version>
-    </parent>
-
     <build>
         <finalName>gogo</finalName>
         <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -36,14 +26,31 @@
                     <target>11</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.4</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <transformers>
+                                <transformer
+                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <mainClass>zenuo.gogo.GogoApplication</mainClass>
+                                </transformer>
+                            </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>
@@ -57,7 +64,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.10.2</version>
+            <version>2.11.1</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
@@ -80,20 +87,25 @@
             <version>3.8.1</version>
         </dependency>
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-test</artifactId>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>7.1.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <scope>test</scope>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-yaml</artifactId>
+            <version>2.11.1</version>
         </dependency>
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <version>7.1.0</version>
-            <scope>test</scope>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.11</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.7</version>
         </dependency>
 
         <dependency>

gogo-server/src/main/java/zenuo/gogo/GogoApplication.java

@@ -1,7 +1,6 @@
 package zenuo.gogo;
 
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
+import zenuo.gogo.core.Server;
 
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -12,7 +11,6 @@
  * @author zenuo
  * 2018-06-02 19:12:15
  */
-@SpringBootApplication
 public class GogoApplication {
     public static void main(String[] args) {
         //若当前目录存在配置文件
@@ -22,6 +20,6 @@ public static void main(String[] args) {
             System.setProperty("spring.config.location", "file:" + configFilePath);
         }
         //启动
-        SpringApplication.run(GogoApplication.class, args);
+        new Server();
     }
 }

gogo-server/src/main/java/zenuo/gogo/core/Handler.java

@@ -11,11 +11,13 @@
 import io.netty.handler.timeout.IdleState;
 import io.netty.handler.timeout.IdleStateEvent;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-import zenuo.gogo.core.processor.IProcessor;
+import zenuo.gogo.core.processor.IIndexProcessor;
+import zenuo.gogo.core.processor.ILintProcessor;
+import zenuo.gogo.core.processor.ISearchProcessor;
 
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
+import java.util.ServiceLoader;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ThreadFactory;
@@ -27,24 +29,23 @@
  * 处理器类，通道读取事件的回调
  */
 @Slf4j
-@Component
 @ChannelHandler.Sharable
 public final class Handler extends SimpleChannelInboundHandler<FullHttpRequest> {
 
     /**
      * 首页处理器
      */
-    private final IProcessor indexProcessor;
+    private final IIndexProcessor indexProcessor = ServiceLoader.load(IIndexProcessor.class).iterator().next();
 
     /**
      * 搜索处理器
      */
-    private final IProcessor searchProcessor;
+    private final ISearchProcessor searchProcessor = ServiceLoader.load(ISearchProcessor.class).iterator().next();
 
     /**
      * 补全处理器
      */
-    private final IProcessor lintProcessor;
+    private final ILintProcessor lintProcessor = ServiceLoader.load(ILintProcessor.class).iterator().next();
 
     /**
      * 处理工作者线程池
@@ -56,10 +57,7 @@ public final class Handler extends SimpleChannelInboundHandler<FullHttpRequest>
      */
     private final BlockingQueue<Runnable> workQueue;
 
-    public Handler(IProcessor indexProcessor, IProcessor searchProcessor, IProcessor lintProcessor) {
-        this.indexProcessor = indexProcessor;
-        this.searchProcessor = searchProcessor;
-        this.lintProcessor = lintProcessor;
+    public Handler() {
         this.workQueue = new ArrayBlockingQueue<>(256);
         this.processWorkers = new ThreadPoolExecutor(2, 8,
                 30, TimeUnit.SECONDS,

gogo-server/src/main/java/zenuo/gogo/core/Server.java

@@ -11,33 +11,25 @@
 import io.netty.handler.logging.LogLevel;
 import io.netty.handler.logging.LoggingHandler;
 import io.netty.handler.stream.ChunkedWriteHandler;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
+import zenuo.gogo.core.config.ApplicationConfig;
 import zenuo.gogo.core.config.GogoConfig;
 
-import javax.annotation.PostConstruct;
 
 /**
  * 服务器
  *
  * @author zenuo
  * @date 2019/05/08
  */
-@Component
 @Slf4j
-@RequiredArgsConstructor
 public final class Server {
 
-    @NonNull
-    private final GogoConfig gogoConfig;
+    private final GogoConfig gogoConfig = ApplicationConfig.gogoConfig();
 
-    @NonNull
-    private final Handler handler;
+    private final Handler handler = new Handler();
 
-    @PostConstruct
-    private void postConstruct() {
+    public Server() {
         //acceptor
         final NioEventLoopGroup boss = new NioEventLoopGroup(1);
         //client

gogo-server/src/main/java/zenuo/gogo/core/config/ApplicationConfig.java

@@ -0,0 +1,53 @@
+package zenuo.gogo.core.config;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * application
+ *
+ * @author zenuo
+ * @version 2020-07-25
+ */
+@Getter
+@Setter
+@Slf4j
+public class ApplicationConfig {
+
+    private static ApplicationConfig INSTANCE;
+
+    static {
+        try {
+            INSTANCE = new ObjectMapper(new YAMLFactory()).readValue(new File("./application.yml"), ApplicationConfig.class);
+        } catch (IOException e) {
+            log.error("loading config error", e);
+            throw new RuntimeException(e);
+        }
+        INSTANCE.gogoConfig.postConstruct();
+    }
+
+    public static void main(String[] args) {
+        System.out.println(INSTANCE);
+    }
+
+    public static HttpClientConfig httpClientConfig() {
+        return INSTANCE.httpClientConfig;
+    }
+
+    public static GogoConfig gogoConfig() {
+        return INSTANCE.gogoConfig;
+    }
+
+    @JsonProperty("http.client")
+    private HttpClientConfig httpClientConfig;
+
+    @JsonProperty("gogo")
+    private GogoConfig gogoConfig;
+}

gogo-server/src/main/java/zenuo/gogo/core/config/EhcacheConfig.java

@@ -1,34 +1,25 @@
 package zenuo.gogo.core.config;
 
 import org.ehcache.Cache;
-import org.ehcache.CacheManager;
 import org.ehcache.config.CacheConfiguration;
 import org.ehcache.config.builders.CacheConfigurationBuilder;
 import org.ehcache.config.builders.CacheManagerBuilder;
 import org.ehcache.config.builders.ExpiryPolicyBuilder;
 import org.ehcache.config.builders.ResourcePoolsBuilder;
 import org.ehcache.config.units.MemoryUnit;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
 
 import java.time.Duration;
 
-@Component
 public class EhcacheConfig {
-    @Bean
-    private CacheManager cacheManager() {
+    public static Cache<String, String> get() {
         CacheConfiguration<String, String> config = CacheConfigurationBuilder.newCacheConfigurationBuilder(
                 String.class, String.class,
                 ResourcePoolsBuilder.newResourcePoolsBuilder().offheap(16L, MemoryUnit.MB))
                 .withExpiry(ExpiryPolicyBuilder.timeToIdleExpiration(Duration.ofSeconds(Constants.SEARCH_RESPONSE_CACHE_TTL_IN_SECONDS)))
                 .build();
         return CacheManagerBuilder.newCacheManagerBuilder()
                 .withCache(Constants.SEARCH_RESULT_CACHE_ALIAS, config)
-                .build(true);
-    }
-
-    @Bean
-    private Cache<String, String> cache(CacheManager cacheManager) {
-        return cacheManager.getCache(Constants.SEARCH_RESULT_CACHE_ALIAS, String.class, String.class);
+                .build(true)
+                .getCache(Constants.SEARCH_RESULT_CACHE_ALIAS, String.class, String.class);
     }
 }