From f74d155cebe8c3f5ff63ffe8b40acfc3fc504f6d Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Wed, 20 Feb 2019 18:27:23 +0100 Subject: [PATCH] Remove deprecated AbstractPeerEventListener and NativePeerEventListener. Their original interface PeerEventListener had already been removed in the last cycle. --- .../src/main/java/org/bitcoinj/core/Peer.java | 36 ---------- .../java/org/bitcoinj/core/PeerGroup.java | 39 ----------- .../listeners/AbstractPeerEventListener.java | 69 ------------------- .../bitcoinj/jni/NativePeerEventListener.java | 58 ---------------- 4 files changed, 202 deletions(-) delete mode 100644 core/src/main/java/org/bitcoinj/core/listeners/AbstractPeerEventListener.java delete mode 100644 core/src/main/java/org/bitcoinj/jni/NativePeerEventListener.java diff --git a/core/src/main/java/org/bitcoinj/core/Peer.java b/core/src/main/java/org/bitcoinj/core/Peer.java index 5c1c19b0..4a229611 100644 --- a/core/src/main/java/org/bitcoinj/core/Peer.java +++ b/core/src/main/java/org/bitcoinj/core/Peer.java @@ -262,42 +262,6 @@ public class Peer extends PeerSocketHandler { this.versionMessage.appendToSubVer(thisSoftwareName, thisSoftwareVersion, null); } - /** Deprecated: use the more specific event handler methods instead */ - @Deprecated @SuppressWarnings("deprecation") - public void addEventListener(AbstractPeerEventListener listener) { - addBlocksDownloadedEventListener(Threading.USER_THREAD, listener); - addChainDownloadStartedEventListener(Threading.USER_THREAD, listener); - addConnectedEventListener(Threading.USER_THREAD, listener); - addDisconnectedEventListener(Threading.USER_THREAD, listener); - addGetDataEventListener(Threading.USER_THREAD, listener); - addOnTransactionBroadcastListener(Threading.USER_THREAD, listener); - addPreMessageReceivedEventListener(Threading.USER_THREAD, listener); - } - - /** Deprecated: use the more specific event handler methods instead */ - @Deprecated - public void addEventListener(AbstractPeerEventListener listener, Executor executor) { - addBlocksDownloadedEventListener(executor, listener); - addChainDownloadStartedEventListener(executor, listener); - addConnectedEventListener(executor, listener); - addDisconnectedEventListener(executor, listener); - addGetDataEventListener(executor, listener); - addOnTransactionBroadcastListener(executor, listener); - addPreMessageReceivedEventListener(executor, listener); - } - - /** Deprecated: use the more specific event handler methods instead */ - @Deprecated - public void removeEventListener(AbstractPeerEventListener listener) { - removeBlocksDownloadedEventListener(listener); - removeChainDownloadStartedEventListener(listener); - removeConnectedEventListener(listener); - removeDisconnectedEventListener(listener); - removeGetDataEventListener(listener); - removeOnTransactionBroadcastListener(listener); - removePreMessageReceivedEventListener(listener); - } - /** Registers a listener that is invoked when new blocks are downloaded. */ public void addBlocksDownloadedEventListener(BlocksDownloadedEventListener listener) { addBlocksDownloadedEventListener(Threading.USER_THREAD, listener); diff --git a/core/src/main/java/org/bitcoinj/core/PeerGroup.java b/core/src/main/java/org/bitcoinj/core/PeerGroup.java index 5df47a92..d36c81f1 100644 --- a/core/src/main/java/org/bitcoinj/core/PeerGroup.java +++ b/core/src/main/java/org/bitcoinj/core/PeerGroup.java @@ -628,32 +628,6 @@ public class PeerGroup implements TransactionBroadcaster { setUserAgent(name, version, null); } - /** Use the more specific listener methods instead */ - @Deprecated @SuppressWarnings("deprecation") - public void addEventListener(AbstractPeerEventListener listener, Executor executor) { - addBlocksDownloadedEventListener(Threading.USER_THREAD, listener); - addChainDownloadStartedEventListener(Threading.USER_THREAD, listener); - addConnectedEventListener(Threading.USER_THREAD, listener); - addDisconnectedEventListener(Threading.USER_THREAD, listener); - addDiscoveredEventListener(Threading.USER_THREAD, listener); - addGetDataEventListener(Threading.USER_THREAD, listener); - addOnTransactionBroadcastListener(Threading.USER_THREAD, listener); - addPreMessageReceivedEventListener(Threading.USER_THREAD, listener); - } - - /** Use the more specific listener methods instead */ - @Deprecated @SuppressWarnings("deprecation") - public void addEventListener(AbstractPeerEventListener listener) { - addBlocksDownloadedEventListener(executor, listener); - addChainDownloadStartedEventListener(executor, listener); - addConnectedEventListener(executor, listener); - addDisconnectedEventListener(executor, listener); - addDiscoveredEventListener(executor, listener); - addGetDataEventListener(executor, listener); - addOnTransactionBroadcastListener(executor, listener); - addPreMessageReceivedEventListener(executor, listener); - } - /** See {@link Peer#addBlocksDownloadedEventListener(BlocksDownloadedEventListener)} */ public void addBlocksDownloadedEventListener(BlocksDownloadedEventListener listener) { addBlocksDownloadedEventListener(Threading.USER_THREAD, listener); @@ -778,19 +752,6 @@ public class PeerGroup implements TransactionBroadcaster { peer.addPreMessageReceivedEventListener(executor, listener); } - /** Use the more specific listener methods instead */ - @Deprecated @SuppressWarnings("deprecation") - public void removeEventListener(AbstractPeerEventListener listener) { - removeBlocksDownloadedEventListener(listener); - removeChainDownloadStartedEventListener(listener); - removeConnectedEventListener(listener); - removeDisconnectedEventListener(listener); - removeDiscoveredEventListener(listener); - removeGetDataEventListener(listener); - removeOnTransactionBroadcastListener(listener); - removePreMessageReceivedEventListener(listener); - } - public boolean removeBlocksDownloadedEventListener(BlocksDownloadedEventListener listener) { boolean result = ListenerRegistration.removeFromList(listener, peersBlocksDownloadedEventListeners); for (Peer peer : getConnectedPeers()) diff --git a/core/src/main/java/org/bitcoinj/core/listeners/AbstractPeerEventListener.java b/core/src/main/java/org/bitcoinj/core/listeners/AbstractPeerEventListener.java deleted file mode 100644 index a8d9ee54..00000000 --- a/core/src/main/java/org/bitcoinj/core/listeners/AbstractPeerEventListener.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright 2011 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.bitcoinj.core.listeners; - -import org.bitcoinj.core.Block; -import org.bitcoinj.core.FilteredBlock; -import org.bitcoinj.core.GetDataMessage; -import org.bitcoinj.core.Message; -import org.bitcoinj.core.PeerAddress; -import org.bitcoinj.core.Peer; -import org.bitcoinj.core.Transaction; -import javax.annotation.*; -import java.util.List; -import java.util.Set; - -/** - * Deprecated: implement the more specific event listener interfaces instead to fill out only what you need - */ -@Deprecated -public abstract class AbstractPeerEventListener extends AbstractPeerDataEventListener implements PeerConnectionEventListener, OnTransactionBroadcastListener { - @Override - public void onBlocksDownloaded(Peer peer, Block block, @Nullable FilteredBlock filteredBlock, int blocksLeft) { - } - - @Override - public void onChainDownloadStarted(Peer peer, int blocksLeft) { - } - - @Override - public Message onPreMessageReceived(Peer peer, Message m) { - // Just pass the message right through for further processing. - return m; - } - - @Override - public void onTransaction(Peer peer, Transaction t) { - } - - @Override - public List getData(Peer peer, GetDataMessage m) { - return null; - } - - @Override - public void onPeersDiscovered(Set peerAddresses) { - } - - @Override - public void onPeerConnected(Peer peer, int peerCount) { - } - - @Override - public void onPeerDisconnected(Peer peer, int peerCount) { - } -} diff --git a/core/src/main/java/org/bitcoinj/jni/NativePeerEventListener.java b/core/src/main/java/org/bitcoinj/jni/NativePeerEventListener.java deleted file mode 100644 index 31500137..00000000 --- a/core/src/main/java/org/bitcoinj/jni/NativePeerEventListener.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright 2013 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.bitcoinj.jni; - -import org.bitcoinj.core.listeners.*; -import org.bitcoinj.core.*; - -import javax.annotation.*; -import java.util.List; -import java.util.Set; - -/** - * An event listener that relays events to a native C++ object. A pointer to that object is stored in - * this class using JNI on the native side, thus several instances of this can point to different actual - * native implementations. - */ -public class NativePeerEventListener implements PeerConnectedEventListener, PeerDiscoveredEventListener, - PeerDisconnectedEventListener, PeerDataEventListener, OnTransactionBroadcastListener { - public long ptr; - - @Override - public native void onPeersDiscovered(Set peerAddresses); - - @Override - public native void onBlocksDownloaded(Peer peer, Block block, @Nullable FilteredBlock filteredBlock, int blocksLeft); - - @Override - public native void onChainDownloadStarted(Peer peer, int blocksLeft); - - @Override - public native void onPeerConnected(Peer peer, int peerCount); - - @Override - public native void onPeerDisconnected(Peer peer, int peerCount); - - @Override - public native Message onPreMessageReceived(Peer peer, Message m); - - @Override - public native void onTransaction(Peer peer, Transaction t); - - @Override - public native List getData(Peer peer, GetDataMessage m); -}