Remove greeting service.

HTTP-RPC · Mar 29, 2019 · 159f2f5 · 159f2f5
1 parent fb7c4b1
commit 159f2f5
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 49 deletions.
diff --git a/httprpc-test/src/main/java/org/httprpc/test/GreetingService.java b/httprpc-test/src/main/java/org/httprpc/test/GreetingService.java
diff --git a/httprpc-test/src/main/java/org/httprpc/test/TestService.java b/httprpc-test/src/main/java/org/httprpc/test/TestService.java
@@ -18,7 +18,6 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.PrintWriter;
-import java.io.StringReader;
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.time.LocalDate;
@@ -27,17 +26,18 @@
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.NoSuchElementException;
 
 import javax.servlet.annotation.MultipartConfig;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.httprpc.WebService;
-import org.httprpc.io.JSONDecoder;
 import org.httprpc.RequestMethod;
 import org.httprpc.RequestParameter;
 import org.httprpc.ResourcePath;
@@ -88,10 +88,48 @@ public class TestService extends WebService {
 
     @RequestMethod("GET")
     @ResourcePath("fibonacci")
-    public List<?> testGetFibonacci() throws IOException {
-        JSONDecoder jsonDecoder = new JSONDecoder();
-
-        return jsonDecoder.read(new StringReader("[1, 2, 3, 5, 8, 13]"));
+    public Iterable<?> testGetFibonacci(int count) {
+        return new Iterable<Integer>() {
+            @Override
+            public Iterator<Integer> iterator() {
+                return new Iterator<Integer>() {
+                    private int i = 0;
+
+                    private int a = 0;
+                    private int b = 1;
+
+                    @Override
+                    public boolean hasNext() {
+                        return i < count;
+                    }
+
+                    @Override
+                    public Integer next() {
+                        if (!hasNext()) {
+                            throw new NoSuchElementException();
+                        }
+
+                        int next;
+                        if (i == 0) {
+                            next = a;
+                        } else {
+                            if (i > 1) {
+                                int c = a + b;
+
+                                a = b;
+                                b = c;
+                            }
+
+                            next = b;
+                        }
+
+                        i++;
+
+                        return next;
+                    }
+                };
+            }
+        };
     }
 
     @Override

diff --git a/httprpc-test/src/main/resources/org/httprpc/test/GreetingService.properties b/httprpc-test/src/main/resources/org/httprpc/test/GreetingService.properties
diff --git a/httprpc-test/src/main/webapp/index.jsp b/httprpc-test/src/main/webapp/index.jsp
@@ -8,12 +8,6 @@
 <body>
 
 <h2>Test</h2>
-<a href="${pageContext.request.contextPath}/greeting?api">Greeting (API)</a><br/>
-<br/>
-<a href="${pageContext.request.contextPath}/greeting">Greeting</a><br/>
-
-<hr/>
-
 <a href="${pageContext.request.contextPath}/math?api">Math (API)</a><br/>
 <br/>
 <a href="${pageContext.request.contextPath}/math/sum?a=2&b=4">Sum</a><br/>
@@ -106,7 +100,7 @@
 <br/>
 <a href="${pageContext.request.contextPath}/test?string=héllo&strings=a&strings=b&strings=c&number=123&flag=true&date=0&localDate=2018-06-28&localTime=10:45&localDateTime=2018-06-28T10:45">GET</a><br/>
 <a href="${pageContext.request.contextPath}/test/a/123/b/héllo/c/456/d/göodbye">GET (Keys)</a><br/>
-<a href="${pageContext.request.contextPath}/test/fibonacci">GET (Fibonacci)</a><br/>
+<a href="${pageContext.request.contextPath}/test/fibonacci?count=8">GET (Fibonacci)</a><br/>
 
 <hr/>