diff --git a/checkstyle/checkstyle.xml b/checkstyle/checkstyle.xml
index 24f85afd3..19a4ad34c 100644
--- a/checkstyle/checkstyle.xml
+++ b/checkstyle/checkstyle.xml
@@ -110,7 +110,6 @@
-
@@ -124,16 +123,9 @@
-
-
-
-
+
-
-
-
-
diff --git a/gradle.properties b/gradle.properties
index 39075f100..edc192ee1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ dockerExecutable=/usr/bin/docker
#3rd party Versions
apacheCommonsCsvVersion=1.5
apacheCommonsCompressVersion=1.21
-checkstyleToolVersion=8.23
+checkstyleToolVersion=10.12.3
commonsBeanutilsVersion=1.9.4
commonsioVersion=2.11.0
commonsLang3Version=3.7
@@ -24,7 +24,7 @@ spotbugsPluginVersion=4.4.4
gradleDockerPlugin=3.1.0
gradleLombokPluginVersion=4.0.0
gradleSshPluginVersion=2.9.0
-guavaVersion=30.1-jre
+guavaVersion=32.0.1-jre
javaxServletApiVersion=4.0.0
jacksonVersion=2.14.1
everitVersion=1.12.1
@@ -39,10 +39,10 @@ nettyBoringSSLVersion=2.0.54.Final
jacocoVersion=0.8.5
protobufGradlePlugin=0.8.15
protobufProtocVersion=3.21.7
-protobufUtilVersion=3.19.4
+protobufUtilVersion=3.24.3
qosLogbackVersion=1.2.10
shadowGradlePlugin=4.0.2
-swaggerJersey2JaxrsVersion=1.6.2
+swaggerJersey2JaxrsVersion=1.6.11
slf4jApiVersion=1.7.25
gradleGitPluginVersion=4.1.1
avroVersion=1.11.1
diff --git a/serializers/json/src/main/java/io/pravega/schemaregistry/serializer/json/schemas/JSONSchema.java b/serializers/json/src/main/java/io/pravega/schemaregistry/serializer/json/schemas/JSONSchema.java
index 6c489bcef..424ede9b2 100644
--- a/serializers/json/src/main/java/io/pravega/schemaregistry/serializer/json/schemas/JSONSchema.java
+++ b/serializers/json/src/main/java/io/pravega/schemaregistry/serializer/json/schemas/JSONSchema.java
@@ -74,7 +74,7 @@ private JSONSchema(SchemaInfo schemaInfo, String schemaString, Class derived)
*
* @param tClass Class whose object's schema is used.
* @param Type of the Java class.
- * @return {@link JSONSchema} with generic type T that extracts and captures the json schema.
+ * @return {@link JSONSchema} with generic type T that extracts and captures the json schema.
*/
public static JSONSchema of(Class tClass) {
Preconditions.checkNotNull(tClass);
@@ -96,7 +96,7 @@ public static JSONSchema of(Class tClass) {
* @param schema Schema to use.
* @param tClass class for the type of object
* @param Type of object
- * @return Returns an JSONSchema with {@link Object} type.
+ * @return Returns an JSONSchema with {@link Object} type.
*/
public static JSONSchema of(String type, JsonSchema schema, Class tClass) {
Preconditions.checkNotNull(type);
@@ -132,7 +132,7 @@ public static JSONSchema of(String type, String schemaString, Class tC
*
* @param tBase Base class whose type is used in the JSON schema object.
* @param tDerived Class whose schema should be used.
- * @param Type of base class.
+ * @param Type of base class.
* @return Returns an JsonSchema of type T.
*/
public static JSONSchema ofBaseType(Class extends T> tDerived, Class tBase) {
diff --git a/serializers/src/main/java/io/pravega/schemaregistry/serializers/WithSchema.java b/serializers/src/main/java/io/pravega/schemaregistry/serializers/WithSchema.java
index a95564ee9..ef7547b99 100644
--- a/serializers/src/main/java/io/pravega/schemaregistry/serializers/WithSchema.java
+++ b/serializers/src/main/java/io/pravega/schemaregistry/serializers/WithSchema.java
@@ -153,7 +153,7 @@ public org.everit.json.schema.Schema getJsonSchema() {
/**
* Applies the transform on the deserialized object.
*
- * @return Transformed object of type T.
+ * @return Transformed object of type T.
*/
public T getTransformed() {
if (schema == null) {
diff --git a/server/src/main/java/io/pravega/schemaregistry/storage/StoreExceptions.java b/server/src/main/java/io/pravega/schemaregistry/storage/StoreExceptions.java
index 72cf17634..06715010c 100644
--- a/server/src/main/java/io/pravega/schemaregistry/storage/StoreExceptions.java
+++ b/server/src/main/java/io/pravega/schemaregistry/storage/StoreExceptions.java
@@ -75,7 +75,7 @@ public static StoreExceptions create(final Type type, final String errorMessage)
* @return Instance of type of StoreException.
*/
public static StoreExceptions create(final Type type, final Throwable cause, final String errorMessage) {
- Preconditions.checkArgument(cause != null || (errorMessage != null && !errorMessage.isEmpty()),
+ Preconditions.checkArgument(cause != null || errorMessage != null && !errorMessage.isEmpty(),
"Either cause or errorMessage should be non-empty");
StoreExceptions exception;
switch (type) {
diff --git a/server/src/main/java/io/pravega/schemaregistry/storage/client/WireCommandClient.java b/server/src/main/java/io/pravega/schemaregistry/storage/client/WireCommandClient.java
index 0080bfa0a..45fd369ca 100644
--- a/server/src/main/java/io/pravega/schemaregistry/storage/client/WireCommandClient.java
+++ b/server/src/main/java/io/pravega/schemaregistry/storage/client/WireCommandClient.java
@@ -372,6 +372,7 @@ private CompletableFuture sendRequest(R
* @param client RawClient for sending request
* @param qualifiedStreamSegmentName StreamSegmentName
* @param requestType request which reply need to be transformed
+ * @param type Wire command Type
*/
private void handleReply(Reply reply,
RawClient client,
diff --git a/server/src/main/java/io/pravega/schemaregistry/storage/impl/group/InMemoryGroupTable.java b/server/src/main/java/io/pravega/schemaregistry/storage/impl/group/InMemoryGroupTable.java
index 111d6a15a..5a27f902f 100644
--- a/server/src/main/java/io/pravega/schemaregistry/storage/impl/group/InMemoryGroupTable.java
+++ b/server/src/main/java/io/pravega/schemaregistry/storage/impl/group/InMemoryGroupTable.java
@@ -86,7 +86,7 @@ public CompletableFuture updateEntries(List> updates) {
TableKey key = update.getKey();
Integer version = update.getVersion();
Value val = table.get(key);
- return version == null || (val != null && version.equals(val.getVersion()));
+ return version == null || val != null && version.equals(val.getVersion());
});
if (isValid) {
diff --git a/server/src/main/java/io/pravega/schemaregistry/storage/impl/group/records/TableRecords.java b/server/src/main/java/io/pravega/schemaregistry/storage/impl/group/records/TableRecords.java
index 4650f3268..687172763 100644
--- a/server/src/main/java/io/pravega/schemaregistry/storage/impl/group/records/TableRecords.java
+++ b/server/src/main/java/io/pravega/schemaregistry/storage/impl/group/records/TableRecords.java
@@ -13,6 +13,7 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import io.pravega.common.ObjectBuilder;
+import io.pravega.common.io.SerializationException;
import io.pravega.common.io.serialization.RevisionDataInput;
import io.pravega.common.io.serialization.RevisionDataOutput;
import io.pravega.common.io.serialization.VersionedSerializer;
@@ -27,6 +28,7 @@
import lombok.Data;
import lombok.Getter;
import lombok.SneakyThrows;
+import lombok.val;
import java.io.DataInput;
import java.io.DataOutput;
@@ -1244,6 +1246,10 @@ private void read00(RevisionDataInput source, SchemaIdValue.SchemaIdValueBuilder
@SneakyThrows(IOException.class)
@SuppressWarnings("unchecked")
static T fromBytes(Class extends TableKey> keyClass, byte[] bytes, Class valueClass) {
- return (T) SERIALIZERS_BY_KEY_TYPE.get(keyClass).deserialize(bytes);
+ val versionSerializer = SERIALIZERS_BY_KEY_TYPE.get(keyClass);
+ if (versionSerializer == null) {
+ throw new SerializationException(String.format("No serializer found for the class %s", keyClass.toGenericString()));
+ }
+ return (T) versionSerializer.deserialize(bytes);
}
}
diff --git a/server/src/main/java/io/pravega/schemaregistry/storage/impl/schemas/SchemaRecords.java b/server/src/main/java/io/pravega/schemaregistry/storage/impl/schemas/SchemaRecords.java
index fd0e82f5e..822bf5ac0 100644
--- a/server/src/main/java/io/pravega/schemaregistry/storage/impl/schemas/SchemaRecords.java
+++ b/server/src/main/java/io/pravega/schemaregistry/storage/impl/schemas/SchemaRecords.java
@@ -12,6 +12,7 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import io.pravega.common.ObjectBuilder;
+import io.pravega.common.io.SerializationException;
import io.pravega.common.io.serialization.RevisionDataInput;
import io.pravega.common.io.serialization.RevisionDataOutput;
import io.pravega.common.io.serialization.VersionedSerializer;
@@ -25,6 +26,7 @@
import lombok.Data;
import lombok.Getter;
import lombok.SneakyThrows;
+import lombok.val;
import java.io.DataInput;
import java.io.DataOutput;
@@ -421,7 +423,11 @@ private void read00(RevisionDataInput source, SchemaGroupsList.SchemaGroupsListB
@SneakyThrows(IOException.class)
@SuppressWarnings("unchecked")
static T fromBytes(Class extends Key> keyClass, byte[] bytes, Class valueClass) {
- return (T) SERIALIZERS_BY_KEY_TYPE.get(keyClass).deserialize(bytes);
+ val versionSerializer = SERIALIZERS_BY_KEY_TYPE.get(keyClass);
+ if ( versionSerializer == null ) {
+ throw new SerializationException(String.format("No serializer found for the class %s", keyClass.toGenericString()));
+ }
+ return (T) versionSerializer.deserialize(bytes);
}
public class KeySerializer extends VersionedSerializer.MultiType {