/**
* First shipping in Sodium SR1. Improved stream coding to eliminate redundancies present in {@link #NEON_SR2}.
* Supports {@code Uint8} et al. as well as {@link BigInteger}.
+ *
+ * @deprecated This version cannot be written in and always required adaption. This version should not be relied
+ * upon, as it is subject to removal in a future version.
*/
+ @Deprecated(since = "11.0.0", forRemoval = true)
SODIUM_SR1 {
+ /**
+ * {@inheritDoc}
+ * @implSpec
+ * This method always throws {@link UnsupportedOperationException}.
+ * @deprecated This version is a historic one and writeout is not supported
+ */
@Override
@Deprecated(since = "10.0.0", forRemoval = true)
public NormalizedNodeDataOutput newDataOutput(final DataOutput output) {
- return new SodiumSR1DataOutput(output);
+ throw new UnsupportedOperationException();
}
},
/**
}
@Override
+ @Deprecated(since = "11.0.0", forRemoval = true)
public NormalizedNodeStreamVersion getVersion() {
return NormalizedNodeStreamVersion.SODIUM_SR1;
}
+++ /dev/null
-/*
- * Copyright (c) 2019 PANTHEON.tech, s.r.o. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * 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.yangtools.yang.data.codec.binfmt;
-
-import java.io.DataOutput;
-import java.io.IOException;
-import java.math.BigInteger;
-
-final class SodiumSR1DataOutput extends AbstractMagnesiumDataOutput {
- SodiumSR1DataOutput(final DataOutput output) {
- super(output);
- }
-
- @Override
- short streamVersion() {
- return TokenTypes.SODIUM_SR1_VERSION;
- }
-
- @Override
- void writeValue(final BigInteger value) throws IOException {
- output.writeByte(MagnesiumValue.BIGINTEGER);
- output.writeUTF(value.toString());
- }
-}
package org.opendaylight.yangtools.yang.data.codec.binfmt;
import com.google.common.collect.ImmutableSet;
-import java.util.Arrays;
+import java.util.Collections;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
public class AidSerializationTest extends AbstractSerializationTest {
@Parameters(name = "{0}")
public static Iterable<Object[]> data() {
- return Arrays.asList(
- new Object[] { NormalizedNodeStreamVersion.SODIUM_SR1, 4, 94, 332, 2376, 716_618, 912_975 },
- new Object[] { NormalizedNodeStreamVersion.MAGNESIUM, 4, 94, 332, 2376, 716_618, 912_975 });
+ return Collections.singletonList(
+ new Object[] { NormalizedNodeStreamVersion.MAGNESIUM, 4, 94, 332, 2_376, 716_618, 912_975 });
}
@Parameter(1)
import com.google.common.io.ByteStreams;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.util.Arrays;
+import java.util.Collections;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
public class BitsSerializationTest extends AbstractSerializationTest {
@Parameters(name = "{0}")
public static Iterable<Object[]> data() {
- return Arrays.asList(
- new Object[] { NormalizedNodeStreamVersion.SODIUM_SR1, 96, 100, 226, 1536, 456_764, 654_045 },
- new Object[] { NormalizedNodeStreamVersion.MAGNESIUM, 96, 100, 226, 1536, 456_764, 654_045 });
+ return Collections.singletonList(
+ new Object[] { NormalizedNodeStreamVersion.MAGNESIUM, 96, 100, 226, 1_536, 456_764, 654_045 });
}
@Parameter(1)
*/
package org.opendaylight.yangtools.yang.data.codec.binfmt;
-import java.util.Arrays;
+import java.util.Collections;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
public class BooleanSerializationTest extends AbstractSerializationTest {
@Parameters(name = "{0}")
public static Iterable<Object[]> data() {
- return Arrays.asList(
- new Object[] { NormalizedNodeStreamVersion.SODIUM_SR1, 96 },
- new Object[] { NormalizedNodeStreamVersion.MAGNESIUM, 96 });
+ return Collections.singletonList(
+ new Object[] { NormalizedNodeStreamVersion.MAGNESIUM, 96 });
}
@Parameter(1)
*/
package org.opendaylight.yangtools.yang.data.codec.binfmt;
-import java.util.Arrays;
+import java.util.Collections;
import java.util.concurrent.ThreadLocalRandom;
import org.junit.Test;
import org.junit.runner.RunWith;
@Parameters(name = "{0}")
public static Iterable<Object[]> data() {
- return Arrays.asList(
- new Object[] { NormalizedNodeStreamVersion.SODIUM_SR1, 96, 97, 225, 482, 66_020 },
- new Object[] { NormalizedNodeStreamVersion.MAGNESIUM, 96, 97, 225, 482, 66_020 });
+ return Collections.singletonList(
+ new Object[] { NormalizedNodeStreamVersion.MAGNESIUM, 96, 97, 225, 482, 66_020 });
}
@Parameter(1)
*/
package org.opendaylight.yangtools.yang.data.codec.binfmt;
-import java.util.Arrays;
+import java.util.Collections;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
public class IntSerializationTest extends AbstractSerializationTest {
@Parameters(name = "{0}")
public static Iterable<Object[]> data() {
- return Arrays.asList(
- new Object[] { NormalizedNodeStreamVersion.SODIUM_SR1, 96, 97, 96, 98, 96, 98, 100, 96, 100, 104 },
- new Object[] { NormalizedNodeStreamVersion.MAGNESIUM, 96, 97, 96, 98, 96, 98, 100, 96, 100, 104 });
+ return Collections.singletonList(
+ new Object[] { NormalizedNodeStreamVersion.MAGNESIUM, 96, 97, 96, 98, 96, 98, 100, 96, 100, 104 });
}
@Parameter(1)
package org.opendaylight.yangtools.yang.data.codec.binfmt;
import com.google.common.collect.Maps;
-import java.util.Arrays;
+import java.util.Collections;
import java.util.Map;
import org.junit.Test;
import org.junit.runner.RunWith;
public class MapEntrySerializationTest extends AbstractSerializationTest {
@Parameters(name = "{0}")
public static Iterable<Object[]> data() {
- return Arrays.asList(
- new Object[] { NormalizedNodeStreamVersion.SODIUM_SR1, 96, 110, 125, 3_927 },
- new Object[] { NormalizedNodeStreamVersion.MAGNESIUM, 96, 110, 125, 3_927 });
+ return Collections.singletonList(
+ new Object[] { NormalizedNodeStreamVersion.MAGNESIUM, 96, 110, 125, 3_927 });
}
@Parameter(1)
import com.google.common.io.ByteStreams;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.util.Arrays;
+import java.util.Collections;
import java.util.Map;
import org.junit.Assert;
import org.junit.Test;
public class NipSerializationTest extends AbstractSerializationTest {
@Parameters(name = "{0}")
public static Iterable<Object[]> data() {
- return Arrays.asList(
- new Object[] { NormalizedNodeStreamVersion.SODIUM_SR1, 95, 107, 156, 3409, 982_867, 1_443_164 },
- new Object[] { NormalizedNodeStreamVersion.MAGNESIUM, 95, 107, 156, 3409, 982_867, 1_443_164 });
+ return Collections.singletonList(
+ new Object[] { NormalizedNodeStreamVersion.MAGNESIUM, 95, 107, 156, 3_409, 982_867, 1_443_164 });
}
@Parameter(1)
import java.io.Serializable;
import java.io.StringReader;
import java.io.StringWriter;
-import java.math.BigInteger;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Optional;
-import java.util.function.Function;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Transformer;
import org.junit.runners.Parameterized.Parameters;
import org.opendaylight.yangtools.yang.common.Empty;
import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.common.Uint64;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
@RunWith(Parameterized.class)
public class NormalizedNodeStreamReaderWriterTest {
- public enum Unsigned implements Function<String, Number> {
- BIG_INTEGER {
- @Override
- public BigInteger apply(final String str) {
- return new BigInteger(str);
- }
- },
- UINT64 {
- @Override
- public Uint64 apply(final String str) {
- return Uint64.valueOf(str);
- }
- };
- }
-
@Parameters(name = "{0} {1}")
public static Iterable<Object[]> data() {
- return List.of(
- new Object[] { NormalizedNodeStreamVersion.SODIUM_SR1, Unsigned.BIG_INTEGER,
- 1_049_619, 2_289_103, 139, 826, 103, 229, 99 },
- new Object[] { NormalizedNodeStreamVersion.SODIUM_SR1, Unsigned.UINT64,
- 1_049_618, 2_289_103, 139, 825, 103, 229, 99 },
- new Object[] { NormalizedNodeStreamVersion.MAGNESIUM, Unsigned.UINT64,
- 1_049_618, 2_289_103, 139, 825, 103, 229, 99 });
+ return Collections.singletonList(
+ new Object[] { NormalizedNodeStreamVersion.MAGNESIUM, 1_049_618, 2_289_103, 139, 825, 103, 229, 99 });
}
@Parameter(0)
public NormalizedNodeStreamVersion version;
@Parameter(1)
- public Unsigned uint64;
- @Parameter(2)
public int normalizedNodeStreamingSize;
- @Parameter(3)
+ @Parameter(2)
public int hugeEntriesSize;
- @Parameter(4)
+ @Parameter(3)
public int yiidStreamingSize;
- @Parameter(5)
+ @Parameter(4)
public int nnYiidStreamingSize;
- @Parameter(6)
+ @Parameter(5)
public int writePathArgumentSize;
- @Parameter(7)
+ @Parameter(6)
public int anyxmlStreamingSize;
- @Parameter(8)
+ @Parameter(7)
public int schemaPathSize;
@Test
final byte[] bytes1 = {1, 2, 3};
final byte[] bytes2 = {};
- return TestModel.createBaseTestContainerBuilder(uint64)
+ return TestModel.createBaseTestContainerBuilder()
.withChild(Builders.leafSetBuilder()
.withNodeIdentifier(new NodeIdentifier(TestModel.BINARY_LEAF_LIST_QNAME))
.withChild(Builders.leafSetEntryBuilder()
@Test
public void testNormalizedNodeAndYangInstanceIdentifierStreaming() throws IOException {
- final NormalizedNode testContainer = TestModel.createBaseTestContainerBuilder(uint64).build();
+ final NormalizedNode testContainer = TestModel.createBaseTestContainerBuilder().build();
final YangInstanceIdentifier path = YangInstanceIdentifier.builder(TestModel.TEST_PATH)
.node(TestModel.OUTER_LIST_QNAME)
.nodeWithKey(TestModel.INNER_LIST_QNAME, TestModel.ID_QNAME, 10)
@Test
public void testWithSerializable() {
- NormalizedNode input = TestModel.createTestContainer(uint64);
+ NormalizedNode input = TestModel.createTestContainer();
SampleNormalizedNodeSerializable serializable = new SampleNormalizedNodeSerializable(version, input);
SampleNormalizedNodeSerializable clone = clone(serializable);
assertEquals(input, clone.getInput());
*/
package org.opendaylight.yangtools.yang.data.codec.binfmt;
-import java.util.Arrays;
+import java.util.Collections;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@Parameters(name = "{0}")
public static Iterable<Object[]> data() {
- return Arrays.asList(
- new Object[] { NormalizedNodeStreamVersion.SODIUM_SR1, 96, 99, 32_865, 33_554_532 },
- new Object[] { NormalizedNodeStreamVersion.MAGNESIUM, 96, 99, 32_865, 33_554_532 });
+ return Collections.singletonList(
+ new Object[] { NormalizedNodeStreamVersion.MAGNESIUM, 96, 99, 32_865, 33_554_532 });
}
@Parameter(1)
import com.google.common.collect.ImmutableSet;
import java.util.Set;
-import java.util.function.Function;
import org.opendaylight.yangtools.yang.common.Decimal64;
import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.Uint64;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
throw new UnsupportedOperationException();
}
- public static DataContainerNodeBuilder<NodeIdentifier, ContainerNode> createBaseTestContainerBuilder(
- final Function<String, Number> uint64) {
+ public static DataContainerNodeBuilder<NodeIdentifier, ContainerNode> createBaseTestContainerBuilder() {
// Create the document
return Builders.containerBuilder()
.withNodeIdentifier(new NodeIdentifier(TEST_QNAME))
.withChild(leafNode(BOOLEAN_LEAF_QNAME, ENABLED))
.withChild(leafNode(SHORT_LEAF_QNAME, SHORT_ID))
.withChild(leafNode(BYTE_LEAF_QNAME, BYTE_ID))
- .withChild(leafNode(TestModel.BIGINTEGER_LEAF_QNAME, uint64.apply("100")))
+ .withChild(leafNode(TestModel.BIGINTEGER_LEAF_QNAME, Uint64.valueOf(100)))
.withChild(leafNode(TestModel.BIGDECIMAL_LEAF_QNAME, Decimal64.valueOf("1.2")))
.withChild(leafNode(SOME_REF_QNAME,
// Create YangInstanceIdentifier with all path arg types.
.build());
}
- static ContainerNode createTestContainer(final Function<String, Number> uint64) {
- return createBaseTestContainerBuilder(uint64).build();
+ static ContainerNode createTestContainer() {
+ return createBaseTestContainerBuilder().build();
}
private static MapEntryNode createAugmentedListEntry(final int id, final String name) {
*/
package org.opendaylight.yangtools.yang.data.codec.binfmt;
-import java.util.Arrays;
+import java.util.Collections;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
public class UintSerializationTest extends AbstractSerializationTest {
@Parameters(name = "{0}")
public static Iterable<Object[]> data() {
- return Arrays.asList(
- new Object[] { NormalizedNodeStreamVersion.SODIUM_SR1 },
+ return Collections.singletonList(
new Object[] { NormalizedNodeStreamVersion.MAGNESIUM });
}
import com.google.common.io.ByteStreams;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.util.Arrays;
+import java.util.Collections;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
public class YiidSerializationTest extends AbstractSerializationTest {
@Parameters(name = "{0}")
public static Iterable<Object[]> data() {
- return Arrays.asList(
- new Object[] { NormalizedNodeStreamVersion.SODIUM_SR1,
- 96, 98, 158, 359, 164, 372, 612, 2388, 131_684, 719_700, 916_815
- },
+ return Collections.singletonList(
new Object[] { NormalizedNodeStreamVersion.MAGNESIUM,
- 96, 98, 158, 359, 164, 372, 612, 2388, 131_684, 719_700, 916_815
+ 96, 98, 158, 359, 164, 372, 612, 2_388, 131_684, 719_700, 916_815
});
}
Code Review / yangtools.git / commitdiff