yangtools.git
4 years agoBump versions to 4.0.1-SNAPSHOT 48/84848/1
Robert Varga [Tue, 1 Oct 2019 12:21:01 +0000 (14:21 +0200)]
Bump versions to 4.0.1-SNAPSHOT

This starts the next development iteration.

Change-Id: I91bf47f8d49bb07de626fb059e22a67234c2974d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoFix EffectiveStatement namespace access 36/84836/4
Robert Varga [Tue, 1 Oct 2019 09:05:48 +0000 (11:05 +0200)]
Fix EffectiveStatement namespace access

We really want to use empty maps and optionals in this interface
contract -- do that now.

Change-Id: Ibfc72d29ff24c592e2a81ad894bb0b9f8f683f6d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoRemove DataTreeCandidateNodes.fromNormalizedNode() 31/84831/3
Robert Varga [Tue, 1 Oct 2019 08:35:10 +0000 (10:35 +0200)]
Remove DataTreeCandidateNodes.fromNormalizedNode()

This has been replaced by written(), remove it now.

Change-Id: Ie4e939cef75240a72556df7599d492dc2033db39
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoDeprecate DataSchemaContextTree.getChild() for removal 32/84832/2
Robert Varga [Tue, 1 Oct 2019 08:37:29 +0000 (10:37 +0200)]
Deprecate DataSchemaContextTree.getChild() for removal

This strengthens deprecation, preparing for its removal.

Change-Id: I97e8fbe1953d103eceb1fa37181f2caa84820d90
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoRemove AugmentToChoiceNamespace 35/84835/2
Robert Varga [Tue, 1 Oct 2019 08:44:33 +0000 (10:44 +0200)]
Remove AugmentToChoiceNamespace

This namespace has been deprecated for removal, as it is not used
anywhere. Remove it now.

Change-Id: Ia199971ab5651fbf4eac74528668b74fd738e403
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoRemove ImplicitCaseSchemaNode 34/84834/2
Robert Varga [Tue, 1 Oct 2019 08:42:44 +0000 (10:42 +0200)]
Remove ImplicitCaseSchemaNode

As noted in deprecation noticed, this class is a former remnant,
we can remove it safely.

Change-Id: I9c730a14299a318664eab76b70ea72aee439f964
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoPush out FIXMEs to 5.0.0 33/84833/4
Robert Varga [Tue, 1 Oct 2019 08:34:46 +0000 (10:34 +0200)]
Push out FIXMEs to 5.0.0

This another round of pushing out FIXMEs.

Change-Id: I4163a08d275ff4c608bc0678a220c6436a215d4d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoSwitch BasicCodeGenerator to use EffectiveModelContext 16/84816/2
Robert Varga [Mon, 30 Sep 2019 18:13:17 +0000 (20:13 +0200)]
Switch BasicCodeGenerator to use EffectiveModelContext

This rolls out EffectiveModelContext to codegen plugins, so they
can take advantage of it.

JIRA: MDSAL-435
Change-Id: I94d7385d29962e281a55b5e0522f7bc198648175
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoMake DataTree take EffectiveModelContext 15/84815/4
Robert Varga [Mon, 30 Sep 2019 15:46:13 +0000 (17:46 +0200)]
Make DataTree take EffectiveModelContext

This deprecates setSchemaContext() in favor of
setEffectiveModelContext(), so that users are encouraged to
migrate.

JIRA: MDSAL-435
Change-Id: If859130e204a058f89c2fee04d4be69969215399
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoAllow startAnyxmlNode() to handle differing object models 07/84807/6
Robert Varga [Mon, 30 Sep 2019 09:40:29 +0000 (11:40 +0200)]
Allow startAnyxmlNode() to handle differing object models

Anyxml can have a number of underlying object models, with the most
common being DOMSource. This changes the entrypoint to work the same
as anydata, allowing implementations to support different models.

Change-Id: I06ec1e5d46e7bc2287b239ea97811d58544c8c2b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoExpose EffectiveModelContext from YangParserTestUtils 14/84814/3
Robert Varga [Mon, 30 Sep 2019 15:41:27 +0000 (17:41 +0200)]
Expose EffectiveModelContext from YangParserTestUtils

We want to start using effective statements for as many operations
as possible -- make sure it is convenient to do so.

JIRA: MDSAL-435
Change-Id: I480475f40356d097c6769253aac0b18453d94153
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoPush out FIXMEs to 5.0.0 11/84811/3
Robert Varga [Mon, 30 Sep 2019 14:45:32 +0000 (16:45 +0200)]
Push out FIXMEs to 5.0.0

We are not going to address these in 4.0.0 timeframe, push them out
to 5.0.0.

Change-Id: I73b9ba42c552c88758866d325b76fe9aebc3b569
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoRename MountPointStreamWriter to StreamWriterMountPointExtension 06/84806/1
Robert Varga [Mon, 30 Sep 2019 09:37:28 +0000 (11:37 +0200)]
Rename MountPointStreamWriter to StreamWriterMountPointExtension

This better reflects the fact this is not a standalone interface,
but rather is an extension to NormalizedNodeStreamWriter.

Change-Id: I8cc0b9d91c95e227877b75e6a333ca830e1e0eeb
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoRename NormalizedMetadataStreamWriter to StreamWriterMetadataExtension 05/84805/1
Robert Varga [Mon, 30 Sep 2019 09:32:47 +0000 (11:32 +0200)]
Rename NormalizedMetadataStreamWriter to StreamWriterMetadataExtension

