Skip to content

Fixed id reuse issue for inner objects #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed id reuse issue for inner objects #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/springpython/config/_xml_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@ def _convert_bean(self, bean, prefix=""):
if "scope" in bean.attrib:
c.scope = scope.convert(bean.get("scope"))
self.logger.debug("bean: %s" % bean)
c.pos_constr = [self._convert_prop_def(bean, constr, bean.get("id") + ".constr") for constr in bean.findall(self.NS+"constructor-arg")]
c.pos_constr = [self._convert_prop_def(bean, constr, bean.get("id") + ".constr.{pos}".format(i))
for i, constr in enumerate(bean.findall(self.NS+"constructor-arg"))]
self.logger.debug("Constructors = %s" % c.pos_constr)
c.props = [self._convert_prop_def(bean, p, p.get("name")) for p in bean.findall(self.NS+"property")]

Expand Down Expand Up @@ -339,13 +340,13 @@ def _traverse_parents(self, leaf, child, ns, pos_constr,
def _get_pos_constr(self, object, ns):
""" Returns a list of all positional constructor arguments of an object.
"""
return [self._convert_prop_def(object, constr, object.get("id") + ".constr", ns) for constr in object.findall(ns+"constructor-arg")
if not "name" in constr.attrib]
return [self._convert_prop_def(object, constr, object.get("id") + ".constr.{pos}".format(i), ns)
for i, constr in enumerate(object.findall(ns+"constructor-arg")) if not "name" in constr.attrib]

def _get_named_constr(self, object, ns):
""" Returns a dictionary of all named constructor arguments of an object.
"""
return dict([(str(constr.get("name")), self._convert_prop_def(object, constr, object.get("id") + ".constr", ns))
return dict([(str(constr.get("name")), self._convert_prop_def(object, constr, object.get("id") + ".constr." + constr.get("name"), ns))
for constr in object.findall(ns+"constructor-arg") if "name" in constr.attrib])

def _get_props(self, object, ns):
Expand Down Expand Up @@ -604,4 +605,3 @@ def _convert_prop_def(self, comp, p, name, ns):
return self._convert_inner_object(p.get("object"), comp.get("id"), name, ns)
else:
return self._convert_inner_object(p.find(ns+"object"), comp.get("id"), name, ns)