From eaf7955436a88f1b9f769267f52fd2c2180ec984 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Wed, 20 Feb 2019 18:39:12 +0100 Subject: [PATCH] Remove deprecated PeerConnectionEventListener. Use PeerConnectedEventListener, PeerDiscoveredEventListener and PeerDisconnectedEventListener instead. --- .../AbstractPeerConnectionEventListener.java | 42 ------------------- .../PeerConnectionEventListener.java | 41 ------------------ .../bitcoinj/jni/NativePeerEventListener.java | 3 +- .../test/java/org/bitcoinj/core/PeerTest.java | 23 ---------- 4 files changed, 2 insertions(+), 107 deletions(-) delete mode 100644 core/src/main/java/org/bitcoinj/core/listeners/AbstractPeerConnectionEventListener.java delete mode 100644 core/src/main/java/org/bitcoinj/core/listeners/PeerConnectionEventListener.java diff --git a/core/src/main/java/org/bitcoinj/core/listeners/AbstractPeerConnectionEventListener.java b/core/src/main/java/org/bitcoinj/core/listeners/AbstractPeerConnectionEventListener.java deleted file mode 100644 index 6e5aa5ba..00000000 --- a/core/src/main/java/org/bitcoinj/core/listeners/AbstractPeerConnectionEventListener.java +++ /dev/null @@ -1,42 +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.*; - -import java.util.*; - -/** - * Deprecated: implement the more specific event listener interfaces instead to fill out only what you need - */ -@Deprecated -public abstract class AbstractPeerConnectionEventListener implements PeerConnectionEventListener { - @Override - public void onPeersDiscovered(Set peerAddresses) { - // Do nothing - } - - @Override - public void onPeerConnected(Peer peer, int peerCount) { - // Do nothing - } - - @Override - public void onPeerDisconnected(Peer peer, int peerCount) { - // Do nothing - } -} diff --git a/core/src/main/java/org/bitcoinj/core/listeners/PeerConnectionEventListener.java b/core/src/main/java/org/bitcoinj/core/listeners/PeerConnectionEventListener.java deleted file mode 100644 index 0c78dfc2..00000000 --- a/core/src/main/java/org/bitcoinj/core/listeners/PeerConnectionEventListener.java +++ /dev/null @@ -1,41 +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.Peer; -import org.bitcoinj.core.PeerGroup; - -/** - *

Implementors can listen to events like peer discovery, connect or disconnects.

- * - * @deprecated Use the single event interfaces instead - */ -@Deprecated -public interface PeerConnectionEventListener extends PeerConnectedEventListener, - PeerDiscoveredEventListener, PeerDisconnectedEventListener { - - /** - * Called when a peer is disconnected. Note that this won't be called if the listener is registered on a - * {@link PeerGroup} and the group is in the process of shutting down. If this listener is registered to a - * {@link Peer} instead of a {@link PeerGroup}, peerCount will always be 0. This handler can be called without - * a corresponding invocation of onPeerConnected if the initial connection is never successful. - * - * @param peer - * @param peerCount the total number of connected peers - */ - 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 index f9b160b8..31500137 100644 --- a/core/src/main/java/org/bitcoinj/jni/NativePeerEventListener.java +++ b/core/src/main/java/org/bitcoinj/jni/NativePeerEventListener.java @@ -28,7 +28,8 @@ import java.util.Set; * this class using JNI on the native side, thus several instances of this can point to different actual * native implementations. */ -public class NativePeerEventListener implements PeerConnectionEventListener, PeerDataEventListener, OnTransactionBroadcastListener { +public class NativePeerEventListener implements PeerConnectedEventListener, PeerDiscoveredEventListener, + PeerDisconnectedEventListener, PeerDataEventListener, OnTransactionBroadcastListener { public long ptr; @Override diff --git a/core/src/test/java/org/bitcoinj/core/PeerTest.java b/core/src/test/java/org/bitcoinj/core/PeerTest.java index 2e2452d0..c2ad37a3 100644 --- a/core/src/test/java/org/bitcoinj/core/PeerTest.java +++ b/core/src/test/java/org/bitcoinj/core/PeerTest.java @@ -105,29 +105,6 @@ public class PeerTest extends TestWithNetworkConnections { writeTarget = connect(peer, peerVersion); } - @Test - public void testAddConnectedEventListener() throws Exception { - connect(); - PeerConnectedEventListener listener = new AbstractPeerConnectionEventListener() { - }; - assertFalse(peer.removeConnectedEventListener(listener)); - peer.addConnectedEventListener(listener); - assertTrue(peer.removeConnectedEventListener(listener)); - assertFalse(peer.removeConnectedEventListener(listener)); - } - - @Test - public void testAddDisconnectedEventListener() throws Exception { - connect(); - PeerDisconnectedEventListener listener = new AbstractPeerConnectionEventListener() { - }; - - assertFalse(peer.removeDisconnectedEventListener(listener)); - peer.addDisconnectedEventListener(listener); - assertTrue(peer.removeDisconnectedEventListener(listener)); - assertFalse(peer.removeDisconnectedEventListener(listener)); - } - // Check that it runs through the event loop and shut down correctly @Test public void shutdown() throws Exception {