Merge pull request #20 from nomisp/bugfix/proxy-configuration

Fixed proxy configuration to be able to use proxy without user and password.

Author: nomisp

build.gradle

@@ -24,7 +24,7 @@ plugins {
 }
 
 group = 'ch.nomisp'
-version = '0.4.0'
+version = '0.5.0'
 
 repositories {
     // Use Maven Central for resolving dependencies.

gradle.properties

@@ -13,7 +13,7 @@ asciiDocGitPublishPluginVersion=3.0.0
 asciidoctorjDiagramVersion=2.2.8
 credentialsPluginVersion=3.0
 pluginPublishPluginVersion=0.16.0
-confluencePublisherPluginVersion=0.3.0
+confluencePublisherPluginVersion=0.4.0
 
 # Dependency versions
 asciidocConfluencePublisherVersion=0.22.0

src/docs/asciidoc/index/release-notes.adoc

@@ -8,6 +8,20 @@
 :sectlinks:
 :sectnums:
 
+== Release 0.5.0
+
+=== New and Noteworthy/Highlights/What's New
+Fixed proxy configuration to be able to use a proxy without username and password.
+
+=== Additional Features and Changes/Minor Features and Changes/Other Features and Changes
+
+=== Changelog
+* Fixed reported issue concerning the proxy configuration.
+
+=== Deprecations
+
+=== Known problems
+
 == Release 0.4.0
 
 === New and Noteworthy/Highlights/What's New

src/docs/asciidoc/index/user-guide.adoc

@@ -113,10 +113,10 @@ _The values are defined in the enum: org.sahli.asciidoc.confluence.publisher.cli
 |The scheme (http or https) used to connect to a forward proxy (in case a forward proxy is required to access the Confluence instance).
 
 *Untested*
-|optional (default empty)
+|optional (default http)
 
 |proxyHost
-|The host of the forward proxy.
+|The host of the forward proxy. Mandatory if a proxy is used.
 
 *Untested*
 |optional (default empty)
@@ -125,7 +125,7 @@ _The values are defined in the enum: org.sahli.asciidoc.confluence.publisher.cli
 |The port of the forward proxy.
 
 *Untested*
-|optional (default empty)
+|optional (default 80)
 
 |proxyUsername
 |The username of the forward proxy (in case the forward proxy requires basic authentication).

src/main/groovy/ch/nomisp/confluence/publisher/PublishToConfluenceTask.groovy

@@ -114,12 +114,12 @@ class PublishToConfluenceTask extends DefaultTask {
                 logger.info("Publishing to Confluence skipped ('convert only' is enabled)")
             } else {
                 ConfluenceRestClient.ProxyConfiguration proxyConfiguration = null
-                if (useProxy()) {
-                    proxyConfiguration = new ConfluenceRestClient.ProxyConfiguration(this.proxyScheme.get(),
+                if (proxyHost.isPresent()) {
+                    proxyConfiguration = new ConfluenceRestClient.ProxyConfiguration(this.proxyScheme.getOrElse('http'),
                             this.proxyHost.get(),
-                            this.proxyPort.get(),
-                            this.proxyUsername.get(),
-                            this.proxyPassword.get())
+                            this.proxyPort.getOrElse(80),
+                            this.proxyUsername.getOrNull(),
+                            this.proxyPassword.getOrNull())
                 }
 
                 Double maxReqPerSec = maxRequestsPerSecond.getOrElse(10)
@@ -181,14 +181,6 @@ class PublishToConfluenceTask extends DefaultTask {
 
     }
 
-    private boolean useProxy() {
-        return proxyScheme.isPresent() &&
-                proxyHost.isPresent() &&
-                proxyPort.isPresent() &&
-                proxyUsername.isPresent() &&
-                proxyPassword.isPresent()
-    }
-
     String getOutputDir() {
         outputDir ?: "${project.buildDir}/docs/confluence"
     }