Skip to content

Commit

Permalink
reslve names (repo support)
Browse files Browse the repository at this point in the history
  • Loading branch information
@katkav
katkav committed Sep 7, 2015
1 parent 08859b7 commit d2236ca
Show file tree
Hide file tree
Showing 4 changed files with 147 additions and 27 deletions.
11 changes: 11 additions & 0 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebModelUtils.java
View file
Expand Up @@ -111,6 +111,17 @@ private static <T extends ObjectType> PrismObject<T> loadObject(Class<T> type, S
}
PrismObject<T> object = null;
try {
if (options == null){
options = SelectorOptions.createCollection(GetOperationOptions.createResolveNames());
} else {
GetOperationOptions getOpts = SelectorOptions.findRootOptions(options);
if (getOpts == null){
options.add(new SelectorOptions<GetOperationOptions>(GetOperationOptions.createResolveNames()));
} else {
getOpts.setResolveNames(Boolean.TRUE);
}
}
// .createResolveNames();
Task task = page.createSimpleTask(subResult.getOperation(), principal);
object = page.getModelService().getObject(type, oid, options, task, subResult);
} catch (Exception ex) {
Expand Down
4 changes: 2 additions & 2 deletions ...model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
View file
Expand Up @@ -320,7 +320,7 @@ public <T extends ObjectType> PrismObject<T> getObject(Class<T> clazz, String oi

applySchemasAndSecurity(object, rootOptions, null, task, result);
resolve(object, options, task, result);
resolveNames(object, options, task, result);
// resolveNames(object, options, task, result);

} catch (SchemaException e) {
ModelUtils.recordFatalError(result, e);
Expand Down Expand Up @@ -1463,7 +1463,7 @@ public <T extends ObjectType> SearchResultList<PrismObject<T>> searchObjects(Cla
}
}
resolve(object, options, task, result);
resolveNames(object, options, task, result);
// resolveNames(object, options, task, result);
}

} finally {
Expand Down
158 changes: 133 additions & 25 deletions .../repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
View file
Expand Up @@ -16,10 +16,66 @@

package com.evolveum.midpoint.repo.sql;

import java.lang.reflect.Method;
import java.sql.Connection;
import java.sql.Driver;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;

import javax.annotation.PostConstruct;
import javax.xml.namespace.QName;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.Validate;
import org.hibernate.Criteria;
import org.hibernate.LockMode;
import org.hibernate.LockOptions;
import org.hibernate.Query;
import org.hibernate.SQLQuery;
import org.hibernate.ScrollMode;
import org.hibernate.ScrollableResults;
import org.hibernate.Session;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
import org.hibernate.exception.ConstraintViolationException;
import org.hibernate.internal.SessionFactoryImpl;
import org.hibernate.jdbc.Work;
import org.hibernate.transform.Transformers;
import org.springframework.stereotype.Repository;

import com.evolveum.midpoint.common.InternalsConfig;
import com.evolveum.midpoint.common.crypto.CryptoUtil;
import com.evolveum.midpoint.prism.*;
import com.evolveum.midpoint.prism.delta.*;
import com.evolveum.midpoint.prism.ConsistencyCheckScope;
import com.evolveum.midpoint.prism.Definition;
import com.evolveum.midpoint.prism.Item;
import com.evolveum.midpoint.prism.ItemDefinition;
import com.evolveum.midpoint.prism.PrismContainer;
import com.evolveum.midpoint.prism.PrismContainerValue;
import com.evolveum.midpoint.prism.PrismContext;
import com.evolveum.midpoint.prism.PrismObject;
import com.evolveum.midpoint.prism.PrismObjectDefinition;
import com.evolveum.midpoint.prism.PrismProperty;
import com.evolveum.midpoint.prism.PrismPropertyDefinition;
import com.evolveum.midpoint.prism.PrismPropertyValue;
import com.evolveum.midpoint.prism.PrismReference;
import com.evolveum.midpoint.prism.PrismReferenceDefinition;
import com.evolveum.midpoint.prism.PrismReferenceValue;
import com.evolveum.midpoint.prism.delta.ContainerDelta;
import com.evolveum.midpoint.prism.delta.ItemDelta;
import com.evolveum.midpoint.prism.delta.ObjectDelta;
import com.evolveum.midpoint.prism.delta.PropertyDelta;
import com.evolveum.midpoint.prism.delta.ReferenceDelta;
import com.evolveum.midpoint.prism.parser.XNodeProcessorEvaluationMode;
import com.evolveum.midpoint.prism.path.ItemPath;
import com.evolveum.midpoint.prism.polystring.PolyString;
Expand All @@ -34,45 +90,48 @@
import com.evolveum.midpoint.repo.sql.data.common.RObject;
import com.evolveum.midpoint.repo.sql.data.common.any.RAnyValue;
import com.evolveum.midpoint.repo.sql.data.common.any.RValueType;
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.data.common.type.RObjectExtensionType;
import com.evolveum.midpoint.repo.sql.query.QueryEngine;
import com.evolveum.midpoint.repo.sql.query.QueryException;
import com.evolveum.midpoint.repo.sql.query.RQuery;
import com.evolveum.midpoint.repo.sql.util.*;
import com.evolveum.midpoint.schema.*;
import com.evolveum.midpoint.repo.sql.util.ClassMapper;
import com.evolveum.midpoint.repo.sql.util.DtoTranslationException;
import com.evolveum.midpoint.repo.sql.util.GetObjectResult;
import com.evolveum.midpoint.repo.sql.util.IdGeneratorResult;
import com.evolveum.midpoint.repo.sql.util.PrismIdentifierGenerator;
import com.evolveum.midpoint.repo.sql.util.RUtil;
import com.evolveum.midpoint.repo.sql.util.ScrollableResultsIterator;
import com.evolveum.midpoint.schema.GetOperationOptions;
import com.evolveum.midpoint.schema.LabeledString;
import com.evolveum.midpoint.schema.ObjectSelector;
import com.evolveum.midpoint.schema.RelationalValueSearchQuery;
import com.evolveum.midpoint.schema.RepositoryDiag;
import com.evolveum.midpoint.schema.ResultHandler;
import com.evolveum.midpoint.schema.RetrieveOption;
import com.evolveum.midpoint.schema.SearchResultList;
import com.evolveum.midpoint.schema.SearchResultMetadata;
import com.evolveum.midpoint.schema.SelectorOptions;
import com.evolveum.midpoint.schema.result.OperationResult;
import com.evolveum.midpoint.schema.result.OperationResultStatus;
import com.evolveum.midpoint.schema.util.ObjectQueryUtil;
import com.evolveum.midpoint.util.DebugUtil;
import com.evolveum.midpoint.util.Transformer;
import com.evolveum.midpoint.util.exception.ObjectAlreadyExistsException;
import com.evolveum.midpoint.util.exception.ObjectNotFoundException;
import com.evolveum.midpoint.util.exception.SchemaException;
import com.evolveum.midpoint.util.exception.SystemException;
import com.evolveum.midpoint.util.logging.Trace;
import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
import com.evolveum.midpoint.xml.ns._public.common.common_3.FocusType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.LookupTableRowType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.LookupTableType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
import com.evolveum.prism.xml.ns._public.types_3.PolyStringType;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.Validate;
import org.hibernate.*;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
import org.hibernate.exception.ConstraintViolationException;
import org.hibernate.internal.SessionFactoryImpl;
import org.hibernate.jdbc.Work;
import org.springframework.stereotype.Repository;

import javax.annotation.PostConstruct;
import javax.xml.namespace.QName;

import java.lang.reflect.Method;
import java.sql.Connection;
import java.sql.Driver;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.util.*;

/**
* @author lazyman
Expand Down Expand Up @@ -182,7 +241,8 @@ private <T extends ObjectType> PrismObject<T> getObject(Session session, Class<T
if (fullObject == null) {
throwObjectNotFoundException(type, oid);
}



LOGGER.trace("Transforming data to JAXB type.");
PrismObject<T> prismObject = updateLoadedObject(fullObject, type, options, session);
validateObjectType(prismObject, type);
Expand Down Expand Up @@ -1017,10 +1077,58 @@ private <T extends ObjectType> PrismObject<T> updateLoadedObject(GetObjectResult
updateLoadedLookupTable(prismObject, options, session);
}

GetOperationOptions rootOptions = SelectorOptions.findRootOptions(options);

if (GetOperationOptions.isResolveNames(rootOptions)){
List<ItemDefinition> defs = (List<ItemDefinition>) prismObject.getDefinition().getDefinitions();
List<String> oidsToResolve = new ArrayList<String>();
for (Definition def : defs){
if (def instanceof PrismReferenceDefinition){
PrismReference ref = prismObject.findReference(((PrismReferenceDefinition) def).getName());
if (ref != null && !ref.isEmpty()){
for (PrismReferenceValue rVal : ref.getValues()){
oidsToResolve.add(rVal.getOid());
}
}
}
}
Query query = session.getNamedQuery("resolveReferences");
query.setString("oid", prismObject.getOid());
query.setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP);

List<Map<String, Object>> results = query.list();
Map<String, PolyString> oidNameMap = consolidateResults(results);

for (Definition def : defs){
if (def instanceof PrismReferenceDefinition){
PrismReference ref = prismObject.findReference(((PrismReferenceDefinition) def).getName());
if (ref != null && !ref.isEmpty()){
Collection<PrismReferenceValue> valuesToReplace = new ArrayList<>();
for (PrismReferenceValue rVal : ref.getValues()){
PrismReferenceValue cloned = rVal.clone();
cloned.setTargetName(oidNameMap.get(rVal.getOid()));
valuesToReplace.add(cloned);
}
ref.getValues().clear();
ref.getValues().addAll(valuesToReplace);
}
}
}
}

validateObjectType(prismObject, type);

return prismObject;
}

private Map<String, PolyString> consolidateResults(List<Map<String, Object>> results){
Map<String, PolyString> oidNameMap = new HashMap<String, PolyString>();
for (Map<String, Object> map : results){
PolyStringType name = RPolyString.copyToJAXB((RPolyString) map.get("1"));
oidNameMap.put((String)map.get("0"), new PolyString(name.getOrig(), name.getNorm()));
}
return oidNameMap;
}

private GetOperationOptions findLookupTableGetOption(Collection<SelectorOptions<GetOperationOptions>> options) {
final ItemPath tablePath = new ItemPath(LookupTableType.F_ROW);
Expand Down
1 change: 1 addition & 0 deletions repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java
View file
Expand Up @@ -74,6 +74,7 @@
@NamedQuery(name = "get.lookupTableLastId", query = "select max(r.id) from RLookupTableRow r where r.ownerOid = :oid"),
@NamedQuery(name = "delete.lookupTableData", query = "delete RLookupTableRow r where r.ownerOid = :oid"),
@NamedQuery(name = "delete.lookupTableDataRow", query = "delete RLookupTableRow r where r.ownerOid = :oid and r.id = :id"),
@NamedQuery(name = "resolveReferences", query = "select o.oid,o.name from RObject as o where o.oid in :oid"),
})
@Entity
@Table(name = "m_object", indexes = {
Expand Down

0 comments on commit d2236ca

Please sign in to comment.