Naming here is quite inconsistent -- we should be explicit about this
interface being a NormalizedNodeStreamWriter extension.

Change-Id: I44fb52d06899785c6e9c8d1eb405343f89908160
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoIntegrate AnydataExtension 96/84096/3
Robert Varga [Fri, 30 Aug 2019 12:50:06 +0000 (14:50 +0200)]
Integrate AnydataExtension

anydata is the same as anyxml, it should be integrated into
NormalizedNodeStreamWriter. Also update FIXME around
startAnyxmlNode() and domSourceValue().

Change-Id: Ia39515a884d1a6883fce72444b8371c4d9f7b9c1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoMake DataTreeTip.prepare() throw a checked exception 01/84801/3
Robert Varga [Mon, 30 Sep 2019 08:02:45 +0000 (10:02 +0200)]
Make DataTreeTip.prepare() throw a checked exception

Not all validation can be done during validate() phase, hence
allow validation failures to be reported cleanly.

Change-Id: I88dbe90c2e4b2fc79fad836939183fa43151ae6c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoFix StoreTreeNode.getChild() return type 99/84799/3
Robert Varga [Mon, 30 Sep 2019 07:57:50 +0000 (09:57 +0200)]
Fix StoreTreeNode.getChild() return type

We should be returning Optional<? extends T> here, so that the
interface can be properly specialized.

Change-Id: Ia3a84c6426e924299a10ea03d435fb584b685c47
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoExpose EffectiveModelContext from YangTextSchemaContextResolver 98/84798/3
Robert Varga [Mon, 30 Sep 2019 05:22:03 +0000 (07:22 +0200)]
Expose EffectiveModelContext from YangTextSchemaContextResolver

This is another step towards migrating away from SchemaContext.

JIRA: MDSAL-435
Change-Id: I1fc6cca79fdfdcbcb45092a402b5b1f3ea9ab206
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoAdd EffectiveModelContextListener 96/84796/2
Robert Varga [Mon, 30 Sep 2019 05:05:48 +0000 (07:05 +0200)]
Add EffectiveModelContextListener

This is a replacement for SchemaContextListener, managing
EffectiveModelContext.

JIRA: MDSAL-435
Change-Id: Icf7c68381d69875a6ea6030ac665d45a7c26ae5f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoUpdate FIXMEs 95/84795/1
Robert Varga [Mon, 30 Sep 2019 05:05:26 +0000 (07:05 +0200)]
Update FIXMEs

This just pushes FIXMEs out to 5.0.0.

Change-Id: Ief679ea949dd995154c9c26ca90dbe0f2d0829eb
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoRename Any{Data,Xml}SchemaNode to Any{data,xml}SchemaNode 87/84787/1
Robert Varga [Fri, 27 Sep 2019 14:09:55 +0000 (16:09 +0200)]
Rename Any{Data,Xml}SchemaNode to Any{data,xml}SchemaNode

This improves naming consistency, as the statements are called
'anydata' and 'anyxml', not 'any-data' nor 'any-xml'.

Change-Id: I5b2563cddba3b39d4b8faa891b85505b61af18b4
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoAdd odl-guava dependency 77/84777/1
Robert Varga [Fri, 27 Sep 2019 09:45:56 +0000 (11:45 +0200)]
Add odl-guava dependency

odl-yangtools-util is pulling in guava, is should depend on
odl-guava to get it.

Change-Id: I7514cf9fe69fa14e042c95bbcc93e4882ac1ae0f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoRename AnyXmlNode to DOMSourceAnyxmlNode 91/83591/22
Andrii Mazurian [Tue, 13 Aug 2019 09:59:44 +0000 (12:59 +0300)]
Rename AnyXmlNode to DOMSourceAnyxmlNode

Rename AnyXmlNode to DOMSourceAnyxmlNode, as that reflects its place
in the object hierarchy. NormalizedNodeWriter is extended with stub
support for other object models, yet DOMSource is the only one
supported at this time.

JIRA: YANGTOOLS-976
Change-Id: I962c910557a14dad5f88fa4e69146606e21fddc4
Signed-off-by: Andrii Mazurian <a.mazuryan@gmail.com>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoBump odlparent to 6.0.0 84/84684/1
Robert Varga [Tue, 24 Sep 2019 06:44:29 +0000 (08:44 +0200)]
Bump odlparent to 6.0.0

This switches to using a released version of odlparent.

Change-Id: Ia9f2c27b38b851abe98f9b90b13d38dee1d46c59
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoGet rid of Strings.repeat() 83/84483/2
Robert Varga [Sun, 15 Sep 2019 22:02:49 +0000 (00:02 +0200)]
Get rid of Strings.repeat()

Java 11 is giving us String.repeat(), which has better performance
characteristics than Guava's Strings.repeat(). Ditch Guava in favor
of Java 11.

Change-Id: Ic5b8b507802f577a28b6b8df7c79e1e50efa779b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoTake advantage of ValueNode in NormalizedNodes 85/84485/2
Robert Varga [Sun, 15 Sep 2019 22:10:56 +0000 (00:10 +0200)]
Take advantage of ValueNode in NormalizedNodes

We can perform a single instanceof check instead of two to check
for LeafNode and LeafSetEntryNode. Also cleanup checks to remove
superfluous type arguments.

