yangtools.git
9 years agoBUG-1514: fixed bug in module sort. 23/10023/4
Martin Vitez [Mon, 18 Aug 2014 10:45:49 +0000 (12:45 +0200)]
BUG-1514: fixed bug in module sort.

Change-Id: If8e2848ebd45ca6d51201e46928d3b2c0b9426c9
Signed-off-by: Martin Vitez <mvitez@cisco.com>
9 years agoMerge "BUG 1440 - json stream to normalized node stream writer"
Tony Tkacik [Mon, 25 Aug 2014 07:59:36 +0000 (07:59 +0000)]
Merge "BUG 1440 - json stream to normalized node stream writer"

9 years agoMerge "BUG-1605: Fixup yang-data-api interface"
Tony Tkacik [Mon, 25 Aug 2014 07:59:30 +0000 (07:59 +0000)]
Merge "BUG-1605: Fixup yang-data-api interface"

9 years agoMerge "BUG-1605: Fix yang-binding interfaces"
Tony Tkacik [Mon, 25 Aug 2014 07:59:24 +0000 (07:59 +0000)]
Merge "BUG-1605: Fix yang-binding interfaces"

9 years agoMerge "Fix javadocs a bit"
Tony Tkacik [Mon, 25 Aug 2014 07:56:22 +0000 (07:56 +0000)]
Merge "Fix javadocs a bit"

9 years agoMerge "BUG-997: fix InMemorySchemaSourceCache interface"
Tony Tkacik [Mon, 25 Aug 2014 07:52:34 +0000 (07:52 +0000)]
Merge "BUG-997: fix InMemorySchemaSourceCache interface"

9 years agoBUG-997: fix InMemorySchemaSourceCache interface 17/10217/1
Robert Varga [Sun, 24 Aug 2014 17:54:34 +0000 (19:54 +0200)]
BUG-997: fix InMemorySchemaSourceCache interface

It turns out it was impossible to instantiate this class reasonably. Add
a static factory method to alleviate.

Change-Id: Id7ed4976db6ca6303752392c9aded444491edd08
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBug 1514: Correctly handle ModuleOrModuleBuilder in ModuleDependencySort 08/10208/3
Ed Warnicke [Sat, 23 Aug 2014 19:56:17 +0000 (14:56 -0500)]
Bug 1514: Correctly handle ModuleOrModuleBuilder in ModuleDependencySort

ModuleDependencySort.processDependencies(...)

Turns out allNS.get(ns) can return objects of type ModuleOrModuleBuilder
(not just Module or ModuleBuilder types).

Now we check for that case, and unpack it to a Module or ModuleBuilder.
The rest of the logic then continues as normal.

Also added a log for getting a module with no name so as to catch
similar issues in the future.

Change-Id: I956c334c5dd10b51bec01d409f2433229d05f767
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoBUG 1440 - json stream to normalized node stream writer 33/10133/9
Jozef Gloncak [Thu, 21 Aug 2014 13:00:10 +0000 (15:00 +0200)]
BUG 1440 - json stream to normalized node stream writer

JsonParserStream contains implementation of read method in which there
is gradually constructed structure of NodeDataWithSchema nodes.

NodeDataWithSchema is similar to SchemaNode but contains only reference to
children which really exists in JSON input and concrete values for nodes
of type leaf or leaf list.

It was necessary to firstly load JSON to NodeDataWitchSchema structure
because for some types (composite keys of list, all nodes belonging to one
augment, all nodes belonging to one choice) it isn't possible to do
sequential processing (it means to call concrete opening and closing
methods of NormalizedNodeStreamWriter interface).

JsonParserStream constructor requires schema context as input parameter.
If data behind mount point should be parsed then schema context of mount
point is required.

Change-Id: I28c1d3193792feb875ec2ceda0035ca56bfa5d42
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-1605: Fixup yang-data-api interface 89/10189/5
Robert Varga [Fri, 22 Aug 2014 17:27:48 +0000 (19:27 +0200)]
BUG-1605: Fixup yang-data-api interface

Now that the binding interface is ready to handle IOExceptions, adjust
the data-api interface and implementations. At the same time we update
the binding world to forward calls to flush().

Change-Id: I8a4cff13123d618634dcd61587a2432d3d49ae8b
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-1605: Fix yang-binding interfaces 88/10188/6
Robert Varga [Fri, 22 Aug 2014 17:42:23 +0000 (19:42 +0200)]
BUG-1605: Fix yang-binding interfaces

This is the frontend piece visible from Binding world. The
implementation relies of the data.api mechanics, so it needs to be
prepared first.

Change-Id: I4694f74e993bbfa9c84578dee04fdd49b87453b7
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoFix javadocs a bit 87/10187/1
Robert Varga [Fri, 22 Aug 2014 17:34:53 +0000 (19:34 +0200)]
Fix javadocs a bit

