From d7451301be1804dbc7e17d168fa903183546e855 Mon Sep 17 00:00:00 2001 From: TechCrafter07 Date: Wed, 17 Mar 2021 10:25:04 +0100 Subject: [PATCH] Add DBHandler --- .gitignore | 2 +- build.gradle | 1 + example.config.json | 9 ++++++++- .../sh/adb/sensorCommunityAPI/DataStore.java | 2 +- .../adb/sensorCommunityAPI/DataStoreBot.java | 2 ++ .../sh/adb/sensorCommunityAPI/dbHandler.java | 20 +++++++++++++++++++ 6 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 src/main/java/sh/adb/sensorCommunityAPI/dbHandler.java diff --git a/.gitignore b/.gitignore index d105ded..0cffcb3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -./config.json \ No newline at end of file +config.json \ No newline at end of file diff --git a/build.gradle b/build.gradle index 0ff86fd..c61b424 100644 --- a/build.gradle +++ b/build.gradle @@ -23,6 +23,7 @@ repositories { } dependencies { + implementation 'org.jetbrains:annotations:20.1.0' compile group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1' compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.13' testCompile group: 'junit', name: 'junit', version: '4.12' diff --git a/example.config.json b/example.config.json index 0ca1f73..40a1ee5 100644 --- a/example.config.json +++ b/example.config.json @@ -1,5 +1,12 @@ { "storePath": "./data/", "apiURL": "https://data.sensor.community/airrohr/v1/sensor/35943/", - "interval": 150 + "interval": 150, + "sqlConnection": { + "db": "", + "pw": "", + "user": "", + "port": 3306, + "server": "localhost" + } } \ No newline at end of file diff --git a/src/main/java/sh/adb/sensorCommunityAPI/DataStore.java b/src/main/java/sh/adb/sensorCommunityAPI/DataStore.java index e2b9798..6e3517a 100644 --- a/src/main/java/sh/adb/sensorCommunityAPI/DataStore.java +++ b/src/main/java/sh/adb/sensorCommunityAPI/DataStore.java @@ -17,7 +17,7 @@ public class DataStore { fw.close(); return true; }catch (IOException e){ - System.out.println("error while soring data to: " + path); + System.out.println("error while storing data to: " + path); } return false; } diff --git a/src/main/java/sh/adb/sensorCommunityAPI/DataStoreBot.java b/src/main/java/sh/adb/sensorCommunityAPI/DataStoreBot.java index 60a11bb..8b9cc7d 100644 --- a/src/main/java/sh/adb/sensorCommunityAPI/DataStoreBot.java +++ b/src/main/java/sh/adb/sensorCommunityAPI/DataStoreBot.java @@ -15,11 +15,13 @@ public class DataStoreBot { String apiURL; APIParser api; DataStore store; + dbHandler db; DataStoreBot(String storePath, String apiURL) throws MalformedURLException { this.storePath = storePath; this.apiURL = apiURL; this.api = new APIParser(this.apiURL); this.store = new DataStore(); + this.db = new dbHandler((JSONObject) store.readJSON("config.json").get("sqlConnection")); } public void setInterval(int seconds) { ScheduledExecutorService ses = Executors.newScheduledThreadPool(1); diff --git a/src/main/java/sh/adb/sensorCommunityAPI/dbHandler.java b/src/main/java/sh/adb/sensorCommunityAPI/dbHandler.java new file mode 100644 index 0000000..2fc719a --- /dev/null +++ b/src/main/java/sh/adb/sensorCommunityAPI/dbHandler.java @@ -0,0 +1,20 @@ +package sh.adb.sensorCommunityAPI; + +import org.json.simple.JSONObject; + + +public class dbHandler { + String pw; + String db; + String user; + int port; + String server; + + dbHandler(JSONObject config){ + this.pw = (String) config.get("pw"); + this.db = (String) config.get("db"); + this.user = (String) config.get("user"); + this.port = (Integer) config.get("port"); + this.server = (String) config.get("server"); + } +}