Change-Id: Id9964088ff0751217175cf1a8c6f13009a0276e8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoCleanup requireNonNull() use in NormalizedNodes 84/84484/2
Robert Varga [Sun, 15 Sep 2019 22:07:49 +0000 (00:07 +0200)]
Cleanup requireNonNull() use in NormalizedNodes

Take advantage of the non-null return to save a tiny bit of bytecode.

Change-Id: Ie43b7ccc15dd96cd320eb74c0b0a2d5a0dd8a4da
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoAdd missing @Override 82/84482/1
Robert Varga [Sun, 15 Sep 2019 22:02:02 +0000 (00:02 +0200)]
Add missing @Override

LoggingNormalizedNodeStreamWriter.domSourceValue() is missing
an annotation for some reason. Fix that.

Change-Id: I01741c2a28de11f2a86562e588db15882dbe0912
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoSimplify Uint range checks 77/84477/1
Robert Varga [Sun, 15 Sep 2019 17:48:10 +0000 (19:48 +0200)]
Simplify Uint range checks

This saves a single instruction (and a stack slot) in the hot path,
while penalizing exceptional path, by not giving it the constant
string.

As exceptions are expected to be (relatively) rare, this should not
hurt much and if for some reason it does, we can always revert.

Change-Id: Ibd926732f49b0d0692f0c894166f4427a49d7f7d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoRemove unneeded masking in Uint{8,16}.valueOf() 76/84476/1
Robert Varga [Sun, 15 Sep 2019 17:31:20 +0000 (19:31 +0200)]
Remove unneeded masking in Uint{8,16}.valueOf()

As we are checking the range of the input, we can just narrow input
value, saving us a few instructions in the process.

Change-Id: I2ff52b1a75565da76804e4f02114249200e7d841
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoChange Uint* IAE messages 75/84475/1
Robert Varga [Sun, 15 Sep 2019 17:02:28 +0000 (19:02 +0200)]
Change Uint* IAE messages

As we are rolling out Uint* as replacements to widened binding
representations, there is a potential useability regression in that
the excepion reported no longer contains the range of allowed
values.

This patch changes the reporting structure, so that the binding
format is retained, while also optimizing the checks a bit.

While we are in the area, fix Uint32/Uint64's failure to throw
NPE on null strings.

Change-Id: Ib482d2e632e7e4f4fbc16f047e70d8077aa9341a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoAdd NodeIdentifierWithPredicates.containsKey() 43/84343/3
Robert Varga [Thu, 12 Sep 2019 15:16:05 +0000 (17:16 +0200)]
Add NodeIdentifierWithPredicates.containsKey()

This is a useful check, which can be performed via getValue()
and checking for null return, but implementations can perform
it a wee bit more quickly.

Change-Id: I2182870ca3cfba082c6cebafe947643d5e191f4a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoUse Optional.isEmpty() 92/84292/2
Robert Varga [Tue, 10 Sep 2019 13:08:57 +0000 (15:08 +0200)]
Use Optional.isEmpty()

This is Java 11 addition, a shorthand for !isPresent(). This allows
us to be a bit more concise.

Change-Id: I99461863e8ae292d0ebea9cc40a5bab2e0805dfb
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoUse {Byte,Short}.compareUnsigned 85/84285/4
Robert Varga [Tue, 10 Sep 2019 04:47:42 +0000 (06:47 +0200)]
Use {Byte,Short}.compareUnsigned

Java 9 has these utility methods, use them instead of custom-brewing
an equivalent.

Change-Id: I774f2c0dcfa9f602830a1c98761b36520613bd52
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoExpose NodeIdentifierWithPredicates.Singleton 71/84271/2
Robert Varga [Mon, 9 Sep 2019 05:00:40 +0000 (07:00 +0200)]
Expose NodeIdentifierWithPredicates.Singleton

Exposing this implementation allows users dealing with serialization
to use Singleton.singleEntry() and skip allocation of a Set.

Change-Id: I3d5941fc62a9ce9766b3bb15eb86e5c9f45af60b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoUpdate uint implementations a bit 64/84264/1
Robert Varga [Fri, 6 Sep 2019 18:32:22 +0000 (20:32 +0200)]
Update uint implementations a bit

Constructor should be private and Integer.toString() is better
than String.valueOf() because it is an intrinsic.

Change-Id: I7e5da76b90add67e479c8d673ad0c696a74907dc
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoMigrate Class.newInstance() user 14/84214/1
Robert Varga [Thu, 5 Sep 2019 09:35:19 +0000 (11:35 +0200)]
Migrate Class.newInstance() user

Class.newInstance() is deprecated since Java 9, migrate to explicit
constructor invocation.

Change-Id: Ifc2e67aa4a56a9ccc306eb540100ebc299eb00c9
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoAdd UintConversions 13/84213/2
Robert Varga [Thu, 5 Sep 2019 07:56:46 +0000 (09:56 +0200)]
Add UintConversions

This adds utility conversion methods for Java/Guava equivalents,
so that transitioning to/from these is easier on the users.

JIRA: YANGTOOLS-1018
Change-Id: Ibcd0cd908cd85c0f038206f96e667a144569582b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoUpdate and document Uint 74/84174/5
Robert Varga [Tue, 3 Sep 2019 11:35:38 +0000 (13:35 +0200)]
Update and document Uint

