yangtools.git
9 years agoMerge changes Id14ebb05,I2a431693
Tony Tkacik [Thu, 5 Feb 2015 09:49:41 +0000 (09:49 +0000)]
Merge changes Id14ebb05,I2a431693

* changes:
  Add copyright header and fix whitespace
  Fix lifecycle mapping errors in eclipse

9 years agoMerge "Optimize Types instantiation"
Tony Tkacik [Thu, 5 Feb 2015 09:48:13 +0000 (09:48 +0000)]
Merge "Optimize Types instantiation"

9 years agoMerge "Improve codec performance"
Tony Tkacik [Thu, 5 Feb 2015 09:47:55 +0000 (09:47 +0000)]
Merge "Improve codec performance"

9 years agoMerge "Modified RpcResultBuilder classes to be Serializable"
Robert Varga [Wed, 4 Feb 2015 22:14:47 +0000 (22:14 +0000)]
Merge "Modified RpcResultBuilder classes to be Serializable"

9 years agoModified RpcResultBuilder classes to be Serializable 56/14656/2
tpantelis [Fri, 30 Jan 2015 17:47:02 +0000 (12:47 -0500)]
Modified RpcResultBuilder classes to be Serializable

Data store exceptions (eg TransactionCommitFailedException) can be
thrown across the wire by remote actors in the clustered store and
they contain RpcError instances so RpcErrorImpl must be Serializable.
Also RpcResultImpl should be Serializable.

Change-Id: Ia938d0fd5f51400ab0c7ae084ef16f22a99de24e
Signed-off-by: tpantelis <tpanteli@brocade.com>
9 years agoMerge "Bug 2561: Parser incorrectly allows usage of union in list"
Robert Varga [Tue, 27 Jan 2015 21:40:25 +0000 (21:40 +0000)]
Merge "Bug 2561: Parser incorrectly allows usage of union in list"

9 years agoResolved some sonar issues: Dead store to local variable 78/11978/6
Ladislav Borak [Wed, 15 Oct 2014 08:49:09 +0000 (10:49 +0200)]
Resolved some sonar issues: Dead store to local variable

DataValidationException - local variables actualValue and expectedValue in method checkListKey
were used only as parameters by throwing IllegalListKeyException, which was thrown when childNode was null.

This check was removed because:

1. it is already performed in call to overloaded checkListKey
2. value is already dereferenced and if it were null a
NullPointerException would have occurred

JSONNormalizedNodeStreamWriter - removed waste calling of anyxmlNode method

BindingToRestRPC - in method invoke added error, which occurs during extracting rpc
output in proxy method, to the rpc errors.

Change-Id: If58bf1e0342f0454600cbd3be1e152c397ce5249
Signed-off-by: Ladislav Borak <lborak@cisco.com>
9 years agoAdd copyright header and fix whitespace 37/14537/1
Robert Varga [Tue, 27 Jan 2015 13:06:52 +0000 (14:06 +0100)]
Add copyright header and fix whitespace

Change-Id: Id14ebb053ea0e6707ed32ce2c571a7e1a774bb9a
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoFix lifecycle mapping errors in eclipse 36/14536/1
Robert Varga [Tue, 27 Jan 2015 13:04:06 +0000 (14:04 +0100)]
Fix lifecycle mapping errors in eclipse

maven-checkstyle-plugin needs to be added to lifecycle mapping. Also do
not override the version provided by odlparent.

Change-Id: I2a4316938a4ffb330e5a08c688bd691d41b6e16c
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoImprove codec performance 02/14402/5
Robert Varga [Thu, 22 Jan 2015 20:18:22 +0000 (21:18 +0100)]
Improve codec performance

Convert the codecs from reflection to invocation API. Invoking
constructors and getters via reflection seems to be causing around
2% overhead which can be avoided if the call site is properly bound.

Change-Id: I0c303773a21913d9d1a6de952d37eb0dd022cbd1
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoOptimize Types instantiation 14/14514/2
Robert Varga [Mon, 26 Jan 2015 17:08:36 +0000 (18:08 +0100)]
Optimize Types instantiation

Instead of using Arrays.copyOf(), use a simple array clone -- it has
better performance characteristics.

Change-Id: I2261f54c2a867dd09fd2f2655a0665492489215f
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "Bug 865: ModuleInfoBackedContext is no more SchemaSourceProvider."
Robert Varga [Tue, 27 Jan 2015 09:33:21 +0000 (09:33 +0000)]
Merge "Bug 865: ModuleInfoBackedContext is no more SchemaSourceProvider."

9 years agoMerge "Bug 865: Moved filesystem model cache related functionality"
Robert Varga [Tue, 27 Jan 2015 09:32:51 +0000 (09:32 +0000)]
Merge "Bug 865: Moved filesystem model cache related functionality"

