Rename variables

onlyskin · onlyskin · commit 2d441cd92aec · 2018-01-08T18:13:20.000+02:00
diff --git a/src/main/java/httpserver/file/PathExaminer.java b/src/main/java/httpserver/file/PathExaminer.java
@@ -12,8 +12,8 @@
 
 public class PathExaminer {
 
-    public Path getFullPath(Path root, String requestPathString) {
-        return root.resolve(requestPathString.substring(1));
+    public Path getFullPath(Path root, String requestPath) {
+        return root.resolve(requestPath.substring(1));
     }
 
     public Path getPath(String input) {
diff --git a/src/main/java/httpserver/header/RangeHeaderValueParser.java b/src/main/java/httpserver/header/RangeHeaderValueParser.java
@@ -36,8 +36,8 @@ private Range getRange(String[] parts) {
     }
 
     private String[] getParts(String headerValue) {
-        String rangeString = headerValue.substring(6);
-        return rangeString.split("-", 2);
+        String range = headerValue.substring(6);
+        return range.split("-", 2);
     }
 
     private int parseRangeValue(String value) {
diff --git a/src/test/java/httpserver/file/PathExaminerTest.java b/src/test/java/httpserver/file/PathExaminerTest.java
@@ -69,20 +69,20 @@ public void readsDirContentsToPathList() throws Exception {
 
     @Test
     public void makesFullPathFromRootPathAndRequestPathString() throws Exception {
-        String requestPathString = "/example.txt";
+        String requestPath= "/example.txt";
 
         Path expected = Paths.get("tmp/serving-dir/example.txt");
         assertEquals(expected,
-                pathExaminer.getFullPath(root, requestPathString));
+                pathExaminer.getFullPath(root, requestPath));
     }
 
     @Test
     public void makesFullPathCorrectlyWhenRequestPathIsSlash() throws Exception {
-        String requestPathString = "/";
+        String requestPath= "/";
 
         Path expected = Paths.get("tmp/serving-dir");
         assertEquals(expected,
-                pathExaminer.getFullPath(root, requestPathString));
+                pathExaminer.getFullPath(root, requestPath));
     }
 
     @Test
diff --git a/src/test/java/httpserver/header/RangeHeaderValueParserTest.java b/src/test/java/httpserver/header/RangeHeaderValueParserTest.java
@@ -1,7 +1,6 @@
 package httpserver.header;
 
 import httpserver.Range;
-import httpserver.header.RangeHeaderValueParser;
 import org.junit.Test;
 
 import static org.junit.Assert.*;

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@`
`12`	`12`
`13`	`13`	`public class PathExaminer {`
`14`	`14`
`15`		`- public Path getFullPath(Path root, String requestPathString) {`
`16`		`- return root.resolve(requestPathString.substring(1));`
	`15`	`+ public Path getFullPath(Path root, String requestPath) {`
	`16`	`+ return root.resolve(requestPath.substring(1));`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`public Path getPath(String input) {`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,8 @@ private Range getRange(String[] parts) {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`private String[] getParts(String headerValue) {`
`39`		`- String rangeString = headerValue.substring(6);`
`40`		`- return rangeString.split("-", 2);`
	`39`	`+ String range = headerValue.substring(6);`
	`40`	`+ return range.split("-", 2);`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`private int parseRangeValue(String value) {`