Skip to content

Commit 36200b5

Browse files
nfalco79nfalco79
authored
Remove old ligthCheckout support and some empty events type (#1092)
1 parent b197231 commit 36200b5

File tree

6 files changed

+35
-38
lines changed

6 files changed

+35
-38
lines changed

‎src/main/java/com/cloudbees/jenkins/plugins/bitbucket/filesystem/BitbucketSCMFileSystem.java

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,8 @@
3131
import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketApiFactory;
3232
import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketAuthenticator;
3333
import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketCommit;
34-
import com.cloudbees.jenkins.plugins.bitbucket.impl.endpoint.BitbucketServerEndpoint;
3534
import com.cloudbees.jenkins.plugins.bitbucket.impl.util.BitbucketApiUtils;
3635
import com.cloudbees.jenkins.plugins.bitbucket.impl.util.DateUtils;
37-
import com.cloudbees.jenkins.plugins.bitbucket.server.BitbucketServerVersion;
3836
import com.cloudbees.plugins.credentials.CredentialsMatchers;
3937
import com.cloudbees.plugins.credentials.CredentialsProvider;
4038
import com.cloudbees.plugins.credentials.common.StandardCredentials;
@@ -290,16 +288,8 @@ public SCMFileSystem build(@NonNull SCMSource source, @NonNull SCMHead head, @Ch
290288
} else if (prHead.getCheckoutStrategy() == ChangeRequestCheckoutStrategy.HEAD) {
291289
ref = "pull-requests/" + prHead.getId() + "/from";
292290
} else if (prHead.getCheckoutStrategy() == ChangeRequestCheckoutStrategy.MERGE) {
293-
// Bitbucket server v7 doesn't have the `merge` ref for PRs
294-
// We don't return `ref` when working with v7
295-
// so that pipeline falls back to heavyweight checkout properly
296-
boolean ligthCheckout = BitbucketServerEndpoint.findServerVersion(serverURL) != BitbucketServerVersion.VERSION_7;
297-
if (ligthCheckout) {
298-
ref = "pull-requests/" + prHead.getId() + "/merge";
299-
} else {
300-
// returning null to fall back to heavyweight checkout
301-
return null;
302-
}
291+
// returning null to fall back to heavyweight checkout
292+
return null;
303293
}
304294
} else if (head instanceof BitbucketTagSCMHead) {
305295
ref = "tags/" + head.getName();

‎src/main/java/com/cloudbees/jenkins/plugins/bitbucket/hooks/HookEventType.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,6 @@ public enum HookEventType {
5656
*/
5757
PULL_REQUEST_DECLINED("pullrequest:rejected", PullRequestHookProcessor.class),
5858

59-
/**
60-
* See <a href="https://confluence.atlassian.com/bitbucket/event-payloads-740262817.html#EventPayloads-Approved">EventPayloads-Approved</a>
61-
*/
62-
PULL_REQUEST_APPROVED("pullrequest:approved", PullRequestHookProcessor.class),
63-
6459
/**
6560
* @see <a href="https://confluence.atlassian.com/bitbucketserver054/event-payload-939508609.html#Eventpayload-Push">Eventpayload-Push</a>
6661
* @since Bitbucket Server 5.4

‎src/main/java/com/cloudbees/jenkins/plugins/bitbucket/hooks/WebhookConfiguration.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public class WebhookConfiguration {
7070
/**
7171
* The list of events available in Bitbucket Data Center v8.x.
7272
*/
73-
private static final List<String> NATIVE_SERVER_EVENTS_v7 = Collections.unmodifiableList(Arrays.asList(
73+
private static final List<String> NATIVE_SERVER_EVENTS_v8 = Collections.unmodifiableList(Arrays.asList(
7474
HookEventType.SERVER_REFS_CHANGED.getKey(),
7575
HookEventType.SERVER_PULL_REQUEST_OPENED.getKey(),
7676
HookEventType.SERVER_PULL_REQUEST_MERGED.getKey(),
@@ -264,12 +264,12 @@ private static List<String> getNativeServerEvents(String serverURL) {
264264
if (endpoint != null) {
265265
BitbucketServerVersion serverVersion = BitbucketServerVersion.valueOf(endpoint.getServerVersion());
266266
switch (serverVersion) {
267-
case VERSION_7:
267+
case VERSION_8:
268268
default:
269-
return NATIVE_SERVER_EVENTS_v7;
269+
return NATIVE_SERVER_EVENTS_v8;
270270
}
271271
}
272-
return NATIVE_SERVER_EVENTS_v7;
272+
return NATIVE_SERVER_EVENTS_v8;
273273
}
274274

275275
private static String getCloudWebhookURL(String serverURL, String rootURL) {

‎src/main/java/com/cloudbees/jenkins/plugins/bitbucket/impl/endpoint/BitbucketServerEndpoint.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public static BitbucketServerVersion findServerVersion(String serverURL) {
8686
.lookupEndpoint(serverURL, BitbucketServerEndpoint.class)
8787
.map(endpoint -> endpoint.getServerVersion())
8888
.map(BitbucketServerVersion::valueOf)
89-
.orElse(BitbucketServerVersion.VERSION_7);
89+
.orElse(BitbucketServerVersion.getMinSupportedVersion());
9090
}
9191

9292
/**
@@ -107,7 +107,7 @@ public static BitbucketServerVersion findServerVersion(String serverURL) {
107107
/**
108108
* The server version for this endpoint.
109109
*/
110-
private BitbucketServerVersion serverVersion = BitbucketServerVersion.VERSION_7;
110+
private BitbucketServerVersion serverVersion = BitbucketServerVersion.getMinSupportedVersion();
111111

112112
/**
113113
* Default constructor.
@@ -157,7 +157,11 @@ public EndpointType getType() {
157157

158158
@Nullable
159159
public String getServerVersion() {
160-
return this.serverVersion != null ? this.serverVersion.name() : null;
160+
if (serverVersion == null) {
161+
// force value to the minimum supported version
162+
this.serverVersion = BitbucketServerVersion.getMinSupportedVersion();
163+
}
164+
return this.serverVersion.name();
161165
}
162166

163167
@DataBoundSetter
@@ -166,7 +170,7 @@ public void setServerVersion(@NonNull String serverVersion) {
166170
this.serverVersion = BitbucketServerVersion.valueOf(serverVersion);
167171
} catch (IllegalArgumentException e) {
168172
// use default
169-
this.serverVersion = BitbucketServerVersion.VERSION_7;
173+
this.serverVersion = BitbucketServerVersion.getMinSupportedVersion();
170174
}
171175
}
172176

@@ -225,7 +229,7 @@ private Object readResolve() {
225229
setBitbucketJenkinsRootUrl(getBitbucketJenkinsRootUrl());
226230
}
227231
if (serverVersion == null) {
228-
serverVersion = BitbucketServerVersion.VERSION_7;
232+
serverVersion = BitbucketServerVersion.getMinSupportedVersion();
229233
}
230234

231235
return this;

‎src/main/java/com/cloudbees/jenkins/plugins/bitbucket/server/BitbucketServerVersion.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import hudson.model.ModelObject;
2727

2828
public enum BitbucketServerVersion implements ModelObject {
29-
VERSION_7("Bitbucket Data Center v8.x (and later)");
29+
VERSION_8("Bitbucket Data Center v8.x (and later)");
3030

3131
private final String displayName;
3232

@@ -39,4 +39,12 @@ public String getDisplayName() {
3939
return displayName;
4040
}
4141

42+
/**
43+
* The minimal supported version.
44+
* <p>
45+
* If configured less than this it will be changed to the minimal.
46+
*/
47+
public static BitbucketServerVersion getMinSupportedVersion() {
48+
return BitbucketServerVersion.VERSION_8;
49+
}
4250
}

‎src/test/java/com/cloudbees/jenkins/plugins/bitbucket/endpoints/BitbucketEndpointConfigurationTest.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,7 @@ void should_support_configuration_as_code() throws Exception {
710710
assertThat(serverEndpoint.isManageHooks()).isTrue();
711711
assertThat(serverEndpoint.getCredentialsId()).isEqualTo("second");
712712
assertThat(serverEndpoint.getWebhookImplementation()).isEqualTo(BitbucketServerWebhookImplementation.NATIVE);
713-
assertThat(serverEndpoint.getServerVersion()).isEqualTo(BitbucketServerVersion.VERSION_7.name());
713+
assertThat(serverEndpoint.getServerVersion()).isEqualTo(BitbucketServerVersion.getMinSupportedVersion().name());
714714

715715
assertThat(instance.getEndpoints()).element(2).isInstanceOf(BitbucketServerEndpoint.class);
716716
serverEndpoint = (BitbucketServerEndpoint) instance.getEndpoints().get(2);
@@ -719,79 +719,79 @@ void should_support_configuration_as_code() throws Exception {
719719
assertThat(serverEndpoint.isManageHooks()).isFalse();
720720
assertThat(serverEndpoint.getCredentialsId()).isNull();
721721
assertThat(serverEndpoint.getWebhookImplementation()).isEqualTo(BitbucketServerWebhookImplementation.NATIVE);
722-
assertThat(serverEndpoint.getServerVersion()).isEqualTo(BitbucketServerVersion.VERSION_7.name());
722+
assertThat(serverEndpoint.getServerVersion()).isEqualTo(BitbucketServerVersion.getMinSupportedVersion().name());
723723

724724
serverEndpoint = (BitbucketServerEndpoint) instance.getEndpoints().get(3);
725725
assertThat(serverEndpoint.getDisplayName()).isEqualTo("Example Inc");
726726
assertThat(serverEndpoint.getServerURL()).isEqualTo("http://bitbucket.example.com:8083");
727727
assertThat(serverEndpoint.isManageHooks()).isTrue();
728728
assertThat(serverEndpoint.getCredentialsId()).isEqualTo("third");
729729
assertThat(serverEndpoint.getWebhookImplementation()).isEqualTo(BitbucketServerWebhookImplementation.NATIVE);
730-
assertThat(serverEndpoint.getServerVersion()).isEqualTo(BitbucketServerVersion.VERSION_7.name());
730+
assertThat(serverEndpoint.getServerVersion()).isEqualTo(BitbucketServerVersion.getMinSupportedVersion().name());
731731

732732
serverEndpoint = (BitbucketServerEndpoint) instance.getEndpoints().get(4);
733733
assertThat(serverEndpoint.getDisplayName()).isEqualTo("Example Inc");
734734
assertThat(serverEndpoint.getServerURL()).isEqualTo("http://bitbucket.example.com:8084");
735735
assertThat(serverEndpoint.isManageHooks()).isTrue();
736736
assertThat(serverEndpoint.getCredentialsId()).isEqualTo("fourth");
737737
assertThat(serverEndpoint.getWebhookImplementation()).isEqualTo(BitbucketServerWebhookImplementation.PLUGIN);
738-
assertThat(serverEndpoint.getServerVersion()).isEqualTo(BitbucketServerVersion.VERSION_7.name());
738+
assertThat(serverEndpoint.getServerVersion()).isEqualTo(BitbucketServerVersion.getMinSupportedVersion().name());
739739

740740
serverEndpoint = (BitbucketServerEndpoint) instance.getEndpoints().get(5);
741741
assertThat(serverEndpoint.getDisplayName()).isEqualTo("Example Inc");
742742
assertThat(serverEndpoint.getServerURL()).isEqualTo("http://bitbucket.example.com:8085");
743743
assertThat(serverEndpoint.isManageHooks()).isTrue();
744744
assertThat(serverEndpoint.getCredentialsId()).isEqualTo("fifth");
745745
assertThat(serverEndpoint.getWebhookImplementation()).isEqualTo(BitbucketServerWebhookImplementation.PLUGIN);
746-
assertThat(serverEndpoint.getServerVersion()).isEqualTo(BitbucketServerVersion.VERSION_7.name());
746+
assertThat(serverEndpoint.getServerVersion()).isEqualTo(BitbucketServerVersion.getMinSupportedVersion().name());
747747

748748
serverEndpoint = (BitbucketServerEndpoint) instance.getEndpoints().get(6);
749749
assertThat(serverEndpoint.getDisplayName()).isEqualTo("Example Inc");
750750
assertThat(serverEndpoint.getServerURL()).isEqualTo("http://bitbucket.example.com:8086");
751751
assertThat(serverEndpoint.isManageHooks()).isFalse();
752752
assertThat(serverEndpoint.getCredentialsId()).isNull();
753753
assertThat(serverEndpoint.getWebhookImplementation()).isEqualTo(BitbucketServerWebhookImplementation.NATIVE);
754-
assertThat(serverEndpoint.getServerVersion()).isEqualTo(BitbucketServerVersion.VERSION_7.name());
754+
assertThat(serverEndpoint.getServerVersion()).isEqualTo(BitbucketServerVersion.getMinSupportedVersion().name());
755755

756756
serverEndpoint = (BitbucketServerEndpoint) instance.getEndpoints().get(7);
757757
assertThat(serverEndpoint.getDisplayName()).isEqualTo("Example Inc");
758758
assertThat(serverEndpoint.getServerURL()).isEqualTo("http://bitbucket.example.com:8087");
759759
assertThat(serverEndpoint.isManageHooks()).isFalse();
760760
assertThat(serverEndpoint.getCredentialsId()).isNull();
761761
assertThat(serverEndpoint.getWebhookImplementation()).isEqualTo(BitbucketServerWebhookImplementation.NATIVE);
762-
assertThat(serverEndpoint.getServerVersion()).isEqualTo(BitbucketServerVersion.VERSION_7.name());
762+
assertThat(serverEndpoint.getServerVersion()).isEqualTo(BitbucketServerVersion.getMinSupportedVersion().name());
763763

764764
serverEndpoint = (BitbucketServerEndpoint) instance.getEndpoints().get(8);
765765
assertThat(serverEndpoint.getDisplayName()).isEqualTo("Example Inc");
766766
assertThat(serverEndpoint.getServerURL()).isEqualTo("http://bitbucket.example.com:8088");
767767
assertThat(serverEndpoint.isManageHooks()).isFalse();
768768
assertThat(serverEndpoint.getCredentialsId()).isNull();
769769
assertThat(serverEndpoint.getWebhookImplementation()).isEqualTo(BitbucketServerWebhookImplementation.NATIVE);
770-
assertThat(serverEndpoint.getServerVersion()).isEqualTo(BitbucketServerVersion.VERSION_7.name());
770+
assertThat(serverEndpoint.getServerVersion()).isEqualTo(BitbucketServerVersion.getMinSupportedVersion().name());
771771

772772
serverEndpoint = (BitbucketServerEndpoint) instance.getEndpoints().get(9);
773773
assertThat(serverEndpoint.getDisplayName()).isEqualTo("Example Inc");
774774
assertThat(serverEndpoint.getServerURL()).isEqualTo("http://bitbucket.example.com:8089");
775775
assertThat(serverEndpoint.isManageHooks()).isFalse();
776776
assertThat(serverEndpoint.getCredentialsId()).isNull();
777777
assertThat(serverEndpoint.getWebhookImplementation()).isEqualTo(BitbucketServerWebhookImplementation.NATIVE);
778-
assertThat(serverEndpoint.getServerVersion()).isEqualTo(BitbucketServerVersion.VERSION_7.name());
778+
assertThat(serverEndpoint.getServerVersion()).isEqualTo(BitbucketServerVersion.getMinSupportedVersion().name());
779779

780780
serverEndpoint = (BitbucketServerEndpoint) instance.getEndpoints().get(10);
781781
assertThat(serverEndpoint.getDisplayName()).isEqualTo("Example Inc");
782782
assertThat(serverEndpoint.getServerURL()).isEqualTo("http://bitbucket.example.com:8090");
783783
assertThat(serverEndpoint.isManageHooks()).isFalse();
784784
assertThat(serverEndpoint.getCredentialsId()).isNull();
785785
assertThat(serverEndpoint.getWebhookImplementation()).isEqualTo(BitbucketServerWebhookImplementation.NATIVE);
786-
assertThat(serverEndpoint.getServerVersion()).isEqualTo(BitbucketServerVersion.VERSION_7.name());
786+
assertThat(serverEndpoint.getServerVersion()).isEqualTo(BitbucketServerVersion.getMinSupportedVersion().name());
787787

788788
serverEndpoint = (BitbucketServerEndpoint) instance.getEndpoints().get(11);
789789
assertThat(serverEndpoint.getDisplayName()).isEqualTo("Example Inc");
790790
assertThat(serverEndpoint.getServerURL()).isEqualTo("http://bitbucket.example.com:8091");
791791
assertThat(serverEndpoint.isManageHooks()).isFalse();
792792
assertThat(serverEndpoint.getCredentialsId()).isNull();
793793
assertThat(serverEndpoint.getWebhookImplementation()).isEqualTo(BitbucketServerWebhookImplementation.NATIVE);
794-
assertThat(serverEndpoint.getServerVersion()).isEqualTo(BitbucketServerVersion.VERSION_7.name());
794+
assertThat(serverEndpoint.getServerVersion()).isEqualTo(BitbucketServerVersion.getMinSupportedVersion().name());
795795
}
796796

797797
private BitbucketCloudEndpoint buildEndpoint(boolean manageHook, String credentials) {

0 commit comments

Comments
 (0)