yangtools.git
8 years agoBUG-1485: remove holder for deprecated Class ranges 70/21370/9
Robert Varga [Thu, 28 May 2015 20:34:01 +0000 (22:34 +0200)]
BUG-1485: remove holder for deprecated Class ranges

With the switchover to new range checks, the static caching field is not
needed. We still retain compatibility with possible users out there, but
they are now responsible for caching the result.

Change-Id: I119615255559263f98fc382b324026c4f5d35cfc
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoBUG-1485: remove holder for deprecated Builder field ranges 69/21369/9
Robert Varga [Thu, 28 May 2015 20:05:51 +0000 (22:05 +0200)]
BUG-1485: remove holder for deprecated Builder field ranges

Caching the result was important as long as ranges were used internally,
now that they are not, do not retain them and re-generate them on each
call. Any callers out there are now responsible for caching them
themselves.

Change-Id: Idcba7fe54c59e33d6eedb6b596a2bf4f4a5ca10c
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoBUG-1485: switch BuilderTemplate to new range enforcement 68/21368/9
Robert Varga [Thu, 28 May 2015 19:33:18 +0000 (21:33 +0200)]
BUG-1485: switch BuilderTemplate to new range enforcement

This switches the template for builders to the new range enforcement
code.

Change-Id: I1368a6a6922b2e982b9f4274dca32cf73b888d4b
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoInvoke equals() on a constant reference 35/21335/2
Robert Varga [Thu, 28 May 2015 14:54:54 +0000 (16:54 +0200)]
Invoke equals() on a constant reference

Inverting how we perform the equality check makes it obvious that the
invoked method is bound to a specific class object, helping compiler
just a tiny bit.

Change-Id: Ia8209f50143b0c3af71a962ab2a3ab167396836f
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoBUG-1485: switch ClassTemplate to new range enformcement 74/21274/13
Robert Varga [Wed, 27 May 2015 20:00:18 +0000 (22:00 +0200)]
BUG-1485: switch ClassTemplate to new range enformcement

Switch range checks for simple classes (typedefs and similar) to the new
range checker. Also move printRangeConstraint() from BaseTemplate to
BuilderTemplate, as it ends up being used only there.

Change-Id: I16e4c1faf239d838ff415c0173ef3d06acc61701
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoBUG-1485: optimize primitive range checks 80/21380/4
Robert Varga [Thu, 28 May 2015 23:50:23 +0000 (01:50 +0200)]
BUG-1485: optimize primitive range checks

When we are dealing with a primitive type, we can force unboxing of the
type by declaring the range checker method's argument as the primitive
type. This will result in the stack not containing references for the
fast path (e.g. successful check) as well as reduce the number of
virtual calls to one. Checks will then be performed using primitive
manipulation instructions, which should result in better fast-path
execution.

The slow path will take a hit, as for throwing the exception, we will
end up re-boxing the primitive type.

Change-Id: I7e6b0e25790f9a43dc99f2fc7426bb9fe25c505c
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoBUG-1485: make AbstractRangeGenerator deal with GTOs 49/21349/6
Robert Varga [Thu, 28 May 2015 14:57:20 +0000 (16:57 +0200)]
BUG-1485: make AbstractRangeGenerator deal with GTOs

For enforcement of ranges in builders, we will need to deal with types
other than ConcreteType. Also clean up internal interfaces, add some
javadocs and remove some trailing whitespace.

Also perform Number class conversion silently if it does not result in
loss of precision. Emit a warning if it does.

Change-Id: I8f3ba96c104fb28f6d2cfc4b05b5d24bb7f80aa1
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoClarify GeneratedTransferObject.getSuperType() 48/21348/1
Robert Varga [Thu, 28 May 2015 15:23:27 +0000 (17:23 +0200)]
Clarify GeneratedTransferObject.getSuperType()

The Javadoc for this method is confusing and actually misleading.
Clarify it a bit for future's sake.

Change-Id: I52f09e2e9cf864dc00fb4883099ca4df5219327f
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoBUG-1485: deprecate public static range/length methods 85/21285/4
Robert Varga [Thu, 28 May 2015 00:46:35 +0000 (02:46 +0200)]
BUG-1485: deprecate public static range/length methods

These methods are not efficient and expose implementation internals.
Mark them as deprecated for removal. This mirrors the deprecation in
ClassTemplate, which was not instantiated before due to how the code is
structured.

Change-Id: I7fcb831f00fd3baab02e1f25e10655c8288c6d4e
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoMake sure we cache QNameModule instances 09/21309/3
Robert Varga [Thu, 28 May 2015 10:21:55 +0000 (12:21 +0200)]
Make sure we cache QNameModule instances

Parser should be taking advantege of cached QNameModules, as multiple
generations/independent instances within a JVM should still be sharing
them.

Change-Id: I3c670519056456f8c93591b1e8e24f095131fb9a
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoBaseTypes' QNameModule should be cached 08/21308/2
Robert Varga [Thu, 28 May 2015 10:24:08 +0000 (12:24 +0200)]
BaseTypes' QNameModule should be cached

This QNameModule may be incoming from multiple places, make sure we seed
it into the cache on load.

Change-Id: I764edf3520a37d853eff519ca4139dc2f60480b3
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoBUG-1485: move generateLengthMethod to BuilderTemplate 84/21284/3
Robert Varga [Thu, 28 May 2015 00:26:42 +0000 (02:26 +0200)]
BUG-1485: move generateLengthMethod to BuilderTemplate

While it looks this method is shared, it is not, as ClassTemplate
defines its own. Move it to BuilderTemplate and make it private,
reducing confusion.

