From 8d62e31edf79db4e03b6587a4f05ac78d006a58b Mon Sep 17 00:00:00 2001
From: delvh <dev.lh@web.de>
Date: Mon, 30 Dec 2019 15:24:25 +0100
Subject: [PATCH 1/7] Create stale.yml

Stale Issues (no progress for about 2 months) will be discarded automatically
---
 .github/workflows/stale.yml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 .github/workflows/stale.yml

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
new file mode 100644
index 0000000..814af80
--- /dev/null
+++ b/.github/workflows/stale.yml
@@ -0,0 +1,22 @@
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: "0 0 * * *"
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/stale@v1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-issue-message: 'Stale issue message'
+        stale-pr-message: 'Stale pull request message'
+        stale-issue-label: 'no-issue-activity'
+        days-before-stale: 60
+        days-before-close: 7
+        stale-pr-label: 'no-pr-activity'
+        operations-per-run: 30

From b83ef8b4efcb7b0abe20b217aebe50b9f75ce977 Mon Sep 17 00:00:00 2001
From: delvh <dev.lh@web.de>
Date: Fri, 3 Jan 2020 16:21:35 +0100
Subject: [PATCH 2/7] Updated Javadoc

---
 .classpath                                    |   1 +
 .project                                      |   6 +
 .settings/org.eclipse.jdt.ui.prefs            |   3 +-
 .settings/org.hibernate.eclipse.console.prefs |   3 +
 src/main/java/envoy/server/data/Message.java  | 107 +++++++++++++++++-
 src/main/java/envoy/server/data/User.java     |  61 +++++++++-
 .../server/database/PersistenceManager.java   |  21 ++++
 7 files changed, 198 insertions(+), 4 deletions(-)
 create mode 100644 .settings/org.hibernate.eclipse.console.prefs
 create mode 100644 src/main/java/envoy/server/database/PersistenceManager.java

diff --git a/.classpath b/.classpath
index 002ad57..2a83b68 100644
--- a/.classpath
+++ b/.classpath
@@ -34,5 +34,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" path="/envoy-common"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/.project b/.project
index 45a395e..f87ca5c 100644
--- a/.project
+++ b/.project
@@ -15,9 +15,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.hibernate.eclipse.console.hibernateBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.hibernate.eclipse.console.hibernateNature</nature>
 	</natures>
 </projectDescription>
diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs
index 7103be7..20da6a0 100644
--- a/.settings/org.eclipse.jdt.ui.prefs
+++ b/.settings/org.eclipse.jdt.ui.prefs
@@ -1,2 +1,3 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.ui.text.custom_code_templates=
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n * @since Envoy Server Standalone v0.1-alpha\n */</template><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n * @since Envoy Server Standalone v0.1-alpha\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n * @since Envoy Server Standalone v0.1-alpha\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment"/><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * Project\: &lt;strong&gt;${project_name}&lt;/strong&gt;&lt;br&gt;\n * File\: &lt;strong&gt;${file_name}&lt;/strong&gt;&lt;br&gt;\n * Created\: &lt;strong&gt;${date}&lt;/strong&gt;&lt;br&gt;\n * \n * @author Leon Hofmeister\n * @since Envoy Server Standalone v0.1-alpha\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n * @since Envoy Server Standalone v0.1-alpha\n */</template><template autoinsert\="false" context\="modulecomment_context" deleted\="false" description\="Comment for modules" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.modulecomment" name\="modulecomment">/**\n * @author ${user}\n *\n * ${tags}\n * @since Envoy Server Standalone v0.1-alpha\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n * @since Envoy Server Standalone v0.1-alpha\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}\n</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">// ${todo} Auto-generated constructor stub\n${body_statement}\n</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/.settings/org.hibernate.eclipse.console.prefs b/.settings/org.hibernate.eclipse.console.prefs
new file mode 100644
index 0000000..a6ccf3c
--- /dev/null
+++ b/.settings/org.hibernate.eclipse.console.prefs
@@ -0,0 +1,3 @@
+default.configuration=envoy-server-standalone
+eclipse.preferences.version=1
+hibernate3.enabled=true
diff --git a/src/main/java/envoy/server/data/Message.java b/src/main/java/envoy/server/data/Message.java
index be11608..7582762 100644
--- a/src/main/java/envoy/server/data/Message.java
+++ b/src/main/java/envoy/server/data/Message.java
@@ -10,10 +10,15 @@ import javax.persistence.TemporalType;
 import envoy.data.MessageBuilder;
 
 /**
+ * This class serves as a way to let Hibernate communicate with the server
+ * without bringing the dependency of JPA/Hibernate into the client.<br>
+ * It will be referenced as "database message" to clarify between the different
+ * message objects.<br>
+ * <br>
  * Project: <strong>envoy-server-standalone</strong><br>
  * File: <strong>Message.java</strong><br>
  * Created: <strong>02.01.2020</strong><br>
- * 
+ *
  * @author Kai S. K. Engelbart
  * @since Envoy Server Standalone v0.1-alpha
  */
