[JENKINS-43507] Tidy up source formatting

jenkinsci · May 4, 2017 · f140209a7fc91f21143bf539ef98ea899ae3b9af · f140209
1 parent 93b3c88
commit f140209a7fc91f21143bf539ef98ea899ae3b9af
diff --git a/src/main/java/jenkins/scm/api/SCMHeadObserver.java b/src/main/java/jenkins/scm/api/SCMHeadObserver.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 package jenkins.scm.api;
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;

diff --git a/src/main/java/jenkins/scm/api/mixin/SCMHeadMixin.java b/src/main/java/jenkins/scm/api/mixin/SCMHeadMixin.java
@@ -1,7 +1,7 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2016 CloudBees, Inc.
+ * Copyright (c) 2016-2017 CloudBees, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/src/main/java/jenkins/scm/api/trait/SCMBuilder.java b/src/main/java/jenkins/scm/api/trait/SCMBuilder.java
@@ -1,3 +1,27 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2017, CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 package jenkins.scm.api.trait;
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;

diff --git a/src/main/java/jenkins/scm/api/trait/SCMHeadAuthority.java b/src/main/java/jenkins/scm/api/trait/SCMHeadAuthority.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 package jenkins.scm.api.trait;
 
 import edu.umd.cs.findbugs.annotations.NonNull;

diff --git a/src/main/java/jenkins/scm/api/trait/SCMHeadAuthorityDescriptor.java b/src/main/java/jenkins/scm/api/trait/SCMHeadAuthorityDescriptor.java
@@ -21,13 +21,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 package jenkins.scm.api.trait;
 
 import hudson.model.Descriptor;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import jenkins.scm.api.SCMHead;
-import jenkins.scm.api.SCMSource;
 import jenkins.scm.api.mixin.SCMHeadMixin;
 import org.jvnet.tiger_types.Types;
 

diff --git a/src/main/java/jenkins/scm/api/trait/SCMHeadFilter.java b/src/main/java/jenkins/scm/api/trait/SCMHeadFilter.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 package jenkins.scm.api.trait;
 
 import edu.umd.cs.findbugs.annotations.NonNull;

diff --git a/src/main/java/jenkins/scm/api/trait/SCMHeadPrefilter.java b/src/main/java/jenkins/scm/api/trait/SCMHeadPrefilter.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 package jenkins.scm.api.trait;
 
 import edu.umd.cs.findbugs.annotations.NonNull;

diff --git a/src/main/java/jenkins/scm/api/trait/SCMNavigatorContext.java b/src/main/java/jenkins/scm/api/trait/SCMNavigatorContext.java
@@ -20,7 +20,6 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
- *
  */
 
 package jenkins.scm.api.trait;

diff --git a/src/main/java/jenkins/scm/api/trait/SCMNavigatorRequest.java b/src/main/java/jenkins/scm/api/trait/SCMNavigatorRequest.java
@@ -20,15 +20,12 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
- *
  */
 
 package jenkins.scm.api.trait;
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
-import hudson.model.TaskListener;
 import java.io.Closeable;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
@@ -38,12 +35,10 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import jdk.nashorn.internal.runtime.ScriptObject;
 import jenkins.scm.api.SCMHead;
 import jenkins.scm.api.SCMNavigator;
 import jenkins.scm.api.SCMSource;
 import jenkins.scm.api.SCMSourceObserver;
-import jenkins.scm.api.SCMSourceOwner;
 import jenkins.scm.impl.NoOpProjectObserver;
 
 /**

diff --git a/src/main/java/jenkins/scm/api/trait/SCMNavigatorTrait.java b/src/main/java/jenkins/scm/api/trait/SCMNavigatorTrait.java
@@ -20,23 +20,18 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
- *
  */
 
 package jenkins.scm.api.trait;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.DescriptorExtensionList;
-import hudson.scm.SCM;
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.CheckForNull;
 import jenkins.scm.api.SCMHeadCategory;
-import jenkins.scm.api.SCMHeadObserver;
-import jenkins.scm.api.SCMNavigator;
 import jenkins.scm.api.SCMNavigatorDescriptor;
 import jenkins.scm.api.SCMSource;
-import jenkins.scm.api.SCMSourceDescriptor;
 import jenkins.scm.api.SCMSourceObserver;
 
 /**

diff --git a/src/main/java/jenkins/scm/api/trait/SCMNavigatorTraitDescriptor.java b/src/main/java/jenkins/scm/api/trait/SCMNavigatorTraitDescriptor.java
@@ -20,7 +20,6 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
- *
  */
 
 package jenkins.scm.api.trait;

diff --git a/src/main/java/jenkins/scm/api/trait/SCMSourceBuilder.java b/src/main/java/jenkins/scm/api/trait/SCMSourceBuilder.java
@@ -1,14 +1,34 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2017, CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 package jenkins.scm.api.trait;
 
