This repository has been archived by the owner on Nov 30, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 339
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bug 1172746 - Project's pom.xml file does not retain tags like <exclu…
…sion>, <optional> and <scope> in the "dependencies" section (cherry picked from commit 0a62e6a)
- Loading branch information
Showing
4 changed files
with
225 additions
and
30 deletions.
There are no files selected for viewing
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
104 changes: 104 additions & 0 deletions
104
...nd/src/main/java/org/guvnor/common/services/project/backend/server/DependencyUpdater.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| /* | ||
| * Copyright 2015 JBoss Inc | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.guvnor.common.services.project.backend.server; | ||
|
|
||
| import java.util.Iterator; | ||
| import java.util.List; | ||
|
|
||
| import org.apache.maven.model.Model; | ||
| import org.guvnor.common.services.project.model.Dependency; | ||
|
|
||
| class DependencyUpdater { | ||
|
|
||
| private Model model; | ||
|
|
||
| DependencyUpdater(Model model) { | ||
| this.model = model; | ||
| } | ||
|
|
||
| void updateDependencies(List<Dependency> dependencies) { | ||
| removeAllThatDoNotExist(dependencies); | ||
| addTheOnesThatDoNotExist(dependencies); | ||
| updateTheRest(dependencies); | ||
| } | ||
|
|
||
| private void updateTheRest(List<Dependency> dependencies) { | ||
| for (Dependency dependency : dependencies) { | ||
| for (org.apache.maven.model.Dependency modelDep : model.getDependencies()) { | ||
| if (hasSameID(dependency, modelDep)) { | ||
| updateDependency(dependency, modelDep); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private void addTheOnesThatDoNotExist(List<Dependency> dependencies) { | ||
| for (Dependency dependency : dependencies) { | ||
| if (!depsContains(model.getDependencies(), dependency)) { | ||
| model.addDependency(fromClientModelToPom(dependency)); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private void removeAllThatDoNotExist(List<Dependency> dependencies) { | ||
| Iterator<org.apache.maven.model.Dependency> iterator = model.getDependencies().iterator(); | ||
| while (iterator.hasNext()) { | ||
| org.apache.maven.model.Dependency dependency = iterator.next(); | ||
| if (!depsContains(dependencies, dependency)) { | ||
| iterator.remove(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private org.apache.maven.model.Dependency fromClientModelToPom(org.guvnor.common.services.project.model.Dependency from) { | ||
| org.apache.maven.model.Dependency dependency = updateDependency(from, new org.apache.maven.model.Dependency()); | ||
|
|
||
| return dependency; | ||
| } | ||
|
|
||
| private org.apache.maven.model.Dependency updateDependency(org.guvnor.common.services.project.model.Dependency from, org.apache.maven.model.Dependency dependency) { | ||
|
|
||
| dependency.setArtifactId(from.getArtifactId()); | ||
| dependency.setGroupId(from.getGroupId()); | ||
| dependency.setVersion(from.getVersion()); | ||
| dependency.setScope(from.getScope()); | ||
| return dependency; | ||
| } | ||
|
|
||
| private boolean depsContains(List<org.guvnor.common.services.project.model.Dependency> dependencies, org.apache.maven.model.Dependency dependency) { | ||
| for (org.guvnor.common.services.project.model.Dependency modelDep : dependencies) { | ||
| if (hasSameID(modelDep, dependency)) { | ||
| return true; | ||
| } | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| private boolean depsContains(List<org.apache.maven.model.Dependency> dependencies, org.guvnor.common.services.project.model.Dependency dependency) { | ||
| for (org.apache.maven.model.Dependency modelDep : dependencies) { | ||
| if (hasSameID(dependency, modelDep)) { | ||
| return true; | ||
| } | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| private boolean hasSameID(org.guvnor.common.services.project.model.Dependency dependency, org.apache.maven.model.Dependency modelDep) { | ||
| return dependency.getArtifactId().equals(modelDep.getArtifactId()) && dependency.getGroupId().equals(modelDep.getGroupId()); | ||
| } | ||
|
|
||
| } |
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
94 changes: 94 additions & 0 deletions
94
...rc/test/java/org/guvnor/common/services/project/backend/server/DependencyUpdaterTest.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| /* | ||
| * Copyright 2015 JBoss Inc | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.guvnor.common.services.project.backend.server; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Collections; | ||
|
|
||
| import org.apache.maven.model.Model; | ||
| import org.guvnor.common.services.project.model.Dependency; | ||
| import org.junit.Test; | ||
|
|
||
| import static org.junit.Assert.*; | ||
|
|
||
| public class DependencyUpdaterTest { | ||
|
|
||
| @Test | ||
| public void testAdd() throws Exception { | ||
|
|
||
| Model model = new Model(); | ||
| ArrayList<Dependency> dependencies = new ArrayList<Dependency>(); | ||
| dependencies.add(makeWorkbenchDependency("group", "artifact-id", "1.0")); | ||
|
|
||
| assertTrue(model.getDependencies().isEmpty()); | ||
|
|
||
| new DependencyUpdater(model).updateDependencies(dependencies); | ||
|
|
||
| assertEquals(1, model.getDependencies().size()); | ||
| assertEquals("group", model.getDependencies().get(0).getGroupId()); | ||
| assertEquals("artifact-id", model.getDependencies().get(0).getArtifactId()); | ||
| assertEquals("1.0", model.getDependencies().get(0).getVersion()); | ||
| } | ||
|
|
||
| @Test | ||
| public void testRemove() throws Exception { | ||
|
|
||
| Model model = new Model(); | ||
|
|
||
| model.getDependencies().add(makeMavenDependency("group", "artifact-id", "1.0")); | ||
|
|
||
| assertFalse(model.getDependencies().isEmpty()); | ||
|
|
||
| new DependencyUpdater(model).updateDependencies(Collections.EMPTY_LIST); | ||
|
|
||
| assertTrue(model.getDependencies().isEmpty()); | ||
| } | ||
|
|
||
| @Test | ||
| public void testUpdate() throws Exception { | ||
| Model model = new Model(); | ||
| model.getDependencies().add(makeMavenDependency("group", "artifact-id", "1.0")); | ||
|
|
||
| ArrayList<Dependency> dependencies = new ArrayList<Dependency>(); | ||
| dependencies.add(makeWorkbenchDependency("group", "artifact-id", "2.0")); | ||
|
|
||
| assertFalse(model.getDependencies().isEmpty()); | ||
|
|
||
| new DependencyUpdater(model).updateDependencies(dependencies); | ||
|
|
||
| assertEquals(1, model.getDependencies().size()); | ||
| assertEquals("group", model.getDependencies().get(0).getGroupId()); | ||
| assertEquals("artifact-id", model.getDependencies().get(0).getArtifactId()); | ||
| assertEquals("2.0", model.getDependencies().get(0).getVersion()); | ||
| } | ||
|
|
||
| private org.apache.maven.model.Dependency makeMavenDependency(String group, String artifactId, String version) { | ||
| org.apache.maven.model.Dependency dependency = new org.apache.maven.model.Dependency(); | ||
| dependency.setGroupId(group); | ||
| dependency.setArtifactId(artifactId); | ||
| dependency.setVersion(version); | ||
| return dependency; | ||
| } | ||
|
|
||
| private Dependency makeWorkbenchDependency(String group, String artifactId, String version) { | ||
| Dependency dependency = new Dependency(); | ||
| dependency.setGroupId(group); | ||
| dependency.setArtifactId(artifactId); | ||
| dependency.setVersion(version); | ||
| return dependency; | ||
| } | ||
| } |