Fix code style

marcospassos · Jul 7, 2017 · f311ac7 · f311ac7
1 parent 0c82d16
commit f311ac7
Show file tree

Hide file tree

Showing 30 changed files with 98 additions and 100 deletions.
diff --git a/src/main/java/com/marcospassos/phpserializer/SerializerBuilder.java b/src/main/java/com/marcospassos/phpserializer/SerializerBuilder.java
@@ -1,22 +1,20 @@
 package com.marcospassos.phpserializer;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import com.marcospassos.phpserializer.adapter.ArrayAdapter;
 import com.marcospassos.phpserializer.adapter.BooleanAdapter;
-import com.marcospassos.phpserializer.adapter.IntegerAdapter;
 import com.marcospassos.phpserializer.adapter.CollectionAdapter;
-import com.marcospassos.phpserializer.adapter.MapAdapter;
+import com.marcospassos.phpserializer.adapter.IntegerAdapter;
 import com.marcospassos.phpserializer.adapter.ObjectAdapter;
 import com.marcospassos.phpserializer.adapter.ReferableObjectAdapter;
 import com.marcospassos.phpserializer.adapter.StringAdapter;
 import com.marcospassos.phpserializer.exclusion.DisjunctionExclusionStrategy;
 import com.marcospassos.phpserializer.exclusion.NoExclusionStrategy;
 import com.marcospassos.phpserializer.naming.PsrNamingStrategy;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 /**
  * Provides a friendly API for creating instances of {@link Serializer}.

diff --git a/src/main/java/com/marcospassos/phpserializer/Writer.java b/src/main/java/com/marcospassos/phpserializer/Writer.java
@@ -1,8 +1,8 @@
 
 package com.marcospassos.phpserializer;
 
-import com.marcospassos.phpserializer.state.WritingValueState;
 import java.lang.reflect.Modifier;
+import com.marcospassos.phpserializer.state.WritingValueState;
 
 /**
  * Writes a values in PHP's serialization format.

diff --git a/src/main/java/com/marcospassos/phpserializer/adapter/ArrayAdapter.java b/src/main/java/com/marcospassos/phpserializer/adapter/ArrayAdapter.java
@@ -1,9 +1,9 @@
 package com.marcospassos.phpserializer.adapter;
 
+import java.lang.reflect.Array;
 import com.marcospassos.phpserializer.Context;
 import com.marcospassos.phpserializer.TypeAdapter;
 import com.marcospassos.phpserializer.Writer;
-import java.lang.reflect.Array;
 
 /**
  * Adapter for handling arrays.

diff --git a/src/main/java/com/marcospassos/phpserializer/adapter/CollectionAdapter.java b/src/main/java/com/marcospassos/phpserializer/adapter/CollectionAdapter.java
@@ -1,9 +1,9 @@
 package com.marcospassos.phpserializer.adapter;
 
+import java.util.Collection;
 import com.marcospassos.phpserializer.Context;
 import com.marcospassos.phpserializer.TypeAdapter;
 import com.marcospassos.phpserializer.Writer;
-import java.util.Collection;
 
 /**
  * Adapter for handling collections.

diff --git a/src/main/java/com/marcospassos/phpserializer/adapter/MapAdapter.java b/src/main/java/com/marcospassos/phpserializer/adapter/MapAdapter.java
@@ -1,9 +1,9 @@
 package com.marcospassos.phpserializer.adapter;
 
+import java.util.Map;
 import com.marcospassos.phpserializer.Context;
 import com.marcospassos.phpserializer.TypeAdapter;
 import com.marcospassos.phpserializer.Writer;
-import java.util.Map;
 
 /**
  * Adapter for handling maps.

diff --git a/src/main/java/com/marcospassos/phpserializer/adapter/ObjectAdapter.java b/src/main/java/com/marcospassos/phpserializer/adapter/ObjectAdapter.java
@@ -1,14 +1,14 @@
 package com.marcospassos.phpserializer.adapter;
 
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
 import com.marcospassos.phpserializer.Context;
 import com.marcospassos.phpserializer.FieldExclusionStrategy;
 import com.marcospassos.phpserializer.NamingStrategy;
 import com.marcospassos.phpserializer.TypeAdapter;
 import com.marcospassos.phpserializer.Writer;
 import com.marcospassos.phpserializer.util.ReflectionUtils;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * Adapter for string values.

diff --git a/src/main/java/com/marcospassos/phpserializer/exclusion/DisjunctionExclusionStrategy.java b/src/main/java/com/marcospassos/phpserializer/exclusion/DisjunctionExclusionStrategy.java
@@ -1,7 +1,7 @@
 package com.marcospassos.phpserializer.exclusion;
 
-import com.marcospassos.phpserializer.FieldExclusionStrategy;
 import java.lang.reflect.Field;
+import com.marcospassos.phpserializer.FieldExclusionStrategy;
 
 /**
  * Aggregates multiple exclusion strategies to perform a short-circuit OR

diff --git a/src/main/java/com/marcospassos/phpserializer/exclusion/NoExclusionStrategy.java b/src/main/java/com/marcospassos/phpserializer/exclusion/NoExclusionStrategy.java
@@ -1,7 +1,7 @@
 package com.marcospassos.phpserializer.exclusion;
 
-import com.marcospassos.phpserializer.FieldExclusionStrategy;
 import java.lang.reflect.Field;
+import com.marcospassos.phpserializer.FieldExclusionStrategy;
 
 /**
  * A strategy to exclude nothing.

diff --git a/src/main/java/com/marcospassos/phpserializer/naming/PsrNamingStrategy.java b/src/main/java/com/marcospassos/phpserializer/naming/PsrNamingStrategy.java
@@ -1,7 +1,7 @@
 package com.marcospassos.phpserializer.naming;
 
-import com.marcospassos.phpserializer.NamingStrategy;
 import java.lang.reflect.Field;
+import com.marcospassos.phpserializer.NamingStrategy;
 
 /**
  * Translates names of classes and methods from Java to PHP PSR-1 standard.

diff --git a/src/test/java/com/marcospassos/phpserializer/ContextTest.java b/src/test/java/com/marcospassos/phpserializer/ContextTest.java
@@ -1,5 +1,9 @@
 package com.marcospassos.phpserializer;
 
+import java.util.ArrayList;
+import org.junit.Before;
+import org.junit.Test;
+
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
@@ -8,10 +12,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.util.ArrayList;
-import org.junit.Before;
-import org.junit.Test;
-
 /**
  * @author Marcos Passos
  * @since 1.0

diff --git a/src/test/java/com/marcospassos/phpserializer/SerializerBuilderTest.java b/src/test/java/com/marcospassos/phpserializer/SerializerBuilderTest.java
@@ -1,5 +1,13 @@
 package com.marcospassos.phpserializer;
 
+import java.lang.reflect.Field;
+import java.util.Map;
+import com.marcospassos.phpserializer.exclusion.DisjunctionExclusionStrategy;
+import com.marcospassos.phpserializer.exclusion.NoExclusionStrategy;
+import com.marcospassos.phpserializer.naming.PsrNamingStrategy;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
@@ -8,14 +16,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import com.marcospassos.phpserializer.exclusion.DisjunctionExclusionStrategy;
-import com.marcospassos.phpserializer.exclusion.NoExclusionStrategy;
-import com.marcospassos.phpserializer.naming.PsrNamingStrategy;
-import java.lang.reflect.Field;
-import java.util.Map;
-import org.junit.Test;
-import org.mockito.ArgumentCaptor;
-
 /**
  * @author Marcos Passos
  * @since 1.0

diff --git a/src/test/java/com/marcospassos/phpserializer/SerializerTest.java b/src/test/java/com/marcospassos/phpserializer/SerializerTest.java
@@ -1,12 +1,12 @@
 package com.marcospassos.phpserializer;
 
-import static org.junit.Assert.assertEquals;
-
 import com.marcospassos.phpserializer.adapter.IntegerAdapter;
 import com.marcospassos.phpserializer.exclusion.NoExclusionStrategy;
 import com.marcospassos.phpserializer.naming.PsrNamingStrategy;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+
 /**
  * @author Marcos Passos
  * @since 1.0

diff --git a/src/test/java/com/marcospassos/phpserializer/WriterTest.java b/src/test/java/com/marcospassos/phpserializer/WriterTest.java
@@ -1,10 +1,10 @@
 package com.marcospassos.phpserializer;
 
-import static org.junit.Assert.assertEquals;
-
 import java.lang.reflect.Modifier;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+
 /**
  * @author Marcos Passos
  * @since 1.0

diff --git a/src/test/java/com/marcospassos/phpserializer/adapter/ArrayAdapterTest.java b/src/test/java/com/marcospassos/phpserializer/adapter/ArrayAdapterTest.java
@@ -1,13 +1,13 @@
 package com.marcospassos.phpserializer.adapter;
 
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.mock;
-
 import com.marcospassos.phpserializer.Context;
 import com.marcospassos.phpserializer.Writer;
 import org.junit.Test;
 import org.mockito.InOrder;
 
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
+
 /**
  * @author Marcos Passos
  * @since 1.0

diff --git a/src/test/java/com/marcospassos/phpserializer/adapter/BooleanAdapterTest.java b/src/test/java/com/marcospassos/phpserializer/adapter/BooleanAdapterTest.java
@@ -1,13 +1,13 @@
 package com.marcospassos.phpserializer.adapter;
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-
 import com.marcospassos.phpserializer.Context;
 import com.marcospassos.phpserializer.Writer;
 import org.junit.Test;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
 /**
  * @author Marcos Passos
  * @since 1.0

diff --git a/src/test/java/com/marcospassos/phpserializer/adapter/CollectionAdapterTest.java b/src/test/java/com/marcospassos/phpserializer/adapter/CollectionAdapterTest.java
@@ -1,15 +1,15 @@
 package com.marcospassos.phpserializer.adapter;
 
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.mock;
-
-import com.marcospassos.phpserializer.Context;
-import com.marcospassos.phpserializer.Writer;
 import java.util.Arrays;
 import java.util.Collection;
+import com.marcospassos.phpserializer.Context;
+import com.marcospassos.phpserializer.Writer;
 import org.junit.Test;
 import org.mockito.InOrder;
 
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
+
 /**
  * @author Marcos Passos
  * @since 1.0

diff --git a/src/test/java/com/marcospassos/phpserializer/adapter/DoubleAdapterTest.java b/src/test/java/com/marcospassos/phpserializer/adapter/DoubleAdapterTest.java
@@ -1,13 +1,13 @@
 package com.marcospassos.phpserializer.adapter;
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-
 import com.marcospassos.phpserializer.Context;
 import com.marcospassos.phpserializer.Writer;
 import org.junit.Test;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
 /**
  * @author Marcos Passos
  * @since 1.0

diff --git a/src/test/java/com/marcospassos/phpserializer/adapter/IntegerAdapterTest.java b/src/test/java/com/marcospassos/phpserializer/adapter/IntegerAdapterTest.java
@@ -1,13 +1,13 @@
 package com.marcospassos.phpserializer.adapter;
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-
 import com.marcospassos.phpserializer.Context;
 import com.marcospassos.phpserializer.Writer;
 import org.junit.Test;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
 /**
  * @author Marcos Passos
  * @since 1.0

diff --git a/src/test/java/com/marcospassos/phpserializer/adapter/MapAdapterTest.java b/src/test/java/com/marcospassos/phpserializer/adapter/MapAdapterTest.java
@@ -1,15 +1,15 @@
 package com.marcospassos.phpserializer.adapter;
 
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.mock;
-
-import com.marcospassos.phpserializer.Context;
-import com.marcospassos.phpserializer.Writer;
 import java.util.HashMap;
 import java.util.Map;
+import com.marcospassos.phpserializer.Context;
+import com.marcospassos.phpserializer.Writer;
 import org.junit.Test;
 import org.mockito.InOrder;
 
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
+
 /**
  * @author Marcos Passos
  * @since 1.0

diff --git a/src/test/java/com/marcospassos/phpserializer/adapter/ObjectAdapterTest.java b/src/test/java/com/marcospassos/phpserializer/adapter/ObjectAdapterTest.java
@@ -1,21 +1,21 @@
 package com.marcospassos.phpserializer.adapter;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
 import com.marcospassos.phpserializer.Context;
 import com.marcospassos.phpserializer.FieldExclusionStrategy;
 import com.marcospassos.phpserializer.NamingStrategy;
 import com.marcospassos.phpserializer.Writer;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
 import org.junit.Test;
 import org.mockito.InOrder;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 public class ObjectAdapterTest
 {
     private class Subject

diff --git a/src/test/java/com/marcospassos/phpserializer/adapter/ReferableObjectAdapterTest.java b/src/test/java/com/marcospassos/phpserializer/adapter/ReferableObjectAdapterTest.java
@@ -1,15 +1,15 @@
 package com.marcospassos.phpserializer.adapter;
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 import com.marcospassos.phpserializer.Context;
 import com.marcospassos.phpserializer.TypeAdapter;
 import com.marcospassos.phpserializer.Writer;
 import org.junit.Test;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 /**
  * @author Marcos Passos
  * @since 1.0

diff --git a/src/test/java/com/marcospassos/phpserializer/adapter/StringAdapterTest.java b/src/test/java/com/marcospassos/phpserializer/adapter/StringAdapterTest.java
@@ -1,13 +1,13 @@
 package com.marcospassos.phpserializer.adapter;
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-
 import com.marcospassos.phpserializer.Context;
 import com.marcospassos.phpserializer.Writer;
 import org.junit.Test;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
 /**
  * @author Marcos Passos
  * @since 1.0

diff --git a/src/test/java/com/marcospassos/phpserializer/exclusion/DisjunctionExclusionStrategyTest.java b/src/test/java/com/marcospassos/phpserializer/exclusion/DisjunctionExclusionStrategyTest.java
@@ -1,16 +1,16 @@
 package com.marcospassos.phpserializer.exclusion;
 
+import java.lang.reflect.Field;
+import com.marcospassos.phpserializer.FieldExclusionStrategy;
+import org.junit.Test;
+
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import com.marcospassos.phpserializer.FieldExclusionStrategy;
-import java.lang.reflect.Field;
-import org.junit.Test;
-
 /**
  * @author Marcos Passos
  * @since 1.0