*/
package org.opendaylight.controller.cluster.datastore.persisted;
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
import com.google.common.base.Verify;
import com.google.common.io.ByteStreams;
import java.io.DataInput;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.io.Serializable;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.controller.cluster.raft.protobuff.client.messages.IdentifiablePayload;
import org.opendaylight.controller.cluster.raft.protobuff.client.messages.Payload;
import org.opendaylight.yangtools.concepts.Identifiable;
import org.opendaylight.yangtools.concepts.Identifier;
*
* @author Robert Varga
*/
-public abstract class AbstractIdentifiablePayload<T extends Identifier>
- extends Payload implements Identifiable<T>, Serializable {
+public abstract class AbstractIdentifiablePayload<T extends Identifier> extends IdentifiablePayload<T>
+ implements Serializable {
protected abstract static class AbstractProxy<T extends Identifier> implements Externalizable {
private static final long serialVersionUID = 1L;
private byte[] serialized;
}
protected AbstractProxy(final byte[] serialized) {
- this.serialized = Preconditions.checkNotNull(serialized);
+ this.serialized = requireNonNull(serialized);
}
@Override
}
@Override
- public final void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException {
+ public final void readExternal(final ObjectInput in) throws IOException {
final int length = in.readInt();
serialized = new byte[length];
in.readFully(serialized);
return Verify.verifyNotNull(createObject(identifier, serialized));
}
- @Nonnull
- protected abstract T readIdentifier(@Nonnull DataInput in) throws IOException;
+ protected abstract @NonNull T readIdentifier(@NonNull DataInput in) throws IOException;
- @Nonnull
- protected abstract Identifiable<T> createObject(@Nonnull T identifier, @Nonnull byte[] serialized);
+ @SuppressWarnings("checkstyle:hiddenField")
+ protected abstract @NonNull Identifiable<T> createObject(@NonNull T identifier, byte @NonNull[] serialized);
}
private static final long serialVersionUID = 1L;
private final byte[] serialized;
private final T identifier;
- AbstractIdentifiablePayload(@Nonnull final T identifier, @Nonnull final byte[] serialized) {
- this.identifier = Preconditions.checkNotNull(identifier);
- this.serialized = Preconditions.checkNotNull(serialized);
+ AbstractIdentifiablePayload(final @NonNull T identifier, final byte @NonNull[] serialized) {
+ this.identifier = requireNonNull(identifier);
+ this.serialized = requireNonNull(serialized);
}
@Override
return Verify.verifyNotNull(externalizableProxy(serialized));
}
- @Nonnull
- protected abstract AbstractProxy<T> externalizableProxy(@Nonnull byte[] serialized);
+ @SuppressWarnings("checkstyle:hiddenField")
+ protected abstract @NonNull AbstractProxy<T> externalizableProxy(byte @NonNull[] serialized);
}