From 4563b8d407893a32772ab35b54e9f41b6ddc6b7b Mon Sep 17 00:00:00 2001
From: lukas-heiligenbrunner <lukas.heiligenbrunner@gmail.com>
Date: Tue, 3 Dec 2019 09:02:30 +0100
Subject: [PATCH] updated artifacts and readme

---
 .idea/artifacts/WasteInformationServer_jar.xml        |  8 +++++++-
 .idea/artifacts/WasteinformationServer.xml            | 11 -----------
 .idea/artifacts/unnamed.xml                           |  6 ------
 README.md                                             |  6 +++++-
 src/{ => main/java}/META-INF/MANIFEST.MF              |  0
 src/main/java/com/wasteinformationserver/db/JDCB.java |  1 -
 .../website/basicrequest/PostRequest.java             |  5 +++++
 .../website/datarequests/DataRequest.java             |  3 ---
 .../website/datarequests/login/LoginState.java        | 10 +++++-----
 9 files changed, 22 insertions(+), 28 deletions(-)
 delete mode 100644 .idea/artifacts/WasteinformationServer.xml
 delete mode 100644 .idea/artifacts/unnamed.xml
 rename src/{ => main/java}/META-INF/MANIFEST.MF (100%)

diff --git a/.idea/artifacts/WasteInformationServer_jar.xml b/.idea/artifacts/WasteInformationServer_jar.xml
index 18a77be..8580486 100644
--- a/.idea/artifacts/WasteInformationServer_jar.xml
+++ b/.idea/artifacts/WasteInformationServer_jar.xml
@@ -1,8 +1,14 @@
 <component name="ArtifactManager">
-  <artifact type="jar" name="WasteInformationServer:jar">
+  <artifact type="jar" build-on-make="true" name="WasteInformationServer:jar">
     <output-path>$PROJECT_DIR$/out/artifacts/WasteInformationServer_jar</output-path>
     <root id="archive" name="WasteInformationServer.jar">
+      <element id="directory" name="META-INF">
+        <element id="file-copy" path="$PROJECT_DIR$/src/main/META-INF/MANIFEST.MF" />
+      </element>
       <element id="module-output" name="WasteInformationServer" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/mysql/mysql-connector-java/8.0.18/mysql-connector-java-8.0.18.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/eclipse/paho/org.eclipse.paho.client.mqttv3/1.2.2/org.eclipse.paho.client.mqttv3-1.2.2.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/google/protobuf/protobuf-java/3.6.1/protobuf-java-3.6.1.jar" path-in-jar="/" />
     </root>
   </artifact>
 </component>
\ No newline at end of file
diff --git a/.idea/artifacts/WasteinformationServer.xml b/.idea/artifacts/WasteinformationServer.xml
deleted file mode 100644
index 6537e3a..0000000
--- a/.idea/artifacts/WasteinformationServer.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="jar" name="WasteinformationServer">
-    <output-path>$PROJECT_DIR$/out/artifacts/WasteinformationServer</output-path>
-    <root id="archive" name="WasteinformationServer.jar">
-      <element id="module-output" name="WasteInformationServer" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/mysql-connector-java-5.1.44-bin.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/org.eclipse.paho.client.mqttv3-1.2.1.jar" path-in-jar="/" />
-      <element id="dir-copy" path="$PROJECT_DIR$/resources" />
-    </root>
-  </artifact>
-</component>
\ No newline at end of file
diff --git a/.idea/artifacts/unnamed.xml b/.idea/artifacts/unnamed.xml
deleted file mode 100644
index 4c3188f..0000000
--- a/.idea/artifacts/unnamed.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="jar" name="unnamed">
-    <output-path>$PROJECT_DIR$/out/artifacts/unnamed</output-path>
-    <root id="archive" name="unnamed.jar" />
-  </artifact>
-</component>
\ No newline at end of file
diff --git a/README.md b/README.md
index d457039..fa2e829 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,5 @@
-# WasteInformationServer
\ No newline at end of file
+# WasteInformationServer
+
+## Dependencies:
+* org.eclipse.paho.client.mqttv3
+* mysql-connector-java
\ No newline at end of file
diff --git a/src/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF
similarity index 100%
rename from src/META-INF/MANIFEST.MF
rename to src/main/java/META-INF/MANIFEST.MF
diff --git a/src/main/java/com/wasteinformationserver/db/JDCB.java b/src/main/java/com/wasteinformationserver/db/JDCB.java
index 25ecd82..3bc644f 100644
--- a/src/main/java/com/wasteinformationserver/db/JDCB.java
+++ b/src/main/java/com/wasteinformationserver/db/JDCB.java
@@ -53,7 +53,6 @@ public class JDCB {
             conn = db.getConnection();
             loggedin = true;
         } catch (SQLException e) {
-            Log.error("no connection to Database!");
             throw new IOException("No connection to database");
         }
 
diff --git a/src/main/java/com/wasteinformationserver/website/basicrequest/PostRequest.java b/src/main/java/com/wasteinformationserver/website/basicrequest/PostRequest.java
index 28aa7f1..e3a60a6 100644
--- a/src/main/java/com/wasteinformationserver/website/basicrequest/PostRequest.java
+++ b/src/main/java/com/wasteinformationserver/website/basicrequest/PostRequest.java
@@ -43,6 +43,11 @@ public abstract class PostRequest implements HttpHandler {
         }
     }
 
+    /**
+     *
+     * @param params received get params from com.wasteinformationserver.website
+     * @return json reply to com.wasteinformationserver.website
+     */
     public abstract String request(HashMap<String, String> params);
 
 }
diff --git a/src/main/java/com/wasteinformationserver/website/datarequests/DataRequest.java b/src/main/java/com/wasteinformationserver/website/datarequests/DataRequest.java
index 2a4fbf1..95babec 100644
--- a/src/main/java/com/wasteinformationserver/website/datarequests/DataRequest.java
+++ b/src/main/java/com/wasteinformationserver/website/datarequests/DataRequest.java
@@ -65,9 +65,6 @@ public class DataRequest extends PostRequest {
                 Log.debug(result);
                 break;
             case "getAllCities":
-
-                // TODO: 15.11.19 database call to get all data and store it as json.
-
                 StringBuilder builder = new StringBuilder();
 
                 ResultSet sett = jdcb.executeQuery("select * from cities");
diff --git a/src/main/java/com/wasteinformationserver/website/datarequests/login/LoginState.java b/src/main/java/com/wasteinformationserver/website/datarequests/login/LoginState.java
index 34ae214..dd460a1 100644
--- a/src/main/java/com/wasteinformationserver/website/datarequests/login/LoginState.java
+++ b/src/main/java/com/wasteinformationserver/website/datarequests/login/LoginState.java
@@ -9,12 +9,12 @@ public class LoginState {
         return mythis;
     }
 
-    String username;
-    String firstname;
-    String lastname;
-    String email;
+    private String username;
+    private String firstname;
+    private String lastname;
+    private String email;
 
-    boolean loggedin = true; //todo set back!!!
+    boolean loggedin = false;
 
     public void logIn(){
         loggedin=true;