9 years agoBUG-1434: fix NPEs when using null byte arrays 07/14507/2
Robert Varga [Mon, 26 Jan 2015 16:42:35 +0000 (17:42 +0100)]
BUG-1434: fix NPEs when using null byte arrays

Commit introduced a regression, which caused NPEs being thrown when the
byte array was null (and hence failed to copy). Guard the copy with an
explicit null check and do not use Arrays.copyOf(), but clone().

Change-Id: I832ccae7a269548954705b2c1cdb1a42f83f71a4
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBug 865: ModuleInfoBackedContext is no more SchemaSourceProvider. 32/14432/2
Tony Tkacik [Fri, 23 Jan 2015 11:29:09 +0000 (12:29 +0100)]
Bug 865: ModuleInfoBackedContext is no more SchemaSourceProvider.

ModuleInfoBackedContext is only used as only class-loader registry
for generated classes and and utility class to create Schema Context
from Binding v1 jar artefacts.

Thus it is safely remove implementation of unused and now deprecated
interface SchemaSourceProvider.

Change-Id: Iee9abf7d35a1a0c64878005c17a6ab82a1857eb3
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoBug 865: Moved filesystem model cache related functionality 31/14431/2
Tony Tkacik [Thu, 22 Jan 2015 13:27:31 +0000 (14:27 +0100)]
Bug 865: Moved filesystem model cache related functionality

Moved static utilities from deprecated implementation of file-system
cache to non-deprecated Helium implementation in order
to ease removal of deprecation classes.

Change-Id: Iecf71444c3532c7fdadea9a5cd34a91837165007
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoMerge "Cleanup warning suppressions"
Tony Tkacik [Mon, 26 Jan 2015 09:16:48 +0000 (09:16 +0000)]
Merge "Cleanup warning suppressions"

9 years agoMerge "Remove unused imports"
Tony Tkacik [Mon, 26 Jan 2015 09:16:15 +0000 (09:16 +0000)]
Merge "Remove unused imports"

9 years agoMerge "Migrate ClassLoaderUtils callers"
Tony Tkacik [Mon, 26 Jan 2015 09:15:37 +0000 (09:15 +0000)]
Merge "Migrate ClassLoaderUtils callers"

9 years agoMerge "Cleanup warnings in pom.xml"
Tony Tkacik [Mon, 26 Jan 2015 09:15:26 +0000 (09:15 +0000)]
Merge "Cleanup warnings in pom.xml"

9 years agoMerge "Bug 1434 - Make arrays non-mutable"
Robert Varga [Sun, 25 Jan 2015 09:13:59 +0000 (09:13 +0000)]
Merge "Bug 1434 - Make arrays non-mutable"

9 years agoBug 1093: Extracted major static inner classes in parser.builder.impl 33/14433/2
Tony Tkacik [Fri, 23 Jan 2015 12:00:17 +0000 (13:00 +0100)]
Bug 1093: Extracted major static inner classes in parser.builder.impl

Change-Id: Ifb00bd69ebf585aaa5f24ee463349d363a24f7a7
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoCleanup warning suppressions 19/14419/2
Robert Varga [Fri, 23 Jan 2015 07:36:12 +0000 (08:36 +0100)]
Cleanup warning suppressions

Some of these are implied by context, some are needed down the stack.

Change-Id: Ifc090d3dce1a99fc5624d312f16f1046705dd285
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoRemove unused imports 18/14418/2
Robert Varga [Fri, 23 Jan 2015 07:34:24 +0000 (08:34 +0100)]
Remove unused imports

The usual spring cleaning of unused import warnings.

Change-Id: Ia9d2d178fd1bc8f3468eab467cd434b34455c7a5
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMigrate ClassLoaderUtils callers 17/14417/2
Robert Varga [Fri, 23 Jan 2015 07:32:26 +0000 (08:32 +0100)]
Migrate ClassLoaderUtils callers

oeg.opendaylight.yangtools.yang.util.ClassLoaderUtils is deprecated in
favor of the util package. This switches over some users.

Change-Id: I5c7035b70e23b37397b31e36616a973d8decbc01
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoCleanup warnings in pom.xml 16/14416/2
Robert Varga [Fri, 23 Jan 2015 07:29:33 +0000 (08:29 +0100)]
Cleanup warnings in pom.xml

- do not override managed versions
- do not override parent groupId where not needed
- do not override parent version where not needed

Change-Id: Ib9d31f93dd6f09c60c86dde46258c20029f278ee
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "Split out codecs from BindingCodecContext"
Tony Tkacik [Fri, 23 Jan 2015 11:07:25 +0000 (11:07 +0000)]
Merge "Split out codecs from BindingCodecContext"

