From 5b20070d90ec2efc54173bd113575d089d25d5e8 Mon Sep 17 00:00:00 2001 From: Richard Richter Date: Wed, 10 Jun 2020 12:05:29 +0200 Subject: [PATCH] MetadataFactory.fromJaxb: rename + removed unused prismContext parameter --- .../com/evolveum/midpoint/repo/sql/data/common/RObject.java | 2 +- .../midpoint/repo/sql/data/common/container/RAssignment.java | 2 +- .../midpoint/repo/sql/data/factory/MetadataFactory.java | 4 ++-- .../midpoint/repo/sql/helpers/mapper/MetadataMapper.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java index 008d9789426..e4c40a463a7 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java @@ -666,7 +666,7 @@ static void copyObjectInformationFromJAXB(ObjectType jaxb, RObject repo, repo.getTrigger().add(rTrigger); } - MetadataFactory.fromJAXB(jaxb.getMetadata(), repo, repositoryContext.prismContext, repositoryContext.relationRegistry); + MetadataFactory.fromJaxb(jaxb.getMetadata(), repo, repositoryContext.relationRegistry); repo.setTenantRef(RUtil.jaxbRefToEmbeddedRepoRef(jaxb.getTenantRef(), repositoryContext.relationRegistry)); if (jaxb.getExtension() != null) { diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java index e6bc9e64888..6cfc362a67b 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java @@ -475,7 +475,7 @@ private static void fromJaxb(AssignmentType jaxb, RAssignment repo, RepositoryCo repo.setResourceRef(RUtil.jaxbRefToEmbeddedRepoRef(jaxb.getConstruction().getResourceRef(), repositoryContext.relationRegistry)); } - MetadataFactory.fromJAXB(jaxb.getMetadata(), repo, repositoryContext.prismContext, repositoryContext.relationRegistry); + MetadataFactory.fromJaxb(jaxb.getMetadata(), repo, repositoryContext.relationRegistry); } @Override diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/factory/MetadataFactory.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/factory/MetadataFactory.java index 20e8c1dc788..db96b50721c 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/factory/MetadataFactory.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/factory/MetadataFactory.java @@ -75,8 +75,8 @@ private static boolean isNull(Metadata repo) { && repo.getModifierRef() == null; } - public static void fromJAXB(MetadataType jaxb, Metadata repo, PrismContext prismContext, - RelationRegistry relationRegistry) + public static void fromJaxb( + MetadataType jaxb, Metadata repo, RelationRegistry relationRegistry) throws DtoTranslationException { if (jaxb == null) { repo.setCreateChannel(null); diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/mapper/MetadataMapper.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/mapper/MetadataMapper.java index 3c0e9e62249..257c97a074c 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/mapper/MetadataMapper.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/mapper/MetadataMapper.java @@ -23,7 +23,7 @@ public class MetadataMapper implements Mapper { public Metadata map(MetadataType input, MapperContext context) { Metadata metadata = (Metadata) context.getOwner(); try { - MetadataFactory.fromJAXB(input, metadata, context.getPrismContext(), context.getRelationRegistry()); + MetadataFactory.fromJaxb(input, metadata, context.getRelationRegistry()); } catch (DtoTranslationException ex) { throw new SystemException("Couldn't translate metadata to entity"); }