Change-Id: I998f200a963dea39b1e2fedaf7a9fd1e394db58d
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoBUG-1485: move *Range* methods to BuilderTemplate 83/21283/3
Robert Varga [Thu, 28 May 2015 00:14:29 +0000 (02:14 +0200)]
BUG-1485: move *Range* methods to BuilderTemplate

printRangeConstraint and generateRangeMethod are used by BuilderTemplate
only, move them there to preserve locality and stop them from spreading.

Change-Id: I5d5421b50bd5e4ac65182ad1a11e7bfad199df51
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoMake test utilities static 91/21291/2
Robert Varga [Thu, 28 May 2015 01:59:22 +0000 (03:59 +0200)]
Make test utilities static

These two can be static, make them static.

Change-Id: I3fe54607edbadea4250928e99260906cbaef4629
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoBUG-1485: Move restriction generation 73/21273/2
Robert Varga [Wed, 27 May 2015 19:24:59 +0000 (21:24 +0200)]
BUG-1485: Move restriction generation

It is only used in the class template, so move it and make it private to
increase clarity.

Change-Id: I751c4a5a0af06dd89a79ce43546ec9c12490f166
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoBUG-3399: fix BaseYangTypes' range constraints 72/21272/2
Robert Varga [Wed, 27 May 2015 23:06:14 +0000 (01:06 +0200)]
BUG-3399: fix BaseYangTypes' range constraints

Constraints Number type should match the Java type a particular type is
bound to. Users dealing with values trying to correlate it to the
metadata available can then rely on things like
value.getClass.cast(rangeMin) just working instead of concocting
conversions to deal with all possible combinations of types.

Also changes BaseConstraints to enforce the two components of a
constraint being the same type, preventing things like min being Integer
while max is a Long.

Change-Id: I38e646b4c08b032248349f3e618354aa2114efd3
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoBUG-1485: Introduce AbstractRangeGenerator and friends 64/21164/3
Robert Varga [Tue, 26 May 2015 20:49:36 +0000 (22:49 +0200)]
BUG-1485: Introduce AbstractRangeGenerator and friends

Adds utility classes for dealing with various range constraints in
generated code. These classes are implemented in pure Java and attempt
to make sure generated code runs as efficiently as possible.

Change-Id: Ie1d05b514937507e225b9bc7559b1949a7e6eb76
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoBUG-1485: store patterns in an array 63/21163/4
Robert Varga [Tue, 26 May 2015 18:32:20 +0000 (20:32 +0200)]
BUG-1485: store patterns in an array

Internal compiled patters are only ever iterated over, hence there is no
need to store them in a list. Convert the field into an array, improving
both CPU and memory efficiency very slightly. Also saves instantiation
of a temporary list.

Change-Id: I5140bc81d0a78d4f91d4ad2d6f81cbd6ed1f6d55
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoBUG 2970 : Throw a specific exception when schema validation fails 18/21018/4
Moiz Raja [Sat, 23 May 2015 00:46:00 +0000 (17:46 -0700)]
BUG 2970 : Throw a specific exception when schema validation fails

When resolving a modification if there is a failure in validating
a data node because it's schema is not present we should throw
a specific exception instead of just an IllegalArgument exception.

This specific exception can be used by CDS to determine if the failure
to add a node was due to a schema validation failure and then we will
attempt to prune data from the normalized node so that the invalid
data elements are removed.

Change-Id: Ieba347c29a9e92ea6aa7ccc2570935cd7a233b8e
Signed-off-by: Moiz Raja <moraja@cisco.com>
8 years agoDo not instantiate augmentation HashMap in DTO builders 62/21162/2
Robert Varga [Tue, 26 May 2015 22:18:57 +0000 (00:18 +0200)]
Do not instantiate augmentation HashMap in DTO builders

Tracing has revealed that the OpenFlowPlugin creates a lot of builders,
instantiation a million HashMaps, which accounts for 1% of CPU time.
Most of these maps are never touched, so we can easily optimize this
away by lazily instantiating a HashMap when the first augmentation is
added. Also prevents copying of empty augmentation in the copy
constructor.

Change-Id: I592fe6af65c9f3b65038def8bb4069666bfdc375
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoAllow instantiation of more efficient RpcServiceInvokers 20/21220/4
Robert Varga [Wed, 27 May 2015 10:54:03 +0000 (12:54 +0200)]
Allow instantiation of more efficient RpcServiceInvokers

Current invoker derived from binding class has the downside of
performing localName->methodName conversion on each invocation, which
costs us in the lookup path, as deriving the binding method name is a
costly operation.

Add a new static factory method for creating a RpcServiceInvoker
instance base on a QName->Method map. Provide two additional
implementations: a generic one, which performs a direct lookup in the
map and a specialized one, which performs lookup only on the localName
part of the qname. The latter is used after we have made sure all QNames
come from the same QNameModule.

Change-Id: I6a4b33f0487838b3ae6c15470823e4bc01114aa5
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoOptimize binding InstanceIdentifier methods 31/21131/2
Robert Varga [Tue, 26 May 2015 13:09:00 +0000 (15:09 +0200)]
Optimize binding InstanceIdentifier methods

Openflow traces show some overhead from UnmodifiableIterable. As it
turns out, we are instantiating them needlessly for internal iteration.
This stems from accessing getPathArguments() instead of pathArguments,
which are exposed precisely for this optimization.

Make sure to access pathArguments directly, eliminating this overhead.

Change-Id: I3ef053baa35c80f555b6b9f0b8813692236afa48
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoBug 2988 - DTO equality appears to be broken by proxy 01/21101/1
Martin Bobak [Mon, 25 May 2015 13:09:01 +0000 (15:09 +0200)]
Bug 2988 - DTO equality appears to be broken by proxy

