Checkstyle: naming: MemberName

Korbik · Korbik · commit be37a3bd6297 · 2025-03-11T10:43:37.000+01:00
diff --git a/src/main/java/org/biscuitsec/biscuit/error/Error.java b/src/main/java/org/biscuitsec/biscuit/error/Error.java
@@ -62,10 +62,10 @@ public String toString() {
       }
 
       public static final class InvalidSignature extends Signature {
-        private final String e;
+        private final String err;
 
         public InvalidSignature(String e) {
-          this.e = e;
+          this.err = e;
         }
 
         @Override
@@ -79,13 +79,13 @@ public boolean equals(Object o) {
         @Override
         public JsonElement toJson() {
           JsonObject jo = new JsonObject();
-          jo.addProperty("InvalidSignature", this.e);
+          jo.addProperty("InvalidSignature", this.err);
           return Signature.jsonWrapper(jo);
         }
 
         @Override
         public String toString() {
-          return "Err(Format(Signature(InvalidFormat(\"" + this.e + "\"))))";
+          return "Err(Format(Signature(InvalidFormat(\"" + this.err + "\"))))";
         }
       }
     }
@@ -151,10 +151,10 @@ public String toString() {
     }
 
     public static final class DeserializationError extends FormatError {
-      private final String e;
+      private final String err;
 
       public DeserializationError(String e) {
-        this.e = e;
+        this.err = e;
       }
 
       @Override
@@ -166,32 +166,32 @@ public boolean equals(Object o) {
           return false;
         }
         DeserializationError other = (DeserializationError) o;
-        return e.equals(other.e);
+        return err.equals(other.err);
       }
 
       @Override
       public int hashCode() {
-        return Objects.hash(e);
+        return Objects.hash(err);
       }
 
       @Override
       public String toString() {
-        return "Err(Format(DeserializationError(\"" + this.e + "\"))";
+        return "Err(Format(DeserializationError(\"" + this.err + "\"))";
       }
 
       @Override
       public JsonElement toJson() {
         JsonObject jo = new JsonObject();
-        jo.addProperty("DeserializationError", this.e);
+        jo.addProperty("DeserializationError", this.err);
         return FormatError.jsonWrapper(jo);
       }
     }
 
     public static final class SerializationError extends FormatError {
-      private final String e;
+      private final String err;
 
       public SerializationError(String e) {
-        this.e = e;
+        this.err = e;
       }
 
       @Override
@@ -203,32 +203,32 @@ public boolean equals(Object o) {
           return false;
         }
         SerializationError other = (SerializationError) o;
-        return e.equals(other.e);
+        return err.equals(other.err);
       }
 
       @Override
       public int hashCode() {
-        return Objects.hash(e);
+        return Objects.hash(err);
       }
 
       @Override
       public String toString() {
-        return "Err(Format(SerializationError(\"" + this.e + "\"))";
+        return "Err(Format(SerializationError(\"" + this.err + "\"))";
       }
 
       @Override
       public JsonElement toJson() {
         JsonObject jo = new JsonObject();
-        jo.addProperty("SerializationError", this.e);
+        jo.addProperty("SerializationError", this.err);
         return FormatError.jsonWrapper(jo);
       }
     }
 
     public static final class BlockDeserializationError extends FormatError {
-      private final String e;
+      private final String err;
 
       public BlockDeserializationError(String e) {
-        this.e = e;
+        this.err = e;
       }
 
       @Override
@@ -240,32 +240,32 @@ public boolean equals(Object o) {
           return false;
         }
         BlockDeserializationError other = (BlockDeserializationError) o;
-        return e.equals(other.e);
+        return err.equals(other.err);
       }
 
       @Override
       public int hashCode() {
-        return Objects.hash(e);
+        return Objects.hash(err);
       }
 
       @Override
       public String toString() {
-        return "Err(FormatError.BlockDeserializationError{ error: " + e + " }";
+        return "Err(FormatError.BlockDeserializationError{ error: " + err + " }";
       }
 
       @Override
       public JsonElement toJson() {
         JsonObject jo = new JsonObject();
-        jo.addProperty("BlockDeserializationError", this.e);
+        jo.addProperty("BlockDeserializationError", this.err);
         return FormatError.jsonWrapper(jo);
       }
     }
 
     public static final class BlockSerializationError extends FormatError {
-      private final String e;
+      private final String err;
 
       public BlockSerializationError(String e) {
-        this.e = e;
+        this.err = e;
       }
 
       @Override
@@ -277,23 +277,23 @@ public boolean equals(Object o) {
           return false;
         }
         BlockSerializationError other = (BlockSerializationError) o;
-        return e.equals(other.e);
+        return err.equals(other.err);
       }
 
       @Override
       public int hashCode() {
-        return Objects.hash(e);
+        return Objects.hash(err);
       }
 
       @Override
       public String toString() {
-        return "Err(FormatError.BlockSerializationError{ error: " + e + " }";
+        return "Err(FormatError.BlockSerializationError{ error: " + err + " }";
       }
 
       @Override
       public JsonElement toJson() {
         JsonObject jo = new JsonObject();
-        jo.addProperty("BlockSerializationError", this.e);
+        jo.addProperty("BlockSerializationError", this.err);
         return FormatError.jsonWrapper(jo);
       }
     }