Change-Id: Ib7c43ca661dcfa105f9a41e0ebeecdbb4f05a655
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoUse xml.bind Base64 decoder instead of Guava 60/10160/1
Tony Tkacik [Fri, 22 Aug 2014 08:33:16 +0000 (10:33 +0200)]
Use xml.bind Base64 decoder instead of Guava

As it turned out Guava Base64 decoder is not
compatible with XML encoding, since it is much
stricter and throws error on new lines which
are pretty common in XMLs with Base64 encoded
data.

javax.xml.bind package provides same static
method for parsing string into bytes,
but with XSD semantics for Base64 encoding
which are compatible with XML way
of encoding data.

Change-Id: I5ef4c0b2ba521472b8caacdff1f44ff17d660eb3
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoMerge "Fix ordering fields in generated type builder"
Tony Tkacik [Thu, 21 Aug 2014 13:45:11 +0000 (13:45 +0000)]
Merge "Fix ordering fields in generated type builder"

9 years agoMerge "BUG-1425: fix LazyDataObject.toString()"
Tony Tkacik [Thu, 21 Aug 2014 13:41:54 +0000 (13:41 +0000)]
Merge "BUG-1425: fix LazyDataObject.toString()"

9 years agoMerge "Bug 1586: Fixed missing processing of single qouted strings."
Martin Vitez [Thu, 21 Aug 2014 13:11:17 +0000 (13:11 +0000)]
Merge "Bug 1586: Fixed missing processing of single qouted strings."

9 years agoBug 1586: Fixed missing processing of single qouted strings. 31/10131/2
Tony Tkacik [Thu, 21 Aug 2014 12:05:18 +0000 (14:05 +0200)]
Bug 1586: Fixed missing processing of single qouted strings.

Change-Id: I72a4c8608b8f1f64287a7199430f4f31af6f67c9
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoMerge "Update feature to carry binding-data-codec"
Tony Tkacik [Thu, 21 Aug 2014 11:45:04 +0000 (11:45 +0000)]
Merge "Update feature to carry binding-data-codec"

9 years agoUpdate feature to carry binding-data-codec 28/10128/1
Robert Varga [Thu, 21 Aug 2014 11:09:54 +0000 (13:09 +0200)]
Update feature to carry binding-data-codec

Change-Id: I4a1835574c1cfdfbba3dba4a6779ee85157b894e
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "add new tests BindingTypesTest, BaseYangTypesTest"
Lukas Sedlak [Thu, 21 Aug 2014 09:40:51 +0000 (09:40 +0000)]
Merge "add new tests BindingTypesTest, BaseYangTypesTest"

9 years agoMerge "BUG-1382: eliminate QName.getPrefix() from GeneratorImpl.xtend"
Robert Varga [Thu, 21 Aug 2014 09:24:23 +0000 (09:24 +0000)]
Merge "BUG-1382: eliminate QName.getPrefix() from GeneratorImpl.xtend"

9 years agoMerge "Bug 1391 - New DataBroker unexpected behaviour"
Tony Tkacik [Thu, 21 Aug 2014 07:22:50 +0000 (07:22 +0000)]
Merge "Bug 1391 - New DataBroker unexpected behaviour"

9 years agoBUG-1425: fix LazyDataObject.toString() 79/9879/2
Robert Varga [Tue, 12 Aug 2014 05:32:07 +0000 (07:32 +0200)]
BUG-1425: fix LazyDataObject.toString()

A major usability improvement is skipping of null fields, as dumping
them adds quite a bit of verbosity to logs.

Change-Id: I94c030f11505718ee48b0e3f4556587a85f8f4e4
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBug 1443: Fixed incorrect throw of IllegalArgumentException in getAugmentation 99/10099/2
Tony Tkacik [Wed, 20 Aug 2014 08:55:10 +0000 (10:55 +0200)]
Bug 1443: Fixed incorrect throw of IllegalArgumentException in getAugmentation

Change-Id: If58292afba9c634fb4368f70d541d4a7cdf02cf6
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoBUG-1382: eliminate QName.getPrefix() from GeneratorImpl.xtend 94/10094/1
Martin Vitez [Wed, 20 Aug 2014 09:58:55 +0000 (11:58 +0200)]
BUG-1382: eliminate QName.getPrefix() from GeneratorImpl.xtend

Change-Id: Ie5fdaf7fc7389c13af8aa591bf9531ed26cb11a9
Signed-off-by: Martin Vitez <mvitez@cisco.com>
9 years agoadd new tests BindingTypesTest, BaseYangTypesTest 56/10056/2
Peter Bandzi [Tue, 19 Aug 2014 08:37:53 +0000 (10:37 +0200)]
add new tests BindingTypesTest, BaseYangTypesTest