Change-Id: Ib068be34371e8863ef6f2ef8d936d3d6918aba37
Signed-off-by: Martin Bobak <mbobak@cisco.com>
8 years agoBug 3325 - RPC returns 500. 75/20975/2
Jan Hajnar [Fri, 22 May 2015 11:02:03 +0000 (13:02 +0200)]
Bug 3325 - RPC returns 500.

* added original schema node resolution to getBaseTypeForLeafRef method
(we need to resolve leafref nodes added by grouping  according
to original module)

Change-Id: I80bf350cc442e966986c57ab2a352939a9f687a9
Signed-off-by: Jan Hajnar <jhajnar@cisco.com>
8 years agoSpeed up getModifiedChild() 46/20846/6
Robert Varga [Wed, 20 May 2015 19:44:29 +0000 (21:44 +0200)]
Speed up getModifiedChild()

As it turns out, the original implementation transformed all children
before performing a lookup. Methods involved in that conversion can be
easily applied to transform a single child, so address the FIXME by
first performing a lookup and then running transformation, if
appropriate.

Change-Id: I11a87a69ce3e8552926017c51db7d4899af74a2a
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoTake advantage of YangInstanceIdentifier methods 05/21005/2
Robert Varga [Fri, 22 May 2015 16:45:02 +0000 (18:45 +0200)]
Take advantage of YangInstanceIdentifier methods

getPathArguments() returns a list, so we can ditch Iterables.

Change-Id: I5f83a46505bdea0c0b89d634a8b5e708b95a96bd
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoAdd stable/lithium as the default branch in gitreview 17/21017/1
Moiz Raja [Sat, 23 May 2015 00:51:22 +0000 (17:51 -0700)]
Add stable/lithium as the default branch in gitreview

This patch should not be merged to master

Change-Id: Id27cc60559712e373382c27d43702fe9284afbb8
Signed-off-by: Moiz Raja <moraja@cisco.com>
8 years agoMark mAbstractModifiedNodeBasedCandidateNode final 48/20848/2
Robert Varga [Wed, 20 May 2015 20:06:22 +0000 (22:06 +0200)]
Mark mAbstractModifiedNodeBasedCandidateNode final

These methods are not to be overridden, so mark them as final.

Change-Id: Ibce6eb5f54b0e1730767b8a9d7c142f784649516
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoMake optionalData() static 47/20847/4
Robert Varga [Wed, 20 May 2015 19:55:40 +0000 (21:55 +0200)]
Make optionalData() static

This private utility method does not touch the object, hence make it
static.

Change-Id: Ifc50b713792cd3e8096173dbdaf3cdb41b9f42e2
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoGuard against null data in AbstractLeafCandidateNode 45/20845/2
Robert Varga [Wed, 20 May 2015 19:56:22 +0000 (21:56 +0200)]
Guard against null data in AbstractLeafCandidateNode

An instance of this class is defunct if data is ever null, as accessors
will throw a NPE from Optional.of(). Make sure data passed down is never
null, catching any possible offenders.

This transitively fixes the transformation functions, as they will throw
NPE when they get a null input, as per Function API contract.

Change-Id: I8851e3c68dc9aa5abab4874f019fd214b20c0415
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBug 3189 Special case of checking root node QName. 72/20772/4
Tony Tkacik [Wed, 20 May 2015 08:23:14 +0000 (10:23 +0200)]
Bug 3189 Special case of checking root node QName.

Root instance identifier is special in that it does not have a path
argument.

Change-Id: I59d699b786b3ce117511785dc4f8227ca86057f2
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-3189: Check consistency of Instance Identifier and Data 25/20225/4
Tony Tkacik [Wed, 13 May 2015 09:23:27 +0000 (11:23 +0200)]
BUG-3189: Check consistency of Instance Identifier and Data

DataTree allows for a NormalizedNode to be stored at a position which is
inconsistent with its identifier. This can lead to weird errors, as
child metadata nodes are created. Add an explicit check to ensure this
cannot occur.

Change-Id: I25918f1f866beadb1ba7c9687ba1a880942a0d9e
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoBUG-3263: remove bridge Collection-based methods 05/20705/1
Robert Varga [Tue, 19 May 2015 08:57:24 +0000 (10:57 +0200)]
BUG-3263: remove bridge Collection-based methods

This class and its methods were used in transition on Lithium and are no
longer needed, so remove them.

Change-Id: I2e67d173f87b409803e46861b77aa165784444e0
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-3263: return a List of PathArguments 86/20686/11
Robert Varga [Mon, 18 May 2015 23:05:42 +0000 (01:05 +0200)]
BUG-3263: return a List of PathArguments

This is a further improvement to the interface, we return a List of path
arguments for both getPathArguments() and getReversePathArguments().
This makes it possible for StackedYangInstanceIdentifier to not retain a
legacy list of path arguments.

Change-Id: I98ebc2bec139a0e02b4a428bc783ea23981e3658
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-3263: return a Collection for path arguments 85/20685/10
Robert Varga [Mon, 18 May 2015 22:29:06 +0000 (00:29 +0200)]
BUG-3263: return a Collection for path arguments

With the rework in place, we can now return a Collection from both
getPathArguments() and getReversePathArguments() even in the stacked
case.

Change-Id: I51179320022f060d9fb2597f473d0919d391092c
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-3263: Split off Fixed/Stacked YangInstanceIdentifier 84/20684/6
Robert Varga [Mon, 18 May 2015 19:03:09 +0000 (21:03 +0200)]
BUG-3263: Split off Fixed/Stacked YangInstanceIdentifier