@@ -640,25 +640,25 @@ public enum Kind {
       Overflow
     }
 
-    Expression e;
+    Expression expr;
     String message;
 
     Kind kind;
 
     public Execution(Expression ex, String msg) {
-      e = ex;
+      expr = ex;
       message = msg;
       kind = Kind.Execution;
     }
 
     public Execution(String msg) {
-      e = null;
+      expr = null;
       message = msg;
       kind = Kind.Execution;
     }
 
     public Execution(Kind kind, String msg) {
-      e = null;
+      expr = null;
       this.kind = kind;
       message = msg;
     }
@@ -680,7 +680,7 @@ public JsonElement toJson() {
 
     @Override
     public String toString() {
-      return "Execution error when evaluating expression '" + e + "': " + message;
+      return "Execution error when evaluating expression '" + expr + "': " + message;
     }
   }
 
diff --git a/src/main/java/org/biscuitsec/biscuit/error/LogicError.java b/src/main/java/org/biscuitsec/biscuit/error/LogicError.java
@@ -18,10 +18,10 @@ public JsonElement toJson() {
   }
 
   public static final class InvalidAuthorityFact extends LogicError {
-    public final String e;
+    public final String err;
 
     public InvalidAuthorityFact(String e) {
-      this.e = e;
+      this.err = e;
     }
 
     @Override
@@ -33,17 +33,17 @@ public boolean equals(Object o) {
         return false;
       }
       InvalidAuthorityFact other = (InvalidAuthorityFact) o;
-      return e.equals(other.e);
+      return err.equals(other.err);
     }
 
     @Override
     public int hashCode() {
-      return Objects.hash(e);
+      return Objects.hash(err);
     }
 
     @Override
     public String toString() {
-      return "LogicError.InvalidAuthorityFact{ error: " + e + " }";
+      return "LogicError.InvalidAuthorityFact{ error: " + err + " }";
     }
 
     @Override
