@@ -147,7 +147,7 @@ boolean updateHook(BitbucketWebHook hook, BitbucketSCMSource owner) {
147
147
}
148
148
} else if (hook instanceof NativeBitbucketServerWebhook serverHook ) {
149
149
String serverURL = owner .getServerUrl ();
150
- String url = getNativeServerWebhookUrl (serverURL , owner .getEndpointJenkinsRootURL ());
150
+ String url = getServerWebhookURL (serverURL , owner .getEndpointJenkinsRootURL ());
151
151
152
152
if (!url .equals (serverHook .getUrl ())) {
153
153
serverHook .setUrl (url );
@@ -195,7 +195,7 @@ public BitbucketWebHook getHook(BitbucketSCMSource owner) {
195
195
hook .setActive (true );
196
196
hook .setDescription (description );
197
197
hook .setEvents (getNativeServerEvents (serverUrl ));
198
- hook .setUrl (getNativeServerWebhookUrl (serverUrl , rootUrl ));
198
+ hook .setUrl (getServerWebhookURL (serverUrl , rootUrl ));
199
199
hook .setSecret (signatureSecret );
200
200
return hook ;
201
201
}
@@ -205,7 +205,7 @@ public BitbucketWebHook getHook(BitbucketSCMSource owner) {
205
205
BitbucketServerWebhook hook = new BitbucketServerWebhook ();
206
206
hook .setActive (true );
207
207
hook .setDescription (description );
208
- hook .setUrl (rootUrl + BitbucketSCMSourcePushHookReceiver . FULL_PATH );
208
+ hook .setUrl (getServerWebhookURL ( serverUrl , rootUrl ) );
209
209
hook .setCommittersToIgnore (committersToIgnore );
210
210
return hook ;
211
211
}
@@ -260,12 +260,12 @@ private static List<String> getNativeServerEvents(String serverUrl) {
260
260
return NATIVE_SERVER_EVENTS_v7 ;
261
261
}
262
262
263
- private static String getNativeServerWebhookUrl (String serverUrl , String rootUrl ) {
264
- return UriTemplate .buildFromTemplate (rootUrl )
263
+ private static String getServerWebhookURL (String serverURL , String rootURL ) {
264
+ return UriTemplate .buildFromTemplate (rootURL )
265
265
.template (BitbucketSCMSourcePushHookReceiver .FULL_PATH )
266
266
.query ("server_url" )
267
267
.build ()
268
- .set ("server_url" , serverUrl )
268
+ .set ("server_url" , serverURL )
269
269
.expand ();
270
270
}
271
271
}
0 commit comments