From 3fd26d91771b0477748db5af11e344cf5713a131 Mon Sep 17 00:00:00 2001 From: Viliam Repan Date: Wed, 21 Feb 2018 13:08:24 +0100 Subject: [PATCH] removed dead code --- .../common/RAccessCertificationCampaign.java | 16 ------------- .../RAccessCertificationDefinition.java | 16 ------------- .../midpoint/repo/sql/data/common/RCase.java | 10 -------- .../repo/sql/data/common/RConnector.java | 14 ----------- .../repo/sql/data/common/RConnectorHost.java | 24 +++---------------- .../midpoint/repo/sql/data/common/RForm.java | 15 ------------ .../sql/data/common/RFunctionLibrary.java | 22 ++++------------- .../repo/sql/data/common/RGenericObject.java | 16 ------------- .../repo/sql/data/common/RLookupTable.java | 17 +++---------- .../midpoint/repo/sql/data/common/RNode.java | 17 ------------- .../repo/sql/data/common/RObject.java | 4 ---- .../repo/sql/data/common/RObjectTemplate.java | 14 ----------- .../midpoint/repo/sql/data/common/ROrg.java | 14 ----------- .../repo/sql/data/common/RReport.java | 18 -------------- .../repo/sql/data/common/RReportOutput.java | 18 -------------- .../repo/sql/data/common/RResource.java | 14 ----------- .../midpoint/repo/sql/data/common/RRole.java | 16 ------------- .../repo/sql/data/common/RSecurityPolicy.java | 19 --------------- .../repo/sql/data/common/RSequence.java | 16 ------------- .../repo/sql/data/common/RService.java | 13 ---------- .../repo/sql/data/common/RShadow.java | 16 ------------- .../sql/data/common/RSystemConfiguration.java | 17 ------------- .../midpoint/repo/sql/data/common/RTask.java | 16 ------------- .../midpoint/repo/sql/data/common/RUser.java | 14 ----------- .../repo/sql/data/common/RValuePolicy.java | 17 ------------- 25 files changed, 11 insertions(+), 382 deletions(-) diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationCampaign.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationCampaign.java index 02b4d4ece76..138f399c814 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationCampaign.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationCampaign.java @@ -16,7 +16,6 @@ package com.evolveum.midpoint.repo.sql.data.common; -import com.evolveum.midpoint.prism.PrismContext; import com.evolveum.midpoint.repo.sql.data.RepositoryContext; import com.evolveum.midpoint.repo.sql.data.common.container.RAccessCertificationCase; import com.evolveum.midpoint.repo.sql.data.common.embedded.REmbeddedReference; @@ -27,8 +26,6 @@ import com.evolveum.midpoint.repo.sql.util.IdGeneratorResult; import com.evolveum.midpoint.repo.sql.util.MidPointJoinedPersister; import com.evolveum.midpoint.repo.sql.util.RUtil; -import com.evolveum.midpoint.schema.GetOperationOptions; -import com.evolveum.midpoint.schema.SelectorOptions; import com.evolveum.midpoint.xml.ns._public.common.common_3.AccessCertificationCampaignType; import com.evolveum.midpoint.xml.ns._public.common.common_3.AccessCertificationCaseType; import org.hibernate.annotations.ForeignKey; @@ -36,7 +33,6 @@ import javax.persistence.*; import javax.xml.datatype.XMLGregorianCalendar; -import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -211,16 +207,4 @@ public static void copyFromJAXB(AccessCertificationCampaignType jaxb, RAccessCer repo.setState(RUtil.getRepoEnumValue(jaxb.getState(), RAccessCertificationCampaignState.class)); repo.setStageNumber(jaxb.getStageNumber()); } - - @Override - public AccessCertificationCampaignType toJAXB(PrismContext prismContext, - Collection> options) - throws DtoTranslationException { - - AccessCertificationCampaignType object = new AccessCertificationCampaignType(); - RUtil.revive(object, prismContext); - RAccessCertificationCampaign.copyToJAXB(this, object, prismContext, options); - - return object; - } } \ No newline at end of file diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationDefinition.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationDefinition.java index d0ceea3d3c3..fd4563b8bc4 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationDefinition.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationDefinition.java @@ -16,7 +16,6 @@ package com.evolveum.midpoint.repo.sql.data.common; -import com.evolveum.midpoint.prism.PrismContext; import com.evolveum.midpoint.repo.sql.data.RepositoryContext; import com.evolveum.midpoint.repo.sql.data.common.embedded.REmbeddedReference; import com.evolveum.midpoint.repo.sql.data.common.embedded.RPolyString; @@ -25,15 +24,12 @@ import com.evolveum.midpoint.repo.sql.util.IdGeneratorResult; import com.evolveum.midpoint.repo.sql.util.MidPointJoinedPersister; import com.evolveum.midpoint.repo.sql.util.RUtil; -import com.evolveum.midpoint.schema.GetOperationOptions; -import com.evolveum.midpoint.schema.SelectorOptions; import com.evolveum.midpoint.xml.ns._public.common.common_3.AccessCertificationDefinitionType; import org.hibernate.annotations.ForeignKey; import org.hibernate.annotations.Persister; import javax.persistence.*; import javax.xml.datatype.XMLGregorianCalendar; -import java.util.Collection; @Entity @Table(name = RAccessCertificationDefinition.TABLE_NAME, @@ -151,16 +147,4 @@ public static void copyFromJAXB(AccessCertificationDefinitionType jaxb, RAccessC repo.setLastCampaignStartedTimestamp(jaxb.getLastCampaignStartedTimestamp()); repo.setLastCampaignClosedTimestamp(jaxb.getLastCampaignClosedTimestamp()); } - - @Override - public AccessCertificationDefinitionType toJAXB(PrismContext prismContext, - Collection> options) - throws DtoTranslationException { - - AccessCertificationDefinitionType object = new AccessCertificationDefinitionType(); - RUtil.revive(object, prismContext); - RAccessCertificationDefinition.copyToJAXB(this, object, prismContext, options); - - return object; - } } \ No newline at end of file diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RCase.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RCase.java index b4f16904f6a..e348393f0fa 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RCase.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RCase.java @@ -16,20 +16,16 @@ package com.evolveum.midpoint.repo.sql.data.common; -import com.evolveum.midpoint.prism.PrismContext; import com.evolveum.midpoint.repo.sql.data.RepositoryContext; import com.evolveum.midpoint.repo.sql.data.common.embedded.RPolyString; import com.evolveum.midpoint.repo.sql.util.DtoTranslationException; import com.evolveum.midpoint.repo.sql.util.IdGeneratorResult; import com.evolveum.midpoint.repo.sql.util.MidPointJoinedPersister; -import com.evolveum.midpoint.schema.GetOperationOptions; -import com.evolveum.midpoint.schema.SelectorOptions; import com.evolveum.midpoint.xml.ns._public.common.common_3.CaseType; import org.hibernate.annotations.ForeignKey; import org.hibernate.annotations.Persister; import javax.persistence.*; -import java.util.Collection; import java.util.Objects; /** @@ -81,10 +77,4 @@ public static void copyFromJAXB(CaseType jaxb, RCase repo, RepositoryContext rep repo.setNameCopy(RPolyString.copyFromJAXB(jaxb.getName())); } - - @Override - public CaseType toJAXB(PrismContext prismContext, Collection> options) - throws DtoTranslationException { - throw new UnsupportedOperationException("Shouldn't be needed anymore."); - } } diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnector.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnector.java index 8e8b1996136..2a9d4e536ef 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnector.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnector.java @@ -16,7 +16,6 @@ package com.evolveum.midpoint.repo.sql.data.common; -import com.evolveum.midpoint.prism.PrismContext; import com.evolveum.midpoint.repo.sql.data.RepositoryContext; import com.evolveum.midpoint.repo.sql.data.common.embedded.REmbeddedReference; import com.evolveum.midpoint.repo.sql.data.common.embedded.RPolyString; @@ -24,8 +23,6 @@ import com.evolveum.midpoint.repo.sql.util.IdGeneratorResult; import com.evolveum.midpoint.repo.sql.util.MidPointJoinedPersister; import com.evolveum.midpoint.repo.sql.util.RUtil; -import com.evolveum.midpoint.schema.GetOperationOptions; -import com.evolveum.midpoint.schema.SelectorOptions; import com.evolveum.midpoint.util.logging.Trace; import com.evolveum.midpoint.util.logging.TraceManager; import com.evolveum.midpoint.xml.ns._public.common.common_3.ConnectorType; @@ -34,7 +31,6 @@ import org.hibernate.annotations.Persister; import javax.persistence.*; -import java.util.Collection; import java.util.Set; /** @@ -180,14 +176,4 @@ public static void copyFromJAXB(ConnectorType jaxb, RConnector repo, RepositoryC throw new DtoTranslationException(ex.getMessage(), ex); } } - - @Override - public ConnectorType toJAXB(PrismContext prismContext, Collection> options) - throws DtoTranslationException { - ConnectorType object = new ConnectorType(); - RUtil.revive(object, prismContext); - RConnector.copyToJAXB(this, object, prismContext, options); - - return object; - } } diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnectorHost.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnectorHost.java index 64f928f6231..0556b96ed55 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnectorHost.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnectorHost.java @@ -16,22 +16,14 @@ package com.evolveum.midpoint.repo.sql.data.common; -import java.util.Collection; - import com.evolveum.midpoint.repo.sql.data.RepositoryContext; -import com.evolveum.midpoint.repo.sql.util.IdGeneratorResult; -import com.evolveum.midpoint.repo.sql.util.MidPointJoinedPersister; -import org.hibernate.annotations.Persister; - -import com.evolveum.midpoint.prism.PrismContext; import com.evolveum.midpoint.repo.sql.data.common.embedded.RPolyString; import com.evolveum.midpoint.repo.sql.util.DtoTranslationException; -import com.evolveum.midpoint.repo.sql.util.RUtil; -import com.evolveum.midpoint.schema.GetOperationOptions; -import com.evolveum.midpoint.schema.SelectorOptions; +import com.evolveum.midpoint.repo.sql.util.IdGeneratorResult; +import com.evolveum.midpoint.repo.sql.util.MidPointJoinedPersister; import com.evolveum.midpoint.xml.ns._public.common.common_3.ConnectorHostType; - import org.hibernate.annotations.ForeignKey; +import org.hibernate.annotations.Persister; import javax.persistence.*; @@ -109,14 +101,4 @@ public static void copyFromJAXB(ConnectorHostType jaxb, RConnectorHost repo, Rep repo.setHostname(jaxb.getHostname()); repo.setPort(jaxb.getPort()); } - - @Override - public ConnectorHostType toJAXB(PrismContext prismContext, Collection> options) - throws DtoTranslationException { - ConnectorHostType object = new ConnectorHostType(); - RUtil.revive(object, prismContext); - RConnectorHost.copyToJAXB(this, object, prismContext, options); - - return object; - } } diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RForm.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RForm.java index 9947df1d656..2cd0c977916 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RForm.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RForm.java @@ -16,21 +16,16 @@ package com.evolveum.midpoint.repo.sql.data.common; -import com.evolveum.midpoint.prism.PrismContext; import com.evolveum.midpoint.repo.sql.data.RepositoryContext; import com.evolveum.midpoint.repo.sql.data.common.embedded.RPolyString; import com.evolveum.midpoint.repo.sql.util.DtoTranslationException; import com.evolveum.midpoint.repo.sql.util.IdGeneratorResult; import com.evolveum.midpoint.repo.sql.util.MidPointJoinedPersister; -import com.evolveum.midpoint.repo.sql.util.RUtil; -import com.evolveum.midpoint.schema.GetOperationOptions; -import com.evolveum.midpoint.schema.SelectorOptions; import com.evolveum.midpoint.xml.ns._public.common.common_3.FormType; import org.hibernate.annotations.ForeignKey; import org.hibernate.annotations.Persister; import javax.persistence.*; -import java.util.Collection; import java.util.Objects; /** @@ -78,14 +73,4 @@ public static void copyFromJAXB(FormType jaxb, RForm repo, RepositoryContext rep IdGeneratorResult generatorResult) throws DtoTranslationException { RObject.copyFromJAXB(jaxb, repo, repositoryContext, generatorResult); } - - - @Override - public FormType toJAXB(PrismContext prismContext, Collection> options) - throws DtoTranslationException { - FormType object = new FormType(); - RUtil.revive(object, prismContext); - RForm.copyToJAXB(this, object, prismContext, options); - return object; - } } diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFunctionLibrary.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFunctionLibrary.java index 367260b818e..42475e99f94 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFunctionLibrary.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFunctionLibrary.java @@ -16,23 +16,17 @@ package com.evolveum.midpoint.repo.sql.data.common; -import java.util.Collection; -import java.util.Objects; - -import javax.persistence.*; - -import org.hibernate.annotations.ForeignKey; -import org.hibernate.annotations.Persister; - -import com.evolveum.midpoint.prism.PrismContext; import com.evolveum.midpoint.repo.sql.data.RepositoryContext; import com.evolveum.midpoint.repo.sql.data.common.embedded.RPolyString; import com.evolveum.midpoint.repo.sql.util.DtoTranslationException; import com.evolveum.midpoint.repo.sql.util.IdGeneratorResult; import com.evolveum.midpoint.repo.sql.util.MidPointJoinedPersister; -import com.evolveum.midpoint.schema.GetOperationOptions; -import com.evolveum.midpoint.schema.SelectorOptions; import com.evolveum.midpoint.xml.ns._public.common.common_3.FunctionLibraryType; +import org.hibernate.annotations.ForeignKey; +import org.hibernate.annotations.Persister; + +import javax.persistence.*; +import java.util.Objects; /** * @@ -80,10 +74,4 @@ public static void copyFromJAXB(FunctionLibraryType jaxb, RFunctionLibrary repo, IdGeneratorResult generatorResult) throws DtoTranslationException { RObject.copyFromJAXB(jaxb, repo, repositoryContext, generatorResult); } - - @Override - public FunctionLibraryType toJAXB(PrismContext prismContext, Collection> options) - throws DtoTranslationException { - throw new UnsupportedOperationException("Shouldn't be needed anymore."); - } } diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RGenericObject.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RGenericObject.java index 2a2f5441471..37ba0f5b47b 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RGenericObject.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RGenericObject.java @@ -16,21 +16,16 @@ package com.evolveum.midpoint.repo.sql.data.common; -import com.evolveum.midpoint.prism.PrismContext; import com.evolveum.midpoint.repo.sql.data.RepositoryContext; import com.evolveum.midpoint.repo.sql.data.common.embedded.RPolyString; import com.evolveum.midpoint.repo.sql.util.DtoTranslationException; import com.evolveum.midpoint.repo.sql.util.IdGeneratorResult; import com.evolveum.midpoint.repo.sql.util.MidPointJoinedPersister; -import com.evolveum.midpoint.repo.sql.util.RUtil; -import com.evolveum.midpoint.schema.GetOperationOptions; -import com.evolveum.midpoint.schema.SelectorOptions; import com.evolveum.midpoint.xml.ns._public.common.common_3.GenericObjectType; import org.hibernate.annotations.ForeignKey; import org.hibernate.annotations.Persister; import javax.persistence.*; -import java.util.Collection; /** * @author lazyman @@ -94,15 +89,4 @@ public static void copyFromJAXB(GenericObjectType jaxb, RGenericObject repo, Rep repo.setNameCopy(RPolyString.copyFromJAXB(jaxb.getName())); repo.setObjectType(jaxb.getObjectType()); } - - @Override - public GenericObjectType toJAXB(PrismContext prismContext, Collection> options) - throws DtoTranslationException { - - GenericObjectType object = new GenericObjectType(); - RUtil.revive(object, prismContext); - RGenericObject.copyToJAXB(this, object, prismContext, options); - - return object; - } } diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RLookupTable.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RLookupTable.java index d9b18b2b358..062dcf7babd 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RLookupTable.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RLookupTable.java @@ -1,15 +1,11 @@ package com.evolveum.midpoint.repo.sql.data.common; -import com.evolveum.midpoint.prism.PrismContext; import com.evolveum.midpoint.repo.sql.data.RepositoryContext; import com.evolveum.midpoint.repo.sql.data.common.embedded.RPolyString; import com.evolveum.midpoint.repo.sql.data.common.other.RLookupTableRow; import com.evolveum.midpoint.repo.sql.util.DtoTranslationException; import com.evolveum.midpoint.repo.sql.util.IdGeneratorResult; import com.evolveum.midpoint.repo.sql.util.MidPointJoinedPersister; -import com.evolveum.midpoint.repo.sql.util.RUtil; -import com.evolveum.midpoint.schema.GetOperationOptions; -import com.evolveum.midpoint.schema.SelectorOptions; import com.evolveum.midpoint.util.exception.SchemaException; import com.evolveum.midpoint.xml.ns._public.common.common_3.LookupTableRowType; import com.evolveum.midpoint.xml.ns._public.common.common_3.LookupTableType; @@ -17,7 +13,9 @@ import org.hibernate.annotations.Persister; import javax.persistence.*; -import java.util.*; +import java.util.HashSet; +import java.util.List; +import java.util.Set; /** * @author Viliam Repan (lazyman) @@ -69,13 +67,4 @@ public static void copyFromJAXB(LookupTableType jaxb, RLookupTable repo, Reposit } } } - - @Override - public LookupTableType toJAXB(PrismContext prismContext, Collection> options) throws DtoTranslationException { - LookupTableType object = new LookupTableType(); - RUtil.revive(object, prismContext); - RLookupTable.copyToJAXB(this, object, prismContext, options); - - return object; - } } diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RNode.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RNode.java index fb7e66bf3b1..7998c83ac8b 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RNode.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RNode.java @@ -16,24 +16,17 @@ package com.evolveum.midpoint.repo.sql.data.common; -import com.evolveum.midpoint.prism.PrismContext; import com.evolveum.midpoint.repo.sql.data.RepositoryContext; import com.evolveum.midpoint.repo.sql.data.common.embedded.RPolyString; import com.evolveum.midpoint.repo.sql.util.DtoTranslationException; import com.evolveum.midpoint.repo.sql.util.IdGeneratorResult; import com.evolveum.midpoint.repo.sql.util.MidPointJoinedPersister; -import com.evolveum.midpoint.repo.sql.util.RUtil; -import com.evolveum.midpoint.schema.GetOperationOptions; -import com.evolveum.midpoint.schema.SelectorOptions; import com.evolveum.midpoint.xml.ns._public.common.common_3.NodeType; - import org.hibernate.annotations.ForeignKey; import org.hibernate.annotations.Persister; import javax.persistence.*; -import java.util.Collection; - /** * @author lazyman */ @@ -97,14 +90,4 @@ public static void copyFromJAXB(NodeType jaxb, RNode repo, RepositoryContext rep repo.setNameCopy(RPolyString.copyFromJAXB(jaxb.getName())); repo.setNodeIdentifier(jaxb.getNodeIdentifier()); } - - @Override - public NodeType toJAXB(PrismContext prismContext, Collection> options) - throws DtoTranslationException { - NodeType object = new NodeType(); - RUtil.revive(object, prismContext); - RNode.copyToJAXB(this, object, prismContext, options); - - return object; - } } 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 e7c3040f19b..c2b17e0c9ba 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 @@ -732,10 +732,6 @@ public static void copyFromJAXB(ObjectType jaxb, RObject< } } - @Deprecated - public abstract T toJAXB(PrismContext prismContext, Collection> options) - throws DtoTranslationException; - @Override public String toString() { return RUtil.getDebugString(this); diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTemplate.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTemplate.java index fd6a95c382b..66703f2b405 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTemplate.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTemplate.java @@ -16,7 +16,6 @@ package com.evolveum.midpoint.repo.sql.data.common; -import com.evolveum.midpoint.prism.PrismContext; import com.evolveum.midpoint.repo.sql.data.RepositoryContext; import com.evolveum.midpoint.repo.sql.data.common.embedded.RPolyString; import com.evolveum.midpoint.repo.sql.data.common.enums.RObjectTemplateType; @@ -25,8 +24,6 @@ import com.evolveum.midpoint.repo.sql.util.IdGeneratorResult; import com.evolveum.midpoint.repo.sql.util.MidPointJoinedPersister; import com.evolveum.midpoint.repo.sql.util.RUtil; -import com.evolveum.midpoint.schema.GetOperationOptions; -import com.evolveum.midpoint.schema.SelectorOptions; import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectTemplateType; import org.hibernate.annotations.Cascade; import org.hibernate.annotations.ForeignKey; @@ -34,7 +31,6 @@ import org.hibernate.annotations.Where; import javax.persistence.*; -import java.util.Collection; import java.util.HashSet; import java.util.Set; @@ -124,14 +120,4 @@ public static void copyFromJAXB(ObjectTemplateType jaxb, RObjectTemplate repo, R repo.getIncludeRef().addAll(RUtil.safeListReferenceToSet( jaxb.getIncludeRef(), repositoryContext.prismContext, repo, RReferenceOwner.INCLUDE)); } - - @Override - public ObjectTemplateType toJAXB(PrismContext prismContext, Collection> options) - throws DtoTranslationException { - ObjectTemplateType object = new ObjectTemplateType(); - RUtil.revive(object, prismContext); - RObjectTemplate.copyToJAXB(this, object, prismContext, options); - - return object; - } } diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROrg.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROrg.java index dec0325931c..97161882e95 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROrg.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROrg.java @@ -16,15 +16,12 @@ package com.evolveum.midpoint.repo.sql.data.common; -import com.evolveum.midpoint.prism.PrismContext; import com.evolveum.midpoint.repo.sql.data.RepositoryContext; import com.evolveum.midpoint.repo.sql.data.common.embedded.RPolyString; import com.evolveum.midpoint.repo.sql.util.DtoTranslationException; import com.evolveum.midpoint.repo.sql.util.IdGeneratorResult; import com.evolveum.midpoint.repo.sql.util.MidPointJoinedPersister; import com.evolveum.midpoint.repo.sql.util.RUtil; -import com.evolveum.midpoint.schema.GetOperationOptions; -import com.evolveum.midpoint.schema.SelectorOptions; import com.evolveum.midpoint.xml.ns._public.common.common_3.OrgType; import org.hibernate.annotations.Cascade; import org.hibernate.annotations.ForeignKey; @@ -32,7 +29,6 @@ import org.hibernate.annotations.Persister; import javax.persistence.*; -import java.util.Collection; import java.util.Set; /** @@ -126,14 +122,4 @@ public static void copyFromJAXB(OrgType jaxb, ROrg repo, RepositoryContext repos repo.setOrgType(RUtil.listToSet(jaxb.getOrgType())); repo.setTenant(jaxb.isTenant()); } - - @Override - public OrgType toJAXB(PrismContext prismContext, Collection> options) - throws DtoTranslationException { - OrgType object = new OrgType(); - RUtil.revive(object, prismContext); - RObject.copyToJAXB(this, object, prismContext, options); - - return object; - } } diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReport.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReport.java index 01db94dddf3..d177e275dce 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReport.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReport.java @@ -1,6 +1,5 @@ package com.evolveum.midpoint.repo.sql.data.common; -import com.evolveum.midpoint.prism.PrismContext; import com.evolveum.midpoint.repo.sql.data.RepositoryContext; import com.evolveum.midpoint.repo.sql.data.common.embedded.RPolyString; import com.evolveum.midpoint.repo.sql.data.common.enums.RExportType; @@ -9,18 +8,13 @@ import com.evolveum.midpoint.repo.sql.util.IdGeneratorResult; import com.evolveum.midpoint.repo.sql.util.MidPointJoinedPersister; import com.evolveum.midpoint.repo.sql.util.RUtil; -import com.evolveum.midpoint.schema.GetOperationOptions; -import com.evolveum.midpoint.schema.SelectorOptions; import com.evolveum.midpoint.xml.ns._public.common.common_3.ReportType; - import org.hibernate.annotations.ForeignKey; import org.hibernate.annotations.Index; import org.hibernate.annotations.Persister; import javax.persistence.*; -import java.util.Collection; - @Entity @Table(uniqueConstraints = @UniqueConstraint(name = "uc_report_name", columnNames = {"name_norm"})) @ForeignKey(name = "fk_report") @@ -127,16 +121,4 @@ public static void copyFromJAXB(ReportType jaxb, RReport repo, RepositoryContext repo.setParent(jaxb.isParent()); repo.setUseHibernateSession(jaxb.isUseHibernateSession()); } - - @Override - public ReportType toJAXB(PrismContext prismContext, - Collection> options) - throws DtoTranslationException { - - ReportType object = new ReportType(); - RUtil.revive(object, prismContext); - RReport.copyToJAXB(this, object, prismContext, options); - - return object; - } } \ No newline at end of file diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReportOutput.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReportOutput.java index 4f3aae81f6f..31cbb2669bc 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReportOutput.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReportOutput.java @@ -1,7 +1,6 @@ package com.evolveum.midpoint.repo.sql.data.common; -import com.evolveum.midpoint.prism.PrismContext; import com.evolveum.midpoint.repo.sql.data.RepositoryContext; import com.evolveum.midpoint.repo.sql.data.common.embedded.REmbeddedReference; import com.evolveum.midpoint.repo.sql.data.common.embedded.RPolyString; @@ -9,18 +8,13 @@ import com.evolveum.midpoint.repo.sql.util.IdGeneratorResult; import com.evolveum.midpoint.repo.sql.util.MidPointJoinedPersister; import com.evolveum.midpoint.repo.sql.util.RUtil; -import com.evolveum.midpoint.schema.GetOperationOptions; -import com.evolveum.midpoint.schema.SelectorOptions; import com.evolveum.midpoint.xml.ns._public.common.common_3.ReportOutputType; - import org.hibernate.annotations.Cascade; import org.hibernate.annotations.ForeignKey; import org.hibernate.annotations.Persister; import javax.persistence.*; -import java.util.Collection; - @Entity @ForeignKey(name = "fk_report_output") @Persister(impl = MidPointJoinedPersister.class) @@ -82,16 +76,4 @@ public static void copyFromJAXB(ReportOutputType jaxb, RReportOutput repo, Repos repo.setNameCopy(RPolyString.copyFromJAXB(jaxb.getName())); repo.setReportRef(RUtil.jaxbRefToEmbeddedRepoRef(jaxb.getReportRef(), repositoryContext.prismContext)); } - - @Override - public ReportOutputType toJAXB(PrismContext prismContext, - Collection> options) - throws DtoTranslationException { - - ReportOutputType object = new ReportOutputType(); - RUtil.revive(object, prismContext); - RReportOutput.copyToJAXB(this, object, prismContext, options); - - return object; - } } \ No newline at end of file diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RResource.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RResource.java index 1b006c644fc..e05135ec22e 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RResource.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RResource.java @@ -16,7 +16,6 @@ package com.evolveum.midpoint.repo.sql.data.common; -import com.evolveum.midpoint.prism.PrismContext; import com.evolveum.midpoint.repo.sql.data.RepositoryContext; import com.evolveum.midpoint.repo.sql.data.common.embedded.REmbeddedReference; import com.evolveum.midpoint.repo.sql.data.common.embedded.ROperationalState; @@ -27,8 +26,6 @@ import com.evolveum.midpoint.repo.sql.util.IdGeneratorResult; import com.evolveum.midpoint.repo.sql.util.MidPointJoinedPersister; import com.evolveum.midpoint.repo.sql.util.RUtil; -import com.evolveum.midpoint.schema.GetOperationOptions; -import com.evolveum.midpoint.schema.SelectorOptions; import com.evolveum.midpoint.util.logging.Trace; import com.evolveum.midpoint.util.logging.TraceManager; import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceBusinessConfigurationType; @@ -39,7 +36,6 @@ import org.hibernate.annotations.Where; import javax.persistence.*; -import java.util.Collection; import java.util.HashSet; import java.util.Set; @@ -172,14 +168,4 @@ public static void copyFromJAXB(ResourceType jaxb, RResource repo, RepositoryCon throw new DtoTranslationException(ex.getMessage(), ex); } } - - @Override - public ResourceType toJAXB(PrismContext prismContext, Collection> options) - throws DtoTranslationException { - ResourceType object = new ResourceType(); - RUtil.revive(object, prismContext); - RResource.copyToJAXB(this, object, prismContext, options); - - return object; - } } diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RRole.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RRole.java index 7e86a745463..b3883407cd4 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RRole.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RRole.java @@ -16,24 +16,17 @@ package com.evolveum.midpoint.repo.sql.data.common; -import com.evolveum.midpoint.prism.PrismContext; import com.evolveum.midpoint.repo.sql.data.RepositoryContext; import com.evolveum.midpoint.repo.sql.data.common.embedded.RPolyString; import com.evolveum.midpoint.repo.sql.util.DtoTranslationException; import com.evolveum.midpoint.repo.sql.util.IdGeneratorResult; import com.evolveum.midpoint.repo.sql.util.MidPointJoinedPersister; -import com.evolveum.midpoint.repo.sql.util.RUtil; -import com.evolveum.midpoint.schema.GetOperationOptions; -import com.evolveum.midpoint.schema.SelectorOptions; import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleType; - import org.hibernate.annotations.ForeignKey; import org.hibernate.annotations.Persister; import javax.persistence.*; -import java.util.Collection; - /** * @author lazyman */ @@ -102,13 +95,4 @@ public static void copyFromJAXB(RoleType jaxb, RRole repo, RepositoryContext rep repo.setRoleType(jaxb.getRoleType()); repo.setNameCopy(RPolyString.copyFromJAXB(jaxb.getName())); } - - @Override - public RoleType toJAXB(PrismContext prismContext, Collection> options) - throws DtoTranslationException { - RoleType object = new RoleType(); - RRole.copyToJAXB(this, object, prismContext, options); - RUtil.revive(object, prismContext); - return object; - } } diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSecurityPolicy.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSecurityPolicy.java index ee2d09f410b..d6ef4724b3d 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSecurityPolicy.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSecurityPolicy.java @@ -1,23 +1,16 @@ package com.evolveum.midpoint.repo.sql.data.common; -import com.evolveum.midpoint.prism.PrismContext; import com.evolveum.midpoint.repo.sql.data.RepositoryContext; import com.evolveum.midpoint.repo.sql.data.common.embedded.RPolyString; import com.evolveum.midpoint.repo.sql.util.DtoTranslationException; import com.evolveum.midpoint.repo.sql.util.IdGeneratorResult; import com.evolveum.midpoint.repo.sql.util.MidPointJoinedPersister; -import com.evolveum.midpoint.repo.sql.util.RUtil; -import com.evolveum.midpoint.schema.GetOperationOptions; -import com.evolveum.midpoint.schema.SelectorOptions; import com.evolveum.midpoint.xml.ns._public.common.common_3.SecurityPolicyType; - import org.hibernate.annotations.ForeignKey; import org.hibernate.annotations.Persister; import javax.persistence.*; -import java.util.Collection; - @Entity @Table(uniqueConstraints = @UniqueConstraint(name = "uc_security_policy_name", columnNames = {"name_norm"})) @ForeignKey(name = "fk_security_policy") @@ -64,17 +57,5 @@ public static void copyFromJAXB(SecurityPolicyType jaxb, RSecurityPolicy repo, R RObject.copyFromJAXB(jaxb, repo, repositoryContext, generatorResult); repo.setNameCopy(RPolyString.copyFromJAXB(jaxb.getName())); } - - @Override - public SecurityPolicyType toJAXB(PrismContext prismContext, - Collection> options) - throws DtoTranslationException { - - SecurityPolicyType object = new SecurityPolicyType(); - RUtil.revive(object, prismContext); - RSecurityPolicy.copyToJAXB(this, object, prismContext, options); - - return object; - } } diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSequence.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSequence.java index bc8af32b9c1..919bcf057cf 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSequence.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSequence.java @@ -16,21 +16,16 @@ package com.evolveum.midpoint.repo.sql.data.common; -import com.evolveum.midpoint.prism.PrismContext; import com.evolveum.midpoint.repo.sql.data.RepositoryContext; import com.evolveum.midpoint.repo.sql.data.common.embedded.RPolyString; import com.evolveum.midpoint.repo.sql.util.DtoTranslationException; import com.evolveum.midpoint.repo.sql.util.IdGeneratorResult; import com.evolveum.midpoint.repo.sql.util.MidPointJoinedPersister; -import com.evolveum.midpoint.repo.sql.util.RUtil; -import com.evolveum.midpoint.schema.GetOperationOptions; -import com.evolveum.midpoint.schema.SelectorOptions; import com.evolveum.midpoint.xml.ns._public.common.common_3.SequenceType; import org.hibernate.annotations.ForeignKey; import org.hibernate.annotations.Persister; import javax.persistence.*; -import java.util.Collection; /** * @author lazyman @@ -82,15 +77,4 @@ public static void copyFromJAXB(SequenceType jaxb, RSequence repo, RepositoryCon repo.setNameCopy(RPolyString.copyFromJAXB(jaxb.getName())); } - - @Override - public SequenceType toJAXB(PrismContext prismContext, Collection> options) - throws DtoTranslationException { - - SequenceType object = new SequenceType(); - RUtil.revive(object, prismContext); - RSequence.copyToJAXB(this, object, prismContext, options); - - return object; - } } diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RService.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RService.java index 472b5f319b6..3ea1d7210a4 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RService.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RService.java @@ -16,15 +16,12 @@ package com.evolveum.midpoint.repo.sql.data.common; -import com.evolveum.midpoint.prism.PrismContext; import com.evolveum.midpoint.repo.sql.data.RepositoryContext; import com.evolveum.midpoint.repo.sql.data.common.embedded.RPolyString; import com.evolveum.midpoint.repo.sql.util.DtoTranslationException; import com.evolveum.midpoint.repo.sql.util.IdGeneratorResult; import com.evolveum.midpoint.repo.sql.util.MidPointJoinedPersister; import com.evolveum.midpoint.repo.sql.util.RUtil; -import com.evolveum.midpoint.schema.GetOperationOptions; -import com.evolveum.midpoint.schema.SelectorOptions; import com.evolveum.midpoint.xml.ns._public.common.common_3.ServiceType; import org.hibernate.annotations.Cascade; import org.hibernate.annotations.ForeignKey; @@ -32,7 +29,6 @@ import javax.persistence.*; import java.util.Arrays; -import java.util.Collection; import java.util.Set; /** @@ -111,13 +107,4 @@ public static void copyFromJAXB(ServiceType jaxb, RService repo, RepositoryConte repo.setServiceType(RUtil.listToSet(jaxb.getServiceType())); repo.setNameCopy(RPolyString.copyFromJAXB(jaxb.getName())); } - - @Override - public ServiceType toJAXB(PrismContext prismContext, Collection> options) - throws DtoTranslationException { - ServiceType object = new ServiceType(); - RService.copyToJAXB(this, object, prismContext, options); - RUtil.revive(object, prismContext); - return object; - } } diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RShadow.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RShadow.java index 41e6a4cdfeb..296ae044bcb 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RShadow.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RShadow.java @@ -16,7 +16,6 @@ package com.evolveum.midpoint.repo.sql.data.common; -import com.evolveum.midpoint.prism.PrismContext; import com.evolveum.midpoint.repo.sql.data.RepositoryContext; import com.evolveum.midpoint.repo.sql.data.common.embedded.REmbeddedReference; import com.evolveum.midpoint.repo.sql.data.common.embedded.RPolyString; @@ -32,20 +31,15 @@ import com.evolveum.midpoint.repo.sql.util.IdGeneratorResult; import com.evolveum.midpoint.repo.sql.util.MidPointJoinedPersister; import com.evolveum.midpoint.repo.sql.util.RUtil; -import com.evolveum.midpoint.schema.GetOperationOptions; -import com.evolveum.midpoint.schema.SelectorOptions; import com.evolveum.midpoint.util.logging.Trace; import com.evolveum.midpoint.util.logging.TraceManager; import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType; - import org.hibernate.annotations.ForeignKey; import org.hibernate.annotations.Index; import org.hibernate.annotations.Persister; import javax.persistence.*; import javax.xml.datatype.XMLGregorianCalendar; - -import java.util.Collection; import java.util.Objects; /** @@ -296,14 +290,4 @@ public static void copyFromJAXB(ShadowType jaxb, RShadow< } repo.pendingOperationCount = jaxb.getPendingOperation().size(); } - - @Override - public T toJAXB(PrismContext prismContext, Collection> options) - throws DtoTranslationException { - ShadowType object = new ShadowType(); - RUtil.revive(object, prismContext); - RObject.copyToJAXB(this, object, prismContext, options); - - return (T) object; - } } diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSystemConfiguration.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSystemConfiguration.java index 87132aae448..7395050b7cf 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSystemConfiguration.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSystemConfiguration.java @@ -16,24 +16,17 @@ package com.evolveum.midpoint.repo.sql.data.common; -import com.evolveum.midpoint.prism.PrismContext; import com.evolveum.midpoint.repo.sql.data.RepositoryContext; import com.evolveum.midpoint.repo.sql.data.common.embedded.RPolyString; import com.evolveum.midpoint.repo.sql.util.DtoTranslationException; import com.evolveum.midpoint.repo.sql.util.IdGeneratorResult; import com.evolveum.midpoint.repo.sql.util.MidPointJoinedPersister; -import com.evolveum.midpoint.repo.sql.util.RUtil; -import com.evolveum.midpoint.schema.GetOperationOptions; -import com.evolveum.midpoint.schema.SelectorOptions; import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemConfigurationType; - import org.hibernate.annotations.ForeignKey; import org.hibernate.annotations.Persister; import javax.persistence.*; -import java.util.Collection; - /** * @author lazyman */ @@ -83,14 +76,4 @@ public static void copyFromJAXB(SystemConfigurationType jaxb, RSystemConfigurati RObject.copyFromJAXB(jaxb, repo, repositoryContext, generatorResult); repo.setNameCopy(RPolyString.copyFromJAXB(jaxb.getName())); } - - @Override - public SystemConfigurationType toJAXB(PrismContext prismContext, - Collection> options) throws DtoTranslationException { - SystemConfigurationType object = new SystemConfigurationType(); - RUtil.revive(object, prismContext); - RSystemConfiguration.copyToJAXB(this, object, prismContext, options); - - return object; - } } diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RTask.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RTask.java index 5166e0cb18b..0e2a1b178cf 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RTask.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RTask.java @@ -16,7 +16,6 @@ package com.evolveum.midpoint.repo.sql.data.common; -import com.evolveum.midpoint.prism.PrismContext; import com.evolveum.midpoint.prism.PrismObjectDefinition; import com.evolveum.midpoint.repo.sql.data.RepositoryContext; import com.evolveum.midpoint.repo.sql.data.common.embedded.REmbeddedReference; @@ -28,10 +27,7 @@ import com.evolveum.midpoint.repo.sql.util.IdGeneratorResult; import com.evolveum.midpoint.repo.sql.util.MidPointJoinedPersister; import com.evolveum.midpoint.repo.sql.util.RUtil; -import com.evolveum.midpoint.schema.GetOperationOptions; -import com.evolveum.midpoint.schema.SelectorOptions; import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskType; - import com.evolveum.midpoint.xml.ns._public.common.common_3.WfContextType; import org.hibernate.annotations.Cascade; import org.hibernate.annotations.ForeignKey; @@ -40,8 +36,6 @@ import javax.persistence.*; import javax.xml.datatype.XMLGregorianCalendar; - -import java.util.Collection; import java.util.Set; /** @@ -440,14 +434,4 @@ public static void copyFromJAXB(TaskType jaxb, RTask repo, RepositoryContext rep RUtil.copyResultFromJAXB(jaxb.F_RESULT, jaxb.getResult(), repo, repositoryContext.prismContext); } - - @Override - public TaskType toJAXB(PrismContext prismContext, Collection> options) - throws DtoTranslationException { - TaskType object = new TaskType(); - RUtil.revive(object, prismContext); - RTask.copyToJAXB(this, object, prismContext, options); - - return object; - } } diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUser.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUser.java index 5cf09cf93d9..2f534d0dc0d 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUser.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUser.java @@ -16,22 +16,18 @@ package com.evolveum.midpoint.repo.sql.data.common; -import com.evolveum.midpoint.prism.PrismContext; import com.evolveum.midpoint.repo.sql.data.RepositoryContext; import com.evolveum.midpoint.repo.sql.data.common.embedded.RPolyString; import com.evolveum.midpoint.repo.sql.util.DtoTranslationException; import com.evolveum.midpoint.repo.sql.util.IdGeneratorResult; import com.evolveum.midpoint.repo.sql.util.MidPointJoinedPersister; import com.evolveum.midpoint.repo.sql.util.RUtil; -import com.evolveum.midpoint.schema.GetOperationOptions; -import com.evolveum.midpoint.schema.SelectorOptions; import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType; import org.hibernate.annotations.Cascade; import org.hibernate.annotations.ForeignKey; import org.hibernate.annotations.Persister; import javax.persistence.*; -import java.util.Collection; import java.util.Set; /** @@ -270,14 +266,4 @@ public static void copyFromJAXB(UserType jaxb, RUser repo, RepositoryContext rep repo.setOrganizationalUnit(RUtil.listPolyToSet(jaxb.getOrganizationalUnit())); repo.setOrganization(RUtil.listPolyToSet(jaxb.getOrganization())); } - - @Override - public UserType toJAXB(PrismContext prismContext, Collection> options) - throws DtoTranslationException { - UserType object = new UserType(); - RUtil.revive(object, prismContext); - RUser.copyToJAXB(this, object, prismContext, options); - - return object; - } } diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RValuePolicy.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RValuePolicy.java index 8c624aecc6e..43076625ed3 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RValuePolicy.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RValuePolicy.java @@ -16,24 +16,17 @@ package com.evolveum.midpoint.repo.sql.data.common; -import com.evolveum.midpoint.prism.PrismContext; import com.evolveum.midpoint.repo.sql.data.RepositoryContext; import com.evolveum.midpoint.repo.sql.data.common.embedded.RPolyString; import com.evolveum.midpoint.repo.sql.util.DtoTranslationException; import com.evolveum.midpoint.repo.sql.util.IdGeneratorResult; import com.evolveum.midpoint.repo.sql.util.MidPointJoinedPersister; -import com.evolveum.midpoint.repo.sql.util.RUtil; -import com.evolveum.midpoint.schema.GetOperationOptions; -import com.evolveum.midpoint.schema.SelectorOptions; import com.evolveum.midpoint.xml.ns._public.common.common_3.ValuePolicyType; - import org.hibernate.annotations.ForeignKey; import org.hibernate.annotations.Persister; import javax.persistence.*; -import java.util.Collection; - /** * @author lazyman */ @@ -84,14 +77,4 @@ public static void copyFromJAXB(ValuePolicyType jaxb, RValuePolicy repo, Reposit repo.setNameCopy(RPolyString.copyFromJAXB(jaxb.getName())); } - - @Override - public ValuePolicyType toJAXB(PrismContext prismContext, Collection> options) - throws DtoTranslationException { - ValuePolicyType policy = new ValuePolicyType(); - RUtil.revive(policy, prismContext); - RValuePolicy.copyToJAXB(this, policy, prismContext, options); - - return policy; - } }