Remove variable assignment just before returning it

garydgregory · garydgregory · commit 0fd7b59fb1db · 2024-02-04T09:40:05.000-05:00
diff --git a/src/main/java/org/apache/commons/codec/digest/MurmurHash3.java b/src/main/java/org/apache/commons/codec/digest/MurmurHash3.java
@@ -1069,9 +1069,7 @@ public static long hash64(final byte[] data, final int offset, final int length,
 
         // finalization
         hash ^= length;
-        hash = fmix64(hash);
-
-        return hash;
+        return fmix64(hash);
     }
 
     /**
@@ -1113,8 +1111,7 @@ public static long hash64(final int data) {
         hash ^= k1;
         // finalization
         hash ^= Integer.BYTES;
-        hash = fmix64(hash);
-        return hash;
+        return fmix64(hash);
     }
 
     /**
@@ -1158,8 +1155,7 @@ public static long hash64(final long data) {
         hash = Long.rotateLeft(hash, R2) * M + N1;
         // finalization
         hash ^= Long.BYTES;
-        hash = fmix64(hash);
-        return hash;
+        return fmix64(hash);
     }
 
     /**
@@ -1204,8 +1200,7 @@ public static long hash64(final short data) {
 
         // finalization
         hash ^= Short.BYTES;
-        hash = fmix64(hash);
-        return hash;
+        return fmix64(hash);
     }
 
     /**
diff --git a/src/main/java/org/apache/commons/codec/digest/UnixCrypt.java b/src/main/java/org/apache/commons/codec/digest/UnixCrypt.java
@@ -399,10 +399,9 @@ private static int fourBytesToInt(final byte[] b, int offset) {
         return value;
     }
 
-    private static int hPermOp(int a, final int n, final int m) {
+    private static int hPermOp(final int a, final int n, final int m) {
         final int t = (a << 16 - n ^ a) & m;
-        a = a ^ t ^ t >>> 16 - n;
-        return a;
+        return a ^ t ^ t >>> 16 - n;
     }
 
     private static void intToFourBytes(final int iValue, final byte[] b, int offset) {
diff --git a/src/main/java/org/apache/commons/codec/language/MatchRatingApproachEncoder.java b/src/main/java/org/apache/commons/codec/language/MatchRatingApproachEncoder.java
@@ -84,9 +84,7 @@ String cleanName(final String name) {
         }
 
         upperName = removeAccents(upperName);
-        upperName = upperName.replaceAll("\\s+", EMPTY);
-
-        return upperName;
+        return upperName.replaceAll("\\s+", EMPTY);
     }
 
     /**
@@ -143,10 +141,7 @@ public final String encode(String name) {
         // 2. Remove second consonant from any double consonant
         name = removeDoubleConsonants(name);
 
-        // 3. Reduce codex to 6 letters by joining the first 3 and last 3 letters
-        name = getFirst3Last3(name);
-
-        return name;
+        return getFirst3Last3(name);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -399,10 +399,9 @@ private static int fourBytesToInt(final byte[] b, int offset) {`
`399`	`399`	`return value;`
`400`	`400`	`}`
`401`	`401`
`402`		`- private static int hPermOp(int a, final int n, final int m) {`
	`402`	`+ private static int hPermOp(final int a, final int n, final int m) {`
`403`	`403`	`final int t = (a << 16 - n ^ a) & m;`
`404`		`- a = a ^ t ^ t >>> 16 - n;`
`405`		`- return a;`
	`404`	`+ return a ^ t ^ t >>> 16 - n;`
`406`	`405`	`}`
`407`	`406`
`408`	`407`	`private static void intToFourBytes(final int iValue, final byte[] b, int offset) {`
Original file line number	Diff line number	Diff line change
`@@ -84,9 +84,7 @@ String cleanName(final String name) {`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`upperName = removeAccents(upperName);`
`87`		`- upperName = upperName.replaceAll("\\s+", EMPTY);`
`88`		`-`
`89`		`- return upperName;`
	`87`	`+ return upperName.replaceAll("\\s+", EMPTY);`
`90`	`88`	`}`
`91`	`89`
`92`	`90`	`/**`
`@@ -143,10 +141,7 @@ public final String encode(String name) {`
`143`	`141`	`// 2. Remove second consonant from any double consonant`
`144`	`142`	`name = removeDoubleConsonants(name);`
`145`	`143`
`146`		`- // 3. Reduce codex to 6 letters by joining the first 3 and last 3 letters`
`147`		`- name = getFirst3Last3(name);`
`148`		`-`
`149`		`- return name;`
	`144`	`+ return getFirst3Last3(name);`
`150`	`145`	`}`
`151`	`146`
`152`	`147`	`/**`