[midPoint-git] [Evolveum/midpoint] ca4e1e: Fixed searching by enums in extensions: MID-3801 (...

[Radovan Semancik]

  Branch: refs/heads/feature/password-hash
  Home:   https://github.com/Evolveum/midpoint
  Commit: ca4e1e369d6d2f3fa29784da14b10c9afc85714f
      https://github.com/Evolveum/midpoint/commit/ca4e1e369d6d2f3fa29784da14b10c9afc85714f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-08 (Wed, 08 Mar 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SimpleTypeDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SimpleTypeDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaDefinitionFactory.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/BaseSQLRepoTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java
    M repo/repo-sql-impl-test/src/test/resources/schema/extension.xsd
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryFactory.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryContext.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryDefinitionRegistry.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryEngine.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryException.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryInterpreter.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/RQueryCriteriaImpl.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/custom/CustomQuery.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/custom/OrgFilterQuery.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/custom/ShadowQueryWithDisjunction.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/matcher/DefaultMatcher.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/matcher/Matcher.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/matcher/PolyStringMatcher.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/matcher/StringMatcher.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/AndRestriction.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/AnyPropertyRestriction.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/CollectionRestriction.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/InOidRestriction.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/ItemRestriction.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/ItemRestrictionOperation.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/LogicalRestriction.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/NaryLogicalRestriction.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/NotRestriction.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/OrRestriction.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/OrgRestriction.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/PropertyRestriction.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/ReferenceRestriction.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/Restriction.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/TypeRestriction.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/UnaryLogicalRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/QueryDefinitionRegistry2.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/QueryInterpreter2.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/definition/JpaAnyContainerDefinition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/definition/JpaDataNodeDefinition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/definition/JpaEntityDefinition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/definition/JpaEntityPointerDefinition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/definition/JpaPropertyDefinition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/definition/JpaReferenceDefinition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/resolution/ItemPathResolutionState.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/resolution/ItemPathResolver.java

  Log Message:
  -----------
  Fixed searching by enums in extensions: MID-3801 (ActivationStatusType cannot be cast to java.lang.String)
Now respecting indexed=false for all extension data types


  Commit: 8c8c0fe780ae1941a3e9e9222b1f02cbda5659ca
      https://github.com/Evolveum/midpoint/commit/8c8c0fe780ae1941a3e9e9222b1f02cbda5659ca
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-03-08 (Wed, 08 Mar 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/OriginType.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
    M model/model-impl/src/test/resources/common/system-configuration.xml
    M model/model-impl/src/test/resources/lens/role-judge.xml
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/AbstractTestAssignmentApproval.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/global/TestAssignmentApprovalGlobal.java
    M model/workflow-impl/src/test/resources/policy/metarole-default.xml
    A model/workflow-impl/src/test/resources/policy/system-configuration-global.xml

  Log Message:
  -----------
  Fixed MID-3799:5 (condition for global rules - currently only for assignment ones) + preparation for fixing MID-3799:1 (policy rules for non-default relations)


  Commit: dac2f88d676e3fa5f020cd5e482a33e1ba6a3776
      https://github.com/Evolveum/midpoint/commit/dac2f88d676e3fa5f020cd5e482a33e1ba6a3776
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-03-08 (Wed, 08 Mar 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/OriginType.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SimpleTypeDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/SimpleTypeDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaDefinitionFactory.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
    M model/model-impl/src/test/resources/common/system-configuration.xml
    M model/model-impl/src/test/resources/lens/role-judge.xml
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/AbstractTestAssignmentApproval.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/global/TestAssignmentApprovalGlobal.java
    M model/workflow-impl/src/test/resources/policy/metarole-default.xml
    A model/workflow-impl/src/test/resources/policy/system-configuration-global.xml
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/BaseSQLRepoTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java
    M repo/repo-sql-impl-test/src/test/resources/schema/extension.xsd
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryFactory.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryContext.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryDefinitionRegistry.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryEngine.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryException.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryInterpreter.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/RQueryCriteriaImpl.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/custom/CustomQuery.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/custom/OrgFilterQuery.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/custom/ShadowQueryWithDisjunction.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/matcher/DefaultMatcher.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/matcher/Matcher.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/matcher/PolyStringMatcher.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/matcher/StringMatcher.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/AndRestriction.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/AnyPropertyRestriction.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/CollectionRestriction.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/InOidRestriction.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/ItemRestriction.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/ItemRestrictionOperation.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/LogicalRestriction.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/NaryLogicalRestriction.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/NotRestriction.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/OrRestriction.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/OrgRestriction.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/PropertyRestriction.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/ReferenceRestriction.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/Restriction.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/TypeRestriction.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/UnaryLogicalRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/QueryDefinitionRegistry2.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/QueryInterpreter2.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/definition/JpaAnyContainerDefinition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/definition/JpaDataNodeDefinition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/definition/JpaEntityDefinition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/definition/JpaEntityPointerDefinition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/definition/JpaPropertyDefinition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/definition/JpaReferenceDefinition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/resolution/ItemPathResolutionState.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/resolution/ItemPathResolver.java

  Log Message:
  -----------
  Merge branch 'master' into feature/password-hash


Compare: https://github.com/Evolveum/midpoint/compare/89b5fbfb1a30...dac2f88d676e