Skip to content

fixed compatibility with Bamboo 6+ #48

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
achystoprudov wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixed compatibility with Bamboo 6+ #48

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
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<!--<bamboo.version>5.11.3</bamboo.version> -->
<!--<bamboo.version>5.12.0.2</bamboo.version> -->

<bamboo.version>5.12.3.1</bamboo.version>
<bamboo.version>6.7.1</bamboo.version>
<!--<bamboo.data.version>5.10.0</bamboo.data.version> -->

<!--<amps.version>4.2.1</amps.version> -->
Expand Down Expand Up @@ -256,8 +256,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.6</source>
<target>1.6</target>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>

Expand Down
47 changes: 17 additions & 30 deletions src/main/java/com/houghtonassociates/bamboo/plugins/GerritRepositoryAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1466,13 +1466,9 @@ private ImmutableChain findFirstPlan(boolean isRemoteTriggeredBy) {
*/
private boolean isRepoTriggerFor(ImmutableChain chain,
boolean isRemoteTrigger) {
List<BuildStrategy> strats = chain.getTriggers();
List<RepositoryDefinition> cRepos =
new ArrayList<RepositoryDefinition>();
List<TriggerDefinition> strats = chain.getTriggerDefinitions();

cRepos = chain.getEffectiveRepositoryDefinitions();

for (RepositoryDefinition rd : cRepos) {
for (RepositoryDefinition rd : chain.getEffectiveRepositoryDefinitions()) {
if (rd.getName().toLowerCase().equals(this.getName().toLowerCase())
&& rd.getPluginKey().equals(this.getKey())) {
HierarchicalConfiguration hconfig = rd.getConfiguration();
Expand All @@ -1485,32 +1481,23 @@ private boolean isRepoTriggerFor(ImmutableChain chain,
|| this.getVcsBranch().isEqualToBranchWith(strCustBranch)) {

if (isRemoteTrigger) {
for (BuildStrategy s : strats) {
if (s instanceof TriggeredBuildStrategy) {
TriggeredBuildStrategy tbs =
Narrow.downTo(s,
TriggeredBuildStrategy.class);

Set<Long> repos =
tbs.getTriggeringRepositories();

if (repos.contains(rd.getId())) {
return true;
} else {
for (Long rID : repos) {
RepositoryDataEntity rde =
repositoryDefinitionManager
.getRepositoryDataEntity(rID);
if (rde.getName()
.equals(this.getName())
&& rde.getPluginKey().equals(
this.getKey())) {
return true;
}
for (TriggerDefinition s : strats) {
Set<Long> repos =
s.getTriggeringRepositories();
if (repos.contains(rd.getId())) {
return true;
} else {
for (Long rID : repos) {
RepositoryDataEntity rde =
repositoryDefinitionManager
.getRepositoryDataEntity(rID);
if (rde.getName()
.equals(this.getName())
&& rde.getPluginKey().equals(
this.getKey())) {
return true;
}
}
} else {
return false;
}
}
} else {
Expand Down
16 changes: 16 additions & 0 deletions src/main/java/com/houghtonassociates/bamboo/plugins/view/RepositoryHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package com.houghtonassociates.bamboo.plugins.view;

import com.atlassian.bamboo.plan.cache.ImmutableChain;
import com.atlassian.bamboo.repository.Repository;
import org.jetbrains.annotations.Nullable;

public class RepositoryHelper {

@Nullable
public static Repository getDefaultRepository(ImmutableChain chain) {
return chain.getPlanRepositoryDefinitions().stream()
.findFirst()
.map(planRepositoryDefinition -> planRepositoryDefinition.asLegacyData().getRepository())
.orElse(null);
}
}
Loading