This updates Uint classes to expose ZERO/ONE/MAX_VALUE and documents
their methods.

Caching is reworked to work on tunable statically-populated caches,
where Uint8 is always fully cached. This mirrors what is being done
for boxing purposes on java.lang.Byte, etc.

On top of the statically-populated caches, each type has a dedicated
Interner instance, which can be efficiently consulted using intern().

JIRA: YANGTOOLS-1018
Change-Id: Ic25b5ac685c920f7d82d588309a543f9a8eb43b7
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoSwitch encoding unsigned type normalization to Uint* types 47/83947/20
Robert Varga [Fri, 23 Aug 2019 17:42:34 +0000 (19:42 +0200)]
Switch encoding unsigned type normalization to Uint* types

Using Java native types for unsigned values is wasteful especially
in case of uint32 and uint64. Furthermore it leads to uncertainty
between int16/uint8, int32/uint16 and int64/uint32.

This is a partial switch, where we retain java.lang types for
signed entities, but switch the unsigned ones.

JIRA: YANGTOOLS-1018
Change-Id: I0eeb1d343d77d05c4e00cb6919c128042ab31eb1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoHide Immutables.KNOWN_IMMUTABLES 31/84131/1
Robert Varga [Mon, 2 Sep 2019 15:28:10 +0000 (17:28 +0200)]
Hide Immutables.KNOWN_IMMUTABLES

This constant should not be leaked to the outside world, hide it
and make it an ImmutableSet.

Change-Id: If05dc0bb5b9915a371913bd6cc0c9ecb0d253c89
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoOptimize immutable lookups 30/84130/1
Robert Varga [Mon, 2 Sep 2019 15:25:37 +0000 (17:25 +0200)]
Optimize immutable lookups

We have a number of private Set/Map/Lists which we are using for
lookups. These typically are backed by Immutable implementations,
hence we can propagate the type knowledge to improve bytecode
generation and make JIT's life easier.

Change-Id: I7f90393b8bc76196deced50f1800c3f99424fa1c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoVerify leaf node squashing 95/84095/1
Robert Varga [Fri, 30 Aug 2019 12:11:09 +0000 (14:11 +0200)]
Verify leaf node squashing

There is a very slight possiblity of somebody playing tricks
to inject Leaf node with a DataContainerChild value, in which case
decoding would break. Verify this does not happen.

JIRA: YANGTOOLS-1019
Change-Id: Idbd6457817b9db5f2b2d4b3fafce57169ace6ec1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoFixup LazyLeafOperations 89/84089/3
Robert Varga [Fri, 30 Aug 2019 08:58:33 +0000 (10:58 +0200)]
Fixup LazyLeafOperations

LazyLeafOperations.isEnabled() allows code to query whether leaf nodes
are being treated as expendable, hence assumptions about them being
equal on identity can be violated. We retrofit the check into tests we
modified before.

Furthermore users of getValue() expect it to work with identities,
even when it is being specialized to a Collection. The expectation here
is that the same collection will be returned from NormalizedNode,
which we are violating. Fix this up by introducing a new implementation
class, which hides this difference and defers equality to the backing
map.

JIRA: YANGTOOLS-1019
Change-Id: Icf62619c3ea5a1c994c6547a0674b36d707248d3
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoFixup RpcResult definitions 72/84072/1
Robert Varga [Thu, 29 Aug 2019 15:28:41 +0000 (17:28 +0200)]
Fixup RpcResult definitions

The 'errors' are a List and the list is always present, which
has goodness for users.

Change-Id: I44fad2f48fe8882eb5cb98b1c099a547659f77c0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoRemove useless method generic arguments 67/84067/1
Robert Varga [Thu, 29 Aug 2019 13:46:53 +0000 (15:46 +0200)]
Remove useless method generic arguments

These arguments are not used, remove them.

Change-Id: Ibd8140b68d012c662a7670ab0ae8639d9a0134fb
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoDo not retain leaf nodes in containers by default 15/84015/9
Robert Varga [Tue, 27 Aug 2019 14:04:55 +0000 (16:04 +0200)]
Do not retain leaf nodes in containers by default

Leaf nodes are observed to dominate our memory footprint. This
patch modifies immutable implementations of NormalizedNodeContainers
such that they eliminate any leaf nodes when they are stored, retaining
only the encapsulated value. Leaf nodes are then re-created on access
as needed.

Note this changes two aspects of operation:

1) looking up a leaf will yield a new object every time it is invoked,
   hence callers must not rely on on returned objects to be identical.

2) getValue() is operating on the backing map's entrySet() and requires
   its transformation. This means that multiple iterations over values
   will not necessarily yield same objects.

Neither of these violates effective immutability contract of NormalizeNode,
as the returned objects will compare as equal.

This behavior can be switched off at runtime by setting the system property:

    org.opendaylight.yangtools.yang.data.impl.schema.nodes.lazy-leaves=false

JIRA: YANGTOOLS-1019
Change-Id: I00fc3ac0b64290068e8a6e4c8972454729fa9011
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoRemove YangInstanceIdentifier.EMPTY 46/84046/6
Robert Varga [Wed, 28 Aug 2019 18:59:36 +0000 (20:59 +0200)]
Remove YangInstanceIdentifier.EMPTY

This constannt has been deprecated for removal -- now we remove it.