9 years agoMerge "DataTreeCandidateNode.getChildNodes() should return a Collection"
Tony Tkacik [Fri, 23 Jan 2015 11:07:08 +0000 (11:07 +0000)]
Merge "DataTreeCandidateNode.getChildNodes() should return a Collection"

9 years agoMerge "Make NodeModification return a Collection"
Tony Tkacik [Fri, 23 Jan 2015 11:06:30 +0000 (11:06 +0000)]
Merge "Make NodeModification return a Collection"

9 years agoMerge "Fixed incorrect serialization of multiple nested UnionTypes."
Tony Tkacik [Fri, 23 Jan 2015 11:05:43 +0000 (11:05 +0000)]
Merge "Fixed incorrect serialization of multiple nested UnionTypes."

9 years agoBug 2561: Parser incorrectly allows usage of union in list 29/14129/6
Martin Ciglan [Tue, 13 Jan 2015 15:42:46 +0000 (16:42 +0100)]
Bug 2561: Parser incorrectly allows usage of union in list

Proposed solution rejects this and parser throws exception

Change-Id: I3cca06a72cfa33245f05a81e62b6a696966697c4
Signed-off-by: Martin Ciglan <mciglan@cisco.com>
9 years agoBug 1434 - Make arrays non-mutable 86/9686/10
Ladislav Borak [Tue, 5 Aug 2014 11:13:58 +0000 (13:13 +0200)]
Bug 1434 - Make arrays non-mutable

- changed getters, if fields return type is array,
  create local copy and send temporary reference
- constructor which has field of type array,
  save this array by temporary reference

Change-Id: Ifd96bd8f16eabec95409675723d5c13684914e16
Signed-off-by: Ladislav Borak <lborak@cisco.com>
9 years agoMerge "Bug 2480: Union objects are generated incorrectly when using bits type"
Robert Varga [Fri, 23 Jan 2015 07:09:26 +0000 (07:09 +0000)]
Merge "Bug 2480: Union objects are generated incorrectly when using bits type"

9 years agoSplit out codecs from BindingCodecContext 01/14401/2
Robert Varga [Thu, 22 Jan 2015 20:35:23 +0000 (21:35 +0100)]
Split out codecs from BindingCodecContext

Static inner classes reduce code clarity, so split them out before we
start making changes.

Change-Id: Iba235f74ff13f89c21371c913c76bf3a571499a4
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoUse Maven Enforcer plugin to require Maven version 37/14237/3
Thanh Ha [Mon, 19 Jan 2015 04:08:42 +0000 (23:08 -0500)]
Use Maven Enforcer plugin to require Maven version

Using the <prerequisites> configuration in pom files is deprecated and
it is recommended to use the maven-enforcer-plugin to enforce these
rules instead.

See:
http://jira.codehaus.org/browse/MNG-5297
http://jira.codehaus.org/browse/MNG-4840

Change-Id: Ia0265ba264693c3ce09ebb24a6a489bad5efa60e
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoDataTreeCandidateNode.getChildNodes() should return a Collection 99/14399/1
Robert Varga [Thu, 22 Jan 2015 19:06:30 +0000 (20:06 +0100)]
DataTreeCandidateNode.getChildNodes() should return a Collection

All known implementations actually use a collection and users usually
need to know the size to size their structures appropriately. It is fair
ask to specify the return to be a Collection, with undefined iteration
order.

Change-Id: I05cbcc89ab309f012f39e4160461eee15904ed25
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMake NodeModification return a Collection 98/14398/1
Robert Varga [Thu, 22 Jan 2015 19:00:33 +0000 (20:00 +0100)]
Make NodeModification return a Collection

Knowing the number of nodes is often useful. Our internal implementation
uses a Map, so we can freely promote this to a Collection.

Change-Id: Ieaa6a9ffa32c84d8484a2ed84f027ff205c4e738
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "Added getModifiedChild to DataTreeCandidateNode."
Robert Varga [Thu, 22 Jan 2015 18:38:01 +0000 (18:38 +0000)]
Merge "Added getModifiedChild to DataTreeCandidateNode."

9 years agoMerge "Bug 2404: RPC and Notification support for Binding Data Codec"
Robert Varga [Thu, 22 Jan 2015 18:31:33 +0000 (18:31 +0000)]
Merge "Bug 2404: RPC and Notification support for Binding Data Codec"

9 years agoMerge "Bug 1305: Review YangTools grammar"
Tony Tkacik [Thu, 22 Jan 2015 16:08:15 +0000 (16:08 +0000)]
Merge "Bug 1305: Review YangTools grammar"

