Roy Golan has uploaded a new change for review.

Change subject: utils: Preferences loader - support non-versioned keys
......................................................................

utils: Preferences loader - support non-versioned keys

Till today the preference loader treats keys and a node with
multi-version values on it

nodeA.nodeB.value.x = 1
nodeA.nodeB.value.y = 2

so "value" is also a node and x and y are keys on the node.

this is specifig behaviour for paths in the form of a.b.c.value.x.y.z

This design is not straight forward with non-versioned keys such as:

nodeC.key = value

so we can:

 Preferences nodeC = getNodeC();
 nodeC.keys() # ["key"]
 nodeC.get("key") # "value"

Bug-Url: https://bugzilla.redhat.com/1006340
Change-Id: I4b3bf67fbd892c37763428ae79204b59632d025d
Signed-off-by: Roy Golan <[email protected]>
---
M 
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/osinfo/OsInfoPreferencesLoader.java
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/94/19794/1

diff --git 
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/osinfo/OsInfoPreferencesLoader.java
 
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/osinfo/OsInfoPreferencesLoader.java
index 652a5b6..fabf0f2 100644
--- 
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/osinfo/OsInfoPreferencesLoader.java
+++ 
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/osinfo/OsInfoPreferencesLoader.java
@@ -99,6 +99,9 @@
                     if (key.startsWith("value")) {
                         key = iterator.hasNext() ? key + "." + 
StringUtils.join(iterator, ".") : key;
                         break;
+                    } else if (!iterator.hasNext()) {
+                        // its a key without a multiple version values
+                        break;
                     } else {
                         node = node.node(key);
                     }


-- 
To view, visit http://gerrit.ovirt.org/19794
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4b3bf67fbd892c37763428ae79204b59632d025d
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Roy Golan <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to