Skip to content
This repository has been archived by the owner on Nov 8, 2024. It is now read-only.

fix: remove last pathway that gzips content en route to bucket #57

Merged
merged 2 commits into from
Feb 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;

/**
* Integration test intended to deploy the plugin within Nexus Repository manager to confirm that the OSGi
* packaging is correct and the bundle will run.
*/
public class GoogleCloudBlobStoreDeploymentIT
extends GoogleCloudBlobStoreITSupport
{
Expand All @@ -21,6 +25,6 @@ public static Option[] configureNexus() {

@Test
public void createGoogleCloudBlobStore() {
//assertNotNull(nxrm.getBlobStoreManager());
// no-op; this test will fail in inherited rule/before methods if the plugin is not successfully deployed
}
}
5 changes: 0 additions & 5 deletions nexus-blobstore-google-cloud/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,6 @@
<artifactId>google-cloud-datastore</artifactId>
</dependency>

<dependency>
<groupId>com.google.oauth-client</groupId>
<artifactId>google-oauth-client</artifactId>
</dependency>

<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-healthchecks</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import com.google.cloud.storage.BlobInfo;
import com.google.cloud.storage.Storage;
import com.google.cloud.storage.Storage.BlobTargetOption;
import com.google.cloud.storage.Storage.BlobWriteOption;
import com.google.cloud.storage.Storage.ComposeRequest;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.util.concurrent.Futures;
Expand Down Expand Up @@ -151,8 +152,7 @@ public Blob upload(final Storage storage, final String bucket, final String dest
BlobInfo blobInfo = BlobInfo.newBuilder(bucket, finalChunkName).build();
// read the rest of the current stream
// downside here is that since we don't know the stream size, we can't chunk it.
// the deprecated create method here does not allow us to disable GZIP compression on these PUTs
return storage.create(blobInfo, current);
return storage.create(blobInfo, current, BlobWriteOption.disableGzipContent());
}));
}

Expand Down
15 changes: 4 additions & 11 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,29 +34,22 @@
</modules>

<properties>
<google-cloud.version>1.84.0</google-cloud.version>
<google-cloud-datastore.version>1.84.0</google-cloud-datastore.version>
<google-cloud-storage.version>1.104.0</google-cloud-storage.version>
<nxrm-version>3.20.1-01</nxrm-version>
</properties>

<dependencyManagement>
<dependencies>

<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-storage</artifactId>
<version>${google-cloud.version}</version>
<version>${google-cloud-storage.version}</version>
</dependency>

<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-datastore</artifactId>
<version>${google-cloud.version}</version>
</dependency>

<dependency>
<groupId>com.google.oauth-client</groupId>
<artifactId>google-oauth-client</artifactId>
<version>1.30.1</version>
<version>${google-cloud-datastore.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down