Signed-off-by: Peter Bandzi <pbandzi@cisco.com>
Change-Id: I289a15eb735c12d4664ff68e73c6e2fc830c6f20

9 years agoMerge "Add scope compile to features pom for xtend-lib"
Robert Varga [Wed, 20 Aug 2014 08:50:13 +0000 (08:50 +0000)]
Merge "Add scope compile to features pom for xtend-lib"

9 years agoBUG-1578: fixed NPE caused by invalid import statement. 87/10087/1
Martin Vitez [Wed, 20 Aug 2014 07:48:26 +0000 (09:48 +0200)]
BUG-1578: fixed NPE caused by invalid import statement.

If parser can't found imported module it throws YangParseException with error info about root cause.

Change-Id: I3ca81fc46ca57d36b770b3846c10d422d415ac37
Signed-off-by: Martin Vitez <mvitez@cisco.com>
9 years agoAdd scope compile to features pom for xtend-lib 79/10079/1
Ed Warnicke [Tue, 19 Aug 2014 23:00:05 +0000 (18:00 -0500)]
Add scope compile to features pom for xtend-lib

Else, tests downstream can and will fail if its
not already in their local .m2

Change-Id: I2be472c66e4828f19169118d84ae03f714c9ec68
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoMerge "Bug 1531: Fixed incorrect use of leaf types in BindingGeneratorImpl"
Robert Varga [Tue, 19 Aug 2014 11:14:19 +0000 (11:14 +0000)]
Merge "Bug 1531: Fixed incorrect use of leaf types in BindingGeneratorImpl"

9 years agoBug 1531: Fixed incorrect use of leaf types in BindingGeneratorImpl 58/10058/1
Tony Tkacik [Tue, 19 Aug 2014 09:39:45 +0000 (11:39 +0200)]
Bug 1531: Fixed incorrect use of leaf types in BindingGeneratorImpl

Change-Id: Id420d1e2b8aadcf0061fcf87910b749e9be89c04
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoBUG-1382: eliminate QName.getPrefix() from binding-generator-impl. 57/10057/1
Martin Vitez [Tue, 19 Aug 2014 09:11:41 +0000 (11:11 +0200)]
BUG-1382: eliminate QName.getPrefix() from binding-generator-impl.

Change-Id: Idce1e0efe18c6034ec036794007ea2716799d889
Signed-off-by: Martin Vitez <mvitez@cisco.com>
9 years agoMerge "BUG-1555: skip choices which are not valid in a particular context"
Tony Tkacik [Tue, 19 Aug 2014 07:14:04 +0000 (07:14 +0000)]
Merge "BUG-1555: skip choices which are not valid in a particular context"

9 years agoMerge "Enabled feature-test for features-yangtools."
Robert Varga [Mon, 18 Aug 2014 15:15:06 +0000 (15:15 +0000)]
Merge "Enabled feature-test for features-yangtools."

9 years agoMerge "features-test to test that features load correctly."
Robert Varga [Mon, 18 Aug 2014 15:14:54 +0000 (15:14 +0000)]
Merge "features-test to test that features load correctly."

9 years agoEnabled feature-test for features-yangtools. 12/10012/5
Ed Warnicke [Sun, 17 Aug 2014 22:51:41 +0000 (17:51 -0500)]
Enabled feature-test for features-yangtools.

Note: We were randomly getting surefire version
2.12.4 because no surefire version was specified.
${maven.surefire.version} is set in odlparent
but we need to apply it in the yang parent pom
because 'dependenciesToScan' is only available
starting in 2.15.

Change-Id: I3d72c845d7f75afc518956267802ea69afadd0c6
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agofeatures-test to test that features load correctly. 11/10011/4
Ed Warnicke [Sun, 17 Aug 2014 21:24:17 +0000 (16:24 -0500)]
features-test to test that features load correctly.

Change-Id: Ieacf7182fa7fe5d47c4696e164680716836f8293
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoBug 1559: Fixed resolving of used extensions. 19/10019/1
Lukas Sedlak [Mon, 18 Aug 2014 11:45:01 +0000 (13:45 +0200)]
Bug 1559: Fixed resolving of used extensions.

This is hotfix in Yang Parser Grammar. As it turnded out Yang parser didn't count with
use of extensions outside of body statements. Now yang parser is capable to parse yang files with used
extensions outside of body statements. The recommendation for future is to completely rewrite yang parser
grammar in general.

Change-Id: I65e61ef712fb499fe543753404a805a4dd14cf85
Signed-off-by: Lukas Sedlak <lsedlak@cisco.com>
9 years agoBUG-1555: skip choices which are not valid in a particular context 20/10020/1
Robert Varga [Mon, 18 Aug 2014 11:44:43 +0000 (13:44 +0200)]
BUG-1555: skip choices which are not valid in a particular context

