Browse Source

update handlers with try block for resultset

Steve Hu 8 years ago
parent
commit
2f96f0b17f

+ 0 - 1
frameworks/Java/light-java/src/main/java/com/networknt/techempower/PathHandlerProvider.java

@@ -12,7 +12,6 @@ public class PathHandlerProvider implements HandlerProvider {
     @Override
     public HttpHandler getHandler() {
         return Handlers.routing()
-            .add(Methods.GET, "/cache", new CacheGetHandler())
             .add(Methods.GET, "/db/mysql", new DbMysqlGetHandler())
             .add(Methods.GET, "/db/postgresql", new DbPostgresqlGetHandler())
             .add(Methods.GET, "/fortunes/mysql", new FortunesMysqlGetHandler())

+ 0 - 27
frameworks/Java/light-java/src/main/java/com/networknt/techempower/handler/CacheGetHandler.java

@@ -1,27 +0,0 @@
-package com.networknt.techempower.handler;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.cache.LoadingCache;
-import com.networknt.config.Config;
-import com.networknt.techempower.model.World;
-import com.networknt.techempower.Helper;
-import io.undertow.server.HttpHandler;
-import io.undertow.server.HttpServerExchange;
-import io.undertow.util.Headers;
-
-public class CacheGetHandler implements HttpHandler {
-    private final ObjectMapper objectMapper = Config.getInstance().getMapper();
-    private final LoadingCache<Integer, World> worldCache = null;
-
-    @Override
-    public void handleRequest(HttpServerExchange exchange) throws Exception {
-        int queries = Helper.getQueries(exchange);
-        World[] worlds = new World[queries];
-        for (int i = 0; i < queries; i++) {
-            worlds[i] = worldCache.get(Helper.randomWorld());
-        }
-        exchange.getResponseHeaders().put(
-                Headers.CONTENT_TYPE, "application/json");
-        exchange.getResponseSender().send(objectMapper.writeValueAsString(worlds));
-    }
-}

+ 4 - 3
frameworks/Java/light-java/src/main/java/com/networknt/techempower/handler/DbMysqlGetHandler.java

@@ -106,9 +106,10 @@ public class DbMysqlGetHandler implements HttpHandler {
                     "SELECT * FROM world WHERE id = ?",
                     ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY)) {
                 statement.setInt(1, Helper.randomWorld());
-                ResultSet resultSet = statement.executeQuery();
-                resultSet.next();
-                exchange.getResponseSender().send("{\"id\":" + resultSet.getInt("id") + ",\"randomNumber\":" + resultSet.getInt("randomNumber") + "}");
+                try(ResultSet resultSet = statement.executeQuery()) {
+                    resultSet.next();
+                    exchange.getResponseSender().send("{\"id\":" + resultSet.getInt("id") + ",\"randomNumber\":" + resultSet.getInt("randomNumber") + "}");
+                }
             }
         }
     }

+ 4 - 3
frameworks/Java/light-java/src/main/java/com/networknt/techempower/handler/DbPostgresqlGetHandler.java

@@ -35,9 +35,10 @@ public class DbPostgresqlGetHandler implements HttpHandler {
                     "SELECT * FROM world WHERE id = ?",
                     ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY)) {
                 statement.setInt(1, Helper.randomWorld());
-                ResultSet resultSet = statement.executeQuery();
-                resultSet.next();
-                exchange.getResponseSender().send("{\"id\":" + resultSet.getInt("id") + ",\"randomNumber\":" + resultSet.getInt("randomNumber") + "}");
+                try (ResultSet resultSet = statement.executeQuery()) {
+                    resultSet.next();
+                    exchange.getResponseSender().send("{\"id\":" + resultSet.getInt("id") + ",\"randomNumber\":" + resultSet.getInt("randomNumber") + "}");
+                }
             }
         }
 

+ 1 - 1
frameworks/Java/light-java/src/main/java/com/networknt/techempower/handler/FortunesMysqlGetHandler.java

