fixed a problem with the Base64 encoder (L2 cached results contained …

…the decoded content, attempted to re-decode a decoded message caused a problem)

src/main/java/ajk/ghcache/services/CacheService.java

@@ -8,15 +8,16 @@
 import org.apache.http.HeaderElement;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpResponse;
-import org.bouncycastle.util.encoders.Base64;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.net.URL;
 import java.nio.charset.Charset;
+import java.util.Base64;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.zip.GZIPInputStream;
@@ -44,6 +45,7 @@ public class CacheService {
 
  private Pattern cacheMaxAge = Pattern.compile(".*max-age=(\\p{Digit}*).*", CASE_INSENSITIVE);
 
+ @Cacheable(value = "responses", unless = "#result == null || #root.args[1]")
  public CachedResponse fetch(String path, boolean force) {
  CachedResponse response;
  if (force) {
@@ -130,7 +132,7 @@ private CachedResponse fetchFromRemote(String path) {
  }
 
  private String decompress(String src) {
- ByteArrayInputStream in = new ByteArrayInputStream(Base64.decode(src.getBytes()));
+ ByteArrayInputStream in = new ByteArrayInputStream(Base64.getDecoder().decode(src.getBytes()));
  ByteArrayOutputStream out = new ByteArrayOutputStream();
  try (GZIPInputStream gzip = new GZIPInputStream(in)) {
  copy(gzip, out);
@@ -151,7 +153,7 @@ private String compress(String src) {
  return "";
  }
 
- return new String(Base64.encode(out.toByteArray()));
+ return new String(Base64.getEncoder().encode(out.toByteArray()));
  }
 
  private String readNextLink(Header linkHeader) {

src/main/java/ajk/ghcache/services/repositories/ConsulResponseRepository.java

@@ -7,7 +7,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.http.HttpResponse;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
@@ -36,21 +35,20 @@ public class ConsulResponseRepository implements ResponseRepository {
  private MetricRegistry metrics;
 
  public CachedResponse store(String path, CachedResponse result) {
- log.info("caching " + path + ", with result " + result.getContent());
+ log.info("caching " + path);
 
  try {
  String storeUrl = props.getConsulUrl().toString() + "/v1/kv/" + props.getConsulKVRoot() + path;
  HttpResponse response = newInstance().execute(Put(storeUrl)
  .bodyString(mapper.writeValueAsString(result), TEXT_PLAIN)).returnResponse();
  log.info(path + ": " + response.getStatusLine());
  } catch (IOException e) {
- log.warn("couldn't cache " + result + " in path " + path + ", " + e.getMessage(), e);
+ log.warn("couldn't cache path " + path + ", " + e.getMessage(), e);
  }
 
  return result;
  }
 
- @Cacheable(value = "responses", unless = "#result == null")
  public CachedResponse fetch(String path) {
  try {
  // do some error validation - if the value doesn't exist in Consul - return null