@@ -53,10 +53,10 @@ public JsonElement toJson() {
   }
 
   public static final class InvalidAmbientFact extends LogicError {
-    public final String e;
+    public final String err;
 
     public InvalidAmbientFact(String e) {
-      this.e = e;
+      this.err = e;
     }
 
     @Override
@@ -68,23 +68,23 @@ public boolean equals(Object o) {
         return false;
       }
       InvalidAmbientFact other = (InvalidAmbientFact) o;
-      return e.equals(other.e);
+      return err.equals(other.err);
     }
 
     @Override
     public int hashCode() {
-      return Objects.hash(e);
+      return Objects.hash(err);
     }
 
     @Override
     public String toString() {
-      return "LogicError.InvalidAmbientFact{ error: " + e + " }";
+      return "LogicError.InvalidAmbientFact{ error: " + err + " }";
     }
 
     @Override
     public JsonElement toJson() {
       JsonObject child = new JsonObject();
-      child.addProperty("error", this.e);
+      child.addProperty("error", this.err);
       JsonObject root = new JsonObject();
       root.add("InvalidAmbientFact", child);
       return root;
@@ -93,11 +93,11 @@ public JsonElement toJson() {
 
   public static final class InvalidBlockFact extends LogicError {
     public final long id;
-    public final String e;
+    public final String err;
 
     public InvalidBlockFact(long id, String e) {
       this.id = id;
-      this.e = e;
+      this.err = e;
     }
 
     @Override
@@ -109,24 +109,24 @@ public boolean equals(Object o) {
         return false;
       }
       InvalidBlockFact other = (InvalidBlockFact) o;
-      return id == other.id && e.equals(other.e);
+      return id == other.id && err.equals(other.err);
     }
 
     @Override
     public int hashCode() {
-      return Objects.hash(id, e);
+      return Objects.hash(id, err);
     }
 
     @Override
     public String toString() {
-      return "LogicError.InvalidBlockFact{ id: " + id + ", error: " + e + " }";
+      return "LogicError.InvalidBlockFact{ id: " + id + ", error: " + err + " }";
     }
 
     @Override
     public JsonElement toJson() {
       JsonObject child = new JsonObject();
       child.addProperty("id", this.id);
-      child.addProperty("error", this.e);
+      child.addProperty("error", this.err);
       JsonObject root = new JsonObject();
       root.add("InvalidBlockFact", child);
       return root;
@@ -135,11 +135,11 @@ public JsonElement toJson() {
 
   public static final class InvalidBlockRule extends LogicError {
     public final long id;
-    public final String e;
+    public final String err;
 
     public InvalidBlockRule(long id, String e) {
       this.id = id;
-      this.e = e;
+      this.err = e;
     }
 
     @Override
@@ -151,24 +151,24 @@ public boolean equals(Object o) {
         return false;
       }
       InvalidBlockRule other = (InvalidBlockRule) o;
-      return id == other.id && e.equals(other.e);
+      return id == other.id && err.equals(other.err);
     }
 
     @Override
     public int hashCode() {
-      return Objects.hash(id, e);
+      return Objects.hash(id, err);
     }
 
     @Override
     public String toString() {
-      return "LogicError.InvalidBlockRule{ id: " + id + ", error: " + e + " }";
+      return "LogicError.InvalidBlockRule{ id: " + id + ", error: " + err + " }";
     }
 
     @Override
     public JsonElement toJson() {
       JsonArray child = new JsonArray();
       child.add(this.id);
-      child.add(this.e);
+      child.add(this.err);
       JsonObject root = new JsonObject();
       root.add("InvalidBlockRule", child);
       return root;

Original file line number	Diff line number	Diff line change
`@@ -62,10 +62,10 @@ public String toString() {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`public static final class InvalidSignature extends Signature {`
`65`		`- private final String e;`
	`65`	`+ private final String err;`
`66`	`66`
`67`	`67`	`public InvalidSignature(String e) {`
`68`		`- this.e = e;`
	`68`	`+ this.err = e;`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`@Override`
`@@ -79,13 +79,13 @@ public boolean equals(Object o) {`
`79`	`79`	`@Override`
`80`	`80`	`public JsonElement toJson() {`
`81`	`81`	`JsonObject jo = new JsonObject();`
`82`		`- jo.addProperty("InvalidSignature", this.e);`
	`82`	`+ jo.addProperty("InvalidSignature", this.err);`
`83`	`83`	`return Signature.jsonWrapper(jo);`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`@Override`
`87`	`87`	`public String toString() {`
`88`		`- return "Err(Format(Signature(InvalidFormat(\"" + this.e + "\"))))";`
	`88`	`+ return "Err(Format(Signature(InvalidFormat(\"" + this.err + "\"))))";`
`89`	`89`	`}`
`90`	`90`	`}`
`91`	`91`	`}`
`@@ -151,10 +151,10 @@ public String toString() {`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`public static final class DeserializationError extends FormatError {`
`154`		`- private final String e;`
	`154`	`+ private final String err;`
`155`	`155`
`156`	`156`	`public DeserializationError(String e) {`
`157`		`- this.e = e;`
	`157`	`+ this.err = e;`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`@Override`
`@@ -166,32 +166,32 @@ public boolean equals(Object o) {`
`166`	`166`	`return false;`
`167`	`167`	`}`
`168`	`168`	`DeserializationError other = (DeserializationError) o;`
`169`		`- return e.equals(other.e);`
	`169`	`+ return err.equals(other.err);`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`@Override`
`173`	`173`	`public int hashCode() {`
`174`		`- return Objects.hash(e);`
	`174`	`+ return Objects.hash(err);`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`@Override`
`178`	`178`	`public String toString() {`
`179`		`- return "Err(Format(DeserializationError(\"" + this.e + "\"))";`
	`179`	`+ return "Err(Format(DeserializationError(\"" + this.err + "\"))";`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`@Override`
`183`	`183`	`public JsonElement toJson() {`
`184`	`184`	`JsonObject jo = new JsonObject();`
`185`		`- jo.addProperty("DeserializationError", this.e);`
	`185`	`+ jo.addProperty("DeserializationError", this.err);`
`186`	`186`	`return FormatError.jsonWrapper(jo);`
`187`	`187`	`}`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`public static final class SerializationError extends FormatError {`
`191`		`- private final String e;`
	`191`	`+ private final String err;`
`192`	`192`
`193`	`193`	`public SerializationError(String e) {`
`194`		`- this.e = e;`
	`194`	`+ this.err = e;`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`@Override`
`@@ -203,32 +203,32 @@ public boolean equals(Object o) {`
`203`	`203`	`return false;`
`204`	`204`	`}`
`205`	`205`	`SerializationError other = (SerializationError) o;`
`206`		`- return e.equals(other.e);`
	`206`	`+ return err.equals(other.err);`
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`@Override`
`210`	`210`	`public int hashCode() {`
`211`		`- return Objects.hash(e);`
	`211`	`+ return Objects.hash(err);`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`@Override`
`215`	`215`	`public String toString() {`
`216`		`- return "Err(Format(SerializationError(\"" + this.e + "\"))";`
	`216`	`+ return "Err(Format(SerializationError(\"" + this.err + "\"))";`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`@Override`
`220`	`220`	`public JsonElement toJson() {`
`221`	`221`	`JsonObject jo = new JsonObject();`
`222`		`- jo.addProperty("SerializationError", this.e);`
	`222`	`+ jo.addProperty("SerializationError", this.err);`
`223`	`223`	`return FormatError.jsonWrapper(jo);`
`224`	`224`	`}`
`225`	`225`	`}`
`226`	`226`
`227`	`227`	`public static final class BlockDeserializationError extends FormatError {`
`228`		`- private final String e;`
	`228`	`+ private final String err;`
`229`	`229`
`230`	`230`	`public BlockDeserializationError(String e) {`
`231`		`- this.e = e;`
	`231`	`+ this.err = e;`
`232`	`232`	`}`
`233`	`233`
`234`	`234`	`@Override`
`@@ -240,32 +240,32 @@ public boolean equals(Object o) {`
`240`	`240`	`return false;`
`241`	`241`	`}`
`242`	`242`	`BlockDeserializationError other = (BlockDeserializationError) o;`
`243`		`- return e.equals(other.e);`
	`243`	`+ return err.equals(other.err);`
`244`	`244`	`}`
`245`	`245`
`246`	`246`	`@Override`
`247`	`247`	`public int hashCode() {`
`248`		`- return Objects.hash(e);`
	`248`	`+ return Objects.hash(err);`
`249`	`249`	`}`
`250`	`250`
`251`	`251`	`@Override`
`252`	`252`	`public String toString() {`
`253`		`- return "Err(FormatError.BlockDeserializationError{ error: " + e + " }";`
	`253`	`+ return "Err(FormatError.BlockDeserializationError{ error: " + err + " }";`
`254`	`254`	`}`
`255`	`255`
`256`	`256`	`@Override`
`257`	`257`	`public JsonElement toJson() {`
`258`	`258`	`JsonObject jo = new JsonObject();`
`259`		`- jo.addProperty("BlockDeserializationError", this.e);`
	`259`	`+ jo.addProperty("BlockDeserializationError", this.err);`
`260`	`260`	`return FormatError.jsonWrapper(jo);`
`261`	`261`	`}`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`public static final class BlockSerializationError extends FormatError {`
`265`		`- private final String e;`
	`265`	`+ private final String err;`
`266`	`266`
`267`	`267`	`public BlockSerializationError(String e) {`
`268`		`- this.e = e;`
	`268`	`+ this.err = e;`
`269`	`269`	`}`
`270`	`270`
`271`	`271`	`@Override`
`@@ -277,23 +277,23 @@ public boolean equals(Object o) {`
`277`	`277`	`return false;`
`278`	`278`	`}`
`279`	`279`	`BlockSerializationError other = (BlockSerializationError) o;`
`280`		`- return e.equals(other.e);`
	`280`	`+ return err.equals(other.err);`
`281`	`281`	`}`
`282`	`282`
`283`	`283`	`@Override`
`284`	`284`	`public int hashCode() {`
`285`		`- return Objects.hash(e);`
	`285`	`+ return Objects.hash(err);`
`286`	`286`	`}`
`287`	`287`
`288`	`288`	`@Override`
`289`	`289`	`public String toString() {`
`290`		`- return "Err(FormatError.BlockSerializationError{ error: " + e + " }";`
	`290`	`+ return "Err(FormatError.BlockSerializationError{ error: " + err + " }";`
`291`	`291`	`}`
`292`	`292`
`293`	`293`	`@Override`
`294`	`294`	`public JsonElement toJson() {`
`295`	`295`	`JsonObject jo = new JsonObject();`
`296`		`- jo.addProperty("BlockSerializationError", this.e);`
	`296`	`+ jo.addProperty("BlockSerializationError", this.err);`
`297`	`297`	`return FormatError.jsonWrapper(jo);`
`298`	`298`	`}`
`299`	`299`	`}`
`@@ -640,25 +640,25 @@ public enum Kind {`
`640`	`640`	`Overflow`
`641`	`641`	`}`
`642`	`642`
`643`		`- Expression e;`
	`643`	`+ Expression expr;`
`644`	`644`	`String message;`
`645`	`645`
`646`	`646`	`Kind kind;`
`647`	`647`
`648`	`648`	`public Execution(Expression ex, String msg) {`
`649`		`- e = ex;`
	`649`	`+ expr = ex;`
`650`	`650`	`message = msg;`
`651`	`651`	`kind = Kind.Execution;`
`652`	`652`	`}`
`653`	`653`
`654`	`654`	`public Execution(String msg) {`
`655`		`- e = null;`
	`655`	`+ expr = null;`
`656`	`656`	`message = msg;`
`657`	`657`	`kind = Kind.Execution;`
`658`	`658`	`}`
`659`	`659`
`660`	`660`	`public Execution(Kind kind, String msg) {`
`661`		`- e = null;`
	`661`	`+ expr = null;`
`662`	`662`	`this.kind = kind;`
`663`	`663`	`message = msg;`
`664`	`664`	`}`
`@@ -680,7 +680,7 @@ public JsonElement toJson() {`
`680`	`680`
`681`	`681`	`@Override`
`682`	`682`	`public String toString() {`
`683`		`- return "Execution error when evaluating expression '" + e + "': " + message;`
	`683`	`+ return "Execution error when evaluating expression '" + expr + "': " + message;`
`684`	`684`	`}`
`685`	`685`	`}`
`686`	`686`