Change-Id: I0808a8e8ebe455275bf6fcc24edae8126a4087c2
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoRemove references to YangInstanceIdentifier.EMPTY 49/84049/2
Robert Varga [Wed, 28 Aug 2019 20:40:14 +0000 (22:40 +0200)]
Remove references to YangInstanceIdentifier.EMPTY

The constant is going away, update javadocs to reflect that.

Change-Id: Ie0415cbd1afd375b14a6c62d097f288ed2193613
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoDeprecate YangInstanceIdentifier.EMPTY for removal 45/84045/4
Robert Varga [Wed, 28 Aug 2019 18:57:15 +0000 (20:57 +0200)]
Deprecate YangInstanceIdentifier.EMPTY for removal

As a JDK9 extension, mark the constant for removal.

Change-Id: I931d870cedef109526bef2f3c6336b1bc2256158
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoDeprecate YangInstanceIdentifier.EMPTY 44/84044/4
Robert Varga [Wed, 28 Aug 2019 18:21:39 +0000 (20:21 +0200)]
Deprecate YangInstanceIdentifier.EMPTY

This runtime constant forces instantiation of a subclass, leading
to a SpotBugs warning. A static accessor works just as well --
hence YangInstanceIdentifier.empty()

Change-Id: I67b562b176f17d3c327b4589b673017f513f98f5
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoAdd Builder.build() override 39/84039/2
Robert Varga [Wed, 28 Aug 2019 14:24:23 +0000 (16:24 +0200)]
Add Builder.build() override

This override stops the unchecked exception from leaking into
IDE-generated implementations.

Change-Id: I7c4fc039e6d0c468ce08cf1647c82473cf6d9096
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoMigrate away from @ConstructorProperties 38/84038/2
Robert Varga [Wed, 28 Aug 2019 14:01:09 +0000 (16:01 +0200)]
Migrate away from @ConstructorProperties

ListenerNotificationQueueStats is meant for consumption in
java.management and therefore it does not need java.desktop
to work -- this is very important for JDK 9+ modular deployments.

Change-Id: I0e7715113ede968db05aacef136e35649cdfa492
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoHide AbstractIdentifier.getValue() 80/82980/10
Robert Varga [Tue, 9 Jul 2019 20:27:30 +0000 (22:27 +0200)]
Hide AbstractIdentifier.getValue()

AbstractIdentifier is a utility wrapper class, hence it should not
have a public surface users should be interested it. Anybody relying
on .getValue() who is not a subclass should expose a domain-specific
getter method.

Change-Id: I64af4b385055d92c6499d62879c77e77216d4b39
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoCorrect cache sizing for Uint types 32/84032/1
Robert Varga [Wed, 28 Aug 2019 09:05:19 +0000 (11:05 +0200)]
Correct cache sizing for Uint types

There is an off-by-one error in these, fix that up.

Change-Id: I7031e8b59bc2c35741d53d663aba3951f6ee2862
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoExpose Uint*.{MIN,MAX}_VALUE constants 25/84025/1
Robert Varga [Wed, 28 Aug 2019 00:19:20 +0000 (02:19 +0200)]
Expose Uint*.{MIN,MAX}_VALUE constants

These contants are useful for outside users, as they allow them
to reference known invariants.

Change-Id: I28467737a2dfe5cac811e7ecbc9ead75c47d1344
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoFix SchemaContextProvider nullness 94/83994/4
Robert Varga [Mon, 26 Aug 2019 14:33:49 +0000 (16:33 +0200)]
Fix SchemaContextProvider nullness

SchemaContextProvider needs to return a schemacontext, or throw
an ISE.

Change-Id: I098c09a77a261f81b2b4b31207733169563aa936
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoAdd a singleton NodeIdentifierWithPredicates 04/82604/20
Robert Varga [Thu, 20 Jun 2019 14:12:07 +0000 (16:12 +0200)]
Add a singleton NodeIdentifierWithPredicates

Heap dumps from OFP-centric load shows that single-predicate
identifiers are dominating the workload. This adds a dedicated
class to handle those cases.

The upshot of a dedicated class vs. a singleton map is a reduction
of one object, i.e. with SharedSingletonMap we get:

NodeIdentifierWithPredicates (24/32b)
SharedSingletonMap (24/32b)

whereas a dedicated class does only:

NodeIdentifierWithPredicates.Singleton (32/40b)

Which reduces total storage requirements from 48/64 bytes down to
32/40 bytes, saving 16/24 bytes (33/37.5%).

Change-Id: I3172ab9435d67adc12ae1734f9ad35f1dc8f891f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoOptimize ImmutableNodes.leafNode() 14/84014/2
Robert Varga [Tue, 27 Aug 2019 14:13:19 +0000 (16:13 +0200)]
Optimize ImmutableNodes.leafNode()

This eliminates instantiation of a temporary builder and shortcuts
to creating the leaf node directly.

Change-Id: I66256b46ef0de1aa3745bb90e70d41a2bd29d419
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoFix YangInstanceIdentifier.PathArgument definition 09/84009/1
Robert Varga [Tue, 27 Aug 2019 10:30:10 +0000 (12:30 +0200)]
Fix YangInstanceIdentifier.PathArgument definition

Javadoc and nullness guarantees do not match implementation behaviour,
align them.

Change-Id: Ifd981021a9261f06fc605d15d6790518e3915735
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoSwitch serialization format to NIPv2 55/82655/9
Robert Varga [Fri, 21 Jun 2019 23:51:14 +0000 (01:51 +0200)]
Switch serialization format to NIPv2

