diff --git a/.gitignore b/.gitignore index 853069d..a6d40d9 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,6 @@ tomcat.5000 # Gradle generated files .gradle app/build -.settings # IntelliJ Idea project files .idea diff --git a/app/.settings/org.eclipse.jdt.core.prefs b/app/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..12b4a91 --- /dev/null +++ b/app/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,13 @@ +# +#Thu Feb 08 14:14:29 CET 2024 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.source=21 +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.compliance=21 +org.eclipse.jdt.core.compiler.debug.sourceFile=generate diff --git a/app/src/main/java/servlet/Database.java b/app/src/main/java/servlet/Database.java index e9a3283..eb89056 100644 --- a/app/src/main/java/servlet/Database.java +++ b/app/src/main/java/servlet/Database.java @@ -6,16 +6,29 @@ import java.sql.*; */ public class Database implements AutoCloseable { - // The connection to the database + // If you have the mysql server on your own computer use "localhost" as server address. + private static String databaseServerAddress = "vm26.cs.lth.se"; + private static String databaseUser = ""; // database login user + private static String databasePassword = ""; // database login password + private static String database = ""; // the database to use, i.e. default schema private Connection conn = null; public Database() { - // Connect to sqlite - try { - Class.forName("org.sqlite.JDBC"); - conn = DriverManager.getConnection("jdbc:sqlite:database.db"); - System.out.println("Opened database successfully"); - } catch (Exception e) { + try{ + conn = DriverManager.getConnection("jdbc:mysql://" + databaseServerAddress + "/" + + database, databaseUser, databasePassword); + + // Display the contents of the database in the console. + // This should be removed in the final version + try(Statement stmt = conn.createStatement()) { + ResultSet rs = stmt.executeQuery("select * from Respondents"); + while (rs.next()) { + String name = rs.getString("name"); + System.out.println(name); + } + } + + } catch (SQLException e) { throw new RuntimeException(e); } }