This patch makes YangInstanceIdentifier an abstract class, with two
subclasses: FixedYangInstanceIdentifier and
StackedYangInstanceIdentifier.

The fixed version uses an internal ImmutableList and derives efficiency
from it to the maximum extent allowed.

The stacked version stores a reference to the parent identifier and the
last path argument. It caches the support classes which provide
getPathArguments and getReversePathArguments.

Also introduce a getParent() method, as it can now be implemented
efficiently.

Change-Id: I0c4a771e74d031cae0b53a7f97221213222729f6
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-3263: Split out YangInstanceIdentifierBuilder 83/20683/2
Robert Varga [Mon, 18 May 2015 18:29:20 +0000 (20:29 +0200)]
BUG-3263: Split out YangInstanceIdentifierBuilder

The builder is not visible, so increase clarity by splitting it out into
its own file. This reduces clutter in YangInstanceIdentifier.

Change-Id: I9c3bcd141e54129777f0c8dd8efd7ce02ae5e8cc
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoDo not instantiate objects for hash values 43/20543/2
Robert Varga [Fri, 15 May 2015 17:06:17 +0000 (19:06 +0200)]
Do not instantiate objects for hash values

While having a reference saves us from having an additional field, it will
cost us an additional object overhead once it is materialized. Opt for a
primitive type with a volatile guard.

Change-Id: Ib3a71eb9d00555f3929d8bc104a5065d0252561e
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-2453 Add enum yang <-> Java mapping support to BindingRuntimeContext 26/20026/3
Maros Marsalek [Mon, 11 May 2015 14:40:26 +0000 (16:40 +0200)]
BUG-2453 Add enum yang <-> Java mapping support to BindingRuntimeContext

BindingRuntimeContext already posses the information about all generated classes
from yang (also enums). This commit makes it public.

Change-Id: I141d6206de80663a9f4f84e9260e107557f5650e
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoBUG-2453 Remove custom hashcode/equals from Enum type 98/19798/3
Maros Marsalek [Thu, 7 May 2015 12:12:17 +0000 (14:12 +0200)]
BUG-2453 Remove custom hashcode/equals from Enum type

Custom hashcode and equals made it impossible to match Enum types based on
packageName and name.

Change-Id: I0f5f326cba5073e08b6d2b1d5ff6d5c19f08bf68
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoAdd an explicit guard for root presence 93/19693/3
Robert Varga [Wed, 6 May 2015 09:57:35 +0000 (11:57 +0200)]
Add an explicit guard for root presence

A modification could potentially remove the root node, which would
trigger a failure in Optional.get(). Add an explicit check to provide
better diagnostic in that case.

Change-Id: I0e27910497169a080aa8185c66f65c9639ccf2e7
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoAdd an explicit guard to child modifications 92/19692/3
Robert Varga [Wed, 6 May 2015 09:45:46 +0000 (11:45 +0200)]
Add an explicit guard to child modifications

If we attempt to apply a merge operation to a non-existent child, we may
end up throwing an IllegalStateException stemming from unchecked
Optional.get().

Add an explicit argument check for child node presence to provide better
diagnostics.

Change-Id: I9e319aa994f01b97a14d5499fba6b1c33dad9a63
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoClarify the correctness of Optional.get() 91/19691/3
Robert Varga [Wed, 6 May 2015 09:37:58 +0000 (11:37 +0200)]
Clarify the correctness of Optional.get()

The check of Optional.isPresent() exists in all codepaths, but it is not
immediately obvious. Make it more explicit.

Change-Id: I73b6931299ee8cd8e40d0331acc6d6e753db8612
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG 2973 - correction of output for empty yang type 04/20104/3
Jozef Gloncak [Thu, 18 Dec 2014 14:08:49 +0000 (15:08 +0100)]
BUG 2973 - correction of output for empty yang type

Empty" type supports (de)serializiation from
JSON array with null ( [null] ) as was specified in
Section 3.3.9 of draft-lhotka-netmod-yang-json-02

Change-Id: I6650893c00212828cd771e477b81811917000713
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoBug 2333 - Java code generation error, when yang model contains Choice node 84/19784/2
pkajsa [Thu, 13 Nov 2014 13:51:20 +0000 (14:51 +0100)]
Bug 2333 - Java code generation error, when yang model contains Choice node
in module body at top level

BindingGeneratorImpl fails (NoSuchElementException) during java source code
generation from yang model which contains Choice node directly in module body
at top level. The parent path of Choice node is empty (because the parent
is the module) and therefore iterator.next() on the path fails. For more
information see Bug 2333.

Change-Id: I6e617eca91bb5d8d2b91ad058a4df5c2793ec81d
Signed-off-by: pkajsa <pkajsa@cisco.com>
(cherry picked from commit 9af32f6d5f9da9f384d491e5066ea2423763e9c9)

9 years agoBug 3016 : This manual serialization of ImmutableList was done because in routed... 92/20092/1
Harman Singh [Thu, 30 Apr 2015 21:37:25 +0000 (14:37 -0700)]
Bug 3016 : This manual serialization of ImmutableList was done because in routed rpc,
remote server was not able to deserialize the object in AKKA messages properly.
Following exception was thrown:

ERROR Remoting - cannot assign instance of com.google.common.collect.RegularImmutableList
to field org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.legacyPath of type
com.google.common.collect.ImmutableList in instance of org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier

Change-Id: I74daf7ab5a6d4c164bb87b1bebc5f4e2dffb8753
Signed-off-by: Harman Singh <harmasin@cisco.com>
(cherry picked from commit 63c9eb4f3bd1a50b6841bbfebb53c1443e5e6ff4)

