/*
 * Copyright 2017 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package ch.myniva.gradle.caching.s3.internal;

import com.amazonaws.services.s3.AmazonS3;
import com.amazonaws.services.s3.model.ObjectMetadata;
import com.amazonaws.services.s3.model.S3Object;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import org.gradle.caching.BuildCacheEntryReader;
import org.gradle.caching.BuildCacheEntryWriter;
import org.gradle.caching.BuildCacheException;
import org.gradle.caching.BuildCacheKey;
import org.gradle.caching.BuildCacheService;
import org.gradle.caching.internal.tasks.TaskOutputPacker;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

public class AwsS3BuildCacheService implements BuildCacheService {
  static final String BUILD_CACHE_CONTENT_TYPE = "application/vnd.gradle.build-cache-artifact.v" + TaskOutputPacker.CACHE_ENTRY_FORMAT;

  private static final Logger logger = LoggerFactory.getLogger(AwsS3BuildCacheService.class);

  private final AmazonS3 s3;
  private final String bucketName;

  public AwsS3BuildCacheService(AmazonS3 s3, String bucketName) {
    this.s3 = s3;
    this.bucketName = bucketName;
  }

  @Override
  public boolean load(BuildCacheKey key, BuildCacheEntryReader reader) {
    if (s3.doesObjectExist(bucketName, key.getHashCode())) {
      logger.info("Found cache item '{}' in S3 bucket", key.getHashCode());
      S3Object object = s3.getObject(bucketName, key.getHashCode());
      try (InputStream is = object.getObjectContent()) {
        reader.readFrom(is);
        return true;
      } catch (IOException e) {
        throw new BuildCacheException("Error while reading cache object from S3 bucket", e);
      }
    } else {
      logger.info("Did not find cache item '{}' in S3 bucket", key.getHashCode());
      return false;
    }
  }

  @Override
  public void store(BuildCacheKey key, BuildCacheEntryWriter writer) {
    logger.info("Start storing cache entry '{}' in S3 bucket", key.getHashCode());
    ObjectMetadata meta = new ObjectMetadata();
    meta.setContentType(BUILD_CACHE_CONTENT_TYPE);

    try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
      writer.writeTo(os);
      try (InputStream is = new ByteArrayInputStream(os.toByteArray())) {
        s3.putObject(bucketName, key.getHashCode(), is, meta);
      }
    } catch (IOException e) {
      throw new BuildCacheException("Error while storing cache object in S3 bucket", e);
    }
  }

  @Override
  public String getDescription() {
    return String.format("AWS S3 Build Cache (%s)", bucketName);
  }

  @Override
  public void close() throws IOException {
    // The AWS S3 client does not need to be closed
  }
}

@@ -1170,67 +1170,8 @@
 ce;%0A
-import org.gradle.caching.internal.tasks.TaskOutputPacker;%0A
 impo
@@ -1187,24 +1187,24 @@
 f4j.Logger;%0A
+
 import org.s
@@ -1291,16 +1291,17 @@
 rvice %7B%0A
+%0A
   static
@@ -1389,51 +1389,10 @@
 fact
-.v%22 + TaskOutputPacker.CACHE_ENTRY_FORMAT;%0A
+%22;
 %0A  p

Remove reference to Gradle internal class