Merge pull request #122 from aozarov/temp1

A fix for issue#121, fix NPE in storage#list and update maven dependencies
googleapis · Jul 30, 2015 · 4736ff9 · 4736ff9
2 parents 37618dd + cbd1b26
commit 4736ff9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -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;

diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
@@ -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());

diff --git a/pom.xml b/pom.xml
@@ -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>
@@ -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>
@@ -156,7 +156,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>2.5</version>
+        <version>2.6</version>
         <configuration>
           <archive>
             <addMavenDescriptor>true</addMavenDescriptor>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>