9 years agoFixed incorrect serialization of multiple nested UnionTypes. 50/14350/7
Tomas Cere [Wed, 21 Jan 2015 17:59:05 +0000 (18:59 +0100)]
Fixed incorrect serialization of multiple nested UnionTypes.

Change-Id: I2bf4153fc3b931fd6f80f2683b8abb47a1e12c7b
Signed-off-by: Tomas Cere <tcere@cisco.com>
9 years agoBug 1305: Review YangTools grammar 07/13307/6
Martin Ciglan [Tue, 2 Dec 2014 13:38:48 +0000 (14:38 +0100)]
Bug 1305: Review YangTools grammar

Since our grammar uses strings, which are validated in Java code during entering actual statements,
this has been addressed within this commit. Rest of grammar issues have been opened as bugs in bugzilla.

Change-Id: Ia70afeeaa1b59d1b77076b1c71cdacf8c3779d74
Signed-off-by: Martin Ciglan <mciglan@cisco.com>
9 years agoBug 865: Deprecated Hydrogen Source Repository APIs 77/14377/2
Tony Tkacik [Thu, 22 Jan 2015 11:57:18 +0000 (12:57 +0100)]
Bug 865: Deprecated Hydrogen Source Repository APIs

Deprecated Hydrogen Source Repository APIs, which are not
used in Helium MD-SAL runtime code and
migrated necessary utility methods from deprecated classes
to non-deprecated ones.

Change-Id: I01e2411c501dd221a6126e6fb80edcd0af6bc852
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoMerge "Improve BaseTemplate speed"
Tony Tkacik [Wed, 21 Jan 2015 14:37:52 +0000 (14:37 +0000)]
Merge "Improve BaseTemplate speed"

9 years agoMerge "Bug 2431: YangTools grammar misses unknown statement in some statements"
Tony Tkacik [Wed, 21 Jan 2015 14:36:02 +0000 (14:36 +0000)]
Merge "Bug 2431: YangTools grammar misses unknown statement in some statements"

9 years agoMerge "Added missing copyright headers to yang-data-impl"
Robert Varga [Wed, 21 Jan 2015 10:41:35 +0000 (10:41 +0000)]
Merge "Added missing copyright headers to yang-data-impl"

9 years agoAdded getModifiedChild to DataTreeCandidateNode. 81/14281/2
Tony Tkacik [Tue, 20 Jan 2015 09:37:22 +0000 (10:37 +0100)]
Added getModifiedChild to DataTreeCandidateNode.

Change-Id: I2e1466d8ef903de2b87a36c49b0b5deba9de9ad8
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoAdded missing copyright headers to yang-data-impl 82/14282/2
Tony Tkacik [Tue, 20 Jan 2015 09:43:42 +0000 (10:43 +0100)]
Added missing copyright headers to yang-data-impl

Change-Id: Ic794c020df39f1a19902a993dfac539f2a6e935f
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoBUG-2606: add support for removing augmentations 57/14257/2
Robert Varga [Mon, 19 Jan 2015 16:15:44 +0000 (17:15 +0100)]
BUG-2606: add support for removing augmentations

This patch adds an explicit removeAugmentation() method to the builder.

Change-Id: I2111da008485512930dc2cfe551a787106c5f599
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "BUG-2606: formalize the augmentation removal"
Tony Tkacik [Tue, 20 Jan 2015 09:39:18 +0000 (09:39 +0000)]
Merge "BUG-2606: formalize the augmentation removal"

9 years agoBUG-2606: formalize the augmentation removal 56/14256/1
Robert Varga [Mon, 19 Jan 2015 16:11:36 +0000 (17:11 +0100)]
BUG-2606: formalize the augmentation removal

Setting an augmentation to null has the same effect as removing it,
when accessing it via getAugmentation(). Formalize this actually
removing the mapping, which is more space-efficient.

Change-Id: I994b459161d9d374c80a353b82763dfb31faaf3d
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "Bug 2606: Fixed serialization of null augmentations."
Robert Varga [Mon, 19 Jan 2015 16:03:04 +0000 (16:03 +0000)]
Merge "Bug 2606: Fixed serialization of null augmentations."

9 years agoBug 2404: RPC and Notification support for Binding Data Codec 63/13763/8
Tony Tkacik [Fri, 19 Dec 2014 15:48:14 +0000 (16:48 +0100)]
Bug 2404: RPC and Notification support for Binding Data Codec

Added support for serialization and deserialization of RPC
and Notification data from Binding representation to Normalized
Representation.

