#28 Fix diable caffeine cache if useCache=false completely (#33)

Author: mpointner

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

@@ -26,18 +26,23 @@ public class RequestManager {
     private final Infos infos;
     private final String url;
     private boolean loggedIn = true;
-    private final LoadingCache<String, Response> requests = Caffeine.newBuilder().maximumSize(1_000).expireAfterWrite(Duration.ofMinutes(10)).refreshAfterWrite(Duration.ofMinutes(1)).build(this::POST);
+    private final boolean useCache;
+    private LoadingCache<String, Response> requests;
 
     /**
      * Initialize the {@link RequestManager} class
      *
      * @param infos user information
      * @since 1.0
      */
-    public RequestManager(Infos infos) {
+    public RequestManager(Infos infos, boolean useCache) {
         this.infos = infos;
-
-        url = infos.getServer() + baseURL + "?school=" + infos.getSchoolName();
+        this.url = infos.getServer() + baseURL + "?school=" + infos.getSchoolName();
+        this.useCache = useCache;
+        
+        if (this.useCache) {
+            requests = Caffeine.newBuilder().maximumSize(1_000).expireAfterWrite(Duration.ofMinutes(10)).refreshAfterWrite(Duration.ofMinutes(1)).build(this::POST);
+        }
     }
 
     /**
@@ -144,7 +149,12 @@ public Response POST(String method, Map<String, ?> params) throws IOException {
     public Response CachedPOST(String method, Map<String, ?> params) throws IOException {
 
         if (loggedIn) {
-            Response response = requests.get(UntisUtils.processParams(method, params));
+            Response response;
+            if (useCache) {
+                response = requests.get(UntisUtils.processParams(method, params));
+            } else {
+                response = POST(UntisUtils.processParams(method, params));
+            }
             if (method.equals(UntisUtils.Method.LOGOUT.getMethod()) && loggedIn && response != null) {
                 loggedIn = false;
             }
@@ -211,5 +221,14 @@ private Response POST(String request) throws IOException
     public String getURL() {
         return url;
     }
-
+    
+    /**
+     * Gets if every request response should be saved in cache
+     *
+     * @return gets if every request response should be saved in cache
+     * @since 1.1
+     */
+    public boolean isCacheUsed() {
+        return useCache;
+    }
 }

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

@@ -32,7 +32,6 @@
 public class Session {
 
     private Infos infos;
-    private boolean useCache = true;
     private RequestManager requestManager;
 
     /**
@@ -68,6 +67,26 @@ public static Session login(String username, String password, String server, Str
         return login(username, password, server, schoolName, "");
     }
 
+    /**
+     * Logs in to the server.
+     *
+     * <p>Send an login request to the server and returns {@link Session} if the login was successful.
+     * Throws {@link IOException} if an IO Exception occurs or {@link LoginException} (which inherits from IOException) if login fails</p>
+     *
+     * @param username   the username used for the api
+     * @param password   the password used for the api
+     * @param server     the server used for the api
+     * @param schoolName the school name used for the api
+     * @param useCache sets if every request response should be saved in cache
+     * @return a session
+     * @throws IOException if an IO Exception occurs
+     * @see Session#login(String, String, String, String, String)
+     * @since 1.0
+     */
+    public static Session login(String username, String password, String server, String schoolName, boolean useCache) throws IOException {
+        return login(username, password, server, schoolName, "", useCache);
+    }
+
     /**
      * Logs in to the server.
      *
@@ -84,12 +103,32 @@ public static Session login(String username, String password, String server, Str
      * @since 1.0
      */
     public static Session login(String username, String password, String server, String schoolName, String userAgent) throws IOException {
+        return login(username, password, server, schoolName, userAgent, true);
+    }
+
+    /**
+     * Logs in to the server.
+     *
+     * <p>Send an login request to the server and returns {@link Session} if the login was successful.
+     * Throws {@link IOException} if an IO Exception occurs or {@link LoginException} (which inherits from IOException) if login fails</p>
+     *
+     * @param server     the server from your school as URL
+     * @param schoolName school name of the school you want to connect to
+     * @param username   the username used for the API
+     * @param password   the password used for the API
+     * @param userAgent  the user agent you want to send with
+     * @param useCache sets if every request response should be saved in cache
+     * @return a {@link Session} session
+     * @throws IOException if an IO Exception occurs
+     * @since 1.0
+     */
+    public static Session login(String username, String password, String server, String schoolName, String userAgent, boolean useCache) throws IOException {
         if (!server.startsWith("http://") && !server.startsWith("https://")) {
             server = "https://" + server;
         }
         Infos infos = RequestManager.generateUserInfosAndLogin(username, password, server, schoolName, userAgent);
 
-        RequestManager requestManager = new RequestManager(infos);
+        RequestManager requestManager = new RequestManager(infos, useCache);
 
         return new Session(infos, requestManager);
     }
@@ -116,13 +155,14 @@ public void logout() throws IOException {
      * @since 1.0
      */
     public void reconnect() throws IOException {
+        boolean useCache = requestManager.isCacheUsed();
         try {
             logout();
         } catch (IOException ignore) {
         }
 
         infos = RequestManager.generateUserInfosAndLogin(infos.getUsername(), infos.getPassword(), infos.getServer(), infos.getSchoolName(), infos.getUserAgent());
-        requestManager = new RequestManager(infos);
+        requestManager = new RequestManager(infos, useCache);
     }
 
     /**
@@ -147,11 +187,7 @@ private <T extends BaseResponse> T requestSender(UntisUtils.Method method, Respo
      * @since 1.1
      */
     private <T extends BaseResponse> T requestSender(UntisUtils.Method method, Map<String, ?> params, ResponseConsumer<? extends T> action) throws IOException {
-        if (useCache) {
-            return action.getResponse(requestManager.CachedPOST(method.getMethod(), params));
-        } else {
-            return action.getResponse(requestManager.POST(method.getMethod(), params));
-        }
+        return action.getResponse(requestManager.CachedPOST(method.getMethod(), params));
     }
 
     /**
@@ -1148,24 +1184,4 @@ public Infos getInfos() {
         return infos;
     }
 
-    /**
-     * Gets if every request response should be saved in cache
-     *
-     * @return gets if every request response should be saved in cache
-     * @since 1.1
-     */
-    public boolean isCacheUsed() {
-        return useCache;
-    }
-
-    /**
-     * Sets if every request response should be saved in cache what returns in better performance
-     *
-     * @param useCache sets if every request response should be saved in cache
-     * @since 1.1
-     */
-    public void useCache(boolean useCache) {
-        this.useCache = useCache;
-    }
-
 }