-import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
-import hudson.scm.SCM;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
-import jenkins.scm.api.SCMHead;
-import jenkins.scm.api.SCMRevision;
 import jenkins.scm.api.SCMSource;
 
 public abstract class SCMSourceBuilder<B extends SCMSourceBuilder<B,S>,S extends SCMSource> {

diff --git a/src/main/java/jenkins/scm/api/trait/SCMSourceContext.java b/src/main/java/jenkins/scm/api/trait/SCMSourceContext.java
@@ -20,7 +20,6 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
- *
  */
 
 package jenkins.scm.api.trait;

diff --git a/src/main/java/jenkins/scm/api/trait/SCMSourceDecorator.java b/src/main/java/jenkins/scm/api/trait/SCMSourceDecorator.java
@@ -1,3 +1,27 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2017, CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 package jenkins.scm.api.trait;
 
 import java.lang.reflect.ParameterizedType;

diff --git a/src/main/java/jenkins/scm/api/trait/SCMSourceFilter.java b/src/main/java/jenkins/scm/api/trait/SCMSourceFilter.java
@@ -21,12 +21,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 package jenkins.scm.api.trait;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.io.IOException;
-import jenkins.scm.api.SCMHead;
-import jenkins.scm.api.SCMNavigator;
 
 public abstract class SCMSourceFilter {
 

diff --git a/src/main/java/jenkins/scm/api/trait/SCMSourcePrefilter.java b/src/main/java/jenkins/scm/api/trait/SCMSourcePrefilter.java
@@ -21,12 +21,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 package jenkins.scm.api.trait;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
-import jenkins.scm.api.SCMHead;
 import jenkins.scm.api.SCMNavigator;
-import jenkins.scm.api.SCMSource;
 
 public abstract class SCMSourcePrefilter {
 

diff --git a/src/main/java/jenkins/scm/api/trait/SCMSourceRequest.java b/src/main/java/jenkins/scm/api/trait/SCMSourceRequest.java
@@ -20,7 +20,6 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
- *
  */
 
 package jenkins.scm.api.trait;

diff --git a/src/main/java/jenkins/scm/api/trait/SCMSourceTrait.java b/src/main/java/jenkins/scm/api/trait/SCMSourceTrait.java
@@ -20,20 +20,16 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
- *
  */
 
 package jenkins.scm.api.trait;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.DescriptorExtensionList;
-import hudson.model.AbstractDescribableImpl;
-import hudson.model.Describable;
 import hudson.scm.SCM;
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.CheckForNull;
-import jenkins.model.Jenkins;
 import jenkins.scm.api.SCMHeadCategory;
 import jenkins.scm.api.SCMHeadObserver;
 import jenkins.scm.api.SCMSource;

diff --git a/src/main/java/jenkins/scm/api/trait/SCMSourceTraitDescriptor.java b/src/main/java/jenkins/scm/api/trait/SCMSourceTraitDescriptor.java
@@ -20,15 +20,12 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
- *
  */
 
 package jenkins.scm.api.trait;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.model.Descriptor;
-import hudson.scm.SCM;
-import hudson.scm.SCMDescriptor;
 import jenkins.scm.api.SCMSource;
 import jenkins.scm.api.SCMSourceDescriptor;
 

diff --git a/src/main/java/jenkins/scm/api/trait/SCMTrait.java b/src/main/java/jenkins/scm/api/trait/SCMTrait.java
@@ -1,3 +1,27 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2017, CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 package jenkins.scm.api.trait;
 
 import hudson.DescriptorExtensionList;

diff --git a/src/main/java/jenkins/scm/api/trait/SCMTraitDescriptor.java b/src/main/java/jenkins/scm/api/trait/SCMTraitDescriptor.java
@@ -20,7 +20,6 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
- *
  */
 
 package jenkins.scm.api.trait;
@@ -29,8 +28,6 @@
 import hudson.model.Descriptor;
 import hudson.scm.SCM;
 import hudson.scm.SCMDescriptor;
-import jenkins.scm.api.SCMSource;
-import jenkins.scm.api.SCMSourceDescriptor;
 
 /**
  * Abstract base class for {@link Descriptor} of {@link SCMTrait} implementations.

diff --git a/src/main/java/jenkins/scm/api/trait/package-info.java b/src/main/java/jenkins/scm/api/trait/package-info.java
@@ -23,7 +23,4 @@
  *
  */
 
-/**
- * @author Stephen Connolly
- */
 package jenkins.scm.api.trait;
diff --git a/src/main/java/jenkins/scm/impl/trait/RegexSCMSourceFilterTrait.java b/src/main/java/jenkins/scm/impl/trait/RegexSCMSourceFilterTrait.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 package jenkins.scm.impl.trait;
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
@@ -35,7 +36,6 @@
 import jenkins.scm.api.trait.SCMNavigatorTrait;
 import jenkins.scm.api.trait.SCMNavigatorTraitDescriptor;
 import jenkins.scm.api.trait.SCMSourcePrefilter;
-import jenkins.scm.api.trait.SCMSourceTraitDescriptor;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.QueryParameter;
 

diff --git a/src/main/java/jenkins/scm/impl/trait/WildcardSCMHeadFilterTrait.java b/src/main/java/jenkins/scm/impl/trait/WildcardSCMHeadFilterTrait.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 package jenkins.scm.impl.trait;
 
 import edu.umd.cs.findbugs.annotations.NonNull;