code cleanup

Evolveum · Jan 31, 2018 · e13e307 · e13e307
1 parent 14435e1
commit e13e307
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 30 deletions.
diff --git a/...epo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectDeltaUpdater.java b/...epo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectDeltaUpdater.java
@@ -54,7 +54,6 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang3.tuple.Pair;
 import org.hibernate.Session;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -114,7 +113,7 @@ public <T extends ObjectType> RObject<T> modifyObject(Class<T> type, String oid,
         // preprocess modifications
         PrismObject changed = prismObject.clone();
         ItemDelta.applyTo(modifications, changed);
-        Collection<? extends ItemDelta> processedModifications = prismObject.diffModifications(changed, false,true);
+        Collection<? extends ItemDelta> processedModifications = prismObject.diffModifications(changed, false, true);
 
         // process only real modifications
         Class<? extends RObject> objectClass = RObjectType.getByJaxbType(type).getClazz();
@@ -679,7 +678,7 @@ private Collection<PrismEntityPair> processDeltaValues(Collection<? extends Pris
         Collection<PrismEntityPair> results = new ArrayList();
         for (PrismValue value : values) {
             MapperContext context = new MapperContext();
-            context.setPrismContext(prismContext);
+            context.setRepositoryContext(new RepositoryContext(repositoryService, prismContext));
             context.setDelta(delta);
             context.setOwner(bean);
 

diff --git a/...ql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/mapper/AssignmentMapper.java b/...ql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/mapper/AssignmentMapper.java
@@ -18,7 +18,6 @@
 
 import com.evolveum.midpoint.prism.delta.ItemDelta;
 import com.evolveum.midpoint.prism.path.ItemPath;
-import com.evolveum.midpoint.repo.sql.data.RepositoryContext;
 import com.evolveum.midpoint.repo.sql.data.common.RObject;
 import com.evolveum.midpoint.repo.sql.data.common.container.RAssignment;
 import com.evolveum.midpoint.repo.sql.data.common.other.RAssignmentOwner;
@@ -47,11 +46,8 @@ public RAssignment map(AssignmentType input, MapperContext context) {
 
         RObject owner = (RObject) context.getOwner();
 
-        RepositoryContext repositoryContext =
-                new RepositoryContext(context.getRepositoryService(), context.getPrismContext());
-
         try {
-            RAssignment.copyFromJAXB(input, ass, owner, repositoryContext);
+            RAssignment.copyFromJAXB(input, ass, owner, context.getRepositoryContext());
         } catch (DtoTranslationException ex) {
             throw new SystemException("Couldn't translate assignment to entity", ex);
         }

diff --git a/...src/main/java/com/evolveum/midpoint/repo/sql/helpers/mapper/OperationExecutionMapper.java b/...src/main/java/com/evolveum/midpoint/repo/sql/helpers/mapper/OperationExecutionMapper.java
@@ -16,7 +16,6 @@
 
 package com.evolveum.midpoint.repo.sql.helpers.mapper;
 
-import com.evolveum.midpoint.repo.sql.data.RepositoryContext;
 import com.evolveum.midpoint.repo.sql.data.common.RObject;
 import com.evolveum.midpoint.repo.sql.data.common.container.ROperationExecution;
 import com.evolveum.midpoint.repo.sql.helpers.modify.MapperContext;
@@ -35,11 +34,8 @@ public ROperationExecution map(OperationExecutionType input, MapperContext conte
 
         RObject owner = (RObject) context.getOwner();
 
-        RepositoryContext repositoryContext =
-                new RepositoryContext(context.getRepositoryService(), context.getPrismContext());
-
         try {
-            ROperationExecution.copyFromJAXB(input, execution, owner, repositoryContext);
+            ROperationExecution.copyFromJAXB(input, execution, owner, context.getRepositoryContext());
         } catch (DtoTranslationException ex) {
             throw new SystemException("Couldn't translate trigger to entity", ex);
         }

diff --git a/...o-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/mapper/TriggerMapper.java b/...o-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/mapper/TriggerMapper.java
@@ -16,7 +16,6 @@
 
 package com.evolveum.midpoint.repo.sql.helpers.mapper;
 
-import com.evolveum.midpoint.repo.sql.data.RepositoryContext;
 import com.evolveum.midpoint.repo.sql.data.common.RObject;
 import com.evolveum.midpoint.repo.sql.data.common.container.RTrigger;
 import com.evolveum.midpoint.repo.sql.helpers.modify.MapperContext;
@@ -35,11 +34,8 @@ public RTrigger map(TriggerType input, MapperContext context) {
 
         RObject owner = (RObject) context.getOwner();
 
-        RepositoryContext repositoryContext =
-                new RepositoryContext(context.getRepositoryService(), context.getPrismContext());
-
         try {
-            RTrigger.copyFromJAXB(input, trigger, owner, repositoryContext);
+            RTrigger.copyFromJAXB(input, trigger, owner, context.getRepositoryContext());
         } catch (DtoTranslationException ex) {
             throw new SystemException("Couldn't translate trigger to entity", ex);
         }

diff --git a/...o-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/modify/MapperContext.java b/...o-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/modify/MapperContext.java
@@ -20,34 +20,34 @@
 import com.evolveum.midpoint.prism.PrismValue;
 import com.evolveum.midpoint.prism.delta.ItemDelta;
 import com.evolveum.midpoint.repo.api.RepositoryService;
+import com.evolveum.midpoint.repo.sql.data.RepositoryContext;
 
 /**
  * @author Viliam Repan (lazyman).
  */
 public class MapperContext {
 
-    private PrismContext prismContext;
-    private RepositoryService repositoryService;
+    private RepositoryContext repositoryContext;
 
     private Object owner;
 
     private ItemDelta delta;
     private PrismValue value;
 
-    public RepositoryService getRepositoryService() {
-        return repositoryService;
+    public RepositoryContext getRepositoryContext() {
+        return repositoryContext;
     }
 
-    public void setRepositoryService(RepositoryService repositoryService) {
-        this.repositoryService = repositoryService;
+    public void setRepositoryContext(RepositoryContext repositoryContext) {
+        this.repositoryContext = repositoryContext;
     }
 
-    public PrismContext getPrismContext() {
-        return prismContext;
+    public RepositoryService getRepositoryService() {
+        return repositoryContext.repositoryService;
     }
 
-    public void setPrismContext(PrismContext prismContext) {
-        this.prismContext = prismContext;
+    public PrismContext getPrismContext() {
+        return repositoryContext.prismContext;
     }
 
     public Object getOwner() {

diff --git a/...l-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/modify/PrismEntityMapper.java b/...l-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/modify/PrismEntityMapper.java
@@ -19,6 +19,7 @@
 import com.evolveum.midpoint.prism.*;
 import com.evolveum.midpoint.prism.polystring.PolyString;
 import com.evolveum.midpoint.repo.api.RepositoryService;
+import com.evolveum.midpoint.repo.sql.data.RepositoryContext;
 import com.evolveum.midpoint.repo.sql.data.common.RObjectReference;
 import com.evolveum.midpoint.repo.sql.data.common.container.RAssignment;
 import com.evolveum.midpoint.repo.sql.data.common.container.ROperationExecution;
@@ -85,8 +86,7 @@ public <I, O> O map(I input, Class<O> outputType, MapperContext context) {
         if (context == null) {
             context = new MapperContext();
         }
-        context.setPrismContext(prismContext);
-        context.setRepositoryService(repositoryService);
+        context.setRepositoryContext(new RepositoryContext(repositoryService, prismContext));
 
         Key key = buildKey(input.getClass(), outputType);
         Mapper<I, O> mapper = mappers.get(key);