This format retains control over the entries being emitted,
so that we are in control of what implementation is being used
for retaining the entries. We adopt a reconstruction strategy,
where the maps are constructed the same way they are in production
code.

Change-Id: Ic08267c4b2424307a60d2fdccc9b6896c487c29a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoAdd utility PotentialSchemaSource constructor 86/83986/1
Robert Varga [Mon, 26 Aug 2019 12:32:46 +0000 (14:32 +0200)]
Add utility PotentialSchemaSource constructor

It is useful for users to use pre-defined acquisition costs, this
adds a utility so users do not have to call Costs.getValue().

Change-Id: Ib44352784076493a317dcee0aa64d108301a6305
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoCentralize serializeImpl() 66/83966/1
Robert Varga [Mon, 26 Aug 2019 09:15:13 +0000 (11:15 +0200)]
Centralize serializeImpl()

All subclasses of AbstractIntegerStringCodec are doing the same
thing in the serialization path, make sure we squash them to
the same implementation.

Change-Id: I98cc8738720ccf38a441a09a069dc48edb5b25ed
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoFix Serializer/Deserializer/Codec concepts 49/83949/9
Robert Varga [Fri, 23 Aug 2019 18:43:01 +0000 (20:43 +0200)]
Fix Serializer/Deserializer/Codec concepts

Base Codec/Serializer/Deserializer classes need to express the fact
the an implementation can throw an exception. This is important for
proper use of checked exception in implementation domains -- for example
it is natural to throw a XMLStreamException when executing in the
context of StAX streaming.

This prevents user surprises when an XML stream throws an unhandled
IAE exception. All implementations are converted with prejudice to
explicitly not allow null.

JIRA: YANGTOOLS-1017
Change-Id: I5d24a36028ae6aef5b244e13c5f9e8b0643f14f4
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoUpdate TypeDefinitionAwareCodec 48/83948/1
Robert Varga [Fri, 23 Aug 2019 19:30:14 +0000 (21:30 +0200)]
Update TypeDefinitionAwareCodec

Note that the factory can return null, annotate as such and document
that @Nullable should be eliminated.

Change-Id: I63c4703ef9b63ce1a7fccb70b32beb23398be748
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoFix a theoretical IM_BAD_CHECK_FOR_ODD 99/83899/1
Robert Varga [Thu, 22 Aug 2019 13:02:53 +0000 (15:02 +0200)]
Fix a theoretical IM_BAD_CHECK_FOR_ODD

While the size of a collection cannot be negative, this keeps
SpotBugs happy about the check.

Change-Id: Ic84a9f147b9d933efc66766617f6271fcf1eddc1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoRely on framework to unregister XPathParserFactory 98/83898/1
Robert Varga [Thu, 22 Aug 2019 12:57:38 +0000 (14:57 +0200)]
Rely on framework to unregister XPathParserFactory

This simplifies the code a bit while also squashing two SpotBug
violations.

Change-Id: Ie3f146568510a949e3c7d332c95c59b90f17c7b0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoEnable spotbugs in yang-model-export 97/83897/1
Robert Varga [Thu, 22 Aug 2019 12:44:39 +0000 (14:44 +0200)]
Enable spotbugs in yang-model-export

SpotBugs is getting confused by our use of checkArgument, not
understanding we will catch nulls. Refactor the code removing
the violation and remove enforcement override.

Change-Id: I787359c01f2761448cb4f3d33aea0baf5e642ed8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoRemome YinExportUtils.prefixToNamespace() 96/83896/1
Robert Varga [Thu, 22 Aug 2019 12:41:07 +0000 (14:41 +0200)]
Remome YinExportUtils.prefixToNamespace()

This method is correctly flagged as unused, remove it along with
getModuleNamespace() which is orphaned after its removal.

Change-Id: I3f410ef802a7e9c4dc89d5671fde775030683353
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoRemove unneeded spotbugs/checkstyle declarations 87/83887/2
Robert Varga [Thu, 22 Aug 2019 10:57:31 +0000 (12:57 +0200)]
Remove unneeded spotbugs/checkstyle declarations

checkstyle/spotbugs are enabled by default by odlparent, there is
no point in keeping these declarations.

Change-Id: I2852f8521457785afb70aee4ac379e099f6fb153
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoDisable SpotBugs enforcement on select artifacts 86/83886/3
Robert Varga [Thu, 22 Aug 2019 10:42:41 +0000 (12:42 +0200)]
Disable SpotBugs enforcement on select artifacts

odlparent has started enforcing SpotBugs by default, but some of
our artifacts are not ready for that. Disable enforcement through
the odlparent property and document why we are disabling it.

Change-Id: Ie8d3e43b26efd75e70223dde2b4555865ce25001
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoFix checkstyle 85/83885/3
Robert Varga [Thu, 22 Aug 2019 10:41:27 +0000 (12:41 +0200)]
Fix checkstyle

This fixes issues found by checkstyle.

Change-Id: Iecab9171c2d4d63cf564139c714a4552d069636b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoExpand MapAdaptor javadoc 92/83792/1
Robert Varga [Tue, 20 Aug 2019 12:17:21 +0000 (14:17 +0200)]
Expand MapAdaptor javadoc

This fixes a few warnings around javadoc completes of MapAdaptor.