Change-Id: I2e071ac1fac9d5f2ac34421f1718dbaa6051975c
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoBug 2606: Fixed serialization of null augmentations. 50/14250/1
Tony Tkacik [Mon, 19 Jan 2015 14:24:12 +0000 (15:24 +0100)]
Bug 2606: Fixed serialization of null augmentations.

Binding DTO contract allowed to use addAugmentation(T,null)
to remove augmentation, but this was not supported
by binding-data-codec.

Added explicit ommision of null augmentations.

Change-Id: Ib16f3a18e6b09ab970dcaef83e3fca4f490c9ec3
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoRemove deprecated sonar.profile property 36/14236/1
Thanh Ha [Mon, 19 Jan 2015 04:04:21 +0000 (23:04 -0500)]
Remove deprecated sonar.profile property

sonar.profile is deprecated in Sonar 4.5.x which is used by ODL.

Change-Id: I0d4f6c33c4324682035858c45b14af265be97c4b
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoRevert "Added generated convenience setters that take Builder<T>" 14/14214/3
Robert Varga [Sat, 17 Jan 2015 10:41:18 +0000 (10:41 +0000)]
Revert "Added generated convenience setters that take Builder<T>"

This reverts commit 0bede1b3a817175f7db70fd5347c08c3f0ff1af1, as it breaks
the controller build. The problem is that it breaks current code which passes
in null argument -- which is ambiguous.

Change-Id: Ie6b8882d7790fc21a6a798f3fa94bca40dc71bd5
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoAdded generated convenience setters that take Builder<T> 93/14093/6
Ed Warnicke [Mon, 12 Jan 2015 01:14:53 +0000 (19:14 -0600)]
Added generated convenience setters that take Builder<T>

Basically, if we previously had

FooBuilder.setBar(Bar value)

we now also have

FooBuilder.setBar(Builder<Bar> value)

That just calls value.build() and calls the original setter.

Change-Id: I99e19f7a8a51af5c4a48ecb8813c6e6202546857
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoImproved RPCResultBuilder to have convenience methods that take Builders 26/13926/7
Ed Warnicke [Mon, 5 Jan 2015 23:37:32 +0000 (17:37 -0600)]
Improved RPCResultBuilder to have convenience methods that take Builders

Change-Id: I994d085d194a2aa6b318e18b8f8e3a3fc539cde6
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "Added RpcResultBuilder.buildFuture() as a convenience method"
Robert Varga [Fri, 16 Jan 2015 17:34:03 +0000 (17:34 +0000)]
Merge "Added RpcResultBuilder.buildFuture() as a convenience method"

9 years agoImprove BaseTemplate speed 98/14198/2
Robert Varga [Fri, 16 Jan 2015 16:53:54 +0000 (17:53 +0100)]
Improve BaseTemplate speed

String processing is sub-optimal in these aspects:
- string-based methods used when character-based ones are available,
- inefficient use of String.replace() for single-character filtering,
- inefficient use of String.replaceAll() where a pre-compiled Pattern
  should be used.
- inefficient use of StringTokenizer where a Splitter can be used

Change-Id: Iee446a4279b9be343891192d93a84a420b32526c
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "Bug 2258: Fixed Type Definition search in runtime generated codecs"
Robert Varga [Fri, 16 Jan 2015 16:40:46 +0000 (16:40 +0000)]
Merge "Bug 2258: Fixed Type Definition search in runtime generated codecs"

9 years agoBug 2480: Union objects are generated incorrectly when using bits type 35/13535/6
Martin Ciglan [Wed, 10 Dec 2014 13:29:05 +0000 (14:29 +0100)]
Bug 2480: Union objects are generated incorrectly when using bits type

In case of bits typedef within union, method getValue() returning array
of booleans was missing.

Change-Id: If4b0f98d3889facff819d02f44566e816674528d
Signed-off-by: Martin Ciglan <mciglan@cisco.com>
9 years agoMerge "Bug 2563 - Parser should fail when key statement does not reference leaf."
Tony Tkacik [Fri, 16 Jan 2015 15:04:01 +0000 (15:04 +0000)]
Merge "Bug 2563 - Parser should fail when key statement does not reference leaf."

9 years agoAdded RpcResultBuilder.buildFuture() as a convenience method 23/13923/8
Ed Warnicke [Mon, 5 Jan 2015 21:47:44 +0000 (15:47 -0600)]
Added RpcResultBuilder.buildFuture() as a convenience method

Wraps RpcResult<T> in a Future.

Change-Id: Icf045362b9cd3be83f7168cbd2baee0561d516d2
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBug 2258: Fixed Type Definition search in runtime generated codecs 21/12521/4
Tony Tkacik [Mon, 27 Oct 2014 13:11:37 +0000 (14:11 +0100)]
Bug 2258: Fixed Type Definition search in runtime generated codecs

