Forgot to run spotlessApply...

diffplug · Dec 23, 2016 · 45deb18 · 45deb18
1 parent 1805075
commit 45deb18
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 15 deletions.
diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/java/package-info.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/java/package-info.java
@@ -2,6 +2,6 @@
 @ReturnValuesAreNonnullByDefault
 package com.diffplug.spotless.extra.java;
 
-import com.diffplug.spotless.annotations.ReturnValuesAreNonnullByDefault;
-
 import javax.annotation.ParametersAreNonnullByDefault;
+
+import com.diffplug.spotless.annotations.ReturnValuesAreNonnullByDefault;
diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/package-info.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/package-info.java
@@ -2,6 +2,6 @@
 @ReturnValuesAreNonnullByDefault
 package com.diffplug.spotless.extra;
 
-import com.diffplug.spotless.annotations.ReturnValuesAreNonnullByDefault;
-
 import javax.annotation.ParametersAreNonnullByDefault;
+
+import com.diffplug.spotless.annotations.ReturnValuesAreNonnullByDefault;
diff --git a/lib/src/main/java/com/diffplug/spotless/annotations/ReturnValuesAreNonnullByDefault.java b/lib/src/main/java/com/diffplug/spotless/annotations/ReturnValuesAreNonnullByDefault.java
@@ -1,12 +1,28 @@
+/*
+ * Copyright 2016 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.annotations;
 
-import javax.annotation.Nonnull;
-import javax.annotation.meta.TypeQualifierDefault;
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
+import javax.annotation.Nonnull;
+import javax.annotation.meta.TypeQualifierDefault;
+
 @Documented
 @Nonnull
 @TypeQualifierDefault(ElementType.METHOD)

diff --git a/lib/src/main/java/com/diffplug/spotless/generic/package-info.java b/lib/src/main/java/com/diffplug/spotless/generic/package-info.java
@@ -2,6 +2,6 @@
 @ReturnValuesAreNonnullByDefault
 package com.diffplug.spotless.generic;
 
-import com.diffplug.spotless.annotations.ReturnValuesAreNonnullByDefault;
-
 import javax.annotation.ParametersAreNonnullByDefault;
+
+import com.diffplug.spotless.annotations.ReturnValuesAreNonnullByDefault;
diff --git a/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java b/lib/src/main/java/com/diffplug/spotless/java/ImportSorterImpl.java
@@ -15,7 +15,6 @@
  */
 package com.diffplug.spotless.java;
 
-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -24,6 +23,8 @@
 import java.util.Map;
 import java.util.Set;
 
+import javax.annotation.Nullable;
+
 /*not thread safe*/
 // Based on ImportSorterImpl from https://github.com/krasa/EclipseCodeFormatter,
 // which itself is licensed under the Apache 2.0 license.

diff --git a/lib/src/main/java/com/diffplug/spotless/java/package-info.java b/lib/src/main/java/com/diffplug/spotless/java/package-info.java
@@ -2,6 +2,6 @@
 @ReturnValuesAreNonnullByDefault
 package com.diffplug.spotless.java;
 
-import com.diffplug.spotless.annotations.ReturnValuesAreNonnullByDefault;
-
 import javax.annotation.ParametersAreNonnullByDefault;
+
+import com.diffplug.spotless.annotations.ReturnValuesAreNonnullByDefault;
diff --git a/lib/src/main/java/com/diffplug/spotless/markdown/package-info.java b/lib/src/main/java/com/diffplug/spotless/markdown/package-info.java
@@ -2,6 +2,6 @@
 @ReturnValuesAreNonnullByDefault
 package com.diffplug.spotless.markdown;
 
-import com.diffplug.spotless.annotations.ReturnValuesAreNonnullByDefault;
-
 import javax.annotation.ParametersAreNonnullByDefault;
+
+import com.diffplug.spotless.annotations.ReturnValuesAreNonnullByDefault;
diff --git a/lib/src/main/java/com/diffplug/spotless/package-info.java b/lib/src/main/java/com/diffplug/spotless/package-info.java
@@ -2,6 +2,6 @@
 @ReturnValuesAreNonnullByDefault
 package com.diffplug.spotless;
 
-import com.diffplug.spotless.annotations.ReturnValuesAreNonnullByDefault;
-
 import javax.annotation.ParametersAreNonnullByDefault;
+
+import com.diffplug.spotless.annotations.ReturnValuesAreNonnullByDefault;