Normalise format/indentation of source code

Set up the Spotless plugin to check/enforce the format/indentation of
the whole source code, currently set to use Google Java Style (AOSP).

Author: thc202

build.gradle

@@ -28,6 +28,8 @@ subprojects {
     spotless {
         java {
             licenseHeaderFile "$rootDir/gradle/spotless/license.java"
+
+            googleJavaFormat().style('AOSP')
         }
     }
 }

subprojects/zap-clientapi-ant/src/main/java/org/zaproxy/clientapi/ant/AbstractActiveScanTask.java

@@ -25,32 +25,32 @@
 
 public abstract class AbstractActiveScanTask extends ZapTask {
 
-	private String url;
-
-	public String getUrl() {
-		return url;
-	}
-
-	public void setUrl(String url) {
-		this.url = url;
-	}
-
-	@Override
-	public void execute() throws BuildException {
-		try {
-			waitForActiveScan(extractValue(startScan()));
-		} catch (Exception e) {
-			throw new BuildException(e);
-		}
-	}
-
-	protected abstract ApiResponse startScan() throws ClientApiException;
-
-	private void waitForActiveScan(String scanId) throws ClientApiException, InterruptedException {
-		int progress;
-		do {
-			progress = Integer.parseInt(extractValue(getClientApi().ascan.status(scanId)));
-			Thread.sleep(1000);
-		} while (progress < 100);
-	}
+    private String url;
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    @Override
+    public void execute() throws BuildException {
+        try {
+            waitForActiveScan(extractValue(startScan()));
+        } catch (Exception e) {
+            throw new BuildException(e);
+        }
+    }
+
+    protected abstract ApiResponse startScan() throws ClientApiException;
+
+    private void waitForActiveScan(String scanId) throws ClientApiException, InterruptedException {
+        int progress;
+        do {
+            progress = Integer.parseInt(extractValue(getClientApi().ascan.status(scanId)));
+            Thread.sleep(1000);
+        } while (progress < 100);
+    }
 }

subprojects/zap-clientapi-ant/src/main/java/org/zaproxy/clientapi/ant/AccessUrlTask.java

@@ -22,24 +22,24 @@
 import org.apache.tools.ant.BuildException;
 
 public class AccessUrlTask extends ZapTask {
-	
-	private String url;
-	
-	@Override
-	public void execute() throws BuildException {
-		try {
-			this.getClientApi().accessUrl(url);
-			
-		} catch (Exception e) {
-			throw new BuildException(e);
-		}
-	}
 
-	public String getUrl() {
-		return url;
-	}
+    private String url;
 
-	public void setUrl(String url) {
-		this.url = url;
-	}
+    @Override
+    public void execute() throws BuildException {
+        try {
+            this.getClientApi().accessUrl(url);
+
+        } catch (Exception e) {
+            throw new BuildException(e);
+        }
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
 }

subprojects/zap-clientapi-ant/src/main/java/org/zaproxy/clientapi/ant/ActiveScanSubtreeTask.java

@@ -24,9 +24,8 @@
 
 public class ActiveScanSubtreeTask extends AbstractActiveScanTask {
 
-	@Override
-	protected ApiResponse startScan() throws ClientApiException {
-		return this.getClientApi().ascan.scan(getUrl(), "true", "false", "", "", "");
-	}
-
+    @Override
+    protected ApiResponse startScan() throws ClientApiException {
+        return this.getClientApi().ascan.scan(getUrl(), "true", "false", "", "", "");
+    }
 }

subprojects/zap-clientapi-ant/src/main/java/org/zaproxy/clientapi/ant/ActiveScanUrlTask.java

@@ -24,8 +24,8 @@
 
 public class ActiveScanUrlTask extends AbstractActiveScanTask {
 
-	@Override
-	protected ApiResponse startScan() throws ClientApiException {
-		return this.getClientApi().ascan.scan(getUrl(), "false", "false", "", "", "");
-	}
+    @Override
+    protected ApiResponse startScan() throws ClientApiException {
+        return this.getClientApi().ascan.scan(getUrl(), "false", "false", "", "", "");
+    }
 }

subprojects/zap-clientapi-ant/src/main/java/org/zaproxy/clientapi/ant/AlertCheckTask.java

@@ -21,47 +21,60 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.tools.ant.BuildException;
 import org.zaproxy.clientapi.core.Alert;
 
 public class AlertCheckTask extends ZapTask {
-	
-	private List<AlertTask> ignoreAlertTasks = new ArrayList<>();
-	private List<AlertTask> requireAlertTasks = new ArrayList<>();
-	
-	@Override
-	public void execute() throws BuildException {
-		try {
-			List<Alert> ignoreAlerts = new ArrayList<>(ignoreAlertTasks.size());
-			List<Alert> requireAlerts = new ArrayList<>(requireAlertTasks.size());
-			for (AlertTask alert: ignoreAlertTasks) {
-				ignoreAlerts.add(new Alert(alert.getName(), alert.getUrl(), alert.getRisk(), alert.getConfidence(), alert.getParam(), alert.getOther()));
-			}
-			for (AlertTask alert: requireAlertTasks) {
-				requireAlerts.add(new Alert(alert.getName(), alert.getUrl(), alert.getRisk(), alert.getConfidence(), alert.getParam(), alert.getOther()));
-			}
-			
-			this.getClientApi().checkAlerts(ignoreAlerts, requireAlerts);
-			
-		} catch (Exception e) {
-			throw new BuildException(e);
-		}
-	}
 
-	public void addIgnoreAlert(AlertTask alert) {
-		this.ignoreAlertTasks.add(alert);
-	}
-	
-	public void addRequireAlert(AlertTask alert) {
-		this.requireAlertTasks.add(alert);
-	}
-	
-	public List<AlertTask> getIgnoreAlerts() {
-		return ignoreAlertTasks;
-	}
+    private List<AlertTask> ignoreAlertTasks = new ArrayList<>();
+    private List<AlertTask> requireAlertTasks = new ArrayList<>();
+
+    @Override
+    public void execute() throws BuildException {
+        try {
+            List<Alert> ignoreAlerts = new ArrayList<>(ignoreAlertTasks.size());
+            List<Alert> requireAlerts = new ArrayList<>(requireAlertTasks.size());
+            for (AlertTask alert : ignoreAlertTasks) {
+                ignoreAlerts.add(
+                        new Alert(
+                                alert.getName(),
+                                alert.getUrl(),
+                                alert.getRisk(),
+                                alert.getConfidence(),
+                                alert.getParam(),
+                                alert.getOther()));
+            }
+            for (AlertTask alert : requireAlertTasks) {
+                requireAlerts.add(
+                        new Alert(
+                                alert.getName(),
+                                alert.getUrl(),
+                                alert.getRisk(),
+                                alert.getConfidence(),
+                                alert.getParam(),
+                                alert.getOther()));
+            }
+
+            this.getClientApi().checkAlerts(ignoreAlerts, requireAlerts);
+
+        } catch (Exception e) {
+            throw new BuildException(e);
+        }
+    }
+
+    public void addIgnoreAlert(AlertTask alert) {
+        this.ignoreAlertTasks.add(alert);
+    }
+
+    public void addRequireAlert(AlertTask alert) {
+        this.requireAlertTasks.add(alert);
+    }
+
+    public List<AlertTask> getIgnoreAlerts() {
+        return ignoreAlertTasks;
+    }
 
-	public List<AlertTask> getRequireAlerts() {
-		return requireAlertTasks;
-	}
+    public List<AlertTask> getRequireAlerts() {
+        return requireAlertTasks;
+    }
 }