Update variable naming.

Frank Natividad · Frank Natividad · commit d4beec1bf250 · 2018-12-07T10:30:33.000-08:00
diff --git a/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProvider.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProvider.java
@@ -907,11 +907,11 @@ public boolean requesterPays(String bucketName) {
       // instead of true/false, this method returns true/null.
       Boolean isRP = storage.get(bucketName).requesterPays();
       return isRP != null && isRP.booleanValue();
-    } catch (StorageException sex) {
-      if (sex.getCode() == 400 && sex.getMessage().contains("Bucket is requester pays")) {
+    } catch (StorageException ex) {
+      if (ex.getCode() == 400 && ex.getMessage().contains("Bucket is requester pays")) {
         return true;
       }
-      throw sex;
+      throw ex;
     }
   }
 
diff --git a/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/it/ITGcsNio.java b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/it/ITGcsNio.java
@@ -166,8 +166,8 @@ public void testFileExistsRequesterPaysNoUserProject() throws IOException {
       // fails because we must pay for every access, including metadata.
       Files.exists(path);
       Assert.fail("It should have thrown an exception.");
-    } catch (StorageException sex) {
-      assertIsRequesterPaysException("testFileExistsRequesterPaysNoUserProject", sex);
+    } catch (StorageException ex) {
+      assertIsRequesterPaysException("testFileExistsRequesterPaysNoUserProject", ex);
     }
   }
 
@@ -196,8 +196,8 @@ public void testCantCreateWithoutUserProject() throws IOException {
       // fails
       Files.write(path, "I would like to write".getBytes());
       Assert.fail("It should have thrown an exception.");
-    } catch (StorageException sex) {
-      assertIsRequesterPaysException("testCantCreateWithoutUserProject", sex);
+    } catch (StorageException ex) {
+      assertIsRequesterPaysException("testCantCreateWithoutUserProject", ex);
     }
   }
 
@@ -218,8 +218,8 @@ public void testCantReadWithoutUserProject() throws IOException {
       // fails
       Files.readAllBytes(path);
       Assert.fail("It should have thrown an exception.");
-    } catch (StorageException sex) {
-      assertIsRequesterPaysException("testCantReadWithoutUserProject", sex);
+    } catch (StorageException ex) {
+      assertIsRequesterPaysException("testCantReadWithoutUserProject", ex);
     }
   }
 
@@ -269,8 +269,8 @@ private void innerTestCantCopyWithoutUserProject(
           description,
           hex.getMessage()
               .contains("Bucket is requester pays bucket but no user project provided"));
-    } catch (StorageException sex) {
-      assertIsRequesterPaysException(description, sex);
+    } catch (StorageException ex) {
+      assertIsRequesterPaysException(description, ex);
     }
   }
 
@@ -317,11 +317,11 @@ public void testAutodetectWhenNotRequesterPays() throws IOException {
         "");
   }
 
-  private void assertIsRequesterPaysException(String message, StorageException sex) {
-    Assert.assertEquals(message, sex.getCode(), 400);
+  private void assertIsRequesterPaysException(String message, StorageException ex) {
+    Assert.assertEquals(message, ex.getCode(), 400);
     Assert.assertTrue(
         message,
-        sex.getMessage().contains("Bucket is requester pays bucket but no user project provided"));
+        ex.getMessage().contains("Bucket is requester pays bucket but no user project provided"));
   }
 
   // End of tests related to the "requester pays" feature

Original file line number	Diff line number	Diff line change
`@@ -907,11 +907,11 @@ public boolean requesterPays(String bucketName) {`
`907`	`907`	`// instead of true/false, this method returns true/null.`
`908`	`908`	`Boolean isRP = storage.get(bucketName).requesterPays();`
`909`	`909`	`return isRP != null && isRP.booleanValue();`
`910`		`- } catch (StorageException sex) {`
`911`		`- if (sex.getCode() == 400 && sex.getMessage().contains("Bucket is requester pays")) {`
	`910`	`+ } catch (StorageException ex) {`
	`911`	`+ if (ex.getCode() == 400 && ex.getMessage().contains("Bucket is requester pays")) {`
