Preparing for version 1.3.4 (#22)

Author: maxmielchen

pom.xml

@@ -6,9 +6,10 @@
 
     <artifactId>untis4j</artifactId>
     <groupId>org.bytedream</groupId>
-    <version>1.3.5</version>
+    <version>1.3.4</version>
 
     <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.target>11</maven.compiler.target>
         <maven.compiler.source>11</maven.compiler.source>
     </properties>
@@ -22,7 +23,7 @@
         <dependency>
             <groupId>com.github.ben-manes.caffeine</groupId>
             <artifactId>caffeine</artifactId>
-            <version>3.1.5</version>
+            <version>3.1.6</version>
         </dependency>
     </dependencies>
 
@@ -36,10 +37,15 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.3.1</version>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
+                <version>3.11.0</version>
                 <configuration>
                     <encoding>UTF-8</encoding>
                     <target>${maven.compiler.target}</target>
@@ -49,7 +55,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.2.1</version>
+                <version>3.3.0</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -62,7 +68,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.5.0</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>

src/main/java/org/bytedream/untis4j/CacheManager.java

@@ -3,18 +3,19 @@
 import org.bytedream.untis4j.responseObjects.baseObjects.BaseResponse;
 import org.bytedream.untis4j.responseObjects.baseObjects.BaseResponseLists.ResponseList;
 
+
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.function.Function;
 
 /**
  * Class to manage cache and minimize server requests and speed up the API
  *
  * @version 1.0
  * @since 1.1
  */
+@Deprecated(since = "1.3.4")
 public class CacheManager {
 
     private final HashMap<Integer, BaseResponse> cachedInformation = new HashMap<>();
@@ -25,7 +26,9 @@ public class CacheManager {
      * @param method method of the cached object you want to check
      * @return if the cache contains the given method
      * @since 1.1
+     * @deprecated Use the RequestManager cache
      */
+    @Deprecated(since = "1.3.4")
     public boolean contains(UntisUtils.Method method) {
         return cachedInformation.containsKey(mapCode(method, new HashMap<>()));
     }
@@ -40,7 +43,9 @@ public boolean contains(UntisUtils.Method method) {
      * @return returns the cached object
      * @see CacheManager#getOrRequest(UntisUtils.Method, RequestManager, Map, ResponseConsumer)
      * @since 1.1
+     * @deprecated Use the RequestManager cache
      */
+    @Deprecated(since = "1.3.4")
     public <T extends BaseResponse> T getOrRequest(UntisUtils.Method method, RequestManager requestManager, ResponseConsumer<? extends T> action) {
         return getOrRequest(method, requestManager, new HashMap<>(), action);
     }
@@ -55,7 +60,9 @@ public <T extends BaseResponse> T getOrRequest(UntisUtils.Method method, Request
      * @param <T>            an object which extends {@link BaseResponse}
      * @return the response in a {@link ResponseList}
      * @since 1.1
+     * @deprecated Use the RequestManager cache
      */
+    @Deprecated(since = "1.3.4")
     public <T extends BaseResponse> T getOrRequest(UntisUtils.Method method, RequestManager requestManager, Map<String, ?> params, ResponseConsumer<T> action) {
         int keyHashCode = mapCode(method, params);
 
@@ -79,7 +86,9 @@ public <T extends BaseResponse> T getOrRequest(UntisUtils.Method method, Request
      * @param action         lambda expression that gets returns the new content
      * @throws IOException if an IO Exception occurs
      * @since 1.1
+     * @deprecated Use the RequestManager cache
      */
+    @Deprecated(since = "1.3.4")
     public void update(UntisUtils.Method method, RequestManager requestManager, Map<String, ?> params, ResponseConsumer<? extends BaseResponse> action) throws IOException {
         cachedInformation.replace(mapCode(method, params), action.getResponse(requestManager.POST(method.getMethod(), params)));
     }

src/main/java/org/bytedream/untis4j/Session.java

@@ -5,7 +5,6 @@
 
 package org.bytedream.untis4j;
 
-import com.github.benmanes.caffeine.cache.LoadingCache;
 import org.bytedream.untis4j.responseObjects.*;
 import org.bytedream.untis4j.responseObjects.baseObjects.BaseResponse;
 import org.bytedream.untis4j.responseObjects.baseObjects.BaseResponseLists;
@@ -127,7 +126,7 @@ public void reconnect() throws IOException {
     }
 
     /**
-     * Checks if the cache should be used and depending on the result it calls {@link CacheManager#getOrRequest(UntisUtils.Method, RequestManager, Map, ResponseConsumer)} or request the given method manually
+     * Checks if the same request is still in the {@link com.github.benmanes.caffeine.cache.LoadingCache} and if not, the request is sent to the server.
      *
      * @see Session#requestSender(UntisUtils.Method, Map, ResponseConsumer)
      * @since 1.1
@@ -137,8 +136,9 @@ private <T extends BaseResponse> T requestSender(UntisUtils.Method method, Respo
     }
 
     /**
-     * Checks if the cache should be used and depending on the result it calls {@link CacheManager#getOrRequest(UntisUtils.Method, RequestManager, Map, ResponseConsumer)} or request the given method manually
-     *
+     * Checks if the same request is still in the {@link com.github.benmanes.caffeine.cache.LoadingCache} and if not, the request is sent to the server.
+     * 
+     * 
      * @param method the POST method
      * @param params params you want to send with the request
      * @param action lambda expression that gets called if the {@code method} is not in the cache manager