diff --git a/ArtificialAutism/src/main/java/DataLayer/DataMapper.java b/ArtificialAutism/src/main/java/DataLayer/DataMapper.java index 40419849..3247b7bd 100644 --- a/ArtificialAutism/src/main/java/DataLayer/DataMapper.java +++ b/ArtificialAutism/src/main/java/DataLayer/DataMapper.java @@ -84,27 +84,26 @@ public class DataMapper { } public static void checkStringsToDelete() { - Connection l_cCon = null; PreparedStatement l_pStatement = null; ResultSet l_rsSearch = null; String CountSQL = "select count(*) from Sentences"; - String l_sSQL = "delete from Sentences\n" + - " order by last_used asc limit 5"; - try { - l_cCon = DBCPDataSource.getConnection(); + String l_sSQL = "delete from Sentences order by last_used asc limit 5;"; + try (Connection l_cCon = DBCPDataSource.getConnection()) { l_pStatement = l_cCon.prepareStatement(CountSQL); ResultSet resultSet = l_pStatement.executeQuery(); if (resultSet.next()) { int count = resultSet.getInt(1); if (count > 7000) { + //System.out.println("cleaning strings: " + l_sSQL); l_pStatement = l_cCon.prepareStatement(l_sSQL); - l_pStatement.execute(); + l_pStatement.executeUpdate(); + l_cCon.commit(); } } } catch (SQLException throwables) { throwables.printStackTrace(); } finally { - CloseConnections(l_pStatement, l_rsSearch, l_cCon); + CloseConnections(l_pStatement, l_rsSearch, null); } } diff --git a/ArtificialAutism/src/main/java/PresentationLayer/DiscordHandler.java b/ArtificialAutism/src/main/java/PresentationLayer/DiscordHandler.java index ef2def3f..00e2481b 100644 --- a/ArtificialAutism/src/main/java/PresentationLayer/DiscordHandler.java +++ b/ArtificialAutism/src/main/java/PresentationLayer/DiscordHandler.java @@ -90,7 +90,6 @@ public class DiscordHandler extends ListenerAdapter { private static Datahandler datahandler; private static StanfordCoreNLP stanfordCoreNLPSentiment; private static ExecutorService executorService = Executors.newFixedThreadPool(1); - private static ExecutorService executorServiceResponse = Executors.newFixedThreadPool(2); private static ExecutorService executorServiceIngame = Executors.newFixedThreadPool(2); //TODO add python program that edits the java code. python program just adds test if statements on @@ -169,17 +168,12 @@ public class DiscordHandler extends ListenerAdapter { } if (mentionedBot || channelName.contains("general-autism")) { final String contentF = content; - executorServiceResponse.execute(new Runnable() { - @Override - public void run() { - String ResponseStr = datahandler.getResponseMsg(contentF, username, stanfordCoreNLP, stanfordCoreNLPSentiment, - false); - if (!ResponseStr.isEmpty()) { - System.out.print("\nResponseStr3: " + ResponseStr + "\n"); - event.getMessage().getChannel().sendMessage(ResponseStr).queue(); - } - } - }); + String ResponseStr = datahandler.getResponseMsg(contentF, username, stanfordCoreNLP, stanfordCoreNLPSentiment, + false); + if (!ResponseStr.isEmpty()) { + System.out.print("\nResponseStr3: " + ResponseStr + "\n"); + event.getMessage().getChannel().sendMessage(ResponseStr).queue(); + } } else { final String contentF = content; executorService.execute(new Runnable() {