`912`	`912`	`return true;`
`913`	`913`	`}`
`914`		`- throw sex;`
	`914`	`+ throw ex;`
`915`	`915`	`}`
`916`	`916`	`}`
`917`	`917`
Original file line number	Diff line number	Diff line change
`@@ -166,8 +166,8 @@ public void testFileExistsRequesterPaysNoUserProject() throws IOException {`
`166`	`166`	`// fails because we must pay for every access, including metadata.`
`167`	`167`	`Files.exists(path);`
`168`	`168`	`Assert.fail("It should have thrown an exception.");`
`169`		`- } catch (StorageException sex) {`
`170`		`- assertIsRequesterPaysException("testFileExistsRequesterPaysNoUserProject", sex);`
	`169`	`+ } catch (StorageException ex) {`
	`170`	`+ assertIsRequesterPaysException("testFileExistsRequesterPaysNoUserProject", ex);`
`171`	`171`	`}`
`172`	`172`	`}`
`173`	`173`
`@@ -196,8 +196,8 @@ public void testCantCreateWithoutUserProject() throws IOException {`
`196`	`196`	`// fails`
`197`	`197`	`Files.write(path, "I would like to write".getBytes());`
`198`	`198`	`Assert.fail("It should have thrown an exception.");`
`199`		`- } catch (StorageException sex) {`
`200`		`- assertIsRequesterPaysException("testCantCreateWithoutUserProject", sex);`
	`199`	`+ } catch (StorageException ex) {`
	`200`	`+ assertIsRequesterPaysException("testCantCreateWithoutUserProject", ex);`
`201`	`201`	`}`
`202`	`202`	`}`
`203`	`203`
`@@ -218,8 +218,8 @@ public void testCantReadWithoutUserProject() throws IOException {`
`218`	`218`	`// fails`
`219`	`219`	`Files.readAllBytes(path);`
`220`	`220`	`Assert.fail("It should have thrown an exception.");`
`221`		`- } catch (StorageException sex) {`
`222`		`- assertIsRequesterPaysException("testCantReadWithoutUserProject", sex);`
	`221`	`+ } catch (StorageException ex) {`
	`222`	`+ assertIsRequesterPaysException("testCantReadWithoutUserProject", ex);`
`223`	`223`	`}`
`224`	`224`	`}`
`225`	`225`
`@@ -269,8 +269,8 @@ private void innerTestCantCopyWithoutUserProject(`
`269`	`269`	`description,`
`270`	`270`	`hex.getMessage()`
`271`	`271`	`.contains("Bucket is requester pays bucket but no user project provided"));`
`272`		`- } catch (StorageException sex) {`
`273`		`- assertIsRequesterPaysException(description, sex);`
	`272`	`+ } catch (StorageException ex) {`
	`273`	`+ assertIsRequesterPaysException(description, ex);`
`274`	`274`	`}`
`275`	`275`	`}`
`276`	`276`
`@@ -317,11 +317,11 @@ public void testAutodetectWhenNotRequesterPays() throws IOException {`
`317`	`317`	`"");`
`318`	`318`	`}`
`319`	`319`
`320`		`- private void assertIsRequesterPaysException(String message, StorageException sex) {`
`321`		`- Assert.assertEquals(message, sex.getCode(), 400);`
	`320`	`+ private void assertIsRequesterPaysException(String message, StorageException ex) {`
	`321`	`+ Assert.assertEquals(message, ex.getCode(), 400);`
`322`	`322`	`Assert.assertTrue(`
`323`	`323`	`message,`
`324`		`- sex.getMessage().contains("Bucket is requester pays bucket but no user project provided"));`
	`324`	`+ ex.getMessage().contains("Bucket is requester pays bucket but no user project provided"));`
`325`	`325`	`}`
`326`	`326`
`327`	`327`	`// End of tests related to the "requester pays" feature`