@@ -33,49 +38,147 @@ public class Message {
 	private String								text;
 	private byte[]								attachment;
 
+	/**
+	 * The constructor for a database object
+	 *
+	 * @since Envoy Server Standalone v0.1-alpha
+	 */
 	public Message() {}
 
 	// TODO: everything except ID
-	public Message(envoy.data.Message message) { id = message.getId(); }
+	/**
+	 * @param message the {@link envoy.data.Message} to convert into a database
+	 *                {@link Message}
+	 * @since Envoy Server Standalone v0.1-alpha
+	 */
+	public Message(envoy.data.Message message) {
+		id		= message.getId();
+		status	= message.getStatus();
+		text	= message.getText();
+	}
 
+	/**
+	 * @return a database {@link Message} converted into an
+	 *         {@link envoy.data.Message}
+	 * @since Envoy Server Standalone v0.1-alpha
+	 */
 	public envoy.data.Message toCommonMessage() {
 		// TODO: Attachment, dates
 		return new MessageBuilder(sender.getId(), recipient.getId()).setText(text).setDate(creationDate).setStatus(status).build();
 	}
 
+	/**
+	 * @return the id of a {link envoy.data.Message}
+	 * @since Envoy Server Standalone v0.1-alpha
+	 */
 	public long getId() { return id; }
 
+	/**
+	 * @param id the id to set
+	 * @since Envoy Server Standalone v0.1-alpha
+	 * @see Message#getId()
+	 */
 	public void setId(long id) { this.id = id; }
 
+	/**
+	 * @return the sender of a {link envoy.data.Message}
+	 * @since Envoy Server Standalone v0.1-alpha
+	 */
 	public User getSender() { return sender; }
 
+	/**
+	 * @param sender the sender to set
+	 * @since Envoy Server Standalone v0.1-alpha
+	 * @see Message#getSender()
+	 */
 	public void setSender(User sender) { this.sender = sender; }
 
+	/**
+	 * @return the recipient of a {link envoy.data.Message}
+	 * @since Envoy Server Standalone v0.1-alpha
+	 */
 	public User getRecipient() { return recipient; }
 
+	/**
+	 * @param recipient the recipient to set
+	 * @since Envoy Server Standalone v0.1-alpha
+	 * @see Message#getRecipient()
+	 */
 	public void setRecipient(User recipient) { this.recipient = recipient; }
 
+	/**
+	 * @return the date at which a {link envoy.data.Message} has been created
+	 * @since Envoy Server Standalone v0.1-alpha
+	 */
 	public Date getCreationDate() { return creationDate; }
 
+	/**
+	 * @param creationDate the creation date to set
+	 * @since Envoy Server Standalone v0.1-alpha
+	 * @see Message#getCreationDate()
+	 */
 	public void setCreationDate(Date creationDate) { this.creationDate = creationDate; }
 
+	/**
+	 * @return the date at which a {link envoy.data.Message} has been received by
+	 *         the server
+	 * @since Envoy Server Standalone v0.1-alpha
+	 */
 	public Date getReceivedDate() { return receivedDate; }
 
+	/**
+	 * @param receivedDate the received date to set
+	 * @since Envoy Server Standalone v0.1-alpha
+	 * @see Message#getReceivedDate()
+	 */
 	public void setReceivedDate(Date receivedDate) { this.receivedDate = receivedDate; }
 
+	/**
+	 * @return the date at which a {link envoy.data.Message} has been read
+	 * @since Envoy Server Standalone v0.1-alpha
+	 */
 	public Date getReadDate() { return readDate; }
 
+	/**
+	 * @param readDate the read date to set
+	 * @since Envoy Server Standalone v0.1-alpha
+	 * @see Message#getReadDate()
+	 */
 	public void setReadDate(Date readDate) { this.readDate = readDate; }
 
+	/**
+	 * @return the status of a {link envoy.data.Message}
+	 * @since Envoy Server Standalone v0.1-alpha
+	 */
 	public envoy.data.Message.MessageStatus getStatus() { return status; }
 
+	/**
+	 * @param status the new status of a {link envoy.data.Message}
+	 * @since Envoy Server Standalone v0.1-alpha
+	 */
 	public void setStatus(envoy.data.Message.MessageStatus status) { this.status = status; }
 
+	/**
+	 * @return the text content of a {link envoy.data.Message}
+	 * @since Envoy Server Standalone v0.1-alpha
+	 */
 	public String getText() { return text; }
 
+	/**
+	 * @param text the new text content of a {@link envoy.data.Message}
+	 * @since Envoy Server Standalone v0.1-alpha
+	 */
 	public void setText(String text) { this.text = text; }
 
+	/**
+	 * @return the attachment of a {@link envoy.data.Message}
+	 * @since Envoy Server Standalone v0.1-alpha
+	 */
 	public byte[] getAttachment() { return attachment; }
 
+	/**
+	 * @param attachment the new attachment
+	 * @since Envoy Server Standalone v0.1-alpha
+	 */
 	public void setAttachment(byte[] attachment) { this.attachment = attachment; }
 }