9 years agoBug 3151: Fix Not a Proxy Instance Exception 12/19812/1
Thomas Bachman [Thu, 7 May 2015 15:07:52 +0000 (11:07 -0400)]
Bug 3151: Fix Not a Proxy Instance Exception

This fixes a bug where a "Not a Proxy Instance"
exception (also IllegalArgumentException) is thrown
when hashCode is invoked in a yangtools generated
builder.

Change-Id: Icb96311f2c0c77dc8ba1377279de18b0db3886d1
Signed-off-by: Thomas Bachman <tbachman@yahoo.com>
9 years agoBug 2690 - Yang-Data-Impl: write and then merge on same list in 09/19709/2
Jan Hajnar [Mon, 27 Apr 2015 12:29:09 +0000 (14:29 +0200)]
Bug 2690 - Yang-Data-Impl: write and then merge on same list in
modification produces incorrect result

* added check for previous WRITE operation in recursiveMerge().
If there is some WRITE operation before MERGE we create new WRITE
operations for children => our data created by WRITE won't be
overwritten by merge on container/list.
* These children WRITE transactions will be recursively pushed down in the tree
while there are merge operations on them

Change-Id: Ie346c61c52cb000ee950d137f39d42e1ead3e1ff
Signed-off-by: Jan Hajnar <jhajnar@cisco.com>
(cherry picked from commit 2d7548bb1ebb925625358da86fba0831cd9b73ad)

9 years agoBug 2988: Fixed incorrect hashCode computation. 08/19708/1
Tony Tkacik [Wed, 6 May 2015 12:33:43 +0000 (14:33 +0200)]
Bug 2988: Fixed incorrect hashCode computation.

Change-Id: I550d59beece68e4d059d701b9022f9229dcfddc0
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoRevert Merge "Bug 2366: new parser - Types & TypeDefs" 76/19676/1
Tony Tkacik [Wed, 6 May 2015 07:28:34 +0000 (09:28 +0200)]
Revert Merge "Bug 2366: new parser - Types & TypeDefs"

Merge was accicendal merge to stable/lithium of patchset
which was parented of bumped master branch.

This reverts commit 8e74c9eb051ac2a8fba46f4be4244c2fd94bff8d,
reversing changes made to e7cc8bba266afa3ce1934f8f2b64e5ae662434d0.

Change-Id: If8caf19b5ba8a3de4a1a06843211821d0e7a102d
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoBug 3067: Fixed missing argument in message. 82/19582/1
Tony Tkacik [Tue, 5 May 2015 09:25:19 +0000 (09:25 +0000)]
Bug 3067: Fixed missing argument in message.

Change-Id: I60b39cb286635fb51d747f15ca9d416823269bae
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoMerge "Bug 2366: new parser - Types & TypeDefs support & resolution implemented Ident...
Tony Tkacik [Mon, 4 May 2015 13:03:41 +0000 (13:03 +0000)]
Merge "Bug 2366: new parser - Types & TypeDefs support & resolution implemented Identity, IdentityRef support & resolution preparation Minor sonar issues fixed Some of effective statements related to types implemented" into stable/lithium

9 years agoFix benchmark to compile on JDK8 06/19506/1
Robert Varga [Sun, 3 May 2015 07:43:18 +0000 (09:43 +0200)]
Fix benchmark to compile on JDK8

Since we do not compile benchmarks by default, this part was skipped
when we fixed javadocs.

Change-Id: I22768608bae94f0ab8cecdbd86b661c8a58010ea
Signed-off-by: Robert Varga <rovarga@cisco.com>
(cherry picked from commit 37afff4ffbc6aa13b69a3d0f133a63194845fbdf)

9 years agoMerge "Bug 2983 - Throws ResultAlreadySet instead of IllegalStateException" into...
Robert Varga [Mon, 4 May 2015 07:37:58 +0000 (07:37 +0000)]
Merge "Bug 2983 - Throws ResultAlreadySet instead of IllegalStateException" into stable/lithium

9 years agoMerge "BUG-2882: introduce cursor-based modification API" into stable/lithium
Robert Varga [Mon, 4 May 2015 07:37:16 +0000 (07:37 +0000)]
Merge "BUG-2882: introduce cursor-based modification API" into stable/lithium

9 years agoMerge "Bug 3067: Improved error reporting in Binding Data Codec" into stable/lithium
Robert Varga [Thu, 30 Apr 2015 23:38:47 +0000 (23:38 +0000)]
Merge "Bug 3067: Improved error reporting in Binding Data Codec" into stable/lithium

9 years agoBug 2366: new parser - Types & TypeDefs support & resolution implemented 86/19386/1
Martin Ciglan [Fri, 24 Apr 2015 09:24:54 +0000 (11:24 +0200)]
Bug 2366: new parser - Types & TypeDefs support & resolution implemented
Identity, IdentityRef support & resolution preparation
Minor sonar issues fixed
Some of effective statements related to types implemented

Change-Id: I7efeb36e5eb103014fc07ba20ab245332eb53c7b
Signed-off-by: Martin Ciglan <mciglan@cisco.com>
9 years agoBug 2983 - Throws ResultAlreadySet instead of IllegalStateException 82/19382/1
Jan Hajnar [Wed, 22 Apr 2015 14:11:32 +0000 (16:11 +0200)]
Bug 2983 - Throws ResultAlreadySet instead of IllegalStateException

* added custom exception when trying to set NormalizedNodeResult
* added more descriptive error when getting NormalizedNodeResult already
set exception