Type Definition search in runtime generated codecs, did not look
up nested (scoped) type definitions properly, which resulted
in IllegalArgumentException in schema context update which
prevented further working of codec.

Updated code to perform correct nested search in grouping
and type-definitoions.

Change-Id: I3860c2f70b5e0ba3d265b7f2b032e89eadaced08
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoBug 2431: YangTools grammar misses unknown statement in some statements 44/14144/2
Martin Ciglan [Wed, 14 Jan 2015 14:43:10 +0000 (15:43 +0100)]
Bug 2431: YangTools grammar misses unknown statement in some statements

Based on existing YANG grammar review, these statements missed unknown statement, wrapped in
statement separator (stmtsep):

submodule-stmt
import-stmt
include-stmt
belongs-to-stmt
revision-stmt

Now fixed.

Change-Id: If0ef7325428b10f10cada5ace427798da6917fe0
Signed-off-by: Martin Ciglan <mciglan@cisco.com>
9 years agoAdd marker interface Builder<T> to generated Builders 24/13924/7
Ed Warnicke [Mon, 5 Jan 2015 23:02:19 +0000 (17:02 -0600)]
Add marker interface Builder<T> to generated Builders

Change-Id: I6e6e7f33143982e4a719ea6d6399947587a627a3
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBug 2563 - Parser should fail when key statement does not reference leaf. 45/14145/3
Peter Kajsa [Wed, 14 Jan 2015 14:45:55 +0000 (15:45 +0100)]
Bug 2563 - Parser should fail when key statement does not reference leaf.

Change-Id: Idec40d3ae75f09894600856a349154cc7fb4b64a
Signed-off-by: Peter Kajsa <pkajsa@cisco.com>
9 years agoBUG-2159: deactivate Java 8 javadoc workaround 86/14186/3
Robert Varga [Thu, 15 Jan 2015 21:38:34 +0000 (22:38 +0100)]
BUG-2159: deactivate Java 8 javadoc workaround

Now that the build is compliant with the stricter rules, remove the
compatibility profile.

Change-Id: I6b53931e75b0aceaf73e40fd8a3838fdd06126f1
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-2159: fix wrong javadocs 85/14185/3
Robert Varga [Thu, 15 Jan 2015 21:36:14 +0000 (22:36 +0100)]
BUG-2159: fix wrong javadocs

Java 8 javadoc generation is a lot stricter than previous versions. This
patch fixes the offenders.

Change-Id: I8a6d7f11a8fb38919d5fa34ab01c3a82849bfa8f
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-2159: make sure generated comments are Java-8-safe 91/14191/2
Robert Varga [Fri, 16 Jan 2015 09:47:52 +0000 (10:47 +0100)]
BUG-2159: make sure generated comments are Java-8-safe

The javadoc generator produced output which was not compliant with
default Java 8 javadoc settings. This patch fixes that.

Change-Id: I102e1398d49042d785ce451846aeebc20d5eed58
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "Shift Builder<P> from toInstance() to build()"
Robert Varga [Thu, 15 Jan 2015 19:11:48 +0000 (19:11 +0000)]
Merge "Shift Builder<P> from toInstance() to build()"

9 years agoShift Builder<P> from toInstance() to build() 92/14092/2
Ed Warnicke [Mon, 12 Jan 2015 00:25:53 +0000 (18:25 -0600)]
Shift Builder<P> from toInstance() to build()

In order to be able to use Builder<P> as a marker
on generated Builders, it needed to shift to build()

All 'internal' uses for Builder have been changed
to use build().  For things used outside of yangtools,
a depracted toInstance() is maintained on child
interfaces/classes.

Change-Id: I43662296e328133a5b5267be54d407e2ad4b95e8
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoSet root pom.xml <name> for Sonar 22/14022/3
Thanh Ha [Fri, 9 Jan 2015 19:15:58 +0000 (14:15 -0500)]
Set root pom.xml <name> for Sonar

As mentioned on the mailing list Sonar uses the <name> field of the
pom.xml that is passed to the mvn command as the name of the project in
Sonar. In most cases this is the root pom.xml file in a project. This
patch sets the name to the project shortname.

https://lists.opendaylight.org/pipermail/discuss/2014-November/004024.html

Change-Id: I52a1cc89da77913da6e530b2d2776538887c9b63
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoBug 1573: Fixed deserialization of not representable Instance Identifier 03/14003/3
Tony Tkacik [Thu, 8 Jan 2015 15:30:59 +0000 (16:30 +0100)]
Bug 1573: Fixed deserialization of not representable Instance Identifier

