Fixing up default state with Docker updates

Author: sgerlach

Dockerfile

@@ -2,6 +2,7 @@ FROM openjdk:11.0.10-jdk-slim
 
 RUN mkdir /javavulny /app
 COPY . /javavulny/
+RUN sed -i 's/localhost\:5432/db\:5432/' /javavulny/src/main/resources/application-postgresql.properties
 
 RUN cd /javavulny \
 && ./gradlew --no-daemon build \

src/main/java/hawk/service/SearchService.java

@@ -25,15 +25,15 @@ public class SearchService {
 
     public List<Item> search(Search search) {
         final Session session = (Session) entityManager.unwrap(Session.class);
-        List items = session.doReturningWork(new ReturningWork<List<Item>>() {
+        return session.doReturningWork(new ReturningWork<List<Item>>() {
             @Override
             public List<Item> execute(Connection connection) throws SQLException {
                 List<Item> items = new ArrayList<>();
                 // The wrong way
                 String query = "select id, name, description from ITEM where description like '%" +
                         search.getSearchText() + "%'";
 
-                LOGGER.log(Level.INFO, "SQL Query " + query);
+                LOGGER.log(Level.INFO, "SQL Query: {0}",  query);;
                 ResultSet rs = connection
                         .createStatement()
                         .executeQuery(query);
@@ -42,17 +42,18 @@ public List<Item> execute(Connection connection) throws SQLException {
                 String query = "select id, name, description from ITEM where description like ?";
                 PreparedStatement statement = connection.prepareStatement(query);
                 statement.setString(1, "%" + search.getSearchText() + "%");
-                LOGGER.log(Level.INFO, "SQL Query " + statement);
+                LOGGER.log(Level.INFO, "SQL Query {0}",  statement);
                 ResultSet rs = statement.executeQuery();
                 */
 
                 while (rs.next()) {
                     items.add(new Item(rs.getLong("id"), rs.getString("name"), rs.getString("description")));
                 }
+                rs.close();
                 return items;
             }
         });
-        return items;
+
     }
 
 

src/main/java/hawk/service/UserSearchService.java

@@ -24,13 +24,13 @@ public class UserSearchService {
 
     public List<User> search(Search search) {
         final Session session = entityManager.unwrap(Session.class);
-        List users = session.doReturningWork(connection -> {
+        return session.doReturningWork(connection -> {
             List<User> users1 = new ArrayList<>();
             // The wrong way
             String query = "select id, name, description, tenant_id from public.user where name like '%" +
                     search.getSearchText() + "%'";
 
-            LOGGER.log(Level.INFO, "SQL Query " + query);
+            LOGGER.log(Level.INFO, "SQL Query {0}",  query);
             ResultSet rs = connection
                     .createStatement()
                     .executeQuery(query);
@@ -39,15 +39,15 @@ public List<User> search(Search search) {
             String query = "select id, name, description from ITEM where description like ?";
             PreparedStatement statement = connection.prepareStatement(query);
             statement.setString(1, "%" + search.getSearchText() + "%");
-            LOGGER.log(Level.INFO, "SQL Query " + statement);
+            LOGGER.log(Level.INFO, "SQL Query {0}",  statement);
             ResultSet rs = statement.executeQuery();
             */
 
             while (rs.next()) {
                 users1.add(new User(rs.getLong("id"), rs.getString("name"), rs.getString("description"), rs.getString("tenant_id")));
             }
+            rs.close();
             return users1;
         });
-        return users;
     }
 }

src/main/resources/application-postgresql.properties

@@ -1,5 +1,5 @@
 spring.datasource.platform=postgres
-spring.datasource.url=jdbc:postgresql://db/postgres
+spring.datasource.url=jdbc:postgresql://localhost:5432/postgres
 spring.datasource.username=postgresql
 spring.datasource.password=postgresql
 spring.datasource.driverClassName=org.postgresql.Driver