We are enumerating the use of a case in all the possible contexts, which
may partially fail. Instead of failing completely, just skip the
offending case.

Change-Id: Icbf137266784e0f469a258b2bb312db4e01bd8f6
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "Fix MapAdaptor logging"
Martin Vitez [Mon, 18 Aug 2014 09:19:36 +0000 (09:19 +0000)]
Merge "Fix MapAdaptor logging"

9 years agoImprove error message 59/9959/1
Robert Varga [Thu, 14 Aug 2014 21:03:29 +0000 (23:03 +0200)]
Improve error message

This fixes the errors reported by default in the log by formatting the
message.

Change-Id: I5c971844ceb9f140ea62fda4472899971689c98f
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoFix Precondition formatting 58/9958/2
Robert Varga [Thu, 14 Aug 2014 19:47:59 +0000 (21:47 +0200)]
Fix Precondition formatting

Preconditions need to be formatted just like String.format().

Change-Id: I4011a6cc6a5f5cb7b0460885d956f775ff45d97c
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBug 1515: Properly resolving prefix for submodule 51/9951/1
Lukas Sedlak [Thu, 14 Aug 2014 12:50:00 +0000 (14:50 +0200)]
Bug 1515: Properly resolving prefix for submodule

Every Yang submodule contains belongs-to statement. Belongs-to statement contains
mandatory prefix statement. Now submodule prefix is resolved properly and set
as module prefix for parsed submodule.

Test models foo and subfoo were modified to cover bug scenario. In model foo there is typedef defined and called
in submodule subfoo.
Ordering test had to be modified accordingly.

Change-Id: I364337c724407ff9ad2c489968e17f1ed060f347
Signed-off-by: Lukas Sedlak <lsedlak@cisco.com>
9 years agoFix ordering fields in generated type builder 14/9814/5
Ladislav Borak [Fri, 8 Aug 2014 13:38:38 +0000 (15:38 +0200)]
Fix ordering fields in generated type builder

Methods is sorted alphabetically to make the order of evaluation
predictable.

Change-Id: Ie1171a78a17e6eab71b629411f0b0a1bb1807d7d
Signed-off-by: Ladislav Borak <lborak@cisco.com>
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoFix conflict on Object definition 19/9919/1
Robert Varga [Wed, 13 Aug 2014 12:49:59 +0000 (14:49 +0200)]
Fix conflict on Object definition

The use of Object (in the java.lang sense) is not working with models
which contain a 'container object' or similar. The fix is to not use a
temporary variable.

Change-Id: I98b3bde9a04d5f33a51a0add107829ad92d35907
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "Check for null pointer when parsing identities."
Robert Varga [Wed, 13 Aug 2014 10:00:47 +0000 (10:00 +0000)]
Merge "Check for null pointer when parsing identities."

9 years agoCheck for null pointer when parsing identities. 13/9913/1
Maros Marsalek [Wed, 13 Aug 2014 09:21:41 +0000 (11:21 +0200)]
Check for null pointer when parsing identities.

Change-Id: I5dba7506b83f145472f7327f92e47ffc17b74062
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoMerge "Make buildModules() in YangParser behave same as other methods"
Robert Varga [Wed, 13 Aug 2014 09:10:14 +0000 (09:10 +0000)]
Merge "Make buildModules() in YangParser behave same as other methods"

9 years agoBugfix: Resolving of extension arguments. 08/9808/3
Lukas Sedlak [Fri, 8 Aug 2014 12:33:38 +0000 (14:33 +0200)]
Bugfix: Resolving of extension arguments.

Fixed methods parseQName and handleUnknownNode in YangParserListenerImpl class. Now if extension contains ":"
as argument value and string before ":" doesn't represent prefix for import the argument will be parsed as ordinary
string and will not throw exception.
Log level in parseQName has been changed from warn to debug.

Tests in yang-parser-impl has been modified since they're lacked of import definitions of extensions in yang modules.

Change-Id: I84debed2bef1a0694a7019c296433b8b089e6d80
Signed-off-by: Lukas Sedlak <lsedlak@cisco.com>
9 years agoMake buildModules() in YangParser behave same as other methods 12/9912/1
Maros Marsalek [Wed, 13 Aug 2014 07:05:20 +0000 (09:05 +0200)]
Make buildModules() in YangParser behave same as other methods

Submodules were not resolved

Change-Id: Ifaac3b7f95883f190874cf91f8837c697c6c33e7
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoBUG-1425: fix builder's implementation of equals() 68/9868/2
Robert Varga [Mon, 11 Aug 2014 21:39:36 +0000 (23:39 +0200)]
BUG-1425: fix builder's implementation of equals()

