Skip to content
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

[JENKINS-72030] Add checkbox to enable/disable Avatar retrieval #738

Merged
merged 8 commits into from
Dec 18, 2023
Merged

[JENKINS-72030] Add checkbox to enable/disable Avatar retrieval #738

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
435450a
[JENKINS-72030] Add checkbox to enable/disable Avatar retrieval
Dohbedoh Sep 18, 2023
7b720fb
[JENKINS-72030] Adapt and add test
Dohbedoh Oct 6, 2023
43d7905
[JENKINS-72030] Enable for existing items. Default to disable for new…
Dohbedoh Oct 9, 2023
4a5f00e
[JENKINS-72030] Use boolean
Dohbedoh Oct 10, 2023
bfd5eab
[JENKINS-72030] Use getEnableAvatar()
Dohbedoh Oct 11, 2023
480b5d0
[JENKINS-72030] Fix test
Dohbedoh Oct 13, 2023
ad94288
Merge branch 'master' into JENKINS-72030
Dohbedoh Oct 13, 2023
8cc08ab
[JENKINS-72030] getEnableAvater -> isEnableAvatar
Dohbedoh Nov 7, 2023
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
13 changes: 8 additions & 5 deletions src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMNavigator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public class GitHubSCMNavigator extends SCMNavigator {
/**
* Whether to enable the retrieval of the Organization avatar. If false, then the default GitHub logo will be used.
*/
private boolean enableAvatar;
private Boolean enableAvatar;

@NonNull
private List<SCMTrait<? extends SCMTrait<?>>> traits;
Expand Down Expand Up @@ -227,7 +227,6 @@ public class GitHubSCMNavigator extends SCMNavigator {
public GitHubSCMNavigator(String repoOwner) {
this.repoOwner = StringUtils.defaultString(repoOwner);
this.traits = new ArrayList<>();
this.enableAvatar = false;
}

/**
Expand Down Expand Up @@ -314,7 +313,8 @@ public void setCredentialsId(@CheckForNull String credentialsId) {
*
* @return true is enabled, false otherwise
*/
public boolean isEnableAvatar() {
@CheckForNull
public Boolean getEnableAvatar() {
Dohbedoh marked this conversation as resolved.
Show resolved Hide resolved
return enableAvatar;
}

Expand All @@ -324,7 +324,7 @@ public boolean isEnableAvatar() {
* @param enableAvatar true to enable, false to disable
*/
@DataBoundSetter
public void setEnableAvatar(boolean enableAvatar) {
public void setEnableAvatar(Boolean enableAvatar) {
Dohbedoh marked this conversation as resolved.
Show resolved Hide resolved
this.enableAvatar = enableAvatar;
}

Expand Down Expand Up @@ -391,6 +391,9 @@ private Object readResolve() {
if (scanCredentialsId != null) {
credentialsId = scanCredentialsId;
}
if (enableAvatar == null) {
enableAvatar = Boolean.TRUE;
}
if (traits == null) {
boolean buildOriginBranch = this.buildOriginBranch == null || this.buildOriginBranch;
boolean buildOriginBranchWithPR = this.buildOriginBranchWithPR == null || this.buildOriginBranchWithPR;
Expand Down Expand Up @@ -1557,7 +1560,7 @@ public List<Action> retrieveActions(
Connector.lookupScanCredentials((Item) owner, getApiUri(), credentialsId, repoOwner);
GitHub hub = Connector.connect(getApiUri(), credentials);
Connector.configureLocalRateLimitChecker(listener, hub);
boolean privateMode = !enableAvatar || determinePrivateMode(apiUri);
boolean privateMode = !Boolean.TRUE.equals(enableAvatar) || determinePrivateMode(apiUri);
Dohbedoh marked this conversation as resolved.
Show resolved Hide resolved
try {
GHUser u = hub.getUser(getRepoOwner());
String objectUrl = u.getHtmlUrl() == null ? null : u.getHtmlUrl().toExternalForm();
Expand Down
2 changes: 1 addition & 1 deletion ...main/resources/org/jenkinsci/plugins/github_branch_source/GitHubSCMNavigator/config.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<f:textbox/>
</f:entry>
<f:entry title="${%Enable Avatar}" field="enableAvatar">
<f:checkbox default="false"/>
<f:checkbox/>
</f:entry>
<f:entry title="${%Behaviours}">
<scm:traits field="traits"/>
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMNavigatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,8 +437,8 @@ public void fetchActions() throws Exception {
}

@Test
public void fetchActionsWithAvatar() throws Exception {
navigator.setEnableAvatar(true);
public void fetchActionsWithoutAvatar() throws Exception {
navigator.setEnableAvatar(false);
assertThat(
navigator.fetchActions(Mockito.mock(SCMNavigatorOwner.class), null, null),
Matchers.containsInAnyOrder(
Expand Down