*/
package org.opendaylight.controller.cluster.datastore.persisted;
+import static com.google.common.base.Verify.verifyNotNull;
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.Externalizable;
import java.io.ObjectOutput;
import java.io.Serializable;
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;
private T identifier;
final int length = in.readInt();
serialized = new byte[length];
in.readFully(serialized);
- identifier = Verify.verifyNotNull(readIdentifier(ByteStreams.newDataInput(serialized)));
+ identifier = verifyNotNull(readIdentifier(ByteStreams.newDataInput(serialized)));
}
protected final Object readResolve() {
- return Verify.verifyNotNull(createObject(identifier, serialized));
+ return verifyNotNull(createObject(identifier, serialized));
}
protected abstract @NonNull T readIdentifier(@NonNull DataInput in) throws IOException;
}
private static final long serialVersionUID = 1L;
- private final byte[] serialized;
- private final T identifier;
+
+ private final byte @NonNull [] serialized;
+ private final @NonNull T identifier;
AbstractIdentifiablePayload(final @NonNull T identifier, final byte @NonNull[] serialized) {
this.identifier = requireNonNull(identifier);
}
protected final Object writeReplace() {
- return Verify.verifyNotNull(externalizableProxy(serialized));
+ return verifyNotNull(externalizableProxy(serialized));
}
@SuppressWarnings("checkstyle:hiddenField")