With the advent of LazyDataObject, we have two implementation which need
to compare as equal. LazyObject.equals(builderObject) already works, but
we need the revers to be true, too. This patch sets out to do exactly
that.

Change-Id: I931f66a9088451524a842f6a67e8492ac922fd3d
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "BUG-1425: fix toString() invocation on LazyObject"
Lukas Sedlak [Mon, 11 Aug 2014 14:23:29 +0000 (14:23 +0000)]
Merge "BUG-1425: fix toString() invocation on LazyObject"

9 years agoBUG-1425: fix toString() invocation on LazyObject 56/9856/1
Robert Varga [Mon, 11 Aug 2014 14:02:28 +0000 (16:02 +0200)]
BUG-1425: fix toString() invocation on LazyObject

When we are coming in from toString(), the proxy invocation does not
work. Extract getAugmentations() into a private method and use that
instead.

Change-Id: Ia851560b7703817f6d75887fa7e80037292e3fd1
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoFixed missing "/" at begining of list. 54/9854/1
Milos Fabian [Mon, 11 Aug 2014 10:57:24 +0000 (12:57 +0200)]
Fixed missing "/" at begining of list.

Change-Id: I95cd9f2fc28bcf8ff46fba72a3c13339a5868078
Signed-off-by: Milos Fabian <milfabia@cisco.com>
9 years agoFix MapAdaptor logging 41/9841/2
Robert Varga [Sun, 10 Aug 2014 14:45:04 +0000 (16:45 +0200)]
Fix MapAdaptor logging

A typo prevented objects from being logged.

Change-Id: I93514dbb4dbf99fa0e3458a4643c24f41992242d
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBug 1391 - New DataBroker unexpected behaviour 25/9425/4
Jan Hajnar [Tue, 29 Jul 2014 09:53:02 +0000 (11:53 +0200)]
Bug 1391 - New DataBroker unexpected behaviour

* deleted empty override for checkWriteApplicable() in
NormalizedNodeContainerModificationStrategy and added check for node
being created by another transaction in checkWriteApplicable()
in SchemaAwareApplyOperation.
* updated concurrency tests.

Change-Id: I0fd5fb230014f794897a30d1a45a86b61a3a8378
Signed-off-by: Jan Hajnar <jhajnar@cisco.com>
9 years agoFixes to yangtools feature.xml file 47/9847/1
Ed Warnicke [Sun, 10 Aug 2014 19:49:06 +0000 (14:49 -0500)]
Fixes to yangtools feature.xml file

Change-Id: I54852269f3e42aeae7a9ef54e593ef29e48bfcbb
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoBug 1443: Implemented Lazy deserialization using dynamic proxies 95/9795/7
Tony Tkacik [Thu, 7 Aug 2014 17:06:17 +0000 (19:06 +0200)]
Bug 1443: Implemented Lazy deserialization using dynamic proxies

Result objects from translation from NormalizedNode to Binding Data
are lazily deserialized and initial cost of deserialization
is only one allocation.

Nested data are lazily deserialized once they are accessed.
This decreases time spent on eager deserialization of data
which never was accessed.

Implementation is mostly carried out in
LazyDataObject - InvocationHandler which maps proxy, data and codec
DataContainerPrototype - Prototype of DataContainerContext,
which holds only neccessary information to instantiate real context
DataObjectCodecContext - Context which holds various mapping
required for serialization / deserialization of data.

Also renames AugmentationNode to AugmentationNodeContext to keep naming
consistent and hides it from outside world, as it is
implementation-specific detail.

Change-Id: I94d994277bd0319e9aabcf842e0a741871713a30
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "BUG-997 Add SourceIdentifier to MissingSchemaSourceException"
Robert Varga [Sun, 10 Aug 2014 05:48:56 +0000 (05:48 +0000)]
Merge "BUG-997 Add SourceIdentifier to MissingSchemaSourceException"

9 years agoMerge "BUG-997 Fix unused argument in SchemaResolutionException"
Robert Varga [Sun, 10 Aug 2014 05:48:40 +0000 (05:48 +0000)]
Merge "BUG-997 Fix unused argument in SchemaResolutionException"

9 years agoMerge "BUG-997 Implement Filesystem source cache for schema repository"
Robert Varga [Sun, 10 Aug 2014 05:48:34 +0000 (05:48 +0000)]
Merge "BUG-997 Implement Filesystem source cache for schema repository"

9 years agoMerge "BUG-997 Add tests for shared schema context and fix dependency resolution...
Robert Varga [Sun, 10 Aug 2014 05:48:13 +0000 (05:48 +0000)]
Merge "BUG-997 Add tests for shared schema context and fix dependency resolution bug"

