fix no response if cache hits

Author: zenuo

gogo-server/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>zenuo</groupId>
     <artifactId>gogo</artifactId>
-    <version>1.7.7</version>
+    <version>1.7.8</version>
 
     <packaging>jar</packaging>
 
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>
-            <version>1.12.1</version>
+            <version>1.13.1</version>
         </dependency>
         <dependency>
             <groupId>com.lmax</groupId>
@@ -63,33 +63,23 @@
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j18-impl</artifactId>
-            <version>2.14.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
-            <version>2.14.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
+            <artifactId>log4j-slf4j-impl</artifactId>
             <version>2.14.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.11.1</version>
+            <version>2.12.1</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
-            <version>4.1.45.Final</version>
+            <version>4.1.58.Final</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-pool2</artifactId>
-            <version>2.8.0</version>
+            <version>2.9.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
@@ -99,7 +89,7 @@
         <dependency>
             <groupId>org.ehcache</groupId>
             <artifactId>ehcache</artifactId>
-            <version>3.8.1</version>
+            <version>3.9.0</version>
         </dependency>
         <dependency>
             <groupId>org.testng</groupId>
@@ -110,7 +100,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>2.11.1</version>
+            <version>2.12.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -126,7 +116,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.10</version>
+            <version>1.18.16</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

gogo-server/src/main/java/zenuo/gogo/core/processor/ISearchResultProvider.java