diff --git a/src/main/java/envoy/server/data/User.java b/src/main/java/envoy/server/data/User.java
index 28dbc0f..4090a25 100644
--- a/src/main/java/envoy/server/data/User.java
+++ b/src/main/java/envoy/server/data/User.java
@@ -11,10 +11,15 @@ import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 
 /**
+ * This class serves as a way to let Hibernate communicate with the server
+ * without bringing the dependency of JPA/Hibernate into the client.<br>
+ * It will be referenced as "database user" to clarify between the different
+ * user objects.<br>
+ * <br>
  * Project: <strong>envoy-server-standalone</strong><br>
  * File: <strong>User.java</strong><br>
  * Created: <strong>02.01.2020</strong><br>
- * 
+ *
  * @author Kai S. K. Engelbart
  * @since Envoy Server Standalone v0.1-alpha
  */
@@ -31,27 +36,81 @@ public class User {
 	private envoy.data.User.UserStatus	status;
 	private List<User>					contacts;
 
+	/**
+	 * @return the id of a {link envoy.data.User}
+	 * @since Envoy Server Standalone v0.1-alpha
+	 */
 	public long getId() { return id; }
 
+	/**
+	 * @param id the id to set
+	 * @since Envoy Server Standalone v0.1-alpha
+	 * @see User#getId
+	 */
 	public void setId(long id) { this.id = id; }
 
+	/**
+	 * @return the name of a {link envoy.data.User}
+	 * @since Envoy Server Standalone v0.1-alpha
+	 */
 	public String getName() { return name; }
 
+	/**
+	 * @param name the username to set
+	 * @since Envoy Server Standalone v0.1-alpha
+	 * @see User#getName()
+	 */
 	public void setName(String name) { this.name = name; }
 
+	/**
+	 * @return the passwordHash of a {link envoy.data.User}
+	 * @since Envoy Server Standalone v0.1-alpha
+	 */
 	public byte[] getPasswordHash() { return passwordHash; }
 
+	/**
+	 * @param passwordHash the password hash to set
+	 * @since Envoy Server Standalone v0.1-alpha
+	 * @see User#getPasswordHash()
+	 */
 	public void setPasswordHash(byte[] passwordHash) { this.passwordHash = passwordHash; }
 
+	/**
+	 * @return the last date an {link envoy.data.User} has been online
+	 * @since Envoy Server Standalone v0.1-alpha
+	 */
 	public Date getLastSeen() { return lastSeen; }
 
+	/**
+	 * @param lastSeen the latest date at which has been seen to set
+	 * @since Envoy Server Standalone v0.1-alpha
+	 * @see User#getLastSeen()
+	 */
 	public void setLastSeen(Date lastSeen) { this.lastSeen = lastSeen; }
 
+	/**
+	 * @return the status of a {link envoy.data.User}
+	 * @since Envoy Server Standalone v0.1-alpha
+	 */
 	public envoy.data.User.UserStatus getStatus() { return status; }
 
+	/**
+	 * @param status the status to set
+	 * @since Envoy Server Standalone v0.1-alpha
+	 * @see User#getStatus()
+	 */
 	public void setStatus(envoy.data.User.UserStatus status) { this.status = status; }
 
+	/**
+	 * @return the contacts of a {link envoy.data.User}
+	 * @since Envoy Server Standalone v0.1-alpha
+	 */
 	public List<User> getContacts() { return contacts; }
 
+	/**
+	 * @param contacts the contacts to set
+	 * @since Envoy Server Standalone v0.1-alpha
+	 * @see User#getContacts()
+	 */
 	public void setContacts(List<User> contacts) { this.contacts = contacts; }
 }
diff --git a/src/main/java/envoy/server/database/PersistenceManager.java b/src/main/java/envoy/server/database/PersistenceManager.java
new file mode 100644
index 0000000..0f36d04
--- /dev/null
+++ b/src/main/java/envoy/server/database/PersistenceManager.java
@@ -0,0 +1,21 @@
+package envoy.server.database;
+
+
+/**
+ * Project: <strong>envoy-server-standalone</strong><br>
+ * File: <strong>PersistenceManager.java</strong><br>
+ * Created: <strong>3 Jan 2020</strong><br>
+ * 
+ * @author Leon Hofmeister
+ * @since Envoy Server Standalone v0.1-alpha
+ */
+public class PersistenceManager {
+
+	/**
+	 * 
+	 * @since Envoy Server Standalone v0.1-alpha
+	 */
+	public PersistenceManager() { // TODO Auto-generated constructor stub
+	}
+
+}

