[midPoint-git] [Evolveum/midpoint] 88b243: Try to fix "too generic xsi:type" parsing failure

Tony Tkáčik noreply at github.com
Mon Sep 21 11:45:27 CEST 2020


  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 88b24347605b0f36f6dcb988a92d8a37c55ca372
      https://github.com/Evolveum/midpoint/commit/88b24347605b0f36f6dcb988a92d8a37c55ca372
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-09-17 (Thu, 17 Sep 2020)

  Changed paths:
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/TypeDefinition.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ComplexTypeDefinitionImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContextImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/TypeDefinitionImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/PrismUnmarshaller.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/DomToSchemaPostProcessor.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/SchemaRegistryImpl.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/MidPointPrismContextFactory.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestConstants.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaSanity.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
    M infra/schema/src/test/resources/common/xml/no-ns/user-jack.xml
    M infra/schema/src/test/resources/common/xml/ns/user-jack.xml
    M infra/schema/src/test/resources/schema/extension.xsd

  Log Message:
  -----------
  Try to fix "too generic xsi:type" parsing failure

Parsing of structures with xsi:type being (mistakenly) set to
a supertype of the actual type used to fail. This is an attempt
to fix that by comparing declared xsi:type with known PCD.

Now also correctly setting ctd.superType for extension types.

Relates to MID-6474 and MID-6394.


  Commit: 925783e99e885fb54feeceb31321a9a90d006d44
      https://github.com/Evolveum/midpoint/commit/925783e99e885fb54feeceb31321a9a90d006d44
  Author: Tony Tkacik <tonydamage at gmail.com>
  Date:   2020-09-21 (Mon, 21 Sep 2020)

  Changed paths:
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/TypeDefinition.java

  Log Message:
  -----------
  MID-6474: Added default implementation of isAssignableFrom

Signed-off-by: Tony Tkacik <tonydamage at gmail.com>


  Commit: 7ce1dd191fb637f833b6937fdb422d1876addef0
      https://github.com/Evolveum/midpoint/commit/7ce1dd191fb637f833b6937fdb422d1876addef0
  Author: Tony Tkacik <tonydamage at gmail.com>
  Date:   2020-09-21 (Mon, 21 Sep 2020)

  Changed paths:
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/TypeDefinition.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ComplexTypeDefinitionImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContextImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/TypeDefinitionImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/PrismUnmarshaller.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/DomToSchemaPostProcessor.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/SchemaRegistryImpl.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/MidPointPrismContextFactory.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestConstants.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaSanity.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
    M infra/schema/src/test/resources/common/xml/no-ns/user-jack.xml
    M infra/schema/src/test/resources/common/xml/ns/user-jack.xml
    M infra/schema/src/test/resources/schema/extension.xsd

  Log Message:
  -----------
  Merge branch 'tmp/mid-6474'


Compare: https://github.com/Evolveum/midpoint/compare/19a0bb056ba6...7ce1dd191fb6


More information about the midPoint-svn mailing list