Skip to content

Fixes #36 - Disable check for SNAPSHOT when checking for promotion #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
drautureau wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixes #36 - Disable check for SNAPSHOT when checking for promotion #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 24 additions & 26 deletions server/src/main/java/org/axway/grapes/server/core/ModuleHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,36 +152,34 @@ public PromotionReportView getPromotionReport(final String moduleId) {
final PromotionReportView report = new PromotionReportView();
report.setRootModule(DataModelFactory.createModule(module.getName(), module.getVersion()));

if(!report.isSnapshot()) {
// filters initialization
final FiltersHolder filters = new FiltersHolder();
filters.addFilter(new PromotedFilter(false));
filters.addFilter(new CorporateFilter(organization));

// Checks if each dependency module has been promoted
for (Dependency dependency : depHandler.getModuleDependencies(moduleId, filters)) {
final DbModule depModule = repositoryHandler.getRootModuleOf(dependency.getTarget().getGavc());
if (depModule != null && !depModule.getId().equals(moduleId)) {
if (!depModule.isPromoted()) {
report.addUnPromotedDependency(depModule.getId());
report.addDependencyPromotionReport(depModule.getId(), getPromotionReport(depModule.getId()));
}
// filters initialization
final FiltersHolder filters = new FiltersHolder();
filters.addFilter(new PromotedFilter(false));
filters.addFilter(new CorporateFilter(organization));

// Checks if each dependency module has been promoted
for (Dependency dependency : depHandler.getModuleDependencies(moduleId, filters)) {
final DbModule depModule = repositoryHandler.getRootModuleOf(dependency.getTarget().getGavc());
if (depModule != null && !depModule.getId().equals(moduleId)) {
if (!depModule.isPromoted()) {
report.addUnPromotedDependency(depModule.getId());
report.addDependencyPromotionReport(depModule.getId(), getPromotionReport(depModule.getId()));
}
}
}

// Checks if the module has dependencies that shouldn't be used
final List<String> treatedArtifacts = new ArrayList<String>();
for (DbDependency dependency : DataUtils.getAllDbDependencies(module)) {
final DbArtifact artifactDep = repositoryHandler.getArtifact(dependency.getTarget());
// Checks if the module has dependencies that shouldn't be used
final List<String> treatedArtifacts = new ArrayList<String>();
for (DbDependency dependency : DataUtils.getAllDbDependencies(module)) {
final DbArtifact artifactDep = repositoryHandler.getArtifact(dependency.getTarget());

if (artifactDep == null) {
// handle the case of a corporate artifact which is not available in the repository
continue;
}
if (artifactDep.getDoNotUse() && !treatedArtifacts.contains(artifactDep.getGavc())) {
report.addDoNotUseArtifact(modelMapper.getArtifact(artifactDep));
treatedArtifacts.add(artifactDep.getGavc());
}
if (artifactDep == null) {
// handle the case of a corporate artifact which is not available in the repository
continue;
}
if (artifactDep.getDoNotUse() && !treatedArtifacts.contains(artifactDep.getGavc())) {
report.addDoNotUseArtifact(modelMapper.getArtifact(artifactDep));
treatedArtifacts.add(artifactDep.getGavc());
}
}

Expand Down
7 changes: 0 additions & 7 deletions server/src/main/java/org/axway/grapes/server/webapp/views/PromotionReportView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,17 +81,10 @@ public List<PromotionReportView> getReportsWithDoNotUseArtifacts() {
}

public Boolean canBePromoted() {
if(isSnapshot()){
return false;
}
return unPromotedDependencies.isEmpty() &&
doNotUseArtifacts.isEmpty();
}

public boolean isSnapshot() {
return getRootModule().getVersion().contains("SNAPSHOT");
}

public Set<String> getMisMatchModules(){
return mismatchVersions.keySet();
}
Expand Down
6 changes: 1 addition & 5 deletions server/src/main/resources/org/axway/grapes/server/webapp/views/PromotionReportView.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,7 @@
</#if>

<#else>
<#if isSnapshot()>
<div id="promotion_ko"><strong>Snapshot module cannot be promoted!!!</strong><br/></div>
<#else>
<div id="promotion_ko"><strong>The module cannot be promoted!!!</strong><br/></div>
</#if>
<div id="promotion_ko"><strong>The module cannot be promoted!!!</strong><br/></div>

<#if getMisMatchModules()?has_content >
<h3>Warning: some dependencies occurs in different versions</h3>
Expand Down