From 351b5f02fb9aa0a613f163231037124a323ddf1a Mon Sep 17 00:00:00 2001
From: delvh <dev.lh@web.de>
Date: Fri, 3 Jan 2020 17:37:27 +0100
Subject: [PATCH 3/7] Added Issue and Pull Request templates

---
 .github/ISSUE_TEMPLATE/bug_report.md          | 38 +++++++++++++++++++
 .github/ISSUE_TEMPLATE/feature_request.md     | 20 ++++++++++
 .github/PULL_REQUEST_TEMPLATE/bugfix.md       | 10 +++++
 .../feature_integration.md                    |  9 +++++
 .../PULL_REQUEST_TEMPLATE/javadoc_upgrade.md  |  9 +++++
 5 files changed, 86 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md
 create mode 100644 .github/PULL_REQUEST_TEMPLATE/bugfix.md
 create mode 100644 .github/PULL_REQUEST_TEMPLATE/feature_integration.md
 create mode 100644 .github/PULL_REQUEST_TEMPLATE/javadoc_upgrade.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..2b978b3
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: CyB3RC0nN0R, delvh, DieGurke, derharry333
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..fbdebf6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: CyB3RC0nN0R, delvh, DieGurke
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/PULL_REQUEST_TEMPLATE/bugfix.md b/.github/PULL_REQUEST_TEMPLATE/bugfix.md
new file mode 100644
index 0000000..e189f31
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/bugfix.md
@@ -0,0 +1,10 @@
+---
+name: Bug fix
+title: Fixed Bug
+labels: bug
+assignees: CyB3RC0nN0R, delvh, DieGurke
+reviewers: CyB3RC0nN0R, delvh
+projects: Envoy
+milestone: Envoy v0.3-alpha
+---
+Fixes #{issue}
diff --git a/.github/PULL_REQUEST_TEMPLATE/feature_integration.md b/.github/PULL_REQUEST_TEMPLATE/feature_integration.md
new file mode 100644
index 0000000..945e7d3
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/feature_integration.md
@@ -0,0 +1,9 @@
+---
+name: Feature integration
+title: Added feature
+labels: enhancement
+assignees: CyB3RC0nN0R, delvh, DieGurke
+reviewers: CyB3RC0nN0R, delvh
+projects: Envoy
+milestone: Envoy v0.3-alpha
+---
diff --git a/.github/PULL_REQUEST_TEMPLATE/javadoc_upgrade.md b/.github/PULL_REQUEST_TEMPLATE/javadoc_upgrade.md
new file mode 100644
index 0000000..7f1786d
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/javadoc_upgrade.md
@@ -0,0 +1,9 @@
+---
+name: Updated Javadoc 
+title: Updated Javadoc
+labels: documentation
+assignees: CyB3RC0nN0R, delvh
+reviewers: CyB3RC0nN0R, delvh
+projects: Envoy
+milestone: Envoy v0.3-alpha
+---

From 0ecc9cf0e9118942ae17c8457db731a695d57155 Mon Sep 17 00:00:00 2001
From: delvh <dev.lh@web.de>
Date: Fri, 3 Jan 2020 18:17:26 +0100
Subject: [PATCH 4/7] Added PersistenceManager and Namedqueries

In theory, this code is all we need for database integration
---
 src/main/java/envoy/server/data/Message.java  | 10 +++
 src/main/java/envoy/server/data/User.java     |  4 +
 .../server/database/PersistenceManager.java   | 85 +++++++++++++++++--
 3 files changed, 94 insertions(+), 5 deletions(-)

diff --git a/src/main/java/envoy/server/data/Message.java b/src/main/java/envoy/server/data/Message.java
index 7582762..19e25a6 100644
--- a/src/main/java/envoy/server/data/Message.java
+++ b/src/main/java/envoy/server/data/Message.java
@@ -4,6 +4,9 @@ import java.util.Date;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 
@@ -23,6 +26,13 @@ import envoy.data.MessageBuilder;
  * @since Envoy Server Standalone v0.1-alpha
  */
 @Entity
