Fix binding

KostyaSha · KostyaSha · commit 3f4c98b26288 · 2017-08-21T22:15:21.000+03:00
diff --git a/github-pullrequest-plugin/src/main/java/com/github/kostyasha/github/integration/branch/dsl/GitHubBranchJobDslExtenstion.java b/github-pullrequest-plugin/src/main/java/com/github/kostyasha/github/integration/branch/dsl/GitHubBranchJobDslExtenstion.java
@@ -24,6 +24,7 @@ public Object onBranch(Runnable closure) throws ANTLRException {
         trigger.setPreStatus(context.isSetPreStatus());
         trigger.setCancelQueued(context.isCancelQueued());
         trigger.setAbortRunning(context.isAbortRunning());
+        trigger.setRepoProviders(context.repoProviders());
 
         return trigger;
     }
diff --git a/github-pullrequest-plugin/src/main/java/com/github/kostyasha/github/integration/branch/dsl/context/GitHubBranchTriggerDslContext.java b/github-pullrequest-plugin/src/main/java/com/github/kostyasha/github/integration/branch/dsl/context/GitHubBranchTriggerDslContext.java
@@ -42,7 +42,6 @@ public void mode(Runnable closure) {
         mode = modeContext.mode();
     }
 
-
     public void setPreStatus() {
         setPreStatus = true;
     }
@@ -66,6 +65,7 @@ public void repoProviders(Runnable closure) {
         GitHubRepoProvidersDslContext repoProvidersContext = new GitHubRepoProvidersDslContext();
         ContextExtensionPoint.executeInContext(closure, repoProvidersContext);
 
+        repoProviders.clear();
         repoProviders.addAll(repoProvidersContext.repoProviders());
     }
 
@@ -100,4 +100,8 @@ public List<GitHubBranchEvent> events() {
     public List<String> whitelistedBranches() {
         return whitelistedBranches;
     }
+
+    public List<GitHubRepoProvider> repoProviders() {
+        return repoProviders;
+    }
 }
diff --git a/github-pullrequest-plugin/src/main/java/org/jenkinsci/plugins/github/pullrequest/dsl/GitHubPRJobDslExtension.java b/github-pullrequest-plugin/src/main/java/org/jenkinsci/plugins/github/pullrequest/dsl/GitHubPRJobDslExtension.java
@@ -31,6 +31,8 @@ public Object onPullRequest(Runnable closure) throws ANTLRException {
         trigger.setPreStatus(context.isSetPreStatus());
         trigger.setCancelQueued(context.isCancelQueued());
         trigger.setAbortRunning(context.isAbortRunning());
+        trigger.setRepoProviders(context.repoProviders());
+
         return trigger;
     }
 
diff --git a/github-pullrequest-plugin/src/main/java/org/jenkinsci/plugins/github/pullrequest/dsl/context/GitHubPRTriggerDslContext.java b/github-pullrequest-plugin/src/main/java/org/jenkinsci/plugins/github/pullrequest/dsl/context/GitHubPRTriggerDslContext.java
@@ -61,6 +61,7 @@ public void repoProviders(Runnable closure) {
         GitHubRepoProvidersDslContext repoProvidersContext = new GitHubRepoProvidersDslContext();
         ContextExtensionPoint.executeInContext(closure, repoProvidersContext);
 
+        repoProviders.clear();
         repoProviders.addAll(repoProvidersContext.repoProviders());
     }
 
@@ -87,4 +88,8 @@ public boolean isAbortRunning() {
     public List<GitHubPREvent> events() {
         return events;
     }
+
+    public List<GitHubRepoProvider> repoProviders() {
+        return repoProviders;
+    }
 }
diff --git a/github-pullrequest-plugin/src/test/java/org/jenkinsci/plugins/github/pullrequest/dsl/DslIntegrationTest.java b/github-pullrequest-plugin/src/test/java/org/jenkinsci/plugins/github/pullrequest/dsl/DslIntegrationTest.java
@@ -1,6 +1,7 @@
 package org.jenkinsci.plugins.github.pullrequest.dsl;
 
 import com.github.kostyasha.github.integration.generic.GitHubRepoProvider;
+import com.github.kostyasha.github.integration.generic.repoprovider.GitHubPluginRepoProvider;
 import hudson.model.Descriptor;
 import hudson.model.FreeStyleProject;
 import hudson.model.Result;
@@ -26,6 +27,8 @@
 import java.util.Collection;
 import java.util.List;
 