Change-Id: I6bb7b6354530b4ad47a07b4b0358c720b80b4230
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoMake sure readOnly field is initialized 87/83787/3
Robert Varga [Tue, 20 Aug 2019 11:49:28 +0000 (13:49 +0200)]
Make sure readOnly field is initialized

Make sure the readOnly field is forced to be initialed to null
by making it a volatile.

Change-Id: I366835a8009fe6fe21992b374f959bfcefcde18e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoRelax read-only snapshot memory fencing 67/83767/1
Robert Varga [Mon, 19 Aug 2019 15:07:09 +0000 (17:07 +0200)]
Relax read-only snapshot memory fencing

With Java 9 we can use VarHandles to reduce memory ordering guarantees
from volatile to acquire/releases.

Use this facility to disconnect ReadOnlyTrieMap from other volatiles,
potentially helping the compiler to do a better job optimizing.

Change-Id: Ibd266a5a341bcdaae25702476610c10eeb0ea374
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoBump odlparent to 6.0.0-SNAPSHOT 83/83383/17
Robert Varga [Mon, 5 Aug 2019 09:27:39 +0000 (11:27 +0200)]
Bump odlparent to 6.0.0-SNAPSHOT

We will need some JDK11 work done, for that we'll use odlparent
snapshots for a while.

Due to MJAVADOC (and underlying JDK-8220702) we keep the target of
yang-data-impl and yang-parser-rfc7950 at 8.

Change-Id: I3da91a8a6b1dfd4cc40c7e0e9fdd527733da5331
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoGeneralize ForwardingIdentityObject 17/83717/3
Robert Varga [Fri, 16 Aug 2019 17:01:18 +0000 (19:01 +0200)]
Generalize ForwardingIdentityObject

Wrapping objects in identity comparison is useful, and there
seems to be no readily-avaible utility. This introduces an
extension to ForwardingObject and a simple utility class to
implement its construct.

JIRA: YANGTOOLS-1016
Change-Id: If0d7a2f731b0a294570f8ba39ce5da7236e2c752
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoFix schema-ref traversal 85/83685/1
Anna Bencurova [Thu, 15 Aug 2019 12:17:34 +0000 (14:17 +0200)]
Fix schema-ref traversal

When traversing schema-mount definitions, we need to account for
schema-ref being a choice and hence its children are not directly
reachable.

JIRA: YANGTOOLS-1015
Change-Id: Iaa9ddbf33c172c433cb323166e5b1bcea5eea649
Signed-off-by: Anna Bencurova <Anna.Bencurova@pantheon.tech>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoAdd @SuppressModernizer 15/83415/9
Robert Varga [Tue, 6 Aug 2019 08:42:49 +0000 (10:42 +0200)]
Add @SuppressModernizer

We are mucking with modernizable constructs on purpose, add
suppressions to keep modernizer quiet.

Change-Id: Ia25640be14f1943a976c4edda6247124986a9d15
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoRemove PrefixToModule.isPreLinkageMap() 08/83408/9
Robert Varga [Tue, 6 Aug 2019 07:24:24 +0000 (09:24 +0200)]
Remove PrefixToModule.isPreLinkageMap()

This property is not used anywhere, remove it.

Change-Id: I4e1674f5b4a00b68e6d3b40b62ebc2a3fcc95573
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoSwitch to using java.util.Base64 17/83417/5
Robert Varga [Tue, 6 Aug 2019 10:43:54 +0000 (12:43 +0200)]
Switch to using java.util.Base64

This follows modernizer recommendation of using java.util.Base64
instead of Guava's BaseEncoding.

Change-Id: I72a49503980fb615ce27d2e3d0a84cbb1b033236
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoAdd more modernization 20/83420/1
Robert Varga [Tue, 6 Aug 2019 11:16:15 +0000 (13:16 +0200)]
Add more modernization

This nails down a missed use of Lists.newArrayList(), fix that.

Change-Id: I0587e92bed503e642b1d003cb10a6947b98ff7a1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoApply modernization 14/83414/2
Robert Varga [Tue, 6 Aug 2019 08:39:43 +0000 (10:39 +0200)]
Apply modernization

This fixes up use of old constructs pointed out by maven modernizer
plugin.

Change-Id: I3f926678763f72b195ae961ce7f220a1845fef52
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoMove Decimal64.toInt() method 97/83397/4
Robert Varga [Mon, 5 Aug 2019 16:04:11 +0000 (18:04 +0200)]
Move Decimal64.toInt() method

This utility is only used in nested class, move it to keep SpotBugs
happy under Java 11.

Change-Id: I405718bf3db9ebcdd972ae5a71c47570c424f730
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoFix checkArgument constructor 04/83404/3
Robert Varga [Tue, 6 Aug 2019 06:23:59 +0000 (08:23 +0200)]
Fix checkArgument constructor

This adds a missing argument and removes the need for synthetic
accessors.

Change-Id: I7e293036b35b86c9ac555f2880747748b8c35443
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoFix stmt.compat Java 11 compilation 98/83398/4
Robert Varga [Mon, 5 Aug 2019 18:34:27 +0000 (20:34 +0200)]
Fix stmt.compat Java 11 compilation

Java 11 inference does not like the implicit cast, although it is
supposed to be safe. We do not really need it, remove it.