@@ -37,7 +37,7 @@ public class FortunesMysqlGetHandler implements HttpHandler {
                      ResultSet.TYPE_FORWARD_ONLY,
                      ResultSet.CONCUR_READ_ONLY);
              ResultSet resultSet = statement.executeQuery()) {
-            while (resultSet.next()) {
+                while (resultSet.next()) {
                 fortunes.add(new Fortune(
                         resultSet.getInt("id"),
                         resultSet.getString("message")));

+ 6 - 5
frameworks/Java/light-java/src/main/java/com/networknt/techempower/handler/QueriesMysqlGetHandler.java

@@ -50,11 +50,12 @@ public class QueriesMysqlGetHandler implements HttpHandler {
                                 ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY)) {
 
                             statement.setInt(1, Helper.randomWorld());
-                            ResultSet resultSet = statement.executeQuery();
-                            resultSet.next();
-                            return new World(
-                                    resultSet.getInt("id"),
-                                    resultSet.getInt("randomNumber"));
+                            try (ResultSet resultSet = statement.executeQuery()) {
+                                resultSet.next();
+                                return new World(
+                                        resultSet.getInt("id"),
+                                        resultSet.getInt("randomNumber"));
+                            }
                         }
                     }
                 }));

+ 6 - 5
frameworks/Java/light-java/src/main/java/com/networknt/techempower/handler/QueriesPostgresqlGetHandler.java

@@ -52,11 +52,12 @@ public class QueriesPostgresqlGetHandler implements HttpHandler {
                                 ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY)) {
 
                             statement.setInt(1, Helper.randomWorld());
-                            ResultSet resultSet = statement.executeQuery();
-                            resultSet.next();
-                            return new World(
-                                    resultSet.getInt("id"),
-                                    resultSet.getInt("randomNumber"));
+                            try (ResultSet resultSet = statement.executeQuery()) {
+                                resultSet.next();
+                                return new World(
+                                        resultSet.getInt("id"),
+                                        resultSet.getInt("randomNumber"));
+                            }
                         }
                     }
                 }));

+ 6 - 5
frameworks/Java/light-java/src/main/java/com/networknt/techempower/handler/UpdatesMysqlGetHandler.java

@@ -49,11 +49,12 @@ public class UpdatesMysqlGetHandler implements HttpHandler {
                                     ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY)) {
 
                                 query.setInt(1, Helper.randomWorld());
-                                ResultSet resultSet = query.executeQuery();
-                                resultSet.next();
-                                world = new World(
-                                        resultSet.getInt("id"),
-                                        resultSet.getInt("randomNumber"));
+                                try (ResultSet resultSet = query.executeQuery()) {
+                                    resultSet.next();
+                                    world = new World(
+                                            resultSet.getInt("id"),
+                                            resultSet.getInt("randomNumber"));
+                                }
                             }
                             world.randomNumber = Helper.randomWorld();
                             update.setInt(1, world.randomNumber);

+ 6 - 5
frameworks/Java/light-java/src/main/java/com/networknt/techempower/handler/UpdatesPostgresqlGetHandler.java

@@ -49,11 +49,12 @@ public class UpdatesPostgresqlGetHandler implements HttpHandler {
                                     ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY)) {
 
                                 query.setInt(1, Helper.randomWorld());
-                                ResultSet resultSet = query.executeQuery();
-                                resultSet.next();
-                                world = new World(
-                                        resultSet.getInt("id"),
-                                        resultSet.getInt("randomNumber"));
+                                try (ResultSet resultSet = query.executeQuery()) {
+                                    resultSet.next();
+                                    world = new World(
+                                            resultSet.getInt("id"),
+                                            resultSet.getInt("randomNumber"));
+                                }
                             }
                             world.randomNumber = Helper.randomWorld();
                             update.setInt(1, world.randomNumber);

+ 0 - 43
frameworks/Java/light-java/src/test/java/com/networknt/techempower/handler/CacheGetHandlerTest.java

@@ -1,43 +0,0 @@
-package com.networknt.techempower.handler;
-
-import com.networknt.client.Client;
-import com.networknt.server.Server;
-import com.networknt.exception.ClientException;
-import com.networknt.exception.ApiException;
-import org.apache.commons.io.IOUtils;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.ResponseHandler;
-import org.apache.http.client.methods.*;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.junit.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-
-/**
-* Generated by swagger-codegen
-*/
-public class CacheGetHandlerTest {
-    @ClassRule
-    public static TestServer server = TestServer.getInstance();
-
-    static final Logger logger = LoggerFactory.getLogger(CacheGetHandlerTest.class);
-
-    @Test
-    public void testCacheGetHandler() throws ClientException, ApiException {
-        CloseableHttpClient client = Client.getInstance().getSyncClient();
-        HttpGet httpGet = new HttpGet("http://localhost:8080/cache");
-        /*
-        Client.getInstance().addAuthorization(httpPost);
-        try {
-            CloseableHttpResponse response = client.execute(httpGet);
-            Assert.assertEquals(200, response.getStatusLine().getStatusCode());
-            Assert.assertEquals("getCache", IOUtils.toString(response.getEntity().getContent(), "utf8"));
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        */
-    }
-}