Skip to content
Failed

Changes

Summary

  1. [Bug #2] Detached value mergers with tests. (commit: fbc9e8a) (details)
  2. [Bug #2] Fixed most of the merging issues. (commit: da7fdf9) (details)
Commit fbc9e8af42da4c52de88946246083de387dfddc0 by Martin Ledvinka
[Bug #2] Detached value mergers with tests.
(commit: fbc9e8a)
The file was addedjopa-impl/src/main/java/cz/cvut/kbss/jopa/sessions/merge/MapValueMerger.java
The file was modifiedjopa-impl/src/main/java/cz/cvut/kbss/jopa/sessions/CloneBuilderImpl.java (diff)
The file was addedjopa-impl/src/main/java/cz/cvut/kbss/jopa/sessions/merge/DetachedValueMerger.java
The file was addedjopa-impl/src/main/java/cz/cvut/kbss/jopa/utils/MetamodelUtils.java
The file was modifiedjopa-impl/src/main/java/cz/cvut/kbss/jopa/sessions/UnitOfWorkImpl.java (diff)
The file was addedjopa-impl/src/main/java/cz/cvut/kbss/jopa/sessions/merge/ManagedTypeValueMerger.java
The file was modifiedjopa-impl/src/main/java/cz/cvut/kbss/jopa/sessions/CollectionInstanceBuilder.java (diff)
The file was modifiedjopa-api/src/main/java/cz/cvut/kbss/jopa/sessions/CloneBuilder.java (diff)
The file was modifiedjopa-impl/src/main/java/cz/cvut/kbss/jopa/utils/CollectionFactory.java (diff)
The file was addedjopa-impl/src/main/java/cz/cvut/kbss/jopa/sessions/DetachedInstanceMerger.java
The file was addedjopa-impl/src/test/java/cz/cvut/kbss/jopa/sessions/merge/ManagedTypeValueMergerTest.java
The file was modifiedjopa-impl/src/main/java/cz/cvut/kbss/jopa/model/metamodel/PropertiesSpecificationImpl.java (diff)
The file was modifiedjopa-impl/src/main/java/cz/cvut/kbss/jopa/model/metamodel/TypesSpecificationImpl.java (diff)
The file was addedjopa-impl/src/main/java/cz/cvut/kbss/jopa/sessions/merge/DefaultValueMerger.java
The file was addedjopa-impl/src/main/java/cz/cvut/kbss/jopa/sessions/merge/CollectionValueMerger.java
The file was modifiedjopa-impl/src/main/java/cz/cvut/kbss/jopa/sessions/MergeManagerImpl.java (diff)
The file was modifiedjopa-impl/src/test/java/cz/cvut/kbss/jopa/sessions/UnitOfWorkTest.java (diff)
The file was addedjopa-impl/src/main/java/cz/cvut/kbss/jopa/sessions/merge/ValueMerger.java
The file was modifiedjopa-impl/src/test/java/cz/cvut/kbss/jopa/environment/OWLClassA.java (diff)
The file was modifiedjopa-impl/src/test/java/cz/cvut/kbss/jopa/sessions/CloneBuilderTest.java (diff)
The file was modifiedjopa-impl/src/test/java/cz/cvut/kbss/jopa/environment/OWLClassF.java (diff)
The file was modifiedjopa-impl/src/main/java/cz/cvut/kbss/jopa/sessions/AbstractInstanceBuilder.java (diff)
The file was modifiedjopa-impl/src/test/java/cz/cvut/kbss/jopa/sessions/MergeManagerTest.java (diff)
The file was modifiedjopa-impl/src/main/java/cz/cvut/kbss/jopa/oom/TypesFieldStrategy.java (diff)
The file was modifiedjopa-api/src/main/java/cz/cvut/kbss/jopa/sessions/MergeManager.java (diff)
The file was addedjopa-impl/src/test/java/cz/cvut/kbss/jopa/sessions/merge/CollectionValueMergerTest.java
The file was addedjopa-impl/src/test/java/cz/cvut/kbss/jopa/sessions/merge/MapValueMergerTest.java
The file was modifiedjopa-api/src/main/java/cz/cvut/kbss/jopa/model/metamodel/TypesSpecification.java (diff)
The file was modifiedjopa-impl/src/test/java/cz/cvut/kbss/jopa/model/MetamodelImplTest.java (diff)
The file was addedjopa-impl/src/test/java/cz/cvut/kbss/jopa/sessions/DetachedInstanceMergerTest.java
The file was modifiedjopa-impl/src/test/java/cz/cvut/kbss/jopa/environment/utils/MetamodelFactory.java (diff)
Commit da7fdf984534cefb5ae32fd13f9cd50a8b6313a8 by Martin Ledvinka
[Bug #2] Fixed most of the merging issues.
(commit: da7fdf9)
The file was modifiedjopa-api/src/main/java/cz/cvut/kbss/jopa/sessions/CloneBuilder.java (diff)
The file was modifiedjopa-impl/src/main/java/cz/cvut/kbss/jopa/sessions/UnitOfWorkImpl.java (diff)
The file was modifiedjopa-impl/src/test/java/cz/cvut/kbss/jopa/sessions/UnitOfWorkTest.java (diff)
The file was modifiedjopa-integration-tests/src/main/java/cz/cvut/kbss/jopa/test/runner/DeleteOperationsRunner.java (diff)
The file was modifiedjopa-integration-tests/src/main/java/cz/cvut/kbss/jopa/test/runner/CreateOperationsMultiContextRunner.java (diff)
The file was addedjopa-impl/src/main/java/cz/cvut/kbss/jopa/model/OneLevelMergeCascadeExplorer.java
The file was modifiedjopa-integration-tests/src/main/java/cz/cvut/kbss/jopa/test/runner/CreateOperationsRunner.java (diff)
The file was modifiedjopa-integration-tests/src/main/java/cz/cvut/kbss/jopa/test/environment/TestEnvironmentUtils.java (diff)
The file was modifiedjopa-integration-tests/src/main/java/cz/cvut/kbss/jopa/test/runner/UpdateOperationsRunner.java (diff)
The file was modifiedjopa-owl2java/src/main/java/cz/cvut/kbss/jopa/owl2java/Constants.java (diff)
The file was modifiedjopa-impl/src/main/java/cz/cvut/kbss/jopa/model/EntityManagerImpl.java (diff)
The file was modifiedjopa-impl/src/main/java/cz/cvut/kbss/jopa/sessions/CloneBuilderImpl.java (diff)
The file was modifiedjopa-integration-tests/src/main/java/cz/cvut/kbss/jopa/test/runner/UpdateOperationsWithInheritanceRunner.java (diff)