removed dead code

Evolveum · Feb 21, 2018 · 3fd26d9 · 3fd26d9
1 parent 1e12bf3
commit 3fd26d9
Show file tree

Hide file tree

Showing 25 changed files with 11 additions and 382 deletions.
diff --git a/...rc/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationCampaign.java b/...rc/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,16 +26,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.AccessCertificationCampaignType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.AccessCertificationCaseType;
 import org.hibernate.annotations.ForeignKey;
 import org.hibernate.annotations.Persister;
 
 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<SelectorOptions<GetOperationOptions>> options)
-            throws DtoTranslationException {
-
-        AccessCertificationCampaignType object = new AccessCertificationCampaignType();
-        RUtil.revive(object, prismContext);
-        RAccessCertificationCampaign.copyToJAXB(this, object, prismContext, options);
-
-        return object;
-    }
 }
diff --git a/.../main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationDefinition.java b/.../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<SelectorOptions<GetOperationOptions>> options)
-            throws DtoTranslationException {
-
-        AccessCertificationDefinitionType object = new AccessCertificationDefinitionType();
-        RUtil.revive(object, prismContext);
-        RAccessCertificationDefinition.copyToJAXB(this, object, prismContext, options);
-
-        return object;
-    }
 }
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
@@ -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<SelectorOptions<GetOperationOptions>> 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
@@ -16,16 +16,13 @@
 
 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;
 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.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<SelectorOptions<GetOperationOptions>> options)
-            throws DtoTranslationException {
-        ConnectorType object = new ConnectorType();
-        RUtil.revive(object, prismContext);
-        RConnector.copyToJAXB(this, object, prismContext, options);
-
-        return object;
-    }
 }
diff --git a/...epo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnectorHost.java b/...epo-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<SelectorOptions<GetOperationOptions>> 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
@@ -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<SelectorOptions<GetOperationOptions>> options)
-            throws DtoTranslationException {
-        FormType object = new FormType();
-        RUtil.revive(object, prismContext);
-        RForm.copyToJAXB(this, object, prismContext, options);
-        return object;
-    }
 }
diff --git a/...o-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFunctionLibrary.java b/...o-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<SelectorOptions<GetOperationOptions>> options)
-            throws DtoTranslationException {
-        throw new UnsupportedOperationException("Shouldn't be needed anymore.");
-    }
 }
diff --git a/...epo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RGenericObject.java b/...epo-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<SelectorOptions<GetOperationOptions>> options)
-            throws DtoTranslationException {
-
-        GenericObjectType object = new GenericObjectType();
-        RUtil.revive(object, prismContext);
-        RGenericObject.copyToJAXB(this, object, prismContext, options);
-
-        return object;
-    }
 }
diff --git a/.../repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RLookupTable.java b/.../repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RLookupTable.java
@@ -1,23 +1,21 @@
 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;
 import org.hibernate.annotations.ForeignKey;
 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<SelectorOptions<GetOperationOptions>> 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
@@ -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<SelectorOptions<GetOperationOptions>> options)
-            throws DtoTranslationException {
-        NodeType object = new NodeType();
-        RUtil.revive(object, prismContext);
-        RNode.copyToJAXB(this, object, prismContext, options);
-
-        return object;
-    }
 }