+@Table(name = "messages")
+@NamedQueries(
+	{ @NamedQuery(query = "SELECT m FROM Message m WHERE m.recipient =:recipient AND m.state = 1", name = "getUnreadMessages"), @NamedQuery(
+		query = "SELECT m FROM Message m WHERE m.sender =:sender AND m.state = :state",
+		name = "find read messages"//TODO do we need this namedQuery?
+	), @NamedQuery(query = "SELECT m FROM Message m WHERE m.id = :messageId", name = "get message") }//TODO do we need this namedQuery?
+)
 public class Message {
 
 	@Id
diff --git a/src/main/java/envoy/server/data/User.java b/src/main/java/envoy/server/data/User.java
index 4090a25..e0de15f 100644
--- a/src/main/java/envoy/server/data/User.java
+++ b/src/main/java/envoy/server/data/User.java
@@ -7,6 +7,8 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 
@@ -24,6 +26,8 @@ import javax.persistence.TemporalType;
  * @since Envoy Server Standalone v0.1-alpha
  */
 @Entity
+@Table(name = "users")
+@NamedQuery(query = "SELECT u FROM DBUser u WHERE u.id = :id", name = "getUserById")
 public class User {
 
 	@Id
diff --git a/src/main/java/envoy/server/database/PersistenceManager.java b/src/main/java/envoy/server/database/PersistenceManager.java
index 0f36d04..4578f6f 100644
--- a/src/main/java/envoy/server/database/PersistenceManager.java
+++ b/src/main/java/envoy/server/database/PersistenceManager.java
@@ -1,21 +1,96 @@
 package envoy.server.database;
 
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Persistence;
+
+import org.hibernate.Session;
+
+import envoy.server.data.Message;
+import envoy.server.data.User;
 
 /**
  * Project: <strong>envoy-server-standalone</strong><br>
  * File: <strong>PersistenceManager.java</strong><br>
- * Created: <strong>3 Jan 2020</strong><br>
- * 
+ * Created: <strong>1 Jan 2020</strong><br>
+ *
  * @author Leon Hofmeister
  * @since Envoy Server Standalone v0.1-alpha
  */
 public class PersistenceManager {
 
+	private EntityManager entityManager = Persistence.createEntityManagerFactory("envoy").createEntityManager();
+
 	/**
-	 * 
+	 *
 	 * @since Envoy Server Standalone v0.1-alpha
 	 */
-	public PersistenceManager() { // TODO Auto-generated constructor stub
+	public PersistenceManager() {
+		/*
+		 * // TODO TESTING
+		 * User user = new User(3, "t");
+		 * User user2 = new User(2, "w");
+		 * Message msg = new MessageBuilder(user.getId(), user2.getId()).build();
+		 * entityManager.getTransaction().begin();
+		 * entityManager.persist(user);
+		 * entityManager.persist(user2);
+		 * entityManager.persist(msg);
+		 * entityManager.getTransaction().commit();
+		 */ // TODO delete until here
 	}
 
-}
+	/**
+	 * Adds a user to the database.
+	 *
+	 * @param User the {@link User} to add to the database
+	 * @since Envoy Server Standalone v0.1-alpha
+	 */
+	public void addUser(User User) { entityManager.persist(User); }
+
+	/**
+	 * Adds a message to the database.
+	 *
+	 * @param message the {@link Message} to add to the database
+	 * @since Envoy Server Standalone v0.1-alpha
+	 */
+	public void addMessage(Message message) { entityManager.persist(message); }// TODO these functions or the one below?
+
+	/**
+	 * This is a delegate function for {@link EntityManager#persist} in order to add
+	 * an {@link User} / a {@link Message} into the database
+	 *
+	 * @param obj the object to add to the database
+	 * @since Envoy Server Standalone v0.1-alpha
+	 */
+	public void addObject(Object obj) { entityManager.persist(obj); }
+
+	/**
+	 * Updates a row of database objects, either a Message or a User with new data.
+	 *
+	 * @param obj the object to update (existing User/Message)
+	 * @since Envoy Server Standalone v0.1-alpha
+	 */
+	public void updateObject(Object obj) { entityManager.unwrap(Session.class).merge(obj); }
+
+	/**
+	 * Searches for a user with a specific id.
+	 *
+	 * @param id - the id to search for
+	 * @return the user with the specified id
+	 * @since Envoy Server Standalone v0.1-alpha
+	 */
+	public User getUserById(long id) { return (User) entityManager.createNamedQuery("getUserById").setParameter("id", id).getSingleResult(); }
+
+	/**
+	 * Returns all messages received while being offline.
+	 *
+	 * @param user - the user who wants to receive his unread messages
+	 * @return all messages that the client does not yet have (unread messages)
+	 * @since Envoy Server Standalone v0.1-alpha
+	 */
+	@SuppressWarnings("unchecked")
+	public List<Message> getUnreadMessages(User user) {// TODO may need to be changed to clientId
+		return entityManager.createNamedQuery("getUnreadMessages").setParameter("recipient", user).getResultList();
+	}
+}
\ No newline at end of file

From 821f61485f4f0a7b8eacb9f704b5613e7b15803b Mon Sep 17 00:00:00 2001
From: delvh <dev.lh@web.de>
Date: Fri, 3 Jan 2020 21:30:14 +0100
Subject: [PATCH 5/7] Create CONTRIBUTING.md

---
 CONTRIBUTING.md | 161 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 161 insertions(+)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..03f92fa
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,161 @@
+# Contributing to Envoy
+
+Looking to contribute something to Envoy? **Here's how you can help.**
+
+Please take a moment to review this document in order to make the contribution
+process easy and effective for everyone involved.
+
+Following these guidelines helps to communicate that you respect the time of
+the developers managing and developing this open source project. In return,
+they should reciprocate that respect in addressing your issue or assessing
+patches and features.
+
+
+## Using the issue tracker
+
+The [issue tracker](https://github.com/informatik-ag-ngl/envoy-server-standalone/issues) is
+the preferred channel for [bug reports](#bug-reports), [features requests](#feature-requests)
+and [submitting pull requests](#pull-requests), but please respect the following
+restrictions:
+
+* Please **do not** derail or troll issues. Keep the discussion on topic and
+  respect the opinions of others.
+
+* Please **do not** post comments consisting solely of "+1" or ":thumbsup:".
+  Use [GitHub's "reactions" feature](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/)
+  instead. We reserve the right to delete comments which violate this rule.
+  
+  However, as we know, we are all software engineers that like being funny hence doing it on purpose. Please also refrain from that kind of behaviour.
+
+## Issues and labels
+
+Our bug tracker utilizes several labels to help organize and identify issues. Here's what they represent and how we use them:
+
+- `Documentation` & `Javadoc`- Issues regarding the documentation of Envoy
+- `Enhancement` & `Feature` - Issues suggesting a new feature
+- `Maven` - Issues concerned with Maven problems
+- `Bug` - Issues concerned with a general bug
+
+For a complete look at our labels, see the [project labels page](https://github.com/informatik-ag-ngl/envoy-server-standalone/labels).
+
+## Bug reports
+
+A bug is a _demonstrable problem_ that is caused by the code in the repository.
+Good bug reports are extremely helpful, so thanks!
+
+Guidelines for bug reports:
+
+0. **ensure your problem isn't caused by a simple error in your own code**.
+
+1. **Use the GitHub issue search** &mdash; check if the issue has already been
+   reported.
+
+2. **Check if the issue has been fixed** &mdash; try to reproduce it using the
+   latest `master` or development branch in the repository.
+
+3. **Isolate the problem** &mdash; ideally create a reduced test
+   case and a live example.
+
+
+A good bug report shouldn't leave others needing to chase you up for more
+information. Please try to be as detailed as possible in your report. What is
+your environment? What steps will reproduce the issue? These details will help people to fix
+any potential bugs.
+
+Example:
+
+> Short and descriptive example bug report title
+>
+> 1. This is the first step
+> 2. This is the second step
+> 3. Further steps, etc.
+>
+> Any other information you want to share that is relevant to the issue being
+> reported. This might include the lines of code that you have identified as
+> causing the bug, and potential solutions (and your opinions on their
+> merits).
+
+## Feature requests
+
+Feature requests are welcome. But take a moment to find out whether your idea
+fits with the scope and aims of the project. It's up to *you* to make a strong
+case to convince the project's developers of the merits of this feature. Please
+provide as much detail and context as possible.
+
+
+## Pull requests
+
+Good pull requests—patches, improvements, new features—are a fantastic
+help. They should remain focused in scope and avoid containing unrelated
+commits.
+
+**Please ask first** before embarking on any significant pull request (e.g.
+implementing features, refactoring code, porting to a different language),
+otherwise you risk spending a lot of time working on something that the
+project's developers might not want to merge into the project.
+
+Please adhere to the [coding guidelines](#code-guidelines) used throughout the
+project (indentation, accurate comments, etc.) and any other requirements
+(such as test coverage).
+
+Adhering to the following process is the best way to get your work
+included in the project:
+
+1. Download, clone or [Fork](https://help.github.com/articles/fork-a-repo/) the project, using [https://github.com/informatik-ag-ngl/envoy-server-standalone/](https://github.com/informatik-ag-ngl/envoy-server-standalone/)as Remote.
+
+2. If you cloned a while ago, get the latest changes from upstream:
+
+   ```bash
+   git checkout master
+   git pull upstream master
+   ```
+   Or, if your IDE of choice supports this, simply use `pull`
+
+3. Create a new topic branch (off the main project development branch) to
+   contain your feature, change, or fix:
+
+   ```bash
+   git checkout -b <topic-branch-name>
+   ```
+   Or, simply use "New branch" if your IDE supports this
+
+4. Commit your changes in logical chunks. Please adhere to these [git commit
+   message guidelines](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
+   or your code is unlikely be merged into the main project. Use Git's
+   [interactive rebase](https://help.github.com/articles/about-git-rebase/)
+   feature to tidy up your commits before making them public.
+
+5. Locally merge (or rebase) the upstream development branch into your topic branch:
+
+   ```bash
+   git pull [--rebase] upstream master
+   ```
+
+6. Push your topic branch up to your fork:
+
+   ```bash
+   git push origin <topic-branch-name>
+   ```
+
+7. [Open a Pull Request](https://help.github.com/articles/about-pull-requests/)
+    with a clear title and description against the `master` branch.
+
+**IMPORTANT**: By submitting a patch, you agree to allow the project owners to
+license your work under the terms of the [MIT License](../LICENSE) (if it
+includes code changes) and under the terms of the
+[Creative Commons Attribution 3.0 Unported License](https://creativecommons.org/licenses/by/3.0/)
+(if it includes documentation changes).
+
+
+## Code guidelines
+
+### Java
+
+Please use the formatter provided with this project. Especially before saving. For best results, select the option "format code" in the "Save Actions" tab in Preferences in Eclipse, so that you never accidentally forget it.
+Every public function (not annotated with `@Override`) must be delivered with Javadoc. For best project-appropriate Javadoc please take a look at the other functions which are all already equipped with Javadoc.
+
+
+## License
+
+By contributing your code, you agree to license your contribution under the [MIT License](../LICENSE).
+By contributing to the documentation, you agree to license your contribution under the [Creative Commons Attribution 3.0 Unported License](https://creativecommons.org/licenses/by/3.0/).

From 8d0e334d605c224821481dca68a3ab31226d1e4c Mon Sep 17 00:00:00 2001
From: delvh <dev.lh@web.de>
Date: Sat, 4 Jan 2020 15:39:43 +0100
Subject: [PATCH 6/7] Updated PersistenceManager as per @CyB3RC0nN0R 's request

---
 .../server/database/PersistenceManager.java   | 34 ++++++-------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/src/main/java/envoy/server/database/PersistenceManager.java b/src/main/java/envoy/server/database/PersistenceManager.java
index 4578f6f..6d2db51 100644
--- a/src/main/java/envoy/server/database/PersistenceManager.java
+++ b/src/main/java/envoy/server/database/PersistenceManager.java
@@ -23,25 +23,12 @@ public class PersistenceManager {
 	private EntityManager entityManager = Persistence.createEntityManagerFactory("envoy").createEntityManager();
 
 	/**
-	 *
 	 * @since Envoy Server Standalone v0.1-alpha
 	 */
-	public PersistenceManager() {
-		/*
-		 * // TODO TESTING
-		 * User user = new User(3, "t");
-		 * User user2 = new User(2, "w");
-		 * Message msg = new MessageBuilder(user.getId(), user2.getId()).build();
-		 * entityManager.getTransaction().begin();
-		 * entityManager.persist(user);
-		 * entityManager.persist(user2);
-		 * entityManager.persist(msg);
-		 * entityManager.getTransaction().commit();
-		 */ // TODO delete until here
-	}
+	public PersistenceManager() {}
 
 	/**
-	 * Adds a user to the database.
+	 * Adds a {@link User} to the database.
 	 *
 	 * @param User the {@link User} to add to the database
 	 * @since Envoy Server Standalone v0.1-alpha
@@ -49,29 +36,28 @@ public class PersistenceManager {
 	public void addUser(User User) { entityManager.persist(User); }
 
 	/**
-	 * Adds a message to the database.
+	 * Adds a {@link Message} to the database.
 	 *
 	 * @param message the {@link Message} to add to the database
 	 * @since Envoy Server Standalone v0.1-alpha
 	 */
-	public void addMessage(Message message) { entityManager.persist(message); }// TODO these functions or the one below?
+	public void addMessage(Message message) { entityManager.persist(message); }
 
 	/**
-	 * This is a delegate function for {@link EntityManager#persist} in order to add
-	 * an {@link User} / a {@link Message} into the database
+	 * Updates a {@link User} in the database
 	 *
-	 * @param obj the object to add to the database
+	 * @param user the {@link User} to add to the database
 	 * @since Envoy Server Standalone v0.1-alpha
 	 */
-	public void addObject(Object obj) { entityManager.persist(obj); }
+	public void updateUser(User user) { entityManager.unwrap(Session.class).merge(user); }
 
 	/**
-	 * Updates a row of database objects, either a Message or a User with new data.
+	 * Updates a {@link Message} in the database.
 	 *
-	 * @param obj the object to update (existing User/Message)
+	 * @param message the message to update
 	 * @since Envoy Server Standalone v0.1-alpha
 	 */
-	public void updateObject(Object obj) { entityManager.unwrap(Session.class).merge(obj); }
+	public void updateMessage(Message message) { entityManager.unwrap(Session.class).merge(message); }
 
 	/**
 	 * Searches for a user with a specific id.

From 8f98c45d46101707f589c24370953d0f4a8032b5 Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Sat, 4 Jan 2020 16:50:05 +0200
Subject: [PATCH 7/7] Adjusted comment templates.

---
 .project                                                  | 6 ------
 .settings/org.eclipse.jdt.ui.prefs                        | 2 +-
 .settings/org.hibernate.eclipse.console.prefs             | 3 ---
 .../java/envoy/server/database/PersistenceManager.java    | 8 ++------
 4 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 .settings/org.hibernate.eclipse.console.prefs

diff --git a/.project b/.project
index f87ca5c..45a395e 100644
--- a/.project
+++ b/.project
@@ -15,15 +15,9 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.hibernate.eclipse.console.hibernateBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.hibernate.eclipse.console.hibernateNature</nature>
 	</natures>
 </projectDescription>
diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs
index 20da6a0..269827f 100644
--- a/.settings/org.eclipse.jdt.ui.prefs
+++ b/.settings/org.eclipse.jdt.ui.prefs
@@ -1,3 +1,3 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n * @since Envoy Server Standalone v0.1-alpha\n */</template><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n * @since Envoy Server Standalone v0.1-alpha\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n * @since Envoy Server Standalone v0.1-alpha\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment"/><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * Project\: &lt;strong&gt;${project_name}&lt;/strong&gt;&lt;br&gt;\n * File\: &lt;strong&gt;${file_name}&lt;/strong&gt;&lt;br&gt;\n * Created\: &lt;strong&gt;${date}&lt;/strong&gt;&lt;br&gt;\n * \n * @author Leon Hofmeister\n * @since Envoy Server Standalone v0.1-alpha\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n * @since Envoy Server Standalone v0.1-alpha\n */</template><template autoinsert\="false" context\="modulecomment_context" deleted\="false" description\="Comment for modules" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.modulecomment" name\="modulecomment">/**\n * @author ${user}\n *\n * ${tags}\n * @since Envoy Server Standalone v0.1-alpha\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n * @since Envoy Server Standalone v0.1-alpha\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}\n</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">// ${todo} Auto-generated constructor stub\n${body_statement}\n</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n * @since Envoy Server Standalone v0.1-alpha\r\n */</template><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n * @since Envoy Server Standalone v0.1-alpha\r\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * Creates an instance of @link{${enclosing_type}}.\r\n *\r\n * ${tags}\r\n * @since Envoy Server Standalone v0.1-alpha\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment"/><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * Project\: &lt;strong&gt;${project_name}&lt;/strong&gt;&lt;br&gt;\r\n * File\: &lt;strong&gt;${file_name}&lt;/strong&gt;&lt;br&gt;\r\n * Created\: &lt;strong&gt;${date}&lt;/strong&gt;&lt;br&gt;\r\n * \r\n * @author ${user}\r\n * @since Envoy Server Standalone v0.1-alpha\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n * @since Envoy Server Standalone v0.1-alpha\r\n */</template><template autoinsert\="false" context\="modulecomment_context" deleted\="false" description\="Comment for modules" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.modulecomment" name\="modulecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n * @since Envoy Server Standalone v0.1-alpha\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n * @since Envoy Server Standalone v0.1-alpha\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}\r\n</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/.settings/org.hibernate.eclipse.console.prefs b/.settings/org.hibernate.eclipse.console.prefs
deleted file mode 100644
index a6ccf3c..0000000
--- a/.settings/org.hibernate.eclipse.console.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-default.configuration=envoy-server-standalone
-eclipse.preferences.version=1
-hibernate3.enabled=true
diff --git a/src/main/java/envoy/server/database/PersistenceManager.java b/src/main/java/envoy/server/database/PersistenceManager.java
index 6d2db51..e7c2dc8 100644
--- a/src/main/java/envoy/server/database/PersistenceManager.java
+++ b/src/main/java/envoy/server/database/PersistenceManager.java
@@ -22,11 +22,6 @@ public class PersistenceManager {
 
 	private EntityManager entityManager = Persistence.createEntityManagerFactory("envoy").createEntityManager();
 
-	/**
-	 * @since Envoy Server Standalone v0.1-alpha
-	 */
-	public PersistenceManager() {}
-
 	/**
 	 * Adds a {@link User} to the database.
 	 *
@@ -76,7 +71,8 @@ public class PersistenceManager {
 	 * @since Envoy Server Standalone v0.1-alpha
 	 */
 	@SuppressWarnings("unchecked")
-	public List<Message> getUnreadMessages(User user) {// TODO may need to be changed to clientId
+	public List<Message> getUnreadMessages(User user) {
+		// TODO may need to be changed to clientId
 		return entityManager.createNamedQuery("getUnreadMessages").setParameter("recipient", user).getResultList();
 	}
 }
\ No newline at end of file