Change-Id: I35beffc79a4951134ba64c07ad1ed627b431031b
Signed-off-by: Jan Hajnar <jhajnar@cisco.com>
(cherry picked from commit 7974d0f2bc2e3182cc521bbab543450dbdb7af83)

9 years agoBug 3067: Improved error reporting in Binding Data Codec 01/19301/3
Tony Tkacik [Wed, 29 Apr 2015 13:35:08 +0000 (15:35 +0200)]
Bug 3067: Improved error reporting in Binding Data Codec

Error reporting in Binding Data Codec was reworked
to throw three additional subclasses of IllegalArgumentException
for specific case of failure:

MissingSchema and MissingSchemaForClass - exception thrown
when schema context associated with codec does not contain
models for supplied class or DOM argument.

IncorrectNesting is thrown when schema is available an user
constructed data with invalid nesting (bypassed generic
compile-time checks).

The checks to determine type of exception are done only
if error condition is detected, so non-error fast path
should not be affected by advanced checks.

Added test which tests these types of exceptions.

Change-Id: Iad020a42317ab46df4d2240568fd6e8205383857
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoMerge "Cleanup some major sonar warning in yang/*"
Robert Varga [Tue, 28 Apr 2015 19:22:56 +0000 (19:22 +0000)]
Merge "Cleanup some major sonar warning in yang/*"

9 years agoMerge "Bumped Checkstyle to 6.1.1 to be in sync with Maven plugin."
Robert Varga [Tue, 28 Apr 2015 19:08:26 +0000 (19:08 +0000)]
Merge "Bumped Checkstyle to 6.1.1 to be in sync with Maven plugin."

9 years agoAdd hooking into NormalizedNodeParsers. 25/19225/2
Tomas Cere [Tue, 28 Apr 2015 12:35:13 +0000 (14:35 +0200)]
Add hooking into NormalizedNodeParsers.

Makes it possible to add a ParsingStrategy into the parsers,
to allow for callbacks/custom processing while parsing.
DefaultParsingStrategy has the same behaviour as the already present parsers.

Change-Id: I5998af4befaf31d3af3f4cf5e2f46ddc32b1e05b
Signed-off-by: Tomas Cere <tcere@cisco.com>
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoBumped Checkstyle to 6.1.1 to be in sync with Maven plugin. 07/19207/1
Tony Tkacik [Tue, 28 Apr 2015 12:31:22 +0000 (14:31 +0200)]
Bumped Checkstyle to 6.1.1 to be in sync with Maven plugin.

Checkstyle checks needs to be in sync with Checkstyle maven
plugin due to static final constants, which were not
preserved between 2.14 and 2.15 which resulted in
NullPointerExceptions.

