Merge multi-inheritance POC #10242 #10243
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vbradnitski
changed the title
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| } | ||
|
|
||
| @Test | ||
| public void testMoveArchiveAndResetFromTwoParents() |
Check warning
Code scanning / Pmd (reported by Codacy)
JUnit tests should include assert() or fail()
| @@ -152,10 +154,62 @@ | |||
|
|
|||
| } | |||
|
|
|||
| @Test | |||
| public void testSyncProjectFromTwoParents() | |||
Check warning
Code scanning / Pmd (reported by Codacy)
JUnit tests should include assert() or fail()
| @@ -14,10 +14,10 @@ | |||
|
|
|||
|
|
|||
| @Test | |||
| public void createProjectWithParent() | |||
| public void createProjectWithOneParent() | |||
Check warning
Code scanning / Pmd (reported by Codacy)
JUnit tests should include assert() or fail()
rymsha
requested changes
Aug 16, 2023
modules/lib/lib-project/src/main/java/com/enonic/xp/lib/project/mapper/ProjectMapper.java
Outdated
Show resolved
Hide resolved
| @@ -759,4 +765,31 @@ private Context adminContext() | |||
| .authInfo( AuthenticationInfo.copyOf( ContextAccessor.current().getAuthInfo() ).principals( RoleKeys.ADMIN ).build() ) | |||
| .build(); | |||
| } | |||
|
|
|||
| private boolean createsCircleDependency( final ProjectName projectName, final List<ProjectName> parentNames ) | |||
There was a problem hiding this comment.
strange name for method. What about shoudCreateCircleDependency?
alansemenov
pushed a commit
that referenced
this pull request
Dec 22, 2023
* Multi-inheritance in layers #10242 * NPE on project create after multi-inheritance implementation #10338 * Wrong parent can be selected in multi-inheritance sync #10343 (#10344) * Wrong parent can be selected for sync during layer init #10346 (#10347) * layers cycle when project gets created #10350 (#10355) * Config to enable multilayer #10351 (#10359) --------- Co-authored-by: rymsha <rymsha@yandex.ru>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.