From 056f1799e42973673060628a0f751f4e7bc7171b Mon Sep 17 00:00:00 2001
From: Strongest Number 9 <16169054+StrongestNumber9@users.noreply.github.com>
Date: Thu, 19 Sep 2024 16:33:50 +0300
Subject: [PATCH] Adds checkstyle, fixes hard errors (#55)
---
pom.xml | 206 ++++++++++++++++++
.../java/com/teragrep/rlo_06/Byteable.java | 2 +-
src/main/java/com/teragrep/rlo_06/Cache.java | 4 +-
.../java/com/teragrep/rlo_06/Clearable.java | 2 +-
.../java/com/teragrep/rlo_06/Fragment.java | 2 +-
.../java/com/teragrep/rlo_06/Matchable.java | 2 +-
.../com/teragrep/rlo_06/PriorityFunction.java | 10 +-
.../java/com/teragrep/rlo_06/SDElement.java | 4 +-
8 files changed, 215 insertions(+), 17 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2cccb09..ced1278 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,6 +90,212 @@
${project.basedir}/target
rlo_06
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+ 3.5.0
+
+
+
+ scan-errors
+
+ check
+
+ process-classes
+
+ error
+ true
+ true
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ scan-warnings
+
+ check
+
+ process-classes
+
+ warning
+ true
+ false
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
com.diffplug.spotless
spotless-maven-plugin
diff --git a/src/main/java/com/teragrep/rlo_06/Byteable.java b/src/main/java/com/teragrep/rlo_06/Byteable.java
index e27616b..c6c2a0b 100644
--- a/src/main/java/com/teragrep/rlo_06/Byteable.java
+++ b/src/main/java/com/teragrep/rlo_06/Byteable.java
@@ -47,5 +47,5 @@
public interface Byteable {
- byte[] toBytes();
+ public abstract byte[] toBytes();
}
diff --git a/src/main/java/com/teragrep/rlo_06/Cache.java b/src/main/java/com/teragrep/rlo_06/Cache.java
index d65965d..0fb088b 100644
--- a/src/main/java/com/teragrep/rlo_06/Cache.java
+++ b/src/main/java/com/teragrep/rlo_06/Cache.java
@@ -47,7 +47,7 @@
interface Cache {
- T take();
+ public abstract T take();
- void put(T t);
+ public abstract void put(T t);
}
diff --git a/src/main/java/com/teragrep/rlo_06/Clearable.java b/src/main/java/com/teragrep/rlo_06/Clearable.java
index 0c1e559..5b71071 100644
--- a/src/main/java/com/teragrep/rlo_06/Clearable.java
+++ b/src/main/java/com/teragrep/rlo_06/Clearable.java
@@ -47,5 +47,5 @@
interface Clearable {
- void clear();
+ public abstract void clear();
}
diff --git a/src/main/java/com/teragrep/rlo_06/Fragment.java b/src/main/java/com/teragrep/rlo_06/Fragment.java
index 641a489..558e893 100644
--- a/src/main/java/com/teragrep/rlo_06/Fragment.java
+++ b/src/main/java/com/teragrep/rlo_06/Fragment.java
@@ -62,7 +62,7 @@ public final class Fragment implements Consumer, Clearable, Matchable, B
Fragment() {
this.isStub = true;
this.buffer = ByteBuffer.allocateDirect(0);
- this.parseRule = (stream, buffer) -> ByteBuffer.allocateDirect(0);
+ this.parseRule = (stream, bytebuffer) -> ByteBuffer.allocateDirect(0);
this.fragmentState = FragmentState.EMPTY;
}
diff --git a/src/main/java/com/teragrep/rlo_06/Matchable.java b/src/main/java/com/teragrep/rlo_06/Matchable.java
index 410f9b8..8557bc0 100644
--- a/src/main/java/com/teragrep/rlo_06/Matchable.java
+++ b/src/main/java/com/teragrep/rlo_06/Matchable.java
@@ -49,5 +49,5 @@
public interface Matchable {
- boolean matches(ByteBuffer buffer);
+ public abstract boolean matches(ByteBuffer buffer);
}
diff --git a/src/main/java/com/teragrep/rlo_06/PriorityFunction.java b/src/main/java/com/teragrep/rlo_06/PriorityFunction.java
index 89c1fb9..59e05e4 100644
--- a/src/main/java/com/teragrep/rlo_06/PriorityFunction.java
+++ b/src/main/java/com/teragrep/rlo_06/PriorityFunction.java
@@ -97,17 +97,11 @@ public ByteBuffer apply(Stream stream, ByteBuffer buffer) {
throw new PriorityParseException("PRIORITY > missing");
}
}
- else if (stream.get() == 62) { // third may be a '>'
- // omit '>'
- }
- else {
+ else if (stream.get() != 62) { // must be a '>'
throw new PriorityParseException("PRIORITY number incorrect");
}
}
- else if (stream.get() == 62) { // second may be a '>'
- // omit '>'
- }
- else {
+ else if (stream.get() != 62) { // must be a '>'
throw new PriorityParseException("PRIORITY number incorrect");
}
buffer.flip();
diff --git a/src/main/java/com/teragrep/rlo_06/SDElement.java b/src/main/java/com/teragrep/rlo_06/SDElement.java
index dc023a3..57dbec7 100644
--- a/src/main/java/com/teragrep/rlo_06/SDElement.java
+++ b/src/main/java/com/teragrep/rlo_06/SDElement.java
@@ -90,11 +90,9 @@ public void accept(Stream stream) {
b = stream.get();
}
- if (b == 93) { // ']', sdId only here: Payload:'[ID_A@1]' or Payload:'[ID_A@1][ID_B@1]'
+ if (b != 93) { // not ']', sdId only here: Payload:'[ID_A@1]' or Payload:'[ID_A@1][ID_B@1]'
// MSG may not exist, no \n either, Parsing may be complete. get sets this.returnAfter to false
// Total payload: '<14>1 2015-06-20T09:14:07.12345+00:00 host02 serverd DEA MSG-01 [ID_A@1]'
- }
- else {
throw new StructuredDataParseException("SP missing after SD_ID or SD_ID too long");
}
fragmentState = FragmentState.WRITTEN;