diff --git a/CHANGES.md b/CHANGES.md index b984a18..28eef72 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -17,6 +17,7 @@ * Fixed display of organization website ([PR-18](https://github.com/jenkinsci/gitea-plugin/pull/18)) * Fixed repository polling with disabled issues or pull requests ([PR-17](https://github.com/jenkinsci/gitea-plugin/pull/17)) ([JENKINS-54516](https://issues.jenkins-ci.org/browse/JENKINS-54516)) +* Optimized imports, less redundant code and other cleanups ([PR-15](https://github.com/jenkinsci/gitea-plugin/pull/15/files)) ## Version 1.1.2 (2019-05-27) diff --git a/src/main/java/org/jenkinsci/plugin/gitea/AbstractGiteaSCMSourceEvent.java b/src/main/java/org/jenkinsci/plugin/gitea/AbstractGiteaSCMSourceEvent.java index 94f235c..8f8596f 100644 --- a/src/main/java/org/jenkinsci/plugin/gitea/AbstractGiteaSCMSourceEvent.java +++ b/src/main/java/org/jenkinsci/plugin/gitea/AbstractGiteaSCMSourceEvent.java @@ -25,20 +25,12 @@ import edu.umd.cs.findbugs.annotations.CheckForNull; import edu.umd.cs.findbugs.annotations.NonNull; -import hudson.scm.SCM; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.Collections; -import java.util.Map; -import jenkins.scm.api.SCMHead; import jenkins.scm.api.SCMHeadEvent; import jenkins.scm.api.SCMNavigator; -import jenkins.scm.api.SCMRevision; import jenkins.scm.api.SCMSource; import jenkins.scm.api.SCMSourceEvent; import org.apache.commons.lang.StringUtils; import org.jenkinsci.plugin.gitea.client.api.GiteaEvent; -import org.jenkinsci.plugin.gitea.servers.GiteaServer; import org.jenkinsci.plugin.gitea.servers.GiteaServers; /** diff --git a/src/main/java/org/jenkinsci/plugin/gitea/BranchDiscoveryTrait.java b/src/main/java/org/jenkinsci/plugin/gitea/BranchDiscoveryTrait.java index 805b2a1..c34df13 100644 --- a/src/main/java/org/jenkinsci/plugin/gitea/BranchDiscoveryTrait.java +++ b/src/main/java/org/jenkinsci/plugin/gitea/BranchDiscoveryTrait.java @@ -52,7 +52,7 @@ public class BranchDiscoveryTrait extends SCMSourceTrait { /** * The strategy encoded as a bit-field. */ - private int strategyId; + private final int strategyId; /** * Constructor for stapler. diff --git a/src/main/java/org/jenkinsci/plugin/gitea/GiteaAvatar.java b/src/main/java/org/jenkinsci/plugin/gitea/GiteaAvatar.java index c03a11f..a7ab218 100644 --- a/src/main/java/org/jenkinsci/plugin/gitea/GiteaAvatar.java +++ b/src/main/java/org/jenkinsci/plugin/gitea/GiteaAvatar.java @@ -24,6 +24,7 @@ package org.jenkinsci.plugin.gitea; import edu.umd.cs.findbugs.annotations.NonNull; +import java.util.Objects; import jenkins.scm.api.metadata.AvatarMetadataAction; import org.apache.commons.lang.StringUtils; @@ -67,7 +68,7 @@ public boolean equals(Object o) { GiteaAvatar that = (GiteaAvatar) o; - return avatar != null ? avatar.equals(that.avatar) : that.avatar == null; + return Objects.equals(avatar, that.avatar); } /** diff --git a/src/main/java/org/jenkinsci/plugin/gitea/GiteaBrowser.java b/src/main/java/org/jenkinsci/plugin/gitea/GiteaBrowser.java index 11368f9..0670a9c 100644 --- a/src/main/java/org/jenkinsci/plugin/gitea/GiteaBrowser.java +++ b/src/main/java/org/jenkinsci/plugin/gitea/GiteaBrowser.java @@ -121,7 +121,7 @@ private URL diffLink(Path path) throws IOException { .fragment(UriTemplateBuilder.var("diff")) .build() .set("changeSet", path.getChangeSet().getId()) - .set("diff", "diff-" + Integer.toString(getIndexOfPath(path) + 1)) + .set("diff", "diff-" + (getIndexOfPath(path) + 1)) .expand() ); } diff --git a/src/main/java/org/jenkinsci/plugin/gitea/GiteaPushSCMEvent.java b/src/main/java/org/jenkinsci/plugin/gitea/GiteaPushSCMEvent.java index 9bd9c2a..b0d4a2b 100644 --- a/src/main/java/org/jenkinsci/plugin/gitea/GiteaPushSCMEvent.java +++ b/src/main/java/org/jenkinsci/plugin/gitea/GiteaPushSCMEvent.java @@ -31,12 +31,9 @@ import hudson.plugins.git.GitStatus; import hudson.plugins.git.extensions.impl.IgnoreNotifyCommit; import hudson.scm.SCM; -import hudson.triggers.SCMTrigger; -import java.net.URI; import java.net.URISyntaxException; import java.util.Collections; import java.util.Map; -import java.util.logging.Level; import jenkins.scm.api.SCMHead; import jenkins.scm.api.SCMHeadEvent; import jenkins.scm.api.SCMNavigator; diff --git a/src/main/java/org/jenkinsci/plugin/gitea/GiteaSCMSource.java b/src/main/java/org/jenkinsci/plugin/gitea/GiteaSCMSource.java index 7b746d9..1875ca7 100644 --- a/src/main/java/org/jenkinsci/plugin/gitea/GiteaSCMSource.java +++ b/src/main/java/org/jenkinsci/plugin/gitea/GiteaSCMSource.java @@ -90,7 +90,15 @@ import org.apache.commons.lang.StringUtils; import org.jenkins.ui.icon.Icon; import org.jenkins.ui.icon.IconSet; -import org.jenkinsci.plugin.gitea.client.api.*; +import org.jenkinsci.plugin.gitea.client.api.Gitea; +import org.jenkinsci.plugin.gitea.client.api.GiteaAuth; +import org.jenkinsci.plugin.gitea.client.api.GiteaBranch; +import org.jenkinsci.plugin.gitea.client.api.GiteaConnection; +import org.jenkinsci.plugin.gitea.client.api.GiteaIssueState; +import org.jenkinsci.plugin.gitea.client.api.GiteaOwner; +import org.jenkinsci.plugin.gitea.client.api.GiteaPullRequest; +import org.jenkinsci.plugin.gitea.client.api.GiteaRepository; +import org.jenkinsci.plugin.gitea.client.api.GiteaUser; import org.jenkinsci.plugin.gitea.servers.GiteaServer; import org.jenkinsci.plugin.gitea.servers.GiteaServers; import org.kohsuke.stapler.AncestorInPath; @@ -830,7 +838,7 @@ public List>> getTraitsDescriptor } public List getTraitsDefaults() { - return Arrays.asList( // TODO finalize + return Arrays.asList( // TODO finalize new BranchDiscoveryTrait(true, false), new OriginPullRequestDiscoveryTrait(EnumSet.of(ChangeRequestCheckoutStrategy.MERGE)), new ForkPullRequestDiscoveryTrait(EnumSet.of(ChangeRequestCheckoutStrategy.MERGE), diff --git a/src/main/java/org/jenkinsci/plugin/gitea/GiteaSCMSourceContext.java b/src/main/java/org/jenkinsci/plugin/gitea/GiteaSCMSourceContext.java index 9b6f71d..46e27e7 100644 --- a/src/main/java/org/jenkinsci/plugin/gitea/GiteaSCMSourceContext.java +++ b/src/main/java/org/jenkinsci/plugin/gitea/GiteaSCMSourceContext.java @@ -41,9 +41,9 @@ public class GiteaSCMSourceContext private boolean wantOriginPRs; private boolean wantForkPRs; @NonNull - private Set originPRStrategies = EnumSet.noneOf(ChangeRequestCheckoutStrategy.class); + private final Set originPRStrategies = EnumSet.noneOf(ChangeRequestCheckoutStrategy.class); @NonNull - private Set forkPRStrategies = EnumSet.noneOf(ChangeRequestCheckoutStrategy.class); + private final Set forkPRStrategies = EnumSet.noneOf(ChangeRequestCheckoutStrategy.class); @NonNull private WebhookRegistration webhookRegistration = WebhookRegistration.SYSTEM; private boolean notificationsDisabled; diff --git a/src/main/java/org/jenkinsci/plugin/gitea/GiteaWebhookAction.java b/src/main/java/org/jenkinsci/plugin/gitea/GiteaWebhookAction.java index e193e22..967bd37 100644 --- a/src/main/java/org/jenkinsci/plugin/gitea/GiteaWebhookAction.java +++ b/src/main/java/org/jenkinsci/plugin/gitea/GiteaWebhookAction.java @@ -42,7 +42,7 @@ @Extension public class GiteaWebhookAction extends CrumbExclusion implements UnprotectedRootAction { - private Logger LOGGER = Logger.getLogger(GiteaWebhookAction.class.getName()); + private final Logger LOGGER = Logger.getLogger(GiteaWebhookAction.class.getName()); @Override public String getIconFileName() { diff --git a/src/main/java/org/jenkinsci/plugin/gitea/GiteaWebhookListener.java b/src/main/java/org/jenkinsci/plugin/gitea/GiteaWebhookListener.java index 6881b3b..beace0b 100644 --- a/src/main/java/org/jenkinsci/plugin/gitea/GiteaWebhookListener.java +++ b/src/main/java/org/jenkinsci/plugin/gitea/GiteaWebhookListener.java @@ -30,9 +30,7 @@ import hudson.model.Item; import hudson.model.Saveable; import hudson.model.listeners.SaveableListener; -import hudson.plugins.git.BranchSpec; import hudson.plugins.git.GitSCM; -import hudson.plugins.git.GitStatus; import hudson.plugins.git.extensions.impl.IgnoreNotifyCommit; import hudson.scm.SCM; import hudson.triggers.SCMTrigger; @@ -40,17 +38,14 @@ import java.net.URISyntaxException; import java.util.ArrayList; import java.util.EnumSet; -import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; import jenkins.authentication.tokens.api.AuthenticationTokens; import jenkins.model.JenkinsLocationConfiguration; -import jenkins.scm.api.SCM2; import jenkins.scm.api.SCMNavigatorOwner; import jenkins.scm.api.SCMSourceOwner; import jenkins.triggers.SCMTriggerItem; @@ -80,8 +75,6 @@ public static void register(SCMNavigatorOwner owner, GiteaSCMNavigator navigator StandardCredentials credentials; String serverUrl = navigator.getServerUrl(); switch (mode) { - case DISABLE: - return; case SYSTEM: GiteaServer server = GiteaServers.get().findServer(serverUrl); if (server == null || !server.isManageHooks()) { @@ -92,6 +85,7 @@ public static void register(SCMNavigatorOwner owner, GiteaSCMNavigator navigator case ITEM: credentials = navigator.credentials(owner); break; + case DISABLE: default: return; } @@ -161,8 +155,6 @@ public static void register(SCMSourceOwner owner, GiteaSCMSource source, StandardCredentials credentials; String serverUrl = source.getServerUrl(); switch (mode) { - case DISABLE: - return; case SYSTEM: GiteaServer server = GiteaServers.get().findServer(serverUrl); if (server == null || !server.isManageHooks()) { @@ -173,6 +165,7 @@ public static void register(SCMSourceOwner owner, GiteaSCMSource source, case ITEM: credentials = source.credentials(); break; + case DISABLE: default: return; } diff --git a/src/main/java/org/jenkinsci/plugin/gitea/OriginPullRequestDiscoveryTrait.java b/src/main/java/org/jenkinsci/plugin/gitea/OriginPullRequestDiscoveryTrait.java index 888f037..a9bc46f 100644 --- a/src/main/java/org/jenkinsci/plugin/gitea/OriginPullRequestDiscoveryTrait.java +++ b/src/main/java/org/jenkinsci/plugin/gitea/OriginPullRequestDiscoveryTrait.java @@ -54,7 +54,7 @@ public class OriginPullRequestDiscoveryTrait extends SCMSourceTrait { /** * The strategy encoded as a bit-field. */ - private int strategyId; + private final int strategyId; /** * Constructor for stapler. diff --git a/src/main/java/org/jenkinsci/plugin/gitea/PullRequestSCMRevision.java b/src/main/java/org/jenkinsci/plugin/gitea/PullRequestSCMRevision.java index 7898663..229bbca 100644 --- a/src/main/java/org/jenkinsci/plugin/gitea/PullRequestSCMRevision.java +++ b/src/main/java/org/jenkinsci/plugin/gitea/PullRequestSCMRevision.java @@ -30,7 +30,7 @@ public class PullRequestSCMRevision extends ChangeRequestSCMRevision { - private BranchSCMRevision origin; + private final BranchSCMRevision origin; /** * Constructor. diff --git a/src/main/java/org/jenkinsci/plugin/gitea/client/api/GiteaIssue.java b/src/main/java/org/jenkinsci/plugin/gitea/client/api/GiteaIssue.java index 16047a1..63a577d 100644 --- a/src/main/java/org/jenkinsci/plugin/gitea/client/api/GiteaIssue.java +++ b/src/main/java/org/jenkinsci/plugin/gitea/client/api/GiteaIssue.java @@ -112,11 +112,11 @@ public void setBody(String body) { } public List getLabels() { - return labels == null ? new ArrayList() : new ArrayList(labels); + return labels == null ? new ArrayList() : new ArrayList<>(labels); } public void setLabels(List labels) { - this.labels = labels == null ? new ArrayList() : new ArrayList(labels); + this.labels = labels == null ? new ArrayList() : new ArrayList<>(labels); } public GiteaMilestone getMilestone() { diff --git a/src/main/java/org/jenkinsci/plugin/gitea/client/api/GiteaMilestone.java b/src/main/java/org/jenkinsci/plugin/gitea/client/api/GiteaMilestone.java index 57d5043..6a4c11b 100644 --- a/src/main/java/org/jenkinsci/plugin/gitea/client/api/GiteaMilestone.java +++ b/src/main/java/org/jenkinsci/plugin/gitea/client/api/GiteaMilestone.java @@ -101,7 +101,7 @@ public void setClosedAt(Date closedAt) { } public Date getDueOn() { - return dueOn == null ? dueOn : (Date) dueOn.clone(); + return dueOn == null ? null : (Date) dueOn.clone(); } @JsonProperty("due_on") diff --git a/src/main/java/org/jenkinsci/plugin/gitea/client/api/GiteaPullRequest.java b/src/main/java/org/jenkinsci/plugin/gitea/client/api/GiteaPullRequest.java index 3574dd6..64ebda9 100644 --- a/src/main/java/org/jenkinsci/plugin/gitea/client/api/GiteaPullRequest.java +++ b/src/main/java/org/jenkinsci/plugin/gitea/client/api/GiteaPullRequest.java @@ -136,11 +136,11 @@ public void setBody(String body) { } public List getLabels() { - return labels == null ? new ArrayList() : new ArrayList(labels); + return labels == null ? new ArrayList() : new ArrayList<>(labels); } public void setLabels(List labels) { - this.labels = labels == null ? new ArrayList() : new ArrayList(labels); + this.labels = labels == null ? new ArrayList() : new ArrayList<>(labels); } public GiteaMilestone getMilestone() { diff --git a/src/main/java/org/jenkinsci/plugin/gitea/client/api/GiteaRepositoryEvent.java b/src/main/java/org/jenkinsci/plugin/gitea/client/api/GiteaRepositoryEvent.java index a9648b9..8db136a 100644 --- a/src/main/java/org/jenkinsci/plugin/gitea/client/api/GiteaRepositoryEvent.java +++ b/src/main/java/org/jenkinsci/plugin/gitea/client/api/GiteaRepositoryEvent.java @@ -24,7 +24,6 @@ package org.jenkinsci.plugin.gitea.client.api; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; /** * Gitea {@link GiteaEventType#REPOSITORY} event. diff --git a/src/main/java/org/jenkinsci/plugin/gitea/client/impl/DefaultGiteaConnection.java b/src/main/java/org/jenkinsci/plugin/gitea/client/impl/DefaultGiteaConnection.java index 5c4c105..19b56ed 100644 --- a/src/main/java/org/jenkinsci/plugin/gitea/client/impl/DefaultGiteaConnection.java +++ b/src/main/java/org/jenkinsci/plugin/gitea/client/impl/DefaultGiteaConnection.java @@ -80,7 +80,7 @@ class DefaultGiteaConnection implements GiteaConnection { private final String serverUrl; private final GiteaAuth authentication; - private ObjectMapper mapper = new ObjectMapper(); + private final ObjectMapper mapper = new ObjectMapper(); DefaultGiteaConnection(@NonNull String serverUrl, @NonNull GiteaAuth authentication) { @@ -155,11 +155,10 @@ public GiteaOwner fetchOwner(String name) throws IOException, InterruptedExcepti if (giteaOrganization != null) { return giteaOrganization; } - } - catch (GiteaHttpStatusException e) { + } catch (GiteaHttpStatusException e) { // When it's NotFound, owner might be a user, so only rethrow when not 404 // Every other non 200 status code should be thrown again by fetchUser() - if(e.getStatusCode() != 404) { + if (e.getStatusCode() != 404) { throw e; } } @@ -246,7 +245,7 @@ public List fetchRepositories(GiteaOwner owner) throws IOExcept public List fetchOrganizationRepositories(GiteaOwner owner) throws IOException, InterruptedException { return getList( api() - .literal("/orgs") + .literal("/orgs") .path(UriTemplateBuilder.var("org")) .literal("/repos") .build() @@ -283,27 +282,7 @@ public GiteaBranch fetchBranch(String username, String repository, String name) @Override public GiteaBranch fetchBranch(GiteaRepository repository, String name) throws IOException, InterruptedException { - if (name.indexOf('/') != -1) { - // TODO remove hack once https://github.com/go-gitea/gitea/issues/2088 is fixed - for (GiteaBranch b : fetchBranches(repository)) { - if (name.equals(b.getName())) { - return b; - } - } - } - return getObject( - api() - .literal("/repos") - .path(UriTemplateBuilder.var("username")) - .path(UriTemplateBuilder.var("repository")) - .literal("/branches") - .path(UriTemplateBuilder.var("name", true)) - .build() - .set("username", repository.getOwner().getUsername()) - .set("repository", repository.getName()) - .set("name", StringUtils.split(name, '/')), - GiteaBranch.class - ); + return fetchBranch(repository.getOwner().getUsername(), repository.getName(), name); } @Override @@ -323,17 +302,7 @@ public List fetchBranches(String username, String name) throws IOEx @Override public List fetchBranches(GiteaRepository repository) throws IOException, InterruptedException { - return getList( - api() - .literal("/repos") - .path(UriTemplateBuilder.var("username")) - .path(UriTemplateBuilder.var("name")) - .literal("/branches") - .build() - .set("username", repository.getOwner().getUsername()) - .set("name", repository.getName()), - GiteaBranch.class - ); + return fetchBranches(repository.getOwner().getUsername(), repository.getName()); } @Override @@ -353,17 +322,7 @@ public List fetchCollaborators(String username, String name) throws I @Override public List fetchCollaborators(GiteaRepository repository) throws IOException, InterruptedException { - return getList( - api() - .literal("/repos") - .path(UriTemplateBuilder.var("username")) - .path(UriTemplateBuilder.var("name")) - .literal("/collaborators") - .build() - .set("username", repository.getOwner().getUsername()) - .set("name", repository.getName()), - GiteaUser.class - ); + return fetchCollaborators(repository.getOwner().getUsername(), repository.getName()); } @Override @@ -386,18 +345,7 @@ public boolean checkCollaborator(String username, String name, String collaborat @Override public boolean checkCollaborator(GiteaRepository repository, String collaboratorName) throws IOException, InterruptedException { - return status( - api() - .literal("/repos") - .path(UriTemplateBuilder.var("username")) - .path(UriTemplateBuilder.var("name")) - .literal("/collaborators") - .path(UriTemplateBuilder.var("collaboratorName")) - .build() - .set("username", repository.getOwner().getUsername()) - .set("name", repository.getName()) - .set("collaboratorName", collaboratorName) - ) / 100 == 2; + return checkCollaborator(repository.getOwner().getUsername(), repository.getName(), collaboratorName); } @Override @@ -461,23 +409,6 @@ public void deleteHook(GiteaOrganization organization, long id) throws IOExcepti } } - @Override - public void updateHook(GiteaOrganization organization, GiteaHook hook) throws IOException, InterruptedException { - GiteaHook diff = new GiteaHook(); - diff.setConfig(hook.getConfig()); - diff.setActive(hook.isActive()); - diff.setEvents(hook.getEvents()); - patch(api() - .literal("/orgs") - .path(UriTemplateBuilder.var("name")) - .literal("/hooks") - .path(UriTemplateBuilder.var("id")) - .build() - .set("name", organization.getUsername()) - .set("id", hook.getId()), - diff, Void.class); - } - @Override public List fetchHooks(String username, String name) throws IOException, InterruptedException { return getList( @@ -495,17 +426,7 @@ public List fetchHooks(String username, String name) throws IOExcepti @Override public List fetchHooks(GiteaRepository repository) throws IOException, InterruptedException { - return getList( - api() - .literal("/repos") - .path(UriTemplateBuilder.var("username")) - .path(UriTemplateBuilder.var("name")) - .literal("/hooks") - .build() - .set("username", repository.getOwner().getUsername()) - .set("name", repository.getName()), - GiteaHook.class - ); + return fetchHooks(repository.getOwner().getUsername(), repository.getName()); } @Override @@ -546,6 +467,23 @@ public void deleteHook(GiteaRepository repository, long id) throws IOException, } } + @Override + public void updateHook(GiteaOrganization organization, GiteaHook hook) throws IOException, InterruptedException { + GiteaHook diff = new GiteaHook(); + diff.setConfig(hook.getConfig()); + diff.setActive(hook.isActive()); + diff.setEvents(hook.getEvents()); + patch(api() + .literal("/orgs") + .path(UriTemplateBuilder.var("name")) + .literal("/hooks") + .path(UriTemplateBuilder.var("id")) + .build() + .set("name", organization.getUsername()) + .set("id", hook.getId()), + diff, Void.class); + } + @Override public void updateHook(GiteaRepository repository, GiteaHook hook) throws IOException, InterruptedException { GiteaHook diff = new GiteaHook(); @@ -602,17 +540,7 @@ public GiteaCommitStatus createCommitStatus(String username, String repository, @Override public GiteaCommitStatus createCommitStatus(GiteaRepository repository, String sha, GiteaCommitStatus status) throws IOException, InterruptedException { - return post(api() - .literal("/repos") - .path(UriTemplateBuilder.var("username")) - .path(UriTemplateBuilder.var("name")) - .literal("/statuses") - .path(UriTemplateBuilder.var("sha")) - .build() - .set("username", repository.getOwner().getUsername()) - .set("name", repository.getName()) - .set("sha", sha), - status, GiteaCommitStatus.class); + return createCommitStatus(repository.getOwner().getUsername(), repository.getName(), sha, status); } @Override @@ -636,19 +564,7 @@ public GiteaPullRequest fetchPullRequest(String username, String name, long id) @Override public GiteaPullRequest fetchPullRequest(GiteaRepository repository, long id) throws IOException, InterruptedException { - return getObject( - api() - .literal("/repos") - .path(UriTemplateBuilder.var("username")) - .path(UriTemplateBuilder.var("name")) - .literal("/pulls") - .path(UriTemplateBuilder.var("id")) - .build() - .set("username", repository.getOwner().getUsername()) - .set("name", repository.getName()) - .set("id", Long.toString(id)), - GiteaPullRequest.class - ); + return fetchPullRequest(repository.getOwner().getUsername(), repository.getName(), id); } @Override @@ -983,8 +899,8 @@ private List getList(UriTemplate template, final Class modelClass) if (status / 100 == 2) { try (InputStream is = connection.getInputStream()) { List list = mapper.readerFor(mapper.getTypeFactory() - .constructCollectionType(List.class, modelClass)) - .readValue(is); + .constructCollectionType(List.class, modelClass)) + .readValue(is); // strip null values from the list for (Iterator iterator = list.iterator(); iterator.hasNext(); ) { if (iterator.next() == null) { @@ -994,7 +910,7 @@ private List getList(UriTemplate template, final Class modelClass) return list; } } - throw new GiteaHttpStatusException(status,connection.getResponseMessage()); + throw new GiteaHttpStatusException(status, connection.getResponseMessage()); } finally { connection.disconnect(); } diff --git a/src/main/java/org/jenkinsci/plugin/gitea/servers/GiteaServers.java b/src/main/java/org/jenkinsci/plugin/gitea/servers/GiteaServers.java index f56840c..5c7e145 100644 --- a/src/main/java/org/jenkinsci/plugin/gitea/servers/GiteaServers.java +++ b/src/main/java/org/jenkinsci/plugin/gitea/servers/GiteaServers.java @@ -240,7 +240,7 @@ public synchronized void setServers(@CheckForNull List se Jenkins.get().checkPermission(Jenkins.ADMINISTER); List eps = new ArrayList<>(Util.fixNull(servers)); // remove duplicates and empty urls - Set serverUrls = new HashSet(); + Set serverUrls = new HashSet<>(); for (ListIterator iterator = eps.listIterator(); iterator.hasNext(); ) { GiteaServer endpoint = iterator.next(); String serverUrl = endpoint.getServerUrl(); diff --git a/src/test/java/org/jenkinsci/plugin/gitea/authentication/GiteaAuthSourceTest.java b/src/test/java/org/jenkinsci/plugin/gitea/authentication/GiteaAuthSourceTest.java index 44ad1a8..f3dbbe6 100644 --- a/src/test/java/org/jenkinsci/plugin/gitea/authentication/GiteaAuthSourceTest.java +++ b/src/test/java/org/jenkinsci/plugin/gitea/authentication/GiteaAuthSourceTest.java @@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertThat; public class GiteaAuthSourceTest { @ClassRule diff --git a/src/test/java/org/jenkinsci/plugin/gitea/client/api/GiteaConnectionBuilderTest.java b/src/test/java/org/jenkinsci/plugin/gitea/client/api/GiteaConnectionBuilderTest.java index fb12a56..832d1ad 100644 --- a/src/test/java/org/jenkinsci/plugin/gitea/client/api/GiteaConnectionBuilderTest.java +++ b/src/test/java/org/jenkinsci/plugin/gitea/client/api/GiteaConnectionBuilderTest.java @@ -6,7 +6,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.not; -import static org.junit.Assert.*; +import static org.junit.Assert.assertThat; public class GiteaConnectionBuilderTest { @Test diff --git a/src/test/java/org/jenkinsci/plugin/gitea/client/mock/MockGiteaConnection.java b/src/test/java/org/jenkinsci/plugin/gitea/client/mock/MockGiteaConnection.java index 248076d..3091c9d 100644 --- a/src/test/java/org/jenkinsci/plugin/gitea/client/mock/MockGiteaConnection.java +++ b/src/test/java/org/jenkinsci/plugin/gitea/client/mock/MockGiteaConnection.java @@ -8,7 +8,6 @@ import java.util.Date; import java.util.EnumSet; import java.util.HashMap; -import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -22,8 +21,6 @@ import org.jenkinsci.plugin.gitea.client.api.GiteaHook; import org.jenkinsci.plugin.gitea.client.api.GiteaIssue; import org.jenkinsci.plugin.gitea.client.api.GiteaIssueState; -import org.jenkinsci.plugin.gitea.client.api.GiteaLabel; -import org.jenkinsci.plugin.gitea.client.api.GiteaMilestone; import org.jenkinsci.plugin.gitea.client.api.GiteaObject; import org.jenkinsci.plugin.gitea.client.api.GiteaOrganization; import org.jenkinsci.plugin.gitea.client.api.GiteaOwner; @@ -299,9 +296,7 @@ public void deleteHook(GiteaOrganization organization, long id) throws IOExcepti @Override public void updateHook(GiteaOrganization organization, GiteaHook hook) throws IOException, InterruptedException { GiteaHook target = null; - for (Iterator iterator = notFoundIfNull(orgHooks.get(organization)).iterator(); - iterator.hasNext(); ) { - GiteaHook h = iterator.next(); + for (GiteaHook h : notFoundIfNull(orgHooks.get(organization))) { if (h.getId() == hook.getId()) { target = h; break; @@ -361,10 +356,8 @@ public void deleteHook(GiteaRepository repository, long id) throws IOException, @Override public void updateHook(GiteaRepository repository, GiteaHook hook) throws IOException, InterruptedException { GiteaHook target = null; - for (Iterator iterator = notFoundIfNull( - repoHooks.get(keyOf(repository))).iterator(); - iterator.hasNext(); ) { - GiteaHook h = iterator.next(); + for (GiteaHook h : notFoundIfNull( + repoHooks.get(keyOf(repository)))) { if (h.getId() == hook.getId()) { target = h; break; diff --git a/src/test/java/org/jenkinsci/plugin/gitea/credentials/PersonalAccessTokenImplTest.java b/src/test/java/org/jenkinsci/plugin/gitea/credentials/PersonalAccessTokenImplTest.java index e71e08d..793bcc8 100644 --- a/src/test/java/org/jenkinsci/plugin/gitea/credentials/PersonalAccessTokenImplTest.java +++ b/src/test/java/org/jenkinsci/plugin/gitea/credentials/PersonalAccessTokenImplTest.java @@ -36,7 +36,7 @@ public class PersonalAccessTokenImplTest { @ClassRule - public static JenkinsRule j = new JenkinsRule(); + public static final JenkinsRule j = new JenkinsRule(); @Test public void configRoundtrip() throws Exception {