@@ -40,7 +40,7 @@ public interface ISearchResultProvider {
      * @param page 页码
      * @return 搜索结果
      */
-    default Optional<SearchResponse> readCache(ICacheService cacheService, String key, int page) {
+    static Optional<SearchResponse> readCache(ICacheService cacheService, String key, int page) {
         //从缓存服务中读取
         final String cacheKey = String.format(Constants.KEY_SEARCH_RESPONSE_PATTERN, key.hashCode(), page);
         final Optional<byte[]> value = cacheService.get(cacheKey);
@@ -55,7 +55,7 @@ default Optional<SearchResponse> readCache(ICacheService cacheService, String ke
      * @param page           页码
      * @param searchResponse 搜索结果
      */
-    default void writeCache(ICacheService cacheService, String key, int page, SearchResponse searchResponse) {
+    static void writeCache(ICacheService cacheService, String key, int page, SearchResponse searchResponse) {
         //序列化，键
         final String cacheKey = String.format(Constants.KEY_SEARCH_RESPONSE_PATTERN, key.hashCode(), page);
         //写入缓存

gogo-server/src/main/java/zenuo/gogo/core/processor/impl/GoogleSearchResultProviderImpl.java

@@ -22,7 +22,6 @@
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 import java.util.ServiceLoader;
 
 /**
@@ -94,7 +93,7 @@ public SearchResponse search(String key, int page) throws SearchException {
                     .desc(videoResult.child(2).text())
                     .build());
         }
-        builder.entries(Optional.of(entries));
+        builder.entries(entries);
         return builder.status(HttpResponseStatus.OK).build();
     }
 
@@ -128,7 +127,6 @@ Document httpGet(final String key, final int page) throws IOException {
     private SearchResponse patternChanged(final SearchResponse.SearchResponseBuilder builder) {
         return builder.status(HttpResponseStatus.INTERNAL_SERVER_ERROR)
                 .error("Please contact developer")
-                .entries(Optional.empty())
                 .build();
     }
 }

gogo-server/src/main/java/zenuo/gogo/core/processor/impl/SearchProcessorImpl.java

@@ -40,7 +40,6 @@ public final class SearchProcessorImpl implements ISearchProcessor {
     public void process(ChannelHandlerContext ctx, FullHttpRequest request, QueryStringDecoder decoder, ResponseType responseType) {
         final List<String> keys = decoder.parameters().get("q");
         if (keys == null || "".equals(keys.get(0))) {
-
             response(ctx,
                     request,
                     ResponseType.API,
@@ -58,26 +57,22 @@ public void process(ChannelHandlerContext ctx, FullHttpRequest request, QueryStr
                         .status(HttpResponseStatus.BAD_REQUEST)
                         .build();
             } else {
-                // try to read cache
                 final Optional<SearchResponse> cache = readCache(key, page);
                 if (cache.isPresent()) {
-                    // if hit
                     response = cache.get();
                 } else {
-                    // if not hit
                     for (ISearchResultProvider srp : searchResultProviders) {
                         try {
                             response = srp.search(key, page);
-                            if (response.getEntries().isPresent()) {
-                                // if response entries is not empty
+                            if (!response.getEntries().isEmpty()) {
                                 break;
                             }
                         } catch (Exception e) {
                             log.error("exception {}", srp, e);
                         }
                     }
                     // cache
-                    if (response != null && response.getEntries().isPresent()) {
+                    if (response != null && !response.getEntries().isEmpty()) {
                         writeCache(key, page, response);
                     }
                 }
@@ -102,10 +97,10 @@ public void process(ChannelHandlerContext ctx, FullHttpRequest request, QueryStr
     }
 
     private Optional<SearchResponse> readCache(String key, int page) {
-        return searchResultProviders.get(0).readCache(cacheService, key, page);
+        return ISearchResultProvider.readCache(cacheService, key, page);
     }
 
     private void writeCache(String key, int page, SearchResponse searchResponse) {
-        searchResultProviders.get(0).writeCache(cacheService, key, page, searchResponse);
+        ISearchResultProvider.writeCache(cacheService, key, page, searchResponse);
     }
 }

gogo-server/src/main/java/zenuo/gogo/core/processor/impl/StartPageSearchResultProviderImpl.java

@@ -21,7 +21,6 @@
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 import java.util.ServiceLoader;
 
 /**
@@ -92,7 +91,7 @@ SearchResponse search0(String key, int page) throws SearchException {
             entryBuilder.desc(StringUtils.escapeHtmlEntities(p.text()));
             entries.add(entryBuilder.build());
         }
-        builder.entries(Optional.of(entries));
+        builder.entries(entries);
         return builder.status(HttpResponseStatus.OK).build();
     }
 
@@ -120,7 +119,6 @@ Document httpPost(String key, int page) throws IOException {
     private SearchResponse patternChanged(final SearchResponse.SearchResponseBuilder builder) {
         return builder.status(HttpResponseStatus.INTERNAL_SERVER_ERROR)
                 .error("Please contact developer")
-                .entries(Optional.empty())
                 .build();
     }
 }

gogo-server/src/main/java/zenuo/gogo/core/processor/impl/StaticProcessorImpl.java

@@ -34,20 +34,17 @@ public void process(ChannelHandlerContext ctx, FullHttpRequest request, QueryStr
             log.error("process static '{}' error", path, e);
             throw new RuntimeException(e);
         }
-        //响应对象
         final DefaultFullHttpResponse response = new DefaultFullHttpResponse(
                 request.protocolVersion(),
                 HttpResponseStatus.OK,
                 Unpooled.copiedBuffer(bytes));
-        //设置头信息
         response.headers().add(HttpHeaderNames.SERVER, "gogo");
         response.headers().add(HttpHeaderNames.CACHE_CONTROL, "private, max-age=120");
         if (path.endsWith(".js")) {
             response.headers().add(HttpHeaderNames.CONTENT_TYPE, "text/javascript");
         } else {
             response.headers().add(HttpHeaderNames.CONTENT_TYPE, HttpHeaderValues.FILE);
         }
-        //响应后关闭通道
         ctx.writeAndFlush(response)
                 .addListener(ChannelFutureListener.CLOSE);
     }

gogo-server/src/main/java/zenuo/gogo/model/SearchResponse.java

@@ -8,9 +8,8 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import java.util.Collections;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.Optional;
 
 @Builder
 @AllArgsConstructor
@@ -22,7 +21,7 @@ public final class SearchResponse implements IResponse {
     private Integer page;
     private Long amount;
     private Float elapsed;
-    private Optional<List<Entry>> entries;
+    private List<Entry> entries = new LinkedList<>();
     private String error;
     @JsonIgnore
     private HttpResponseStatus status;

gogo-server/src/main/java/zenuo/gogo/web/ResultPageBuilder.java

@@ -120,8 +120,8 @@ public byte[] build(IResponse iResponse) {
         sb.append(HTML_AFTER_STYLE)
                 .append(entitiesEscapedKey)
                 .append(HTML_BEFORE_RESULT);
-        if (response.getEntries().isPresent()) {
-            response.getEntries().get().forEach(e -> EntryBuilder.build(sb, e));
+        if (!response.getEntries().isEmpty()) {
+            response.getEntries().forEach(e -> EntryBuilder.build(sb, e));
             NextBuilder.build(sb, response.getKey(), response.getPage());
         } else {
             sb.append(String.format(HTML_ERROR, URLEncoder.encode(response.getKey(), StandardCharsets.UTF_8)));

gogo-server/src/main/resources/log4j2.xml

@@ -1,33 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="WARN">
+<Configuration status="WARN" monitorInterval="5">
   <Properties>
-    <property name="PATTERN">%d [%t] %-5level %logger{36} - %msg%n</property>
-    <Property name="filename">./log/gogo.log</Property>
+    <Property name="PATTERN">%d{yyyy-MM-dd HH:mm:ss} %5p [%t] %logger{1.} - %m%n</Property>
+    <Property name="LOG_FILE_DIRECTORY">./logs</Property>
   </Properties>
- 
+
   <Appenders>
     <Console name="Console" target="SYSTEM_OUT">
-      <PatternLayout pattern="${PATTERN}"/>
+      <PatternLayout pattern="${PATTERN}" charset="UTF-8"/>
     </Console>
 
-    <RollingRandomAccessFile name="File" filePattern="${filename}.%d.log.gz">
-      <PatternLayout pattern="${PATTERN}"/>
+    <RollingRandomAccessFile name="File"
+                             fileName="${LOG_FILE_DIRECTORY}/gogo.log"
+                             filePattern="${LOG_FILE_DIRECTORY}/gogo-%d{yyyy-MM-dd}-%i.log.gz">
+      <PatternLayout pattern="${PATTERN}" charset="UTF-8"/>
       <Policies>
         <TimeBasedTriggeringPolicy />
+        <SizeBasedTriggeringPolicy size="128 MB"/>
       </Policies>
     </RollingRandomAccessFile>
   </Appenders>
- 
+
   <Loggers>
-    <Root level="INFO">
+    <Root level="INFO" includeLocation="false">
       <AppenderRef ref="Console"/>
       <AppenderRef ref="File"/>
     </Root>
-
-    <AsyncLogger name="gogo" additivity="false">
-      <AppenderRef ref="Console"/>
-      <AppenderRef ref="File"/>
-    </AsyncLogger>
   </Loggers>
- 
+
 </Configuration>

gogo-server/src/test/java/zenuo/gogo/core/processor/impl/GoogleSearchResultProviderImplTest.java

@@ -29,8 +29,8 @@ public void request() throws IOException {
     @Test
     public void search() throws SearchException {
         final SearchResponse response = searchResultProvider.search("udp", 1);
-        if (response.getEntries().isPresent()) {
-            response.getEntries().get().forEach(e -> System.out.println(e.getName()));
+        if (!response.getEntries().isEmpty()) {
+            response.getEntries().forEach(e -> System.out.println(e.getName()));
         }
     }
 

gogo-server/src/test/java/zenuo/gogo/model/SearchResponseTest.java

@@ -19,6 +19,6 @@ public class SearchResponseTest {
     public void deserialize() throws IOException {
         final String json = "{\"key\":\"LRU\",\"page\":1,\"amount\":5490000,\"elapsed\":0.46,\"entries\":[{\"name\":\"Cache replacement policies - Wikipedia\",\"url\":\"https://en.wikipedia.org/wiki/Cache_replacement_policies\",\"desc\":\"In computing, cache algorithms are optimizing instructions, or algorithms, that a computer ... Even worse, many cache algorithms (in particular, LRU) allow this streaming data to fill the cache, pushing out of the cache information that will be ...\"}]}";
         final SearchResponse searchResponse = JsonUtils.fromJsonBytes(json.getBytes(StandardCharsets.UTF_8), SearchResponse.class);
-        Assert.assertEquals(searchResponse.getEntries().get().size(), 1);
+        Assert.assertEquals(searchResponse.getEntries().size(), 1);
     }
 }