From 22ff40bc84de82c54d77b20b32eba01f0cc31c09 Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Tue, 7 Dec 2021 15:33:41 -0500
Subject: [PATCH] Build: Add missing @Override annotations (dep-ann lint)
---
.../java/src/net/i2p/router/web/StatSummarizer.java | 1 +
core/java/src/net/i2p/crypto/DSAEngine.java | 1 +
core/java/src/net/i2p/crypto/SigUtil.java | 1 +
core/java/src/net/i2p/crypto/eddsa/EdDSAEngine.java | 2 ++
core/java/src/net/i2p/crypto/elgamal/ElGamalSigEngine.java | 2 ++
core/java/src/net/i2p/data/DataHelper.java | 3 +++
core/java/src/net/i2p/data/Lease.java | 1 +
router/java/src/net/i2p/data/i2np/DeliveryInstructions.java | 1 -
router/java/src/net/i2p/router/crypto/ElGamalAESEngine.java | 3 +++
9 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/StatSummarizer.java b/apps/routerconsole/java/src/net/i2p/router/web/StatSummarizer.java
index 02c9947ac9..324ce124ed 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/StatSummarizer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/StatSummarizer.java
@@ -342,6 +342,7 @@ public class StatSummarizer implements Runnable, ClientApp {
}
/** @deprecated unused */
+ @Deprecated
public boolean renderPng(OutputStream out, String templateFilename) throws IOException {
SummaryRenderer.render(_context, out, templateFilename);
return true;
diff --git a/core/java/src/net/i2p/crypto/DSAEngine.java b/core/java/src/net/i2p/crypto/DSAEngine.java
index 805750edae..77f3d58177 100644
--- a/core/java/src/net/i2p/crypto/DSAEngine.java
+++ b/core/java/src/net/i2p/crypto/DSAEngine.java
@@ -478,6 +478,7 @@ public final class DSAEngine {
* @return hash SHA-1 hash, NOT a SHA-256 hash
* @deprecated unused
*/
+ @Deprecated
public SHA1Hash calculateHash(InputStream in) {
MessageDigest digest = SHA1.getInstance();
byte buf[] = new byte[64];
diff --git a/core/java/src/net/i2p/crypto/SigUtil.java b/core/java/src/net/i2p/crypto/SigUtil.java
index 0a3509b9a9..2624925102 100644
--- a/core/java/src/net/i2p/crypto/SigUtil.java
+++ b/core/java/src/net/i2p/crypto/SigUtil.java
@@ -460,6 +460,7 @@ public final class SigUtil {
/**
* @deprecated unused
*/
+ @Deprecated
public static RSAPublicKey toJavaRSAKey(SigningPublicKey pk)
throws GeneralSecurityException {
SigType type = pk.getType();
diff --git a/core/java/src/net/i2p/crypto/eddsa/EdDSAEngine.java b/core/java/src/net/i2p/crypto/eddsa/EdDSAEngine.java
index a237f22fe6..5f62f87074 100644
--- a/core/java/src/net/i2p/crypto/eddsa/EdDSAEngine.java
+++ b/core/java/src/net/i2p/crypto/eddsa/EdDSAEngine.java
@@ -496,6 +496,7 @@ public class EdDSAEngine extends Signature {
* @deprecated replaced with <a href="#engineSetParameter(java.security.spec.AlgorithmParameterSpec)">this</a>
*/
@Override
+ @Deprecated
protected void engineSetParameter(String param, Object value) {
throw new UnsupportedOperationException("engineSetParameter unsupported");
}
@@ -504,6 +505,7 @@ public class EdDSAEngine extends Signature {
* @deprecated
*/
@Override
+ @Deprecated
protected Object engineGetParameter(String param) {
throw new UnsupportedOperationException("engineSetParameter unsupported");
}
diff --git a/core/java/src/net/i2p/crypto/elgamal/ElGamalSigEngine.java b/core/java/src/net/i2p/crypto/elgamal/ElGamalSigEngine.java
index b3f26703df..d730ac029e 100644
--- a/core/java/src/net/i2p/crypto/elgamal/ElGamalSigEngine.java
+++ b/core/java/src/net/i2p/crypto/elgamal/ElGamalSigEngine.java
@@ -150,6 +150,7 @@ public final class ElGamalSigEngine extends Signature {
* @deprecated replaced with <a href="#engineSetParameter(java.security.spec.AlgorithmParameterSpec)">this</a>
*/
@Override
+ @Deprecated
protected void engineSetParameter(String param, Object value) {
throw new UnsupportedOperationException("engineSetParameter unsupported");
}
@@ -158,6 +159,7 @@ public final class ElGamalSigEngine extends Signature {
* @deprecated
*/
@Override
+ @Deprecated
protected Object engineGetParameter(String param) {
throw new UnsupportedOperationException("engineSetParameter unsupported");
}
diff --git a/core/java/src/net/i2p/data/DataHelper.java b/core/java/src/net/i2p/data/DataHelper.java
index a4660e1d07..9d28e4ba2c 100644
--- a/core/java/src/net/i2p/data/DataHelper.java
+++ b/core/java/src/net/i2p/data/DataHelper.java
@@ -629,6 +629,7 @@ public class DataHelper {
* @return (new BigInteger(1, buf)).toString()
* @deprecated unused
*/
+ @Deprecated
public static String toDecimalString(byte buf[], int len) {
if (buf == null)
return "0";
@@ -652,6 +653,7 @@ public class DataHelper {
* @return minimum-length representation (with possible leading 0 byte)
* @deprecated unused
*/
+ @Deprecated
public final static byte[] fromHexString(String val) {
BigInteger bv = new BigInteger(val, 16);
return bv.toByteArray();
@@ -2011,6 +2013,7 @@ public class DataHelper {
* @throws RuntimeException
* @deprecated unused
*/
+ @Deprecated
public static byte[] getUTF8(StringBuffer orig) {
if (orig == null) return null;
return getUTF8(orig.toString());
diff --git a/core/java/src/net/i2p/data/Lease.java b/core/java/src/net/i2p/data/Lease.java
index 44efe47e6e..85ad2a58a7 100644
--- a/core/java/src/net/i2p/data/Lease.java
+++ b/core/java/src/net/i2p/data/Lease.java
@@ -69,6 +69,7 @@ public class Lease extends DataStructureImpl {
/**
* @deprecated use setEndDate(long)
*/
+ @Deprecated
public void setEndDate(Date date) {
_end = date.getTime();
}
diff --git a/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java b/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java
index 81fadcd53f..2bed57759b 100644
--- a/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java
+++ b/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java
@@ -232,7 +232,6 @@ public class DeliveryInstructions extends DataStructureImpl {
/**
* For cloves only (not tunnels), default false, unused
- * @deprecated unused
*/
/****
private static boolean flagEncrypted(long flags) {
diff --git a/router/java/src/net/i2p/router/crypto/ElGamalAESEngine.java b/router/java/src/net/i2p/router/crypto/ElGamalAESEngine.java
index c7d97fb946..baa8ce8a1c 100644
--- a/router/java/src/net/i2p/router/crypto/ElGamalAESEngine.java
+++ b/router/java/src/net/i2p/router/crypto/ElGamalAESEngine.java
@@ -73,6 +73,7 @@ public final class ElGamalAESEngine {
*
* @deprecated specify the key manager!
*/
+ @Deprecated
public byte[] decrypt(byte data[], PrivateKey targetPrivateKey) throws DataFormatException {
return decrypt(data, targetPrivateKey, _context.sessionKeyManager());
}
@@ -567,6 +568,7 @@ public final class ElGamalAESEngine {
* @throws IllegalArgumentException on bad target EncType
* @deprecated unused
*/
+ @Deprecated
public byte[] encrypt(byte data[], PublicKey target, SessionKey key, Set<SessionTag> tagsForDelivery, long paddedSize) {
return encrypt(data, target, key, tagsForDelivery, null, null, paddedSize);
}
@@ -579,6 +581,7 @@ public final class ElGamalAESEngine {
* @throws IllegalArgumentException on bad target EncType
* @deprecated unused
*/
+ @Deprecated
public byte[] encrypt(byte data[], PublicKey target, SessionKey key, long paddedSize) {
return encrypt(data, target, key, null, null, null, paddedSize);
}
--
GitLab