diff --git a/java/src/com/zerotier/sdk/Event.java b/java/src/com/zerotier/sdk/Event.java index fbc016c66..c55da2cc0 100644 --- a/java/src/com/zerotier/sdk/Event.java +++ b/java/src/com/zerotier/sdk/Event.java @@ -29,14 +29,14 @@ package com.zerotier.sdk; /** * Status codes sent to status update callback when things happen - * + *

* Defined in ZeroTierOne.h as ZT_Event */ public enum Event { /** * Node has been initialized - * + *

* This is the first event generated, and is always sent. It may occur * before Node's constructor returns. */ @@ -49,7 +49,7 @@ public enum Event { /** * Node is online -- at least one upstream node appears reachable - * + *

* Meta-data: none */ EVENT_ONLINE(2), @@ -104,7 +104,7 @@ public enum Event { /** * VERB_USER_MESSAGE received - * + *

* These are generated when a VERB_USER_MESSAGE packet is received via * ZeroTier VL1. */ @@ -112,7 +112,7 @@ public enum Event { /** * Remote trace received - * + *

* These are generated when a VERB_REMOTE_TRACE is received. Note * that any node can fling one of these at us. It is your responsibility * to filter and determine if it's worth paying attention to. If it's diff --git a/java/src/com/zerotier/sdk/Node.java b/java/src/com/zerotier/sdk/Node.java index a3f3ab470..7ba269e60 100644 --- a/java/src/com/zerotier/sdk/Node.java +++ b/java/src/com/zerotier/sdk/Node.java @@ -299,7 +299,7 @@ public class Node { /** * Add or update a moon - * + *

* Moons are persisted in the data store in moons.d/, so this can persist * across invocations if the contents of moon.d are scanned and orbit is * called for each on startup. diff --git a/java/src/com/zerotier/sdk/NodeStatus.java b/java/src/com/zerotier/sdk/NodeStatus.java index 1172650b1..04c3ee60c 100644 --- a/java/src/com/zerotier/sdk/NodeStatus.java +++ b/java/src/com/zerotier/sdk/NodeStatus.java @@ -31,7 +31,7 @@ import com.zerotier.sdk.util.StringUtils; /** * Current node status - * + *

* Defined in ZeroTierOne.h as ZT_NodeStatus */ public class NodeStatus { diff --git a/java/src/com/zerotier/sdk/PathChecker.java b/java/src/com/zerotier/sdk/PathChecker.java index cfc97d60e..66a297dc4 100644 --- a/java/src/com/zerotier/sdk/PathChecker.java +++ b/java/src/com/zerotier/sdk/PathChecker.java @@ -11,9 +11,9 @@ public interface PathChecker { /** * Callback to check whether a path should be used for ZeroTier traffic - * + *

* This function must return true if the path should be used. - * + *

* If no path check function is specified, ZeroTier will still exclude paths * that overlap with ZeroTier-assigned and managed IP address blocks. But the * use of a path check function is recommended to ensure that recursion does @@ -22,7 +22,7 @@ public interface PathChecker { * all configured ZeroTier interfaces and check to ensure that the supplied * addresses will not result in ZeroTier traffic being sent over a ZeroTier * interface (recursion). - * + *

* Obviously this is not required in configurations where this can't happen, * such as network containers or embedded. * @@ -35,7 +35,7 @@ public interface PathChecker { /** * Function to get physical addresses for ZeroTier peers - * + *

* If provided this function will be occasionally called to get physical * addresses that might be tried to reach a ZeroTier address. * diff --git a/java/src/com/zerotier/sdk/Peer.java b/java/src/com/zerotier/sdk/Peer.java index e3d544381..de7d64e56 100644 --- a/java/src/com/zerotier/sdk/Peer.java +++ b/java/src/com/zerotier/sdk/Peer.java @@ -33,7 +33,7 @@ import java.util.Arrays; /** * Peer status result buffer - * + *

* Defined in ZeroTierOne.h as ZT_Peer */ public class Peer { diff --git a/java/src/com/zerotier/sdk/PeerPhysicalPath.java b/java/src/com/zerotier/sdk/PeerPhysicalPath.java index f6d326425..849725b50 100644 --- a/java/src/com/zerotier/sdk/PeerPhysicalPath.java +++ b/java/src/com/zerotier/sdk/PeerPhysicalPath.java @@ -31,7 +31,7 @@ import java.net.InetSocketAddress; /** * Physical network path to a peer - * + *

* Defined in ZeroTierOne.h as ZT_PeerPhysicalPath */ public class PeerPhysicalPath { diff --git a/java/src/com/zerotier/sdk/PeerRole.java b/java/src/com/zerotier/sdk/PeerRole.java index d69a1f1bb..e05ba4a3b 100644 --- a/java/src/com/zerotier/sdk/PeerRole.java +++ b/java/src/com/zerotier/sdk/PeerRole.java @@ -29,7 +29,7 @@ package com.zerotier.sdk; /** * What trust hierarchy role does this peer have? - * + *

* Defined in ZeroTierOne.h as ZT_PeerRole */ public enum PeerRole { diff --git a/java/src/com/zerotier/sdk/VirtualNetworkConfig.java b/java/src/com/zerotier/sdk/VirtualNetworkConfig.java index bcf64854a..6245436a7 100644 --- a/java/src/com/zerotier/sdk/VirtualNetworkConfig.java +++ b/java/src/com/zerotier/sdk/VirtualNetworkConfig.java @@ -38,7 +38,7 @@ import java.util.Collections; /** * Virtual network configuration - * + *

* Defined in ZeroTierOne.h as ZT_VirtualNetworkConfig */ public class VirtualNetworkConfig implements Comparable { @@ -374,11 +374,11 @@ public class VirtualNetworkConfig implements Comparable { /** * ZeroTier-assigned addresses (in {@link InetSocketAddress} objects) - * + *

* For IP, the port number of the sockaddr_XX structure contains the number * of bits in the address netmask. Only the IP address and port are used. * Other fields like interface number can be ignored. - * + *

* This is only used for ZeroTier-managed address assignments sent by the * virtual network's configuration master. */ diff --git a/java/src/com/zerotier/sdk/VirtualNetworkConfigListener.java b/java/src/com/zerotier/sdk/VirtualNetworkConfigListener.java index ce91e79d9..7c140bd77 100644 --- a/java/src/com/zerotier/sdk/VirtualNetworkConfigListener.java +++ b/java/src/com/zerotier/sdk/VirtualNetworkConfigListener.java @@ -36,14 +36,14 @@ public interface VirtualNetworkConfigListener { *

This can be called at any time to update the configuration of a virtual * network port. The parameter after the network ID specifies whether this * port is being brought up, updated, brought down, or permanently deleted. - * + *

* This in turn should be used by the underlying implementation to create * and configure tap devices at the OS (or virtual network stack) layer.

* * This should not call {@link Node#multicastSubscribe(long, long)} or other network-modifying * methods, as this could cause a deadlock in multithreaded or interrupt * driven environments. - * + *

* This must return 0 on success. It can return any OS-dependent error code * on failure, and this results in the network being placed into the * PORT_ERROR state. diff --git a/java/src/com/zerotier/sdk/VirtualNetworkConfigOperation.java b/java/src/com/zerotier/sdk/VirtualNetworkConfigOperation.java index a1981bd15..59837a6be 100644 --- a/java/src/com/zerotier/sdk/VirtualNetworkConfigOperation.java +++ b/java/src/com/zerotier/sdk/VirtualNetworkConfigOperation.java @@ -29,7 +29,7 @@ package com.zerotier.sdk; /** * Virtual network configuration update type - * + *

* Defined in ZeroTierOne.h as ZT_VirtualNetworkConfigOperation */ public enum VirtualNetworkConfigOperation { diff --git a/java/src/com/zerotier/sdk/VirtualNetworkDNS.java b/java/src/com/zerotier/sdk/VirtualNetworkDNS.java index 6e4bb3d22..48d24046d 100644 --- a/java/src/com/zerotier/sdk/VirtualNetworkDNS.java +++ b/java/src/com/zerotier/sdk/VirtualNetworkDNS.java @@ -10,7 +10,7 @@ import java.util.ArrayList; /** * DNS configuration to be pushed on a virtual network - * + *

* Defined in ZeroTierOne.h as ZT_VirtualNetworkDNS */ public class VirtualNetworkDNS implements Comparable { @@ -45,6 +45,7 @@ public class VirtualNetworkDNS implements Comparable { return false; } + //noinspection RedundantIfStatement if (!servers.equals(d.servers)) { return false; } diff --git a/java/src/com/zerotier/sdk/VirtualNetworkRoute.java b/java/src/com/zerotier/sdk/VirtualNetworkRoute.java index afd9ee45a..ec569813b 100644 --- a/java/src/com/zerotier/sdk/VirtualNetworkRoute.java +++ b/java/src/com/zerotier/sdk/VirtualNetworkRoute.java @@ -31,7 +31,7 @@ import java.net.InetSocketAddress; /** * A route to be pushed on a virtual network - * + *

* Defined in ZeroTierOne.h as ZT_VirtualNetworkRoute */ public class VirtualNetworkRoute implements Comparable @@ -126,6 +126,7 @@ public class VirtualNetworkRoute implements Comparable return false; } + //noinspection RedundantIfStatement if (metric != other.metric) { return false; } diff --git a/java/src/com/zerotier/sdk/VirtualNetworkStatus.java b/java/src/com/zerotier/sdk/VirtualNetworkStatus.java index 8a32ba6ad..9539bdcc6 100644 --- a/java/src/com/zerotier/sdk/VirtualNetworkStatus.java +++ b/java/src/com/zerotier/sdk/VirtualNetworkStatus.java @@ -29,7 +29,7 @@ package com.zerotier.sdk; /** * Virtual network status codes - * + *

* Defined in ZeroTierOne.h as ZT_VirtualNetworkStatus */ public enum VirtualNetworkStatus { diff --git a/java/src/com/zerotier/sdk/VirtualNetworkType.java b/java/src/com/zerotier/sdk/VirtualNetworkType.java index 44be8864b..5c1239c02 100644 --- a/java/src/com/zerotier/sdk/VirtualNetworkType.java +++ b/java/src/com/zerotier/sdk/VirtualNetworkType.java @@ -29,7 +29,7 @@ package com.zerotier.sdk; /** * Virtual network type codes - * + *

* Defined in ZeroTierOne.h as ZT_VirtualNetworkType */ public enum VirtualNetworkType {