9 years agoMerge "Fix DCL in YangInstanceIdentifier"
Tony Tkacik [Fri, 8 Aug 2014 22:49:00 +0000 (22:49 +0000)]
Merge "Fix DCL in YangInstanceIdentifier"

9 years agoFix DCL in YangInstanceIdentifier 12/9812/2
Robert Varga [Fri, 8 Aug 2014 12:41:09 +0000 (14:41 +0200)]
Fix DCL in YangInstanceIdentifier

We were DCL on non-volatile variables. Fixed both instances.

Change-Id: Iedfc9a03ba1fea1c049f44f2b68c2d873564c4ca
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-997 Add SourceIdentifier to MissingSchemaSourceException 11/9811/1
Maros Marsalek [Fri, 8 Aug 2014 08:52:17 +0000 (10:52 +0200)]
BUG-997 Add SourceIdentifier to MissingSchemaSourceException

Change-Id: Ia4a595492935a66371faa844c5286a312a7897e2
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoBUG-997 Fix unused argument in SchemaResolutionException 10/9810/1
Maros Marsalek [Fri, 8 Aug 2014 07:44:53 +0000 (09:44 +0200)]
BUG-997 Fix unused argument in SchemaResolutionException

Change-Id: Id40a5318d824e71405a220c18dffa34ade745c08
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoBUG-997 Implement Filesystem source cache for schema repository 69/9769/3
Maros Marsalek [Wed, 6 Aug 2014 08:42:22 +0000 (10:42 +0200)]
BUG-997 Implement Filesystem source cache for schema repository

Use utility methods for storing files from legacy Filesystem cache

+ Add sorting by Cost to schema repository for multiple providers of the same source

Change-Id: I9a30240042e34fe7898966467b503eee85166887
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoBUG-997 Add tests for shared schema context and fix dependency resolution bug 46/9646/4
Maros Marsalek [Mon, 4 Aug 2014 11:16:48 +0000 (13:16 +0200)]
BUG-997 Add tests for shared schema context and fix dependency resolution bug

Change-Id: I51d1110629b915e6893a08fa827ccf2ba46ed181
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoBug 1443: Added support for Union type & OSGI Runtime 49/9749/3
Tony Tkacik [Wed, 6 Aug 2014 13:02:05 +0000 (15:02 +0200)]
Bug 1443: Added support for Union type & OSGI Runtime

Introduced new marker interface SchemaUnawareCodec
which marks codecs for simple value types,
which are unaffected by introduction of new modules
(practically everything except union, instance identifier
 and identity codecs). Reworked caching to cache only these
codecs.

Added integration with OSGI, which ensures proper class loading
and updates Javassist classpool if necessary.

Updated ModuleContext to not populate type to schema fields
with empty augmentations, which are undetectable in
data tree.

Change-Id: I2a2c8477e9fdc2ef53bd9f81956023c0760d620e
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoMerge "Bug 1372 - toString methods in generated classes"
Tony Tkacik [Fri, 8 Aug 2014 07:20:19 +0000 (07:20 +0000)]
Merge "Bug 1372 - toString methods in generated classes"

9 years agoMerge "BUG-1436: deprecate IntermediateMapping"
Tony Tkacik [Thu, 7 Aug 2014 20:16:41 +0000 (20:16 +0000)]
Merge "BUG-1436: deprecate IntermediateMapping"

9 years agoMerge "Fixed incorrect test location."
Tony Tkacik [Thu, 7 Aug 2014 20:16:10 +0000 (20:16 +0000)]
Merge "Fixed incorrect test location."

9 years agoMerge "Fix AugmentationSchemaProxy.getDataChildByName()"
Tony Tkacik [Thu, 7 Aug 2014 20:03:11 +0000 (20:03 +0000)]
Merge "Fix AugmentationSchemaProxy.getDataChildByName()"

9 years agoMigrate test asserts 26/9626/4
Robert Varga [Sun, 3 Aug 2014 12:51:21 +0000 (14:51 +0200)]
Migrate test asserts

With update to JUnit 4.11 we need to migrate tests to use
proper non-deprecated methods/classes. Also removes wildcard imports.

Change-Id: I969f482a2dd85242fd32c22e7c5807d643e3e554
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoDo not override versions provided through odlparent 33/9433/7
Robert Varga [Tue, 29 Jul 2014 13:41:16 +0000 (15:41 +0200)]
Do not override versions provided through odlparent

Cuts down declarations which are duplicates and/or result in downgrades.

Change-Id: I7110996ddedff456881a768cd49841191e219345
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoFix AugmentationSchemaProxy.getDataChildByName() 92/9792/1
Robert Varga [Thu, 7 Aug 2014 14:54:15 +0000 (16:54 +0200)]
Fix AugmentationSchemaProxy.getDataChildByName()