Change-Id: I043a9b8bf196b44636f3496e5fd65efce9eccc80
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoCleanup some major sonar warning in yang/* 35/19135/1
Tony Tkacik [Mon, 27 Apr 2015 09:11:03 +0000 (09:11 +0000)]
Cleanup some major sonar warning in yang/*

Change-Id: I7d300fbb5521a3fcad6dea8ceea96eb9a5419fa9
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoBUG-2882: introduce cursor-based modification API 29/19129/1
Robert Varga [Sun, 19 Apr 2015 02:36:43 +0000 (04:36 +0200)]
BUG-2882: introduce cursor-based modification API

This patch introduces the notion of a DataTreeSnapshotCursor and a
DataTreeModificationCurser as its mutating variant. The use of cursors
can lean to potential savings when applying multiple operations which
share a common root nested deeper in the data tree.

Change-Id: Iaed2c3d2d0260c97f4dfa36410b1c0944ba37c6c
Signed-off-by: Robert Varga <rovarga@cisco.com>
(cherry picked from commit ccb71b5a08b7a6d5d03b21492c1e8f968c434a22)

9 years agoBUG-2882: introduce cursor-based modification API 95/18595/15
Robert Varga [Sun, 19 Apr 2015 02:36:43 +0000 (04:36 +0200)]
BUG-2882: introduce cursor-based modification API

This patch introduces the notion of a DataTreeSnapshotCursor and a
DataTreeModificationCurser as its mutating variant. The use of cursors
can lean to potential savings when applying multiple operations which
share a common root nested deeper in the data tree.

Change-Id: Iaed2c3d2d0260c97f4dfa36410b1c0944ba37c6c
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "Bug 3051: Fixed pattern checks in generated DTOs"
Robert Varga [Fri, 24 Apr 2015 11:03:54 +0000 (11:03 +0000)]
Merge "Bug 3051: Fixed pattern checks in generated DTOs"

9 years agoBumped model versions to .8-SNAPSHOT 84/18984/1
Tony Tkacik [Fri, 24 Apr 2015 08:37:21 +0000 (10:37 +0200)]
Bumped model versions to .8-SNAPSHOT

Change-Id: I1b1c6c3fcd875795f2b8cab1d4146b25c87ee7e7
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoBumped Yangtools by minor version. 06/18906/2
Tony Tkacik [Thu, 23 Apr 2015 10:03:12 +0000 (10:03 +0000)]
Bumped Yangtools by minor version.

Change-Id: I0c357c757ed78607982abfbf788433e16c88835c
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoMerge "Bug 2363, Bug 2205. Beta version of LeafRefContext tree computation"
Tony Tkacik [Thu, 23 Apr 2015 19:37:19 +0000 (19:37 +0000)]
Merge "Bug 2363, Bug 2205. Beta version of LeafRefContext tree computation"

9 years agoBug 2363, Bug 2205. Beta version of LeafRefContext tree computation 91/14891/19
Peter Kajsa [Wed, 4 Feb 2015 09:06:09 +0000 (10:06 +0100)]
Bug 2363, Bug 2205. Beta version of LeafRefContext tree computation

beta version of DataTree leafrefs values validation

Currently works (Bug 2363):

- LeafRefContext tree build with all relations:
          - isReferencing/ hasReferencingChild
          - isReferenced/ hasReferencedChild
          - leafref target node -> leafref source nodes
- validation of LeafRef Path and Predicates syntax according to RFC6020
  specification
- parsing of all LeafRef Path components (i.e.: LeafRef absolute/relative
  target path, path Predicates, key path expressions) into LeafRefPath
  instance
- pack of utils methods over LeafRefContext tree
- a couple of simple tests

Currently works (Bug 2205):

- validation of LeafRefs values and LeafRefs targets for WRITE, MERGE and
  DELETE operations
- leafref path predicates evaluation (also multiple)

Currently known issues (Bug 2363):

- improve leafref identification, also for cases when type of the leaf is
  typedef -> typedef -> etc.. -> leafref
- handle also choices without case
- questionable issue is, whether it is necessary to merge referencing and
  referencedBy subtrees under the root context (currently are not)
- in equals method check also for predicates equality
- test the solution

Currently known issues (Bug 2205):
- handle also UnkeyedLists
- perfrom further testing
- increase unit tests coverage
- add tests for special cases.

Change-Id: Id873fb446fe40855993fe00e6a56f82d3daee491
Signed-off-by: Peter Kajsa <pkajsa@cisco.com>
9 years agoBug 2366: new parser API extensions support implemented 21/18421/7
Gregor Zatko [Thu, 23 Apr 2015 06:58:18 +0000 (08:58 +0200)]
Bug 2366: new parser API extensions support implemented

Change-Id: Ic8b25287a5e79b6c95e40eb65f7f305e9ba41145
Signed-off-by: Martin Ciglan <mciglan@cisco.com>
Signed-off-by: Gregor Zatko <gzatko@cisco.com>
9 years agoBug 3051: Fixed pattern checks in generated DTOs 22/18922/1
Tony Tkacik [Thu, 23 Apr 2015 15:13:36 +0000 (17:13 +0200)]
Bug 3051: Fixed pattern checks in generated DTOs

Pattern checks in generated DTOs were generated as
OR checks in case model type specified multiple
patterns, but correct behaviour is to do AND.

So in order string needs to verified against
all patterns and match all of them.

Change-Id: If82e282312c82dd71de79534c7fa599fcdcefab4
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoExpose YangInstanceIdentifier.EMPTY 16/18916/1
Robert Varga [Thu, 23 Apr 2015 13:01:20 +0000 (15:01 +0200)]
Expose YangInstanceIdentifier.EMPTY

Quite a few users have custom-made versions of this field. Expose it as
an API element.

Change-Id: I2e77b6bc7751b8e4be92df139c9b1cf782328414
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoSchemaAwareApplyOperation.checkDeleteApplicable() can be static 56/18856/4
Robert Varga [Wed, 22 Apr 2015 15:33:37 +0000 (17:33 +0200)]
SchemaAwareApplyOperation.checkDeleteApplicable() can be static

This method does not touch local state, so make it static.

Change-Id: I973fb25e4989c7969ddb5df18e2d683d2cbc15ef
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoDump the modification which fails to produce a root node 55/18855/4
Robert Varga [Wed, 22 Apr 2015 15:32:47 +0000 (17:32 +0200)]
Dump the modification which fails to produce a root node

For CDS implementation, there seems to be a bug where we fail to create
an appropriate changeset. Also be sure to send debug on how the
candidate is being applied.

Change-Id: Ie0eccd831169ff42c002851633926713dba20c74
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoFixed thread-safety issue in YANG parser. 08/18908/1
Tony Tkacik [Thu, 23 Apr 2015 10:27:19 +0000 (12:27 +0200)]
Fixed thread-safety issue in YANG parser.

Change-Id: I9a83ecb316528ee99bc1905ea1d2e7e3f61f11e3
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoMerge "Fix missing format placeholder"
Tony Tkacik [Wed, 22 Apr 2015 18:28:43 +0000 (18:28 +0000)]
Merge "Fix missing format placeholder"

9 years agoMerge "Add parser support for non-strict schema lookup."
Tony Tkacik [Wed, 22 Apr 2015 18:28:10 +0000 (18:28 +0000)]
Merge "Add parser support for non-strict schema lookup."

9 years agoMerge "Introduce InstanceIdToNodes into yang-data-impl"
Tony Tkacik [Wed, 22 Apr 2015 18:25:56 +0000 (18:25 +0000)]
Merge "Introduce InstanceIdToNodes into yang-data-impl"

9 years agoSonar issues clean-up 45/18745/5
Gregor Zatko [Wed, 22 Apr 2015 13:56:11 +0000 (15:56 +0200)]
Sonar issues clean-up

Change-Id: I9267a5e8dc8347f04a04977043b558369e35670b
Signed-off-by: Gregor Zatko <gzatko@cisco.com>
9 years agoMerge "tests for arguments parsing parsing Augment in Uses (except extensions)"
Tony Tkacik [Wed, 22 Apr 2015 15:54:40 +0000 (15:54 +0000)]
Merge "tests for arguments parsing parsing Augment in Uses (except extensions)"

9 years agoMerge "Fix ifelse curly braces"
Tony Tkacik [Wed, 22 Apr 2015 15:53:39 +0000 (15:53 +0000)]
Merge "Fix ifelse curly braces"

9 years agoMerge "Fixing findbugs"
Tony Tkacik [Wed, 22 Apr 2015 15:52:02 +0000 (15:52 +0000)]
Merge "Fixing findbugs"

9 years agoIntroduce InstanceIdToNodes into yang-data-impl 41/18741/6
Maros Marsalek [Tue, 21 Apr 2015 12:15:19 +0000 (14:15 +0200)]
Introduce InstanceIdToNodes into yang-data-impl

This utility class transforms instance identifier into a normalized node
structure. Suitable for netconf/restconf protocols.

Change-Id: Ib91afe858ee1d5871dd20222b4a8dba56664df73
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoAdd parser support for non-strict schema lookup. 51/18851/1
Tomas Cere [Wed, 22 Apr 2015 14:44:02 +0000 (16:44 +0200)]
Add parser support for non-strict schema lookup.

If parsers are in non-strict mode they will ignore parsing
any node that fails schema lookup.

Change-Id: I61fa05a2607477a7378952d8a88283f2ca98a13c
Signed-off-by: Tomas Cere <tcere@cisco.com>
9 years agoMerge changes I7c9bd36f,I09573668
Tony Tkacik [Wed, 22 Apr 2015 13:26:57 +0000 (13:26 +0000)]
Merge changes I7c9bd36f,I09573668

* changes:
  Add a revisionless QName constructor
  Fix DataTreeCandidateNode API definition

9 years agotests for arguments parsing 08/18408/6
Gregor Zatko [Wed, 22 Apr 2015 08:42:32 +0000 (10:42 +0200)]
tests for arguments parsing
parsing Augment in Uses (except extensions)

Change-Id: I331f97cc38d8a060c24d76f482e42618ee046316
Signed-off-by: Gregor Zatko <gzatko@cisco.com>
9 years agoFix ifelse curly braces 81/18781/1
Debalina Ghosh [Tue, 21 Apr 2015 21:15:35 +0000 (14:15 -0700)]
Fix ifelse curly braces

Change-Id: I174644fd63e25ae0a499908ef60b683407e78185
Signed-off-by: Debalina Ghosh <debalina.ghosh@hp.com>
9 years agoFix missing format placeholder 55/18755/1
Robert Varga [Tue, 21 Apr 2015 15:44:34 +0000 (17:44 +0200)]
Fix missing format placeholder

The modification is not logged because we are missing the %s
placeholder.

Change-Id: I8dd1b72a3fe1dde516cad063996731964c1fac29
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "Bug 2900: Fixed incorrect instanceof check in xml codec."
Robert Varga [Tue, 21 Apr 2015 08:52:12 +0000 (08:52 +0000)]
Merge "Bug 2900: Fixed incorrect instanceof check in xml codec."

9 years agoBug 2900: Fixed incorrect instanceof check in xml codec. 93/18693/1
Tony Tkacik [Tue, 21 Apr 2015 08:34:29 +0000 (08:34 +0000)]
Bug 2900: Fixed incorrect instanceof check in xml codec.

Change-Id: I4b48f73458b8876271ce8ee219f9babd05ec632b
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoMerge "change to interface"
Tony Tkacik [Tue, 21 Apr 2015 08:05:53 +0000 (08:05 +0000)]
Merge "change to interface"

9 years agoMerge "Sonar issues clean-up"
Tony Tkacik [Tue, 21 Apr 2015 07:47:16 +0000 (07:47 +0000)]
Merge "Sonar issues clean-up"

9 years agoFixing findbugs 92/18492/2
Debalina Ghosh [Thu, 16 Apr 2015 21:25:05 +0000 (14:25 -0700)]
Fixing findbugs

Change-Id: I153b8f990b79b3600d40ac239b5930fabb1f9f63
Signed-off-by: Debalina Ghosh <debalina.ghosh@hp.com>
9 years agochange to interface 58/18558/3
Debalina Ghosh [Fri, 17 Apr 2015 17:47:06 +0000 (10:47 -0700)]
change to interface

Change-Id: Id16a68b5486e334c01341a646a9e83bb0407272c
Signed-off-by: Debalina Ghosh <debalina.ghosh@hp.com>
9 years agoFindbugs for yang parser impl util 61/18561/2
Debalina Ghosh [Fri, 17 Apr 2015 18:49:59 +0000 (11:49 -0700)]
Findbugs for yang parser impl util

Change-Id: I82f976de66bb3806f0f8d35ab77ca19cdad87b40
Signed-off-by: Debalina Ghosh <debalina.ghosh@hp.com>
9 years agoAdd a revisionless QName constructor 90/18590/5
Robert Varga [Sat, 18 Apr 2015 21:31:38 +0000 (23:31 +0200)]
Add a revisionless QName constructor

We already provide a string-based constructor, but that requires a valid
revision date. A QNameModule does not require a revision, which is
reflected by other factory methods. Add a two-string factory method,
which does not take a revision argument.

Change-Id: I7c9bd36fc972a843b6b45ef972400a8f77f9c9b0
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoFix DataTreeCandidateNode API definition 20/18620/2
Robert Varga [Mon, 20 Apr 2015 13:40:36 +0000 (15:40 +0200)]
Fix DataTreeCandidateNode API definition

The javadocs for getDataBefore() and getDataAfter() were switched. Also
add @Nonnull annotations to express the intent to users.

Change-Id: I0957366830f43f0c02e69ae7bddfabe018955bef
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBug 2900: Fixed incorrect dispatch for unkeyed list parser. 17/18617/1
Tony Tkacik [Mon, 20 Apr 2015 13:25:03 +0000 (15:25 +0200)]
Bug 2900: Fixed incorrect dispatch for unkeyed list parser.

Change-Id: I3a15b79fd1973736fa0443099f1e7572b78663c1
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>