From 6e1aa434d2f6f954c3b4252010a410867213460d Mon Sep 17 00:00:00 2001 From: a-murphy <5492015+a-murphy@users.noreply.github.com> Date: Mon, 30 Mar 2020 11:26:30 -0700 Subject: [PATCH 1/3] Update build.gradle --- build.gradle | 2 -- 1 file changed, 2 deletions(-) diff --git a/build.gradle b/build.gradle index 722bb9a..9fe7431 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,5 @@ apply plugin: 'java' -test.reports.junitXml.destination = 'shippable/testresults' - repositories { mavenCentral() } From 6597f5bff21cedc59ea49b69134077a07eb1b0c5 Mon Sep 17 00:00:00 2001 From: a-murphy <5492015+a-murphy@users.noreply.github.com> Date: Mon, 30 Mar 2020 11:28:44 -0700 Subject: [PATCH 2/3] Update build.gradle --- build.gradle | 6 ------ 1 file changed, 6 deletions(-) diff --git a/build.gradle b/build.gradle index 9fe7431..aab3292 100644 --- a/build.gradle +++ b/build.gradle @@ -16,12 +16,6 @@ buildscript { dependencies { classpath 'postgresql:postgresql:9.0-801.jdbc4' - classpath 'net.saliman:gradle-cobertura-plugin:2.2.2' } } -apply plugin: 'cobertura' -cobertura { - coverageReportDir = file('shippable/codecoverage') - coverageFormats = ['xml'] -} From 98f0629c848d2a12d69422d1124a12265d385107 Mon Sep 17 00:00:00 2001 From: a-murphy <5492015+a-murphy@users.noreply.github.com> Date: Mon, 30 Mar 2020 11:35:28 -0700 Subject: [PATCH 3/3] Update App.java --- src/main/java/App.java | 72 ++++-------------------------------------- 1 file changed, 6 insertions(+), 66 deletions(-) diff --git a/src/main/java/App.java b/src/main/java/App.java index 1c77830..77cc6c6 100644 --- a/src/main/java/App.java +++ b/src/main/java/App.java @@ -1,78 +1,18 @@ package main; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.PreparedStatement; -import java.sql.Statement; -import java.sql.ResultSet; public class App { - final String databaseURL = "jdbc:postgresql://localhost/"; - final static String user = "postgres"; - final static String password = ""; - - Connection connection; - PreparedStatement preparedStatement; - ResultSet rs; - Statement statement; - + String city = ""; + String state = ""; public App() throws Exception{ - Class.forName("org.postgresql.Driver"); - - try { - connection = DriverManager.getConnection(databaseURL, user, password); - statement = connection.createStatement(); - statement.execute("DROP TABLE IF EXISTS test;"); - statement.execute("CREATE TABLE test (city varchar(20), state char(2));"); - } catch (java.sql.SQLException ex) { - System.out.println("Failed to set up database."); - } - } public void insertData() { - try { - connection = DriverManager.getConnection(databaseURL, user, password); - preparedStatement = connection.prepareStatement("INSERT INTO test (city, state) VALUES (?, ?);"); - preparedStatement.setString(1, "Seattle"); - preparedStatement.setString(2, "WA"); - preparedStatement.executeUpdate(); - } catch (java.sql.SQLException ex) { - } finally { - try { - preparedStatement.close(); - } catch (java.sql.SQLException ex) { - preparedStatement = null; - } - try { - connection.close(); - } catch (java.sql.SQLException ex) { - connection = null; - } - } + city = "Seattle"; + state = "WA"; } + public String getData() { - String toReturn = ""; - try { - connection = DriverManager.getConnection(databaseURL, user, password); - preparedStatement = connection.prepareStatement("SELECT * FROM test"); - rs = preparedStatement.executeQuery(); - if (rs.next()) { - toReturn = rs.getString("city") + ", " + rs.getString("state"); - } - } catch (java.sql.SQLException ex) { - } finally { - try { - preparedStatement.close(); - } catch (java.sql.SQLException ex) { - preparedStatement = null; - } - try { - connection.close(); - } catch (java.sql.SQLException ex) { - connection = null; - } - return toReturn; - } + return city + ", " + state; } }