Not all YangInstanceIdentifier are representable in Binding form,
codecs were designed to handle this and omit such cases,
but one ommision case was missing in deserializing Instance Identifier
without data and this resulted into returning incorrectly
constructed InstanceIdentifier.

Updated test which was testing incorrect behaviour to test correct
behaviour.

Change-Id: I97215f674f7ff164bc2c87d9eef4a254510b0280
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoMerge "BUG-2159: update karaf version to 3.0.2"
Tony Tkacik [Wed, 7 Jan 2015 16:15:43 +0000 (16:15 +0000)]
Merge "BUG-2159: update karaf version to 3.0.2"

9 years agoBug 1559, Bug 2406 - Unknown statement is missing in submodule and revision statements 49/13249/2
Peter Kajsa [Mon, 1 Dec 2014 09:57:50 +0000 (10:57 +0100)]
Bug 1559, Bug 2406 - Unknown statement is missing in submodule and revision statements

Bug 1559 - stmtsep is missing in submodule_stmt.
Bug 2406 - in our grammar unknown-statement can occur only after all revision
statements, but in RFC grammar unknown-statement can occur also before or
between two revision statements etc.

Change-Id: Ide4a9044545af8a397cc8c4074ea6ae91022288d
Signed-off-by: Peter Kajsa <pkajsa@cisco.com>
9 years agoBUG-2159: update karaf version to 3.0.2 62/13962/1
Robert Varga [Wed, 7 Jan 2015 13:29:11 +0000 (14:29 +0100)]
BUG-2159: update karaf version to 3.0.2

Karaf 3.0.1 doe snot work correctly with Java 8, specifically it does
not export the 1.7 JavaSE osgi.ee property. This bumps the version used
in integration tests.

Change-Id: I67d7cd3fb3f7e243fab3cf7f8c36ff0ec3d91040
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge changes Ic65eb07d,Iab2814f6
Tony Tkacik [Wed, 7 Jan 2015 12:56:50 +0000 (12:56 +0000)]
Merge changes Ic65eb07d,Iab2814f6

* changes:
  BUG-2350: introduce KeyedListNodeCodecContext
  Drop a FIXME for partially-overwritten writes

9 years agoMerge changes I0eabfe3d,I58faf7df,I7e7758f4,Ic56afe1b,I623aa497
Tony Tkacik [Wed, 7 Jan 2015 12:54:55 +0000 (12:54 +0000)]
Merge changes I0eabfe3d,I58faf7df,I7e7758f4,Ic56afe1b,I623aa497

* changes:
  Publish StoreUtils as NormalizedNodes
  Publish TreeNodeUtils as StoreTreeNodes
  Split off UnkeyedListModificationStrategy
  Add better diagnostic on failed write
  Do not override surefire version

9 years agoMerge "Fix whitespace in binding-parent"
Tony Tkacik [Wed, 7 Jan 2015 12:54:10 +0000 (12:54 +0000)]
Merge "Fix whitespace in binding-parent"

9 years agoBUG-2350: introduce KeyedListNodeCodecContext 65/13865/2
Robert Varga [Thu, 25 Dec 2014 17:53:36 +0000 (18:53 +0100)]
BUG-2350: introduce KeyedListNodeCodecContext

Instead of special-casing calls within ListNodeCodecContext, introduce a
subclass which holds the logic specific to keyed items. Improves memory
overhead very slightly by saving two null fields for unkeyed lists.

Change-Id: Ic65eb07d2ee75c583e39cf458ec7e663dd98d335
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoPublish StoreUtils as NormalizedNodes 61/13861/3
Robert Varga [Thu, 25 Dec 2014 07:32:50 +0000 (08:32 +0100)]
Publish StoreUtils as NormalizedNodes

Move the widely useful functionality, which requires only API elements
into the API package, so it can be reused elsewhere.

Change-Id: I0eabfe3dbd1e0035f5ba96a0beee4b4c4d8d4114
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoFix javadoc reference 64/13864/2
Robert Varga [Thu, 25 Dec 2014 09:34:24 +0000 (10:34 +0100)]
Fix javadoc reference

Javadoc points to a controller package, where this code originated. Make
sure the pointer is uptodate.

Change-Id: I92271808f7b0763700997279482d52886a94db93
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoDrop a FIXME for partially-overwritten writes 59/13859/3
Robert Varga [Thu, 25 Dec 2014 08:13:39 +0000 (09:13 +0100)]
Drop a FIXME for partially-overwritten writes

When a user performs a write, followed by a write which changes some
parts of the first one, we arrive at the resulting data in the prepare()
path. That is not right, as we can perform the merge in the seal() path.

The difference is that in MD-SAL the prepare() path is single-threaded,
while the seal() and read() path are executed in the application thread.
We really want to charge application-sourced mess to application
threads.

