Cleanup

Author: smaye81

src/main/java/build/buf/protovalidate/Ipv4.java

@@ -80,11 +80,7 @@ boolean addressPrefix() {
   private boolean prefixLength() {
     int start = this.index;
 
-    while (true) {
-      if (this.index >= this.str.length() || !this.digit()) {
-        break;
-      }
-
+    while (this.index < this.str.length() && this.digit()) {
       if (this.index - start > 2) {
         // max prefix-length is 32 bits, so anything more than 2 digits is invalid
         return false;
@@ -138,11 +134,7 @@ private boolean addressPart() {
   private boolean decOctet() {
     int start = this.index;
 
-    while (true) {
-      if (this.index >= this.str.length() || !this.digit()) {
-        break;
-      }
-
+    while (this.index < this.str.length() && this.digit()) {
       if (this.index - start > 3) {
         // decimal octet can be three characters at most
         return false;

src/main/java/build/buf/protovalidate/Ipv6.java

@@ -62,10 +62,7 @@ private long[] getBits() {
 
     // handle double colon, fill pieces with 0
     if (this.doubleColonSeen) {
-      while (true) {
-        if (p16.size() >= 8) {
-          break;
-        }
+      while (p16.size() < 8) {
         p16.add(this.doubleColonAt, 0x00000000);
       }
     }
@@ -128,10 +125,7 @@ boolean addressPrefix() {
   private boolean prefixLength() {
     int start = this.index;
 
-    while (true) {
-      if (this.index >= this.str.length() || !this.digit()) {
-        break;
-      }
+    while (this.index < this.str.length() && this.digit()) {
       if (this.index - start > 3) {
         return false;
       }
@@ -167,10 +161,7 @@ private boolean prefixLength() {
 
   // Stores dotted notation for right-most 32 bits in `dottedRaw` / `dottedAddr` if found.
   private boolean addressPart() {
-    while (true) {
-      if (this.index >= this.str.length()) {
-        break;
-      }
+    while (this.index < this.str.length()) {
       // dotted notation for right-most 32 bits, e.g. 0:0:0:0:0:ffff:192.1.56.10
       if ((this.doubleColonSeen || this.pieces.size() == 6) && this.dotted()) {
         Ipv4 dotted = new Ipv4(this.dottedRaw);
@@ -249,12 +240,7 @@ private boolean dotted() {
 
     this.dottedRaw = "";
 
-    while (true) {
-      if (this.index < this.str.length() && (this.digit() || this.take('.'))) {
-        continue;
-      }
-      break;
-    }
+    while (this.index < this.str.length() && (this.digit() || this.take('.'))) {}
 
     if (this.index - start >= 7) {
       this.dottedRaw = this.str.substring(start, this.index);
@@ -279,11 +265,7 @@ private boolean dotted() {
   private boolean h16() {
     int start = this.index;
 
-    while (true) {
-      if (this.index >= this.str.length() || !this.hexDig()) {
-        break;
-      }
-    }
+    while (this.index < this.str.length() && this.hexDig()) {}
 
     String str = this.str.substring(start, this.index);