Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

A fix for issue#121, fix NPE in storage#list and update maven dependencies #122

Merged
merged 1 commit into from
Jul 30, 2015
Merged

A fix for issue#121, fix NPE in storage#list and update maven dependencies #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public abstract class ServiceOptions<

private static final String DEFAULT_HOST = "https://www.googleapis.com";
private static final long serialVersionUID = 1203687993961393350L;
private static final String PROJECT_ENV_NAME = "default_project_id";
private static final String PROJECT_ENV_NAME = "GCLOUD_PROJECT";

private final String projectId;
private final String host;
Expand Down
4 changes: 3 additions & 1 deletion gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,9 @@ private static abstract class BasePageFetcher<T extends Serializable>
Map<StorageRpc.Option, ?> optionMap) {
this.serviceOptions = serviceOptions;
ImmutableMap.Builder<StorageRpc.Option, Object> builder = ImmutableMap.builder();
builder.put(StorageRpc.Option.PAGE_TOKEN, cursor);
if (cursor != null) {
builder.put(StorageRpc.Option.PAGE_TOKEN, cursor);
}
for (Map.Entry<StorageRpc.Option, ?> option : optionMap.entrySet()) {
if (option.getKey() != StorageRpc.Option.PAGE_TOKEN) {
builder.put(option.getKey(), option.getValue());
Expand Down
28 changes: 14 additions & 14 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.3.2</version>
<version>1.4.0</version>
<configuration>
<skip>true</skip>
<executable>java</executable>
Expand Down Expand Up @@ -125,7 +125,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.3.2</version>
<version>1.4.0</version>
<executions>
<execution>
<goals>
Expand Down Expand Up @@ -156,7 +156,7 @@
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.5</version>
<version>2.6</version>
<configuration>
<archive>
<addMavenDescriptor>true</addMavenDescriptor>
Expand Down Expand Up @@ -200,7 +200,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.1</version>
<version>2.10.3</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand All @@ -213,7 +213,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version>
<version>1.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand All @@ -227,7 +227,7 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.3</version>
<version>1.6.5</version>
<extensions>true</extensions>
<configuration>
<serverId>sonatype-nexus-staging</serverId>
Expand All @@ -238,7 +238,7 @@
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>3.0.1</version>
<version>3.1.0</version>
<configuration>
<coberturaReports>
<coberturaReport>${basedir}/target/coverage.xml</coberturaReport>
Expand All @@ -248,7 +248,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.6</version>
<version>2.7</version>
<configuration>
<outputDirectory>${basedir}/target</outputDirectory>
<formats>
Expand All @@ -271,12 +271,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.13</version>
<version>2.16</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>6.2</version>
<version>6.8.1</version>
</dependency>
</dependencies>
</plugin>
Expand Down Expand Up @@ -331,7 +331,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.1</version>
<version>2.10.3</version>
<reportSets>
<reportSet>
<id>html</id>
Expand All @@ -355,7 +355,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.13</version>
<version>2.16</version>
<configuration>
<configLocation>checkstyle.xml</configLocation>
<failOnViolation>false</failOnViolation>
Expand All @@ -364,7 +364,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.6</version>
<version>2.7</version>
<configuration>
<aggregate>true</aggregate>
</configuration>
Expand All @@ -375,7 +375,7 @@
<plugin>
<groupId>com.github.github</groupId>
<artifactId>site-maven-plugin</artifactId>
<version>0.10</version>
<version>0.12</version>
<configuration>
<message>Creating site for ${project.artifactId} ${project.version}</message>
<path>${project.distributionManagement.site.url}</path>
Expand Down