From c94bcafc41447177c0d03b23285d3a445e64dbfa Mon Sep 17 00:00:00 2001
From: Rsl1122 <djrapitops@hotmail.com>
Date: Thu, 3 Aug 2017 09:57:54 +0300
Subject: [PATCH] 3.6.1

Fix TimeKeeper tostring
Remove parallelStream from Tables because there is only one database connection.
---
 .../Maven__com_djrapitops_PlanPluginBridge_3_6_0.xml   | 10 +++++-----
 Plan/pom.xml                                           |  2 +-
 .../java/com/djrapitops/plan/data/time/TimeKeeper.java |  2 +-
 .../djrapitops/plan/database/tables/GMTimesTable.java  |  4 ++--
 .../djrapitops/plan/database/tables/SessionsTable.java |  2 +-
 .../com/djrapitops/plan/database/tables/TPSTable.java  |  2 +-
 .../djrapitops/plan/database/tables/UsersTable.java    |  2 +-
 Plan/src/main/resources/plugin.yml                     |  2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Plan/.idea/libraries/Maven__com_djrapitops_PlanPluginBridge_3_6_0.xml b/Plan/.idea/libraries/Maven__com_djrapitops_PlanPluginBridge_3_6_0.xml
index f28c9c6a8..e05eb9fab 100644
--- a/Plan/.idea/libraries/Maven__com_djrapitops_PlanPluginBridge_3_6_0.xml
+++ b/Plan/.idea/libraries/Maven__com_djrapitops_PlanPluginBridge_3_6_0.xml
@@ -1,14 +1,14 @@
 <component name="libraryTable">
   <library name="Maven: com.djrapitops:PlanPluginBridge:3.6.0">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/../PlanPluginBridge/PlanPluginBridge-3.6.0.jar!/" />
-      <root url="file://$PROJECT_DIR$/../PlanPluginBridge" />
-      <root url="file://$PROJECT_DIR$/../PlanPluginBridge" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/djrapitops/PlanPluginBridge/3.6.0/PlanPluginBridge-3.6.0.jar!/" />
     </CLASSES>
-    <JAVADOC />
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/djrapitops/PlanPluginBridge/3.6.0/PlanPluginBridge-3.6.0-javadoc.jar!/" />
+    </JAVADOC>
     <SOURCES>
       <root url="file://$PROJECT_DIR$/../PlanPluginBridge/src/main/java" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/djrapitops/PlanPluginBridge/3.6.0/PlanPluginBridge-3.6.0-sources.jar!/" />
     </SOURCES>
-    <jarDirectory url="file://$PROJECT_DIR$/../PlanPluginBridge" recursive="false" />
   </library>
 </component>
\ No newline at end of file
diff --git a/Plan/pom.xml b/Plan/pom.xml
index 272959b04..8d6d3b44d 100644
--- a/Plan/pom.xml
+++ b/Plan/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.djrapitops</groupId>
     <artifactId>Plan</artifactId>
-    <version>3.6.0</version>
+    <version>3.6.1</version>
     <packaging>jar</packaging>
     <repositories>
         <repository>
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/time/TimeKeeper.java b/Plan/src/main/java/com/djrapitops/plan/data/time/TimeKeeper.java
index 80e04fcbd..08fef0842 100644
--- a/Plan/src/main/java/com/djrapitops/plan/data/time/TimeKeeper.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/time/TimeKeeper.java
@@ -155,7 +155,7 @@ public abstract class TimeKeeper {
 
     @Override
     public String toString() {
-        return "TimeKeeper{" +
+        return getClass().getSimpleName()+"{" +
                 "times=" + times +
                 ", state='" + state + '\'' +
                 ", lastStateChange=" + lastStateChange +
diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/GMTimesTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/GMTimesTable.java
index cdec6ff1f..58c7e8437 100644
--- a/Plan/src/main/java/com/djrapitops/plan/database/tables/GMTimesTable.java
+++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/GMTimesTable.java
@@ -220,7 +220,7 @@ public class GMTimesTable extends Table {
 
         List<List<Container<GMTimes>>> batches = DBUtils.splitIntoBatchesWithID(gmTimes);
 
-        batches.parallelStream().forEach(batch -> {
+        batches.stream().forEach(batch -> {
             try {
                 saveGMTimesBatch(batch);
             } catch (SQLException e) {
@@ -298,7 +298,7 @@ public class GMTimesTable extends Table {
 
         List<List<Container<GMTimes>>> batches = DBUtils.splitIntoBatchesWithID(gmTimes);
 
-        batches.parallelStream().forEach(batch -> {
+        batches.stream().forEach(batch -> {
             try {
                 addNewGMTimesBatch(batch);
             } catch (SQLException e) {
diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/SessionsTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/SessionsTable.java
index 2eb135925..a5b4e609e 100644
--- a/Plan/src/main/java/com/djrapitops/plan/database/tables/SessionsTable.java
+++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/SessionsTable.java
@@ -218,7 +218,7 @@ public class SessionsTable extends Table {
 
         List<List<Container<SessionData>>> batches = splitIntoBatches(sessions);
 
-        batches.parallelStream().forEach(batch -> {
+        batches.stream().forEach(batch -> {
             try {
                 saveSessionBatch(batch);
             } catch (SQLException e) {
diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/TPSTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/TPSTable.java
index f2b9b86a8..904ddcbb5 100644
--- a/Plan/src/main/java/com/djrapitops/plan/database/tables/TPSTable.java
+++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/TPSTable.java
@@ -119,7 +119,7 @@ public class TPSTable extends Table {
      */
     public void saveTPSData(List<TPS> data) throws SQLException {
         List<List<TPS>> batches = DBUtils.splitIntoBatches(data);
-        batches.parallelStream()
+        batches.stream()
                 .forEach(batch -> {
                     try {
                         saveTPSBatch(batch);
diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/UsersTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/UsersTable.java
index 2d20f4db3..21e912da8 100644
--- a/Plan/src/main/java/com/djrapitops/plan/database/tables/UsersTable.java
+++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/UsersTable.java
@@ -683,7 +683,7 @@ public class UsersTable extends Table {
 
             List<List<UserData>> batches = DBUtils.splitIntoBatches(newUserdata);
 
-            batches.parallelStream()
+            batches.stream()
                     .forEach(batch -> {
                         try {
                             insertNewUserData(batch);
diff --git a/Plan/src/main/resources/plugin.yml b/Plan/src/main/resources/plugin.yml
index fdce47d5d..9214c2da2 100644
--- a/Plan/src/main/resources/plugin.yml
+++ b/Plan/src/main/resources/plugin.yml
@@ -1,7 +1,7 @@
 name: Plan
 author: Rsl1122
 main: main.java.com.djrapitops.plan.Plan
-version: 3.6.0
+version: 3.6.1
 softdepend:
 - OnTime
 - EssentialsX