This is an automated email from the ASF dual-hosted git repository.
szetszwo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 98ce7e761de HDDS-14875. Remove the type parameter from
ScmCodec.deserialize(...) (#9956)
98ce7e761de is described below
commit 98ce7e761deae90383fc136aec9015eaf7adb015
Author: Tsz-Wo Nicholas Sze <[email protected]>
AuthorDate: Sat Mar 21 11:34:01 2026 -0700
HDDS-14875. Remove the type parameter from ScmCodec.deserialize(...) (#9956)
---
.../java/org/apache/hadoop/hdds/scm/ha/SCMRatisRequest.java | 2 +-
.../java/org/apache/hadoop/hdds/scm/ha/SCMRatisResponse.java | 2 +-
.../org/apache/hadoop/hdds/scm/ha/io/ScmBigIntegerCodec.java | 4 ++--
.../java/org/apache/hadoop/hdds/scm/ha/io/ScmBooleanCodec.java | 4 ++--
.../org/apache/hadoop/hdds/scm/ha/io/ScmByteStringCodec.java | 4 ++--
.../main/java/org/apache/hadoop/hdds/scm/ha/io/ScmCodec.java | 3 +--
.../java/org/apache/hadoop/hdds/scm/ha/io/ScmCodecFactory.java | 4 ++--
.../java/org/apache/hadoop/hdds/scm/ha/io/ScmEnumCodec.java | 2 +-
.../java/org/apache/hadoop/hdds/scm/ha/io/ScmIntegerCodec.java | 2 +-
.../java/org/apache/hadoop/hdds/scm/ha/io/ScmListCodec.java | 9 ++-------
.../java/org/apache/hadoop/hdds/scm/ha/io/ScmLongCodec.java | 2 +-
.../apache/hadoop/hdds/scm/ha/io/ScmManagedSecretKeyCodec.java | 10 ++++------
.../hadoop/hdds/scm/ha/io/ScmNonShadedByteStringCodec.java | 2 +-
.../hdds/scm/ha/io/ScmNonShadedGeneratedMessageCodec.java | 10 ++++++----
.../java/org/apache/hadoop/hdds/scm/ha/io/ScmStringCodec.java | 2 +-
.../apache/hadoop/hdds/scm/ha/io/ScmX509CertificateCodec.java | 8 +++-----
.../apache/hadoop/hdds/scm/ha/io/TestScmBigIntegerCodec.java | 2 +-
.../org/apache/hadoop/hdds/scm/ha/io/TestScmListCodec.java | 3 +--
.../hadoop/hdds/scm/ha/io/TestScmX509CertificateCodec.java | 4 ++--
19 files changed, 35 insertions(+), 44 deletions(-)
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMRatisRequest.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMRatisRequest.java
index ab6c8835396..78d70cc099c 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMRatisRequest.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMRatisRequest.java
@@ -153,7 +153,7 @@ public static SCMRatisRequest decode(Message message)
final Class<?> clazz = ReflectionUtil.getClass(argument.getType());
parameterTypes[paramCounter++] = clazz;
args.add(ScmCodecFactory.getCodec(clazz)
- .deserialize(clazz, argument.getValue()));
+ .deserialize(argument.getValue()));
} catch (ClassNotFoundException ex) {
throw new InvalidProtocolBufferException(argument.getType() +
" cannot be decoded!" + ex.getMessage());
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMRatisResponse.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMRatisResponse.java
index 6a0c3d1aabc..ddb65c46936 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMRatisResponse.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMRatisResponse.java
@@ -105,7 +105,7 @@ public static SCMRatisResponse decode(RaftClientReply reply)
try {
final Class<?> type = ReflectionUtil.getClass(responseProto.getType());
return new SCMRatisResponse(ScmCodecFactory.getCodec(type)
- .deserialize(type, responseProto.getValue()));
+ .deserialize(responseProto.getValue()));
} catch (ClassNotFoundException e) {
throw new InvalidProtocolBufferException(responseProto.getType() +
" cannot be decoded!" + e.getMessage());
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmBigIntegerCodec.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmBigIntegerCodec.java
index 40641663afe..23c45e79829 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmBigIntegerCodec.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmBigIntegerCodec.java
@@ -24,7 +24,7 @@
/**
* Codec for type BigInteger.
*/
-public class ScmBigIntegerCodec implements ScmCodec<BigInteger> {
+class ScmBigIntegerCodec implements ScmCodec<BigInteger> {
@Override
public ByteString serialize(BigInteger object) {
@@ -33,7 +33,7 @@ public ByteString serialize(BigInteger object) {
}
@Override
- public BigInteger deserialize(Class< ? > type, ByteString value) {
+ public BigInteger deserialize(ByteString value) {
return new BigInteger(value.toByteArray());
}
}
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmBooleanCodec.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmBooleanCodec.java
index 5ee64695151..fc2bf3651fd 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmBooleanCodec.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmBooleanCodec.java
@@ -22,7 +22,7 @@
/**
* {@link ScmCodec} for {@code Boolean} objects.
*/
-public class ScmBooleanCodec implements ScmCodec<Boolean> {
+class ScmBooleanCodec implements ScmCodec<Boolean> {
static final ByteString TRUE =
ByteString.copyFromUtf8(Boolean.TRUE.toString());
static final ByteString FALSE =
ByteString.copyFromUtf8(Boolean.FALSE.toString());
@@ -32,7 +32,7 @@ public ByteString serialize(Boolean object) {
}
@Override
- public Boolean deserialize(Class<?> type, ByteString value) {
+ public Boolean deserialize(ByteString value) {
return value.equals(TRUE) ? Boolean.TRUE : Boolean.FALSE;
}
}
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmByteStringCodec.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmByteStringCodec.java
index 253acb01210..5cfa9768b1e 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmByteStringCodec.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmByteStringCodec.java
@@ -22,7 +22,7 @@
/**
* A dummy codec that serializes a ByteString object to ByteString.
*/
-public class ScmByteStringCodec implements ScmCodec<ByteString> {
+class ScmByteStringCodec implements ScmCodec<ByteString> {
@Override
public ByteString serialize(ByteString object) {
@@ -30,7 +30,7 @@ public ByteString serialize(ByteString object) {
}
@Override
- public ByteString deserialize(Class<?> type, ByteString value) {
+ public ByteString deserialize(ByteString value) {
return value;
}
}
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmCodec.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmCodec.java
index a60b23df200..be8fd5707ca 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmCodec.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmCodec.java
@@ -29,6 +29,5 @@ public interface ScmCodec<T> {
ByteString serialize(T object) throws InvalidProtocolBufferException;
- T deserialize(Class<?> type, ByteString value) throws
InvalidProtocolBufferException;
-
+ T deserialize(ByteString value) throws InvalidProtocolBufferException;
}
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmCodecFactory.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmCodecFactory.java
index 36c6849c938..d4f92eb53f3 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmCodecFactory.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmCodecFactory.java
@@ -79,8 +79,8 @@ public final class ScmCodecFactory {
}
static <T extends Message> void putProto(T proto) {
- codecs.put(proto.getClass(),
- new ScmNonShadedGeneratedMessageCodec<>(proto.getParserForType()));
+ final Class<? extends Message> clazz = proto.getClass();
+ codecs.put(clazz, new
ScmNonShadedGeneratedMessageCodec<>(clazz.getSimpleName(),
proto.getParserForType()));
}
static <T extends Enum<T> & ProtocolMessageEnum> void putEnum(
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmEnumCodec.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmEnumCodec.java
index e91ac4d9e10..646ea9cc4a0 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmEnumCodec.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmEnumCodec.java
@@ -50,7 +50,7 @@ public ByteString serialize(T object) {
}
@Override
- public T deserialize(Class<?> type, ByteString value) throws
InvalidProtocolBufferException {
+ public T deserialize(ByteString value) throws InvalidProtocolBufferException
{
final int n;
try {
n = IntegerCodec.get().fromByteArray(value.toByteArray());
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmIntegerCodec.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmIntegerCodec.java
index 45639a31bb2..148515ef04f 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmIntegerCodec.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmIntegerCodec.java
@@ -32,7 +32,7 @@ public ByteString serialize(Integer object) {
}
@Override
- public Integer deserialize(Class<?> type, ByteString value) {
+ public Integer deserialize(ByteString value) {
return IntegerCodec.get().fromByteArray(value.toByteArray());
}
}
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmListCodec.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmListCodec.java
index 0cf6a50f92c..cb426356b22 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmListCodec.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmListCodec.java
@@ -60,12 +60,7 @@ public ByteString serialize(Object object) throws
InvalidProtocolBufferException
}
@Override
- public Object deserialize(Class<?> type, ByteString value)
- throws InvalidProtocolBufferException {
- if (!List.class.isAssignableFrom(type)) {
- throw new InvalidProtocolBufferException(
- "Unexpected non-list type: " + type);
- }
+ public Object deserialize(ByteString value) throws
InvalidProtocolBufferException {
final ListArgument argument = ListArgument.parseFrom(
value.asReadOnlyByteBuffer());
if (!argument.hasType()) {
@@ -76,7 +71,7 @@ public Object deserialize(Class<?> type, ByteString value)
final ScmCodec<?> elementCodec = ScmCodecFactory.getCodec(elementClass);
final List<Object> list = new ArrayList<>();
for (ByteString element : argument.getValueList()) {
- list.add(elementCodec.deserialize(elementClass, element));
+ list.add(elementCodec.deserialize(element));
}
return list;
}
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmLongCodec.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmLongCodec.java
index 04780170592..25c13741df5 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmLongCodec.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmLongCodec.java
@@ -33,7 +33,7 @@ public ByteString serialize(Long object) {
}
@Override
- public Long deserialize(Class<?> type, ByteString value) {
+ public Long deserialize(ByteString value) {
return LongCodec.get().fromByteArray(value.toByteArray());
}
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmManagedSecretKeyCodec.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmManagedSecretKeyCodec.java
index da198f700f8..b09b3c04cc7 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmManagedSecretKeyCodec.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmManagedSecretKeyCodec.java
@@ -26,17 +26,15 @@
/**
* A codec for {@link ManagedSecretKey} objects.
*/
-public class ScmManagedSecretKeyCodec implements ScmCodec<ManagedSecretKey> {
+class ScmManagedSecretKeyCodec implements ScmCodec<ManagedSecretKey> {
@Override
- public ByteString serialize(ManagedSecretKey object)
- throws InvalidProtocolBufferException {
- ManagedSecretKey secretKey = object;
+ public ByteString serialize(ManagedSecretKey secretKey) throws
InvalidProtocolBufferException {
return UnsafeByteOperations.unsafeWrap(
secretKey.toProtobuf().toByteString().asReadOnlyByteBuffer());
}
@Override
- public ManagedSecretKey deserialize(Class<?> type, ByteString value)
+ public ManagedSecretKey deserialize(ByteString value)
throws InvalidProtocolBufferException {
try {
SCMSecretKeyProtocolProtos.ManagedSecretKey message =
@@ -44,7 +42,7 @@ public ManagedSecretKey deserialize(Class<?> type, ByteString
value)
value.asReadOnlyByteBuffer());
return ManagedSecretKey.fromProtobuf(message);
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
- throw new InvalidProtocolBufferException("Failed to deserialize value
for " + type, e);
+ throw new InvalidProtocolBufferException("Failed to deserialize
ManagedSecretKey", e);
}
}
}
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmNonShadedByteStringCodec.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmNonShadedByteStringCodec.java
index 94a41deca5b..761298f67ef 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmNonShadedByteStringCodec.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmNonShadedByteStringCodec.java
@@ -32,7 +32,7 @@ public ByteString serialize(com.google.protobuf.ByteString
object) {
}
@Override
- public com.google.protobuf.ByteString deserialize(Class<?> type, ByteString
value) {
+ public com.google.protobuf.ByteString deserialize(ByteString value) {
return
com.google.protobuf.UnsafeByteOperations.unsafeWrap(value.asReadOnlyByteBuffer());
}
}
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmNonShadedGeneratedMessageCodec.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmNonShadedGeneratedMessageCodec.java
index b8de8ccf7d0..f0785209add 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmNonShadedGeneratedMessageCodec.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmNonShadedGeneratedMessageCodec.java
@@ -27,11 +27,13 @@
* {@link ScmCodec} implementation for non-shaded
* {@link com.google.protobuf.Message} objects.
*/
-public class ScmNonShadedGeneratedMessageCodec<T extends Message> implements
ScmCodec<T> {
+class ScmNonShadedGeneratedMessageCodec<T extends Message> implements
ScmCodec<T> {
+ private final String name;
private final Parser<T> parser;
- public ScmNonShadedGeneratedMessageCodec(Parser<T> parser) {
+ ScmNonShadedGeneratedMessageCodec(String name, Parser<T> parser) {
+ this.name = name;
this.parser = parser;
}
@@ -41,11 +43,11 @@ public ByteString serialize(T object) throws
InvalidProtocolBufferException {
}
@Override
- public T deserialize(Class<?> type, ByteString value) throws
InvalidProtocolBufferException {
+ public T deserialize(ByteString value) throws InvalidProtocolBufferException
{
try {
return parser.parseFrom(value.asReadOnlyByteBuffer());
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
- throw new InvalidProtocolBufferException("Message cannot be decoded", e);
+ throw new InvalidProtocolBufferException("Failed to parse " + name, e);
}
}
}
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmStringCodec.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmStringCodec.java
index fc34811542d..0f51c38b47e 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmStringCodec.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmStringCodec.java
@@ -33,7 +33,7 @@ public ByteString serialize(String object) {
}
@Override
- public String deserialize(Class<?> type, ByteString value) {
+ public String deserialize(ByteString value) {
return new String(value.toByteArray(), UTF_8);
}
}
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmX509CertificateCodec.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmX509CertificateCodec.java
index 249b9a698a2..fb91ed67074 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmX509CertificateCodec.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/io/ScmX509CertificateCodec.java
@@ -38,20 +38,18 @@ public ByteString serialize(X509Certificate object)
// getBytes returns a new array
return UnsafeByteOperations.unsafeWrap(certString.getBytes(UTF_8));
} catch (Exception ex) {
- throw new InvalidProtocolBufferException(
- "X509Certificate cannot be decoded: " + ex.getMessage());
+ throw new InvalidProtocolBufferException("Failed to serialize
X509Certificate", ex);
}
}
@Override
- public X509Certificate deserialize(Class< ? > type, ByteString value)
+ public X509Certificate deserialize(ByteString value)
throws InvalidProtocolBufferException {
try {
String pemEncodedCert = new String(value.toByteArray(), UTF_8);
return CertificateCodec.getX509Certificate(pemEncodedCert);
} catch (Exception ex) {
- throw new InvalidProtocolBufferException(
- "X509Certificate cannot be decoded: " + ex.getMessage());
+ throw new InvalidProtocolBufferException("Failed to deserialize
X509Certificate", ex);
}
}
}
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/io/TestScmBigIntegerCodec.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/io/TestScmBigIntegerCodec.java
index 94ec024ee7d..f21d41ac50b 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/io/TestScmBigIntegerCodec.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/io/TestScmBigIntegerCodec.java
@@ -35,7 +35,7 @@ public void testCodec() {
BigInteger bigInteger = BigInteger.valueOf(100);
ByteString byteString = scmBigIntegerCodec.serialize(bigInteger);
- BigInteger actual = scmBigIntegerCodec.deserialize(BigInteger.class,
byteString);
+ BigInteger actual = scmBigIntegerCodec.deserialize(byteString);
assertEquals(bigInteger, actual);
}
}
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/io/TestScmListCodec.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/io/TestScmListCodec.java
index df20696b6b9..f7230bcd2f4 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/io/TestScmListCodec.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/io/TestScmListCodec.java
@@ -21,7 +21,6 @@
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Collections;
-import java.util.List;
import org.apache.hadoop.hdds.protocol.proto.SCMRatisProtocol;
import org.apache.ratis.thirdparty.com.google.protobuf.ByteString;
import
org.apache.ratis.thirdparty.com.google.protobuf.InvalidProtocolBufferException;
@@ -46,7 +45,7 @@ public void testListDecodeMissingTypeShouldFail() throws
Exception {
InvalidProtocolBufferException ex = assertThrows(
InvalidProtocolBufferException.class,
- () -> codec.deserialize(List.class, listArg.toByteString()));
+ () -> codec.deserialize(listArg.toByteString()));
assertTrue(ex.getMessage().contains("Missing ListArgument.type"));
}
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/io/TestScmX509CertificateCodec.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/io/TestScmX509CertificateCodec.java
index 435f0bff470..1a22c405f39 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/io/TestScmX509CertificateCodec.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/io/TestScmX509CertificateCodec.java
@@ -52,7 +52,7 @@ public void codec() throws Exception {
ScmX509CertificateCodec scmX509CertificateCodec = new
ScmX509CertificateCodec();
ByteString byteString = scmX509CertificateCodec.serialize(x509Certificate);
- X509Certificate actual =
scmX509CertificateCodec.deserialize(X509Certificate.class, byteString);
+ X509Certificate actual = scmX509CertificateCodec.deserialize(byteString);
assertEquals(x509Certificate, actual);
@@ -65,6 +65,6 @@ public void testCodecError() {
final ByteString byteString =
UnsafeByteOperations.unsafeWrap("dummy".getBytes(UTF_8));
assertThrows(InvalidProtocolBufferException.class, () ->
- scmX509CertificateCodec.deserialize(X509Certificate.class,
byteString));
+ scmX509CertificateCodec.deserialize(byteString));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