This implementation breaks the API contract specified by
AugmentationDefinition by throwing IllegalArgumentException where it
should just return null.

Drive-by: fix a typo in AugmentationSchema
Change-Id: I762ce3c02ba776d8a025ccd5bcdba82a6c1579ad
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-1436: deprecate IntermediateMapping 87/9787/2
Robert Varga [Thu, 7 Aug 2014 13:53:59 +0000 (15:53 +0200)]
BUG-1436: deprecate IntermediateMapping

IntermediateMapping is only used in CompositeNode-related codecs and
thus is scheduled to be removed at the same time as CompositeNodes.

Change-Id: Ifff06e62441e5f8cc2eac069145389201f369493
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBug 1372 - toString methods in generated classes 82/9782/1
Ladislav Borak [Thu, 7 Aug 2014 11:41:09 +0000 (13:41 +0200)]
Bug 1372 - toString methods in generated classes

- changed generated toString method in BaseTemplate,
  added info about simple name of class

Change-Id: I1e4142a9d78205b497f8ed552ac72d1440029b46
Signed-off-by: Ladislav Borak <lborak@cisco.com>
9 years agoMerge "Bug 1372 - toString methods in generated classes"
Tony Tkacik [Thu, 7 Aug 2014 06:13:41 +0000 (06:13 +0000)]
Merge "Bug 1372 - toString methods in generated classes"

9 years agoMerge "BUG-576: modified parser to handle augmentation of extension instances."
Tony Tkacik [Wed, 6 Aug 2014 16:49:39 +0000 (16:49 +0000)]
Merge "BUG-576: modified parser to handle augmentation of extension instances."

9 years agoMerge "BUG-576: modified parser to handle refinement of extension instances."
Tony Tkacik [Wed, 6 Aug 2014 16:49:27 +0000 (16:49 +0000)]
Merge "BUG-576: modified parser to handle refinement of extension instances."

9 years agoMerge "Fix sonar not reporting unit tests"
Tony Tkacik [Wed, 6 Aug 2014 15:54:07 +0000 (15:54 +0000)]
Merge "Fix sonar not reporting unit tests"

9 years agoFix sonar not reporting unit tests 24/9724/10
Ladislav Borak [Wed, 6 Aug 2014 14:38:39 +0000 (16:38 +0200)]
Fix sonar not reporting unit tests

Enables jacoco plugin (uncodnitionally for now) to get sonar to pickup
the stats.
Changed TypeDefinitionCompilationTest because synthetic fields.

Change-Id: I6baced1cd3ed1a10b790c8a7f11348febc1a380b
Signed-off-by: Robert Varga <rovarga@cisco.com>
Signed-off-by: Ladislav Borak <lborak@cisco.com>
9 years agoBUG-1487: refactor StreamWriterGenerator 09/9709/8
Robert Varga [Tue, 5 Aug 2014 16:30:05 +0000 (18:30 +0200)]
BUG-1487: refactor StreamWriterGenerator

This is a reorganization of the StreamWriterGenerator such that it is
properly split up into classes, with contracts clarified. It also
prevents outside subclassing. Also cache pre-made serializer instances.

Change-Id: I492d73a082c24c03b8d17f3868e4a497c8f64b7b
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-1487: use prototypes for instantiating codecs 08/9708/8
Robert Varga [Tue, 5 Aug 2014 14:37:01 +0000 (16:37 +0200)]
BUG-1487: use prototypes for instantiating codecs

Optimizes the per-class overhead by copying a prototype class, and then
setting the proper serializer name. At the same time we get rid of the
static serializer methods, making the interface a bit cleaner.
Additionally, we hide the AbstractStreamWriterGenerator, so that to have
a proper boundary.

Change-Id: Ia7d56ff16e1eec7204fa087c49f2ee55a658a377
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-576: modified parser to handle augmentation of extension instances. 75/9575/4
Martin Vitez [Fri, 1 Aug 2014 11:13:11 +0000 (13:13 +0200)]
BUG-576: modified parser to handle augmentation of extension instances.

Change-Id: Ic40d5691baa57ee72953abf761dd52e1c85f66c2
Signed-off-by: Martin Vitez <mvitez@cisco.com>
9 years agoMerge "Bug 1432 - Generated DTOs for types use inefficient instantiation"
Tony Tkacik [Wed, 6 Aug 2014 09:22:59 +0000 (09:22 +0000)]
Merge "Bug 1432 - Generated DTOs for types use inefficient instantiation"

9 years agoBUG-576: modified parser to handle refinement of extension instances. 74/9574/3
Martin Vitez [Fri, 1 Aug 2014 10:38:44 +0000 (12:38 +0200)]
BUG-576: modified parser to handle refinement of extension instances.

