* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.controller.cluster.datastore.modification;
-import com.google.common.base.Preconditions;
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
+
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.util.List;
import org.opendaylight.controller.cluster.datastore.DataStoreVersions;
import org.opendaylight.controller.cluster.datastore.messages.VersionedExternalizableMessage;
-import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeDataInput;
-import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeDataOutput;
-import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeInputOutput;
import org.opendaylight.mdsal.dom.spi.store.DOMStoreWriteTransaction;
+import org.opendaylight.yangtools.yang.data.api.schema.stream.ReusableStreamReceiver;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification;
+import org.opendaylight.yangtools.yang.data.codec.binfmt.NormalizedNodeDataInput;
+import org.opendaylight.yangtools.yang.data.codec.binfmt.NormalizedNodeDataOutput;
+import org.opendaylight.yangtools.yang.data.impl.schema.ReusableImmutableNormalizedNodeStreamWriter;
/**
* MutableCompositeModification is just a mutable version of a CompositeModification.
* @param modification the modification to add.
*/
public void addModification(final Modification modification) {
- Preconditions.checkNotNull(modification);
- modifications.add(modification);
+ modifications.add(requireNonNull(modification));
}
public void addModifications(final Iterable<Modification> newMods) {
int size = in.readInt();
if (size > 0) {
- final NormalizedNodeDataInput input = NormalizedNodeInputOutput.newDataInputWithoutValidation(in);
+ final NormalizedNodeDataInput input = NormalizedNodeDataInput.newDataInputWithoutValidation(in);
+ final ReusableStreamReceiver receiver = ReusableImmutableNormalizedNodeStreamWriter.create();
+
for (int i = 0; i < size; i++) {
byte type = in.readByte();
switch (type) {
case Modification.WRITE:
- modifications.add(WriteModification.fromStream(input, getVersion()));
+ modifications.add(WriteModification.fromStream(input, getVersion(), receiver));
break;
case Modification.MERGE:
- modifications.add(MergeModification.fromStream(input, getVersion()));
+ modifications.add(MergeModification.fromStream(input, getVersion(), receiver));
break;
case Modification.DELETE:
final int size = modifications.size();
out.writeInt(size);
if (size > 0) {
- try (NormalizedNodeDataOutput stream = NormalizedNodeInputOutput.newDataOutput(out)) {
+ try (NormalizedNodeDataOutput stream = getStreamVersion().newDataOutput(out)) {
for (Modification mod : modifications) {
out.writeByte(mod.getType());
mod.writeTo(stream);
}
public static MutableCompositeModification fromSerializable(final Object serializable) {
- Preconditions.checkArgument(serializable instanceof MutableCompositeModification);
+ checkArgument(serializable instanceof MutableCompositeModification);
return (MutableCompositeModification)serializable;
}