Change-Id: Iab2814f616ec8ca0d184513e5c8d3a3b8b1f2174
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoPublish TreeNodeUtils as StoreTreeNodes 60/13860/3
Robert Varga [Thu, 25 Dec 2014 07:28:40 +0000 (08:28 +0100)]
Publish TreeNodeUtils as StoreTreeNodes

Publishes the utility methods which rely only on API elements into the
API package, so they can be reused more widely.

Change-Id: I58faf7df17edbc9850bfd6b6fa5cb1d5361a121d
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoCleanup and document ModifiedNode 63/13863/2
Robert Varga [Thu, 25 Dec 2014 15:50:45 +0000 (16:50 +0100)]
Cleanup and document ModifiedNode

Clean up method visibility to make the fact this class is not public
more visible. Also remove a FIXME and explain why it is correct to store
the value without taking any further action.

Change-Id: I49fb79bd41bbf1c42fb262c244a2f49460dfc5cf
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoSplit off UnkeyedListModificationStrategy 58/13858/3
Robert Varga [Thu, 25 Dec 2014 07:42:58 +0000 (08:42 +0100)]
Split off UnkeyedListModificationStrategy

It is a complex class, so it deserves its own file.

Change-Id: I7e7758f440f40863cc91f739e0ebed3e61f8e9d3
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoAdd better diagnostic on failed write 57/13857/3
Robert Varga [Thu, 25 Dec 2014 07:40:57 +0000 (08:40 +0100)]
Add better diagnostic on failed write

Rather than pointing out the class, also print the value being written.

Change-Id: Ic56afe1b9a2a5b113e181021633c37bf35008f4b
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoDo not override surefire version 56/13856/3
Robert Varga [Thu, 25 Dec 2014 08:25:22 +0000 (09:25 +0100)]
Do not override surefire version

It is inherited. Also remove empty lines.

Change-Id: I623aa4979297efaf7c6697395eb5c5232962b54c
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "BUG-2350: do encapsulte null snapshot"
Tony Tkacik [Wed, 7 Jan 2015 10:23:24 +0000 (10:23 +0000)]
Merge "BUG-2350: do encapsulte null snapshot"

9 years agoMerge "Parent schema node input parameter in JsonParserStream"
Tony Tkacik [Wed, 7 Jan 2015 09:45:47 +0000 (09:45 +0000)]
Merge "Parent schema node input parameter in JsonParserStream"

9 years agoMerge "BUG-1382: eliminate QName.getPrefix()"
Tony Tkacik [Wed, 7 Jan 2015 09:36:26 +0000 (09:36 +0000)]
Merge "BUG-1382: eliminate QName.getPrefix()"

9 years agoFix whitespace in binding-parent 45/13845/2
Robert Varga [Wed, 24 Dec 2014 12:44:54 +0000 (13:44 +0100)]
Fix whitespace in binding-parent

Whitespace should be four spaces, as it is the norm across project.

Change-Id: Iba62064a397cb8b28713eb45eabdd8d1ad5d928e
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-2350: do encapsulte null snapshot 62/13862/2
Robert Varga [Thu, 25 Dec 2014 09:44:48 +0000 (10:44 +0100)]
BUG-2350: do encapsulte null snapshot

getSnapshot() has only one caller in the same package, so performing
Optional.formNullable() just so we can then check for presence means
unnecessary object creation. Remove it and just deal with the potential
nulls.

Also rename methods for clarity and do not allow direct stores of nulls
into the cache.

Change-Id: I671a075ad6200fc37e586e413256bdd57e9ae4a0
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "Turn NodeModification into an abstract class"
Tony Tkacik [Wed, 7 Jan 2015 09:29:35 +0000 (09:29 +0000)]
Merge "Turn NodeModification into an abstract class"

9 years agoMerge "Update xtend and embed it"
Tony Tkacik [Wed, 7 Jan 2015 09:28:23 +0000 (09:28 +0000)]
Merge "Update xtend and embed it"

9 years agoMerge "Do not test bundle activation of maven plugins"
Tony Tkacik [Wed, 7 Jan 2015 09:27:37 +0000 (09:27 +0000)]
Merge "Do not test bundle activation of maven plugins"

9 years agoMerge "BUG-2159: ensure test survies Java 8"
Tony Tkacik [Wed, 7 Jan 2015 09:27:24 +0000 (09:27 +0000)]
Merge "BUG-2159: ensure test survies Java 8"

9 years agoMerge "Use predictable class order"
Tony Tkacik [Wed, 7 Jan 2015 09:23:14 +0000 (09:23 +0000)]
Merge "Use predictable class order"