+import static com.github.kostyasha.github.integration.generic.repoprovider.GHPermission.PULL;
+import static com.github.kostyasha.github.integration.generic.repoprovider.GHPermission.PUSH;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.hasSize;
@@ -91,6 +94,13 @@ public void shouldCreateJobWithExtendedDsl() throws Exception {
         assertThat("Should contain repoProvider", repoProviders, notNullValue());
         assertThat("Should contain 1 repoProvider", repoProviders, hasSize(1));
 
+        final GitHubRepoProvider repoProvider = repoProviders.get(0);
+        assertThat(repoProvider, instanceOf(GitHubPluginRepoProvider.class));
+        final GitHubPluginRepoProvider provider = (GitHubPluginRepoProvider) repoProvider;
+        assertThat(provider.isCacheConnection(), is(false));
+        assertThat(provider.isManageHooks(), is(false));
+        assertThat(provider.getRepoPermission(), is(PUSH));
+
         final List<GitHubPREvent> events = trigger.getEvents();
         assertThat("Should add events", events, hasSize(17));
 
diff --git a/github-pullrequest-plugin/src/test/java/org/jenkinsci/plugins/github/pullrequest/dsl/GitHubPRJobDslExtensionTest.java b/github-pullrequest-plugin/src/test/java/org/jenkinsci/plugins/github/pullrequest/dsl/GitHubPRJobDslExtensionTest.java
@@ -3,13 +3,16 @@
 import com.github.kostyasha.github.integration.branch.GitHubBranchTrigger;
 import com.github.kostyasha.github.integration.branch.events.GitHubBranchEvent;
 import com.github.kostyasha.github.integration.branch.events.impl.GitHubBranchCommitEvent;
-import com.github.kostyasha.github.integration.branch.events.impl.commitchecks.impl.GitHubBranchCommitMessageCheck;
 import com.github.kostyasha.github.integration.branch.events.impl.GitHubBranchRestrictionFilter;
-
+import com.github.kostyasha.github.integration.branch.events.impl.commitchecks.impl.GitHubBranchCommitMessageCheck;
 import com.github.kostyasha.github.integration.generic.GitHubRepoProvider;
+import com.github.kostyasha.github.integration.generic.repoprovider.GitHubPluginRepoProvider;
 import hudson.model.FreeStyleProject;
 import hudson.triggers.Trigger;
-
+import javaposse.jobdsl.plugin.ExecuteDslScripts;
+import javaposse.jobdsl.plugin.LookupStrategy;
+import javaposse.jobdsl.plugin.RemovedJobAction;
+import javaposse.jobdsl.plugin.RemovedViewAction;
 import org.apache.commons.io.IOUtils;
 import org.junit.Rule;
 import org.junit.Test;
@@ -18,12 +21,7 @@
 import java.util.Collection;
 import java.util.List;
 
-import javaposse.jobdsl.plugin.ExecuteDslScripts;
-import javaposse.jobdsl.plugin.LookupStrategy;
-import javaposse.jobdsl.plugin.RemovedJobAction;
-import javaposse.jobdsl.plugin.RemovedViewAction;
-
-import static org.hamcrest.Matchers.contains;
+import static com.github.kostyasha.github.integration.generic.repoprovider.GHPermission.PULL;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasItem;
@@ -90,6 +88,13 @@ public void shouldCreateJobWithExtendedDsl() throws Exception {
         assertThat("Should contain repoProvider", repoProviders, notNullValue());
         assertThat("Should contain 1 repoProvider", repoProviders, hasSize(1));
 
+        final GitHubRepoProvider repoProvider = repoProviders.get(0);
+        assertThat(repoProvider, instanceOf(GitHubPluginRepoProvider.class));
+        final GitHubPluginRepoProvider provider = (GitHubPluginRepoProvider) repoProvider;
+        assertThat(provider.isCacheConnection(), is(false));
+        assertThat(provider.isManageHooks(), is(false));
+        assertThat(provider.getRepoPermission(), is(PULL));
+
     }
 
     private void verifyCommitChecks(GitHubBranchEvent gitHubBranchEvent) {
diff --git a/github-pullrequest-plugin/src/test/resources/dsl/branch-jobdsl.groovy b/github-pullrequest-plugin/src/test/resources/dsl/branch-jobdsl.groovy
@@ -13,9 +13,9 @@ freeStyleJob('gh-branch') {
 
             repoProviders {
                 gitHubPlugin {
-                    manageHooks(true)
-                    cacheConnection(true)
-                    permission { admin() }
+                    manageHooks(false)
+                    cacheConnection(false)
+                    permission { pull() }
                 }
             }
 
diff --git a/github-pullrequest-plugin/src/test/resources/dsl/jobdsl.groovy b/github-pullrequest-plugin/src/test/resources/dsl/jobdsl.groovy
@@ -13,9 +13,9 @@ freeStyleJob('gh-pull-request') {
 
             repoProviders {
                 gitHubPlugin {
-                    manageHooks(true)
-                    cacheConnection(true)
-                    permission { admin() }
+                    manageHooks(false)
+                    cacheConnection(false)
+                    permission { push() }
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ public Object onBranch(Runnable closure) throws ANTLRException {`
`24`	`24`	`trigger.setPreStatus(context.isSetPreStatus());`
`25`	`25`	`trigger.setCancelQueued(context.isCancelQueued());`
`26`	`26`	`trigger.setAbortRunning(context.isAbortRunning());`
	`27`	`+ trigger.setRepoProviders(context.repoProviders());`
`27`	`28`
`28`	`29`	`return trigger;`
`29`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,6 @@ public void mode(Runnable closure) {`
`42`	`42`	`mode = modeContext.mode();`
`43`	`43`	`}`
`44`	`44`
`45`		`-`
`46`	`45`	`public void setPreStatus() {`
`47`	`46`	`setPreStatus = true;`
`48`	`47`	`}`
`@@ -66,6 +65,7 @@ public void repoProviders(Runnable closure) {`
`66`	`65`	`GitHubRepoProvidersDslContext repoProvidersContext = new GitHubRepoProvidersDslContext();`
`67`	`66`	`ContextExtensionPoint.executeInContext(closure, repoProvidersContext);`
`68`	`67`
	`68`	`+ repoProviders.clear();`
`69`	`69`	`repoProviders.addAll(repoProvidersContext.repoProviders());`
`70`	`70`	`}`
`71`	`71`
`@@ -100,4 +100,8 @@ public List<GitHubBranchEvent> events() {`
`100`	`100`	`public List<String> whitelistedBranches() {`
`101`	`101`	`return whitelistedBranches;`
`102`	`102`	`}`
	`103`	`+`
	`104`	`+ public List<GitHubRepoProvider> repoProviders() {`
	`105`	`+ return repoProviders;`
	`106`	`+ }`
`103`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,8 @@ public Object onPullRequest(Runnable closure) throws ANTLRException {`
`31`	`31`	`trigger.setPreStatus(context.isSetPreStatus());`
`32`	`32`	`trigger.setCancelQueued(context.isCancelQueued());`
`33`	`33`	`trigger.setAbortRunning(context.isAbortRunning());`
	`34`	`+ trigger.setRepoProviders(context.repoProviders());`
	`35`	`+`
`34`	`36`	`return trigger;`
`35`	`37`	`}`
`36`	`38`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@ public void repoProviders(Runnable closure) {`
`61`	`61`	`GitHubRepoProvidersDslContext repoProvidersContext = new GitHubRepoProvidersDslContext();`
`62`	`62`	`ContextExtensionPoint.executeInContext(closure, repoProvidersContext);`
`63`	`63`
	`64`	`+ repoProviders.clear();`
`64`	`65`	`repoProviders.addAll(repoProvidersContext.repoProviders());`
`65`	`66`	`}`
`66`	`67`
`@@ -87,4 +88,8 @@ public boolean isAbortRunning() {`
`87`	`88`	`public List<GitHubPREvent> events() {`
`88`	`89`	`return events;`
`89`	`90`	`}`
	`91`	`+`
	`92`	`+ public List<GitHubRepoProvider> repoProviders() {`
	`93`	`+ return repoProviders;`
	`94`	`+ }`
`90`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,9 @@ freeStyleJob('gh-branch') {`
`13`	`13`
`14`	`14`	`repoProviders {`
`15`	`15`	`gitHubPlugin {`
`16`		`- manageHooks(true)`
`17`		`- cacheConnection(true)`
`18`		`- permission { admin() }`
	`16`	`+ manageHooks(false)`
	`17`	`+ cacheConnection(false)`
	`18`	`+ permission { pull() }`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,9 @@ freeStyleJob('gh-pull-request') {`
`13`	`13`
`14`	`14`	`repoProviders {`
`15`	`15`	`gitHubPlugin {`
`16`		`- manageHooks(true)`
`17`		`- cacheConnection(true)`
`18`		`- permission { admin() }`
	`16`	`+ manageHooks(false)`
	`17`	`+ cacheConnection(false)`
	`18`	`+ permission { push() }`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`