mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-03-13 11:36:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

base: remove last @Nonnull annotations & findbugs dependency

Browse source 
A previous PR removed the last @Nullable annotation.

This PR removes the @Nonnull annotations as we can now assume that
everything in this module is non-nullable. If we discover otherwise
we can add JSpecify and mark them with that. We may want to use
JSpecify anyway, but I'll leave that for a separate PR.
This commit is contained in:
Sean Gilligan 2025-02-25 12:40:02 -08:00
parent b041e491e3
commit 7dacb62805
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
base/build.gradle
View file

@ -9,7 +9,6 @@ version = '0.18-SNAPSHOT'
dependencies {
implementation 'org.slf4j:slf4j-api:2.0.16'
implementation 'com.google.code.findbugs:jsr305:3.0.2'
testImplementation project(':bitcoinj-test-support')
testImplementation 'junit:junit:4.13.2'

3
base/src/main/java/org/bitcoinj/base/LegacyAddress.java
View file

@ -21,7 +21,6 @@ package org.bitcoinj.base;
import org.bitcoinj.base.exceptions.AddressFormatException;
import org.bitcoinj.base.internal.ByteUtils;
import javax.annotation.Nonnull;
import java.util.Arrays;
import java.util.Comparator;
import java.util.EnumSet;
@ -113,7 +112,7 @@ public class LegacyAddress implements Address {
* @throws AddressFormatException if the given base58 doesn't parse or the checksum is invalid
* @throws AddressFormatException.WrongNetwork if the given address is valid but for a different chain (e.g. testnet vs mainnet)
*/
public static LegacyAddress fromBase58(String base58, @Nonnull Network network)
public static LegacyAddress fromBase58(String base58, Network network)
throws AddressFormatException, AddressFormatException.WrongNetwork {
byte[] versionAndDataBytes = Base58.decodeChecked(base58);
int version = versionAndDataBytes[0] & 0xFF;

5
base/src/main/java/org/bitcoinj/base/SegwitAddress.java
View file

@ -19,7 +19,6 @@ package org.bitcoinj.base;
import org.bitcoinj.base.exceptions.AddressFormatException;
import org.bitcoinj.base.internal.ByteUtils;
import javax.annotation.Nonnull;
import java.util.Arrays;
import java.util.Comparator;
import java.util.EnumSet;
@ -252,7 +251,7 @@ public class SegwitAddress implements Address {
* @return constructed address
* @throws AddressFormatException if something about the given bech32 address isn't right
*/
public static SegwitAddress fromBech32(String bech32, @Nonnull Network network)
public static SegwitAddress fromBech32(String bech32, Network network)
throws AddressFormatException {
Bech32.Bech32Data bechData = Bech32.decode(bech32);
if (bechData.hrp.equals(network.segwitAddressHrp()))
@ -260,7 +259,7 @@ public class SegwitAddress implements Address {
throw new AddressFormatException.WrongNetwork(bechData.hrp);
}
static SegwitAddress fromBechData(@Nonnull Network network, Bech32.Bech32Data bechData) {
static SegwitAddress fromBechData(Network network, Bech32.Bech32Data bechData) {
if (bechData.bytes().length < 1) {
throw new AddressFormatException.InvalidDataLength("invalid address length (0)");
}