If user tries to refine an instance of extension parser log this event and continue with parsing
instead of throwing an exception.

Change-Id: I6d535b124527bc5a47ef90ba72b57eccbd6c73ef
Signed-off-by: Martin Vitez <mvitez@cisco.com>
9 years agoBug 1432 - Generated DTOs for types use inefficient instantiation 02/9502/3
Ladislav Borak [Wed, 30 Jul 2014 17:32:00 +0000 (19:32 +0200)]
Bug 1432 - Generated DTOs for types use inefficient instantiation

- changed method for generating default instance value
- only for types (boolean, byte, short, int and long)

Change-Id: I4a423f3569ed84f4d6aff8efe97a110045c6e7c7
Signed-off-by: Ladislav Borak <lborak@cisco.com>
9 years agoFix feature file (again :( ) 15/9715/1
Ed Warnicke [Tue, 5 Aug 2014 20:28:03 +0000 (15:28 -0500)]
Fix feature file (again :( )

Change-Id: I95c9d241a812f6d54b7df6d5ee46627930bc1691
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoFix to feature file 91/9691/3
Giovanni Meo [Tue, 5 Aug 2014 18:07:47 +0000 (20:07 +0200)]
Fix to feature file

Change-Id: I6619218e29d8581aedb8012e3fd35553168ad36d
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
9 years agoMerge "yang-data-json is in the feature file, but not built"
Tony Tkacik [Tue, 5 Aug 2014 13:23:47 +0000 (13:23 +0000)]
Merge "yang-data-json is in the feature file, but not built"

9 years agoBUG-1402: Make sure the version in the yang-maven-plugin-it is interpolated also... 94/9694/2
Giovanni Meo [Mon, 4 Aug 2014 14:49:45 +0000 (16:49 +0200)]
BUG-1402: Make sure the version in the yang-maven-plugin-it is interpolated also for the parent

- The parent version of the test parent pom for the IT was still
hardcoded, we need that to come from the project itself else it cannot
be released

Change-Id: I88ae85df3bb84e805df9594b56d3c62d21386f4f
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
9 years agoyang-data-json is in the feature file, but not built 93/9693/1
Giovanni Meo [Fri, 1 Aug 2014 16:53:12 +0000 (18:53 +0200)]
yang-data-json is in the feature file, but not built

- Remove reference to a no-longer existent artifacts and add new dependencies

Change-Id: Ib9fe2e388f658114e0deadfa4dbab0f403a1fed7
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
9 years agoBUG-1382: eliminate use of QName.getPrefix from yang parser 90/9390/7
Martin Vitez [Wed, 23 Jul 2014 12:52:14 +0000 (14:52 +0200)]
BUG-1382: eliminate use of QName.getPrefix from yang parser

Updated tests - removed tests on QName's prefix.

Please do not merge before https://git.opendaylight.org/gerrit/#/c/9640/ is merged.

Change-Id: I41b8940965631609074c5bb8e4c2e0538a33f6a9
Signed-off-by: Martin Vitez <mvitez@cisco.com>
9 years agoMerge "BUG-1472: deprecated CompositeNode and friends"
Robert Varga [Tue, 5 Aug 2014 08:01:46 +0000 (08:01 +0000)]
Merge "BUG-1472: deprecated CompositeNode and friends"

9 years agoMerge "BUG-994: introduce ObjectCache for QNameModule/QName"
Tony Tkacik [Tue, 5 Aug 2014 07:46:55 +0000 (07:46 +0000)]
Merge "BUG-994: introduce ObjectCache for QNameModule/QName"

9 years agoBUG-1472: deprecated CompositeNode and friends 21/9621/3
Robert Varga [Sun, 3 Aug 2014 11:18:33 +0000 (13:18 +0200)]
BUG-1472: deprecated CompositeNode and friends

These APIs are deprecated in favor of NormalizedNode and friends. Mark
them as such, so the code that needs to be migrated gets highlighted.

Change-Id: I9d5b903d54dd295f4111f6832bf023b2685c0291
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBug 1439, Bug 1443 Binding Codec NormalizedNodeWriter support 97/9497/11
Tony Tkacik [Fri, 1 Aug 2014 17:28:13 +0000 (19:28 +0200)]
Bug 1439, Bug 1443 Binding Codec NormalizedNodeWriter support

Added initial implementation of Code generator for Binding Stream Writers
which uses NormalizedNodeStreamWriter on the backend
to write data.

Change-Id: Icae22fd1b9ed4256022650d3ad16b38c577f3d3a
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "BUG-1275: teach NormalizedNode builders about size hints"
Tony Tkacik [Mon, 4 Aug 2014 18:17:03 +0000 (18:17 +0000)]
Merge "BUG-1275: teach NormalizedNode builders about size hints"