Change-Id: Ic2b89a523eb91cb86cd669dc9670c6acba214dca
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoFix checkstyle errors 96/83396/3
Robert Varga [Mon, 5 Aug 2019 14:14:49 +0000 (16:14 +0200)]
Fix checkstyle errors

Upgraded checkstyle plugin is finding some more errors, fix them
up.

Change-Id: Id58302b1dcd0574fa94340965c15259621a9156d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoBump odlparent to 5.0.2-SNAPSHOT 13/83413/1
Robert Varga [Tue, 6 Aug 2019 08:52:51 +0000 (10:52 +0200)]
Bump odlparent to 5.0.2-SNAPSHOT

This is an intermediate bump to fix javadoc/jdk11 issues.

Change-Id: I407c6e1712b304cef4d0a46e223094f16903e04a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoFix checkstyle errors 90/83390/1
Robert Varga [Mon, 5 Aug 2019 14:14:49 +0000 (16:14 +0200)]
Fix checkstyle errors

Upgraded checkstyle plugin is finding some more errors, fix them
up.

Change-Id: I755c73be82230cb1a1a22fd776322b7a1d2afc4f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoRemove javadoc plugin version override 82/83382/2
Robert Varga [Mon, 5 Aug 2019 09:25:58 +0000 (11:25 +0200)]
Remove javadoc plugin version override

odlparent is using a newer plugin, remove the unneeded override.

Change-Id: I6afb495233e3959364c45eb3189cabe20ebdcf5a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoRemove NodeIdentifierWithPredicates.getKeyValues() 03/82603/12
Robert Varga [Thu, 20 Jun 2019 13:52:01 +0000 (15:52 +0200)]
Remove NodeIdentifierWithPredicates.getKeyValues()

This method has been deprecated, with entrySet()/keySet() being
its replacements.

Change-Id: Ie1d2a61539fd86584aff9d6aea8d11f63f1908e1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoHide effective statement implementations 06/69206/20
Robert Varga [Wed, 7 Mar 2018 12:03:02 +0000 (13:03 +0100)]
Hide effective statement implementations

Remove deprecated tags and address the 3.0.0 guidance instructions,
hiding the implementation classes.

Change-Id: I42d2e580a513e02657fd7f927b025e329e067104
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoRemove public NodeIdentifierWithPredicates constructors 02/82602/11
Robert Varga [Thu, 20 Jun 2019 13:48:31 +0000 (15:48 +0200)]
Remove public NodeIdentifierWithPredicates constructors

This removes constructors in favor of static factory methods.

Change-Id: I0881f42ed2a0599bf48e0a84a9dcd06194f32f83
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoMake QName subclass AbstractQName 64/81064/8
Robert Varga [Thu, 21 Mar 2019 09:09:17 +0000 (10:09 +0100)]
Make QName subclass AbstractQName

This breaks serialization format compatibility with all versions
older than 3.0.0 by changing the QName class hierarchy.

JIRA: YANGTOOLS-970
Change-Id: I7e1b655ceb06186ca82f34b6c6d3f6adb12b30f8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoBump version to 4.0.0-SNAPSHOT 18/83318/1
Robert Varga [Tue, 30 Jul 2019 10:20:54 +0000 (12:20 +0200)]
Bump version to 4.0.0-SNAPSHOT

This starts next major version development.

Change-Id: I9c0ced5fc5341b432b3d206157f801d30d03f9b1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoTeach DataSchemaContextNode about anydata 03/83303/2
Robert Varga [Mon, 29 Jul 2019 15:25:54 +0000 (17:25 +0200)]
Teach DataSchemaContextNode about anydata

We failed to account for anydata nodes, which should behave the
same way as anyxml nodes.

Change-Id: Id8a2aff60921094e149f58c8b7bba1822587c96f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoBump version to 3.0.5-SNAPSHOT 93/83293/1
Robert Varga [Mon, 29 Jul 2019 09:10:20 +0000 (11:10 +0200)]
Bump version to 3.0.5-SNAPSHOT

This starts the next development iteration.

Change-Id: Iaf21895aadee2433c1bba42e0b3fa8097f4ae8e4
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoRevert "Check for nested augmentations" 91/83291/1
Robert Varga [Mon, 29 Jul 2019 08:41:59 +0000 (10:41 +0200)]
Revert "Check for nested augmentations"

This reverts commit 759e69d85991edb987a760165adb83fa3f2ab67b.

JIRA: YANGTOOLS-956
Change-Id: I3c80751043a101de77292bc91e0c1c4178d16f44
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoCheck for nested augmentations 45/81145/6
Robert Varga [Tue, 19 Feb 2019 10:22:49 +0000 (11:22 +0100)]
Check for nested augmentations

When we are augmenting an already-conditional-augmented node from
the same module, we should inherit the previous when statement.

JIRA: YANGTOOLS-956
Change-Id: Ia3c04d60f4975bd721406b26aa4c2e7d8b05122b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
4 years agoAdd support for writing mountpoints to JSON 55/83255/1
Robert Varga [Thu, 25 Jul 2019 15:59:35 +0000 (17:59 +0200)]
Add support for writing mountpoints to JSON

This adds basic support for emitting mountpoints into JSON documents,
as otherwise we cannot translate XML-to-JSON, which hampers the usual
use case of NETCONF-to-RESTCONF transformation.

JIRA: YANGTOOLS-1013
Change-Id: I9e29050384ba344804538d4155175908c9ed6697
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>