Fixing JPA XMLContentExporter for ARelationship

Author: ilgrosso

client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/Relationships.java

@@ -49,7 +49,6 @@
 import org.apache.syncope.client.ui.commons.wizards.any.UserWrapper;
 import org.apache.syncope.common.lib.to.AnyObjectTO;
 import org.apache.syncope.common.lib.to.AnyTO;
-import org.apache.syncope.common.lib.to.RelatableTO;
 import org.apache.syncope.common.lib.to.RelationshipTO;
 import org.apache.syncope.common.lib.to.RelationshipTypeTO;
 import org.apache.syncope.common.lib.types.AnyEntitlement;
@@ -121,12 +120,11 @@ protected Fragment getViewFragment() {
         Fragment viewFragment = new Fragment("relationships", "viewFragment", this);
         viewFragment.setOutputMarkupId(true);
 
-        List<RelationshipTO> relationships = getCurrentRelationships();
-        viewFragment.add(relationships.isEmpty()
+        viewFragment.add(anyTO.getRelationships().isEmpty()
                 ? new Label("relationships", new Model<>(getString("relationships.empty.list")))
                 : new RelationshipViewPanel.Builder(pageRef).
                         setAnyTO(anyTO).
-                        setRelationships(relationships).
+                        setRelationships(anyTO.getRelationships()).
                         build("relationships"));
 
         ActionsPanel<RelationshipTO> panel = new ActionsPanel<>("actions", null);
@@ -148,18 +146,6 @@ public void onClick(final AjaxRequestTarget target, final RelationshipTO ignore)
         return viewFragment;
     }
 
-    protected List<RelationshipTO> getCurrentRelationships() {
-        return anyTO instanceof RelatableTO relatableTO
-                ? relatableTO.getRelationships()
-                : List.of();
-    }
-
-    protected void addNewRelationship(final RelationshipTO relaltionship) {
-        if (anyTO instanceof RelatableTO relatableTO) {
-            relatableTO.getRelationships().add(relaltionship);
-        }
-    }
-
     @Override
     public boolean evaluate() {
         return !relationshipTypeRestClient.list().isEmpty();
@@ -270,7 +256,7 @@ public void onEvent(final IEvent<?> event) {
                 rel.setOtherEndKey(right.getKey());
                 rel.setOtherEndName(AnyObjectTO.class.cast(right).getName());
 
-                Relationships.this.addNewRelationship(rel);
+                anyTO.getRelationships().add(rel);
 
                 Relationships.this.addOrReplace(getViewFragment().setRenderBodyOnly(true));
                 target.add(Relationships.this);

core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/content/XMLContentExporter.java

@@ -161,7 +161,7 @@ protected static String columnName(final Supplier<Stream<Attribute<?, ?>>> attrs
         }).filter(Objects::nonNull).findFirst().orElse(columnName);
 
         if (Strings.CI.endsWith(name, "_ID")) {
-            String left = StringUtils.substringBefore(name, "_");
+            String left = StringUtils.substringBeforeLast(name, "_");
             String prefix = attrs.get().filter(attr -> left.equalsIgnoreCase(attr.getName())).findFirst().
                     map(Attribute::getName).orElse(left);
             name = prefix + "_id";