From 72b9b677d9f361ebbf963e7e1cf95f287e0315ea Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Thu, 1 Nov 2018 11:56:59 +0300
Subject: drop resttemplate cache

---
 juick-server/build.gradle                          |  1 -
 .../configuration/ActivityPubClientConfig.java     | 24 ----------------------
 2 files changed, 25 deletions(-)

diff --git a/juick-server/build.gradle b/juick-server/build.gradle
index 90ed90a3..e9415548 100644
--- a/juick-server/build.gradle
+++ b/juick-server/build.gradle
@@ -66,7 +66,6 @@ dependencies {
     compile ('org.springframework.boot:spring-boot-starter-jdbc')
     compile("org.springframework.boot:spring-boot-starter-security")
     compile("org.springframework.boot:spring-boot-starter-web")
-    compile 'org.apache.httpcomponents:httpclient-cache'
     compile("org.springframework.boot:spring-boot-starter-websocket")
     compile 'org.springframework.boot:spring-boot-devtools'
     
diff --git a/juick-server/src/main/java/com/juick/server/configuration/ActivityPubClientConfig.java b/juick-server/src/main/java/com/juick/server/configuration/ActivityPubClientConfig.java
index 37afc1d8..12626b59 100644
--- a/juick-server/src/main/java/com/juick/server/configuration/ActivityPubClientConfig.java
+++ b/juick-server/src/main/java/com/juick/server/configuration/ActivityPubClientConfig.java
@@ -1,13 +1,8 @@
 package com.juick.server.configuration;
 
 import com.juick.server.ActivityPubManager;
-import org.apache.http.client.HttpClient;
-import org.apache.http.impl.client.cache.CacheConfig;
-import org.apache.http.impl.client.cache.CachingHttpClientBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.http.client.BufferingClientHttpRequestFactory;
-import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.http.client.SimpleClientHttpRequestFactory;
 import org.springframework.web.client.RestTemplate;
 
@@ -17,26 +12,7 @@ public class ActivityPubClientConfig {
     public RestTemplate apClient() {
         SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory();
         RestTemplate restTemplate = new RestTemplate(requestFactory);
-        // BufferingClientHttpRequestFactory allows us to read the response more than once - Necessary for debugging.
-        restTemplate.setRequestFactory(new BufferingClientHttpRequestFactory(new HttpComponentsClientHttpRequestFactory(httpClient())));
         restTemplate.setErrorHandler(new ActivityPubManager.ErrorHandler());
         return restTemplate;
     }
-    @Bean
-    public HttpClient httpClient() {
-        return CachingHttpClientBuilder
-                .create()
-                .setCacheConfig(cacheConfig())
-                .build();
-    }
-    @Bean
-    public CacheConfig cacheConfig() {
-        return CacheConfig
-                .custom()
-                .setMaxObjectSize(500000) // 500KB
-                .setMaxCacheEntries(2000)
-                // Set this to false and a response with queryString
-                // will be cached when it is explicitly cacheable .setNeverCacheHTTP10ResponsesWithQueryString(false)
-                .build();
-    }
 }
\ No newline at end of file
-- 
cgit v1.2.3