Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix modernization issues
[controller.git]
/
opendaylight
/
md-sal
/
cds-access-api
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
access
/
concepts
/
MemberName.java
diff --git
a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/MemberName.java
b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/MemberName.java
index a6794d0032623dff80e2ef92d1d9e11a9c8c6d2d..70df622b9bde76d4685d1cd805e8def05cd6db07 100644
(file)
--- a/
opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/MemberName.java
+++ b/
opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/MemberName.java
@@
-7,11
+7,14
@@
*/
package org.opendaylight.controller.cluster.access.concepts;
*/
package org.opendaylight.controller.cluster.access.concepts;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Verify.verifyNotNull;
+import static java.util.Objects.requireNonNull;
+
import com.google.common.annotations.Beta;
import com.google.common.base.MoreObjects;
import com.google.common.annotations.Beta;
import com.google.common.base.MoreObjects;
-import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.base.Strings;
-import
com.google.common.base.Verify
;
+import
edu.umd.cs.findbugs.annotations.SuppressFBWarnings
;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.Externalizable;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.Externalizable;
@@
-19,7
+22,7
@@
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.nio.charset.StandardCharsets;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.nio.charset.StandardCharsets;
-import org.opendaylight.yangtools.concepts.Identifier;
+import org.opendaylight.yangtools.concepts.
Writable
Identifier;
/**
* Type-safe encapsulation of a cluster member name.
/**
* Type-safe encapsulation of a cluster member name.
@@
-27,27
+30,30
@@
import org.opendaylight.yangtools.concepts.Identifier;
* @author Robert Varga
*/
@Beta
* @author Robert Varga
*/
@Beta
-public final class MemberName implements Comparable<MemberName>,
Identifier, WritableObject
{
+public final class MemberName implements Comparable<MemberName>,
WritableIdentifier
{
private static final class Proxy implements Externalizable {
private static final long serialVersionUID = 1L;
private byte[] serialized;
private static final class Proxy implements Externalizable {
private static final long serialVersionUID = 1L;
private byte[] serialized;
+ // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to
+ // be able to create instances via reflection.
+ @SuppressWarnings("checkstyle:RedundantModifier")
public Proxy() {
// For Externalizable
}
Proxy(final byte[] serialized) {
public Proxy() {
// For Externalizable
}
Proxy(final byte[] serialized) {
- this.serialized =
Preconditions.checkNot
Null(serialized);
+ this.serialized =
requireNon
Null(serialized);
}
@Override
}
@Override
- public void writeExternal(ObjectOutput out) throws IOException {
+ public void writeExternal(
final
ObjectOutput out) throws IOException {
out.writeInt(serialized.length);
out.write(serialized);
}
@Override
out.writeInt(serialized.length);
out.write(serialized);
}
@Override
- public void readExternal(ObjectInput in) throws IOException {
+ public void readExternal(
final
ObjectInput in) throws IOException {
serialized = new byte[in.readInt()];
in.readFully(serialized);
}
serialized = new byte[in.readInt()];
in.readFully(serialized);
}
@@
-60,19
+66,22
@@
public final class MemberName implements Comparable<MemberName>, Identifier, Wri
private static final long serialVersionUID = 1L;
private final String name;
private static final long serialVersionUID = 1L;
private final String name;
+
+ @SuppressFBWarnings(value = "VO_VOLATILE_REFERENCE_TO_ARRAY",
+ justification = "The array elements are non-volatile but we don't access them.")
private volatile byte[] serialized;
private MemberName(final String name) {
private volatile byte[] serialized;
private MemberName(final String name) {
- this.name =
Preconditions.checkNot
Null(name);
+ this.name =
requireNon
Null(name);
}
MemberName(final String name, final byte[] serialized) {
this(name);
}
MemberName(final String name, final byte[] serialized) {
this(name);
- this.serialized =
Verify.
verifyNotNull(serialized);
+ this.serialized = verifyNotNull(serialized);
}
public static MemberName forName(final String name) {
}
public static MemberName forName(final String name) {
-
Preconditions.
checkArgument(!Strings.isNullOrEmpty(name));
+ checkArgument(!Strings.isNullOrEmpty(name));
// TODO: consider caching instances here
return new MemberName(name);
}
// TODO: consider caching instances here
return new MemberName(name);
}
@@
-85,9
+94,9
@@
public final class MemberName implements Comparable<MemberName>, Identifier, Wri
@Override
public void writeTo(final DataOutput out) throws IOException {
@Override
public void writeTo(final DataOutput out) throws IOException {
- final byte[]
serialized
= getSerialized();
- out.writeInt(
serialized
.length);
- out.write(
serialized
);
+ final byte[]
local
= getSerialized();
+ out.writeInt(
local
.length);
+ out.write(
local
);
}
public String getName() {
}
public String getName() {
@@
-100,13
+109,13
@@
public final class MemberName implements Comparable<MemberName>, Identifier, Wri
}
@Override
}
@Override
- public boolean equals(final Object o) {
- return this == o
|| (o instanceof MemberName && name.equals(((MemberName)o).name)
);
+ public boolean equals(final Object o
bj
) {
+ return this == o
bj || obj instanceof MemberName && name.equals(((MemberName)obj).name
);
}
@Override
}
@Override
- public int compareTo(final MemberName o) {
- return this == o
? 0 : name.compareTo(o
.name);
+ public int compareTo(final MemberName o
bj
) {
+ return this == o
bj ? 0 : name.compareTo(obj
.name);
}
@Override
}
@Override