Skip to content

Commit f311ac7

Browse files
marcospassosmarcospassos
committed
Fix code style
1 parent 0c82d16 commit f311ac7

30 files changed

+98
-100
lines changed

Diff for: ‎src/main/java/com/marcospassos/phpserializer/SerializerBuilder.java

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
11
package com.marcospassos.phpserializer;
22

3+
import java.util.ArrayList;
4+
import java.util.Collection;
5+
import java.util.HashMap;
6+
import java.util.List;
7+
import java.util.Map;
38
import com.marcospassos.phpserializer.adapter.ArrayAdapter;
49
import com.marcospassos.phpserializer.adapter.BooleanAdapter;
5-
import com.marcospassos.phpserializer.adapter.IntegerAdapter;
610
import com.marcospassos.phpserializer.adapter.CollectionAdapter;
7-
import com.marcospassos.phpserializer.adapter.MapAdapter;
11+
import com.marcospassos.phpserializer.adapter.IntegerAdapter;
812
import com.marcospassos.phpserializer.adapter.ObjectAdapter;
913
import com.marcospassos.phpserializer.adapter.ReferableObjectAdapter;
1014
import com.marcospassos.phpserializer.adapter.StringAdapter;
1115
import com.marcospassos.phpserializer.exclusion.DisjunctionExclusionStrategy;
1216
import com.marcospassos.phpserializer.exclusion.NoExclusionStrategy;
1317
import com.marcospassos.phpserializer.naming.PsrNamingStrategy;
14-
import java.util.ArrayList;
15-
import java.util.Collection;
16-
import java.util.HashMap;
17-
import java.util.List;
18-
import java.util.Map;
19-
import java.util.Set;
2018

2119
/**
2220
* Provides a friendly API for creating instances of {@link Serializer}.

Diff for: ‎src/main/java/com/marcospassos/phpserializer/Writer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
package com.marcospassos.phpserializer;
33

4-
import com.marcospassos.phpserializer.state.WritingValueState;
54
import java.lang.reflect.Modifier;
5+
import com.marcospassos.phpserializer.state.WritingValueState;
66

77
/**
88
* Writes a values in PHP's serialization format.

Diff for: ‎src/main/java/com/marcospassos/phpserializer/adapter/ArrayAdapter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.marcospassos.phpserializer.adapter;
22

3+
import java.lang.reflect.Array;
34
import com.marcospassos.phpserializer.Context;
45
import com.marcospassos.phpserializer.TypeAdapter;
56
import com.marcospassos.phpserializer.Writer;
6-
import java.lang.reflect.Array;
77

88
/**
99
* Adapter for handling arrays.

Diff for: ‎src/main/java/com/marcospassos/phpserializer/adapter/CollectionAdapter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.marcospassos.phpserializer.adapter;
22

3+
import java.util.Collection;
34
import com.marcospassos.phpserializer.Context;
45
import com.marcospassos.phpserializer.TypeAdapter;
56
import com.marcospassos.phpserializer.Writer;
6-
import java.util.Collection;
77

88
/**
99
* Adapter for handling collections.

Diff for: ‎src/main/java/com/marcospassos/phpserializer/adapter/MapAdapter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.marcospassos.phpserializer.adapter;
22

3+
import java.util.Map;
34
import com.marcospassos.phpserializer.Context;
45
import com.marcospassos.phpserializer.TypeAdapter;
56
import com.marcospassos.phpserializer.Writer;
6-
import java.util.Map;
77

88
/**
99
* Adapter for handling maps.

Diff for: ‎src/main/java/com/marcospassos/phpserializer/adapter/ObjectAdapter.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package com.marcospassos.phpserializer.adapter;
22

3+
import java.lang.reflect.Field;
4+
import java.util.ArrayList;
5+
import java.util.List;
36
import com.marcospassos.phpserializer.Context;
47
import com.marcospassos.phpserializer.FieldExclusionStrategy;
58
import com.marcospassos.phpserializer.NamingStrategy;
69
import com.marcospassos.phpserializer.TypeAdapter;
710
import com.marcospassos.phpserializer.Writer;
811
import com.marcospassos.phpserializer.util.ReflectionUtils;
9-
import java.lang.reflect.Field;
10-
import java.util.ArrayList;
11-
import java.util.List;
1212

1313
/**
1414
* Adapter for string values.

Diff for: ‎src/main/java/com/marcospassos/phpserializer/exclusion/DisjunctionExclusionStrategy.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.marcospassos.phpserializer.exclusion;
22

3-
import com.marcospassos.phpserializer.FieldExclusionStrategy;
43
import java.lang.reflect.Field;
4+
import com.marcospassos.phpserializer.FieldExclusionStrategy;
55

66
/**
77
* Aggregates multiple exclusion strategies to perform a short-circuit OR

Diff for: ‎src/main/java/com/marcospassos/phpserializer/exclusion/NoExclusionStrategy.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.marcospassos.phpserializer.exclusion;
22

3-
import com.marcospassos.phpserializer.FieldExclusionStrategy;
43
import java.lang.reflect.Field;
4+
import com.marcospassos.phpserializer.FieldExclusionStrategy;
55

66
/**
77
* A strategy to exclude nothing.

Diff for: ‎src/main/java/com/marcospassos/phpserializer/naming/PsrNamingStrategy.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.marcospassos.phpserializer.naming;
22

3-
import com.marcospassos.phpserializer.NamingStrategy;
43
import java.lang.reflect.Field;
4+
import com.marcospassos.phpserializer.NamingStrategy;
55

66
/**
77
* Translates names of classes and methods from Java to PHP PSR-1 standard.

Diff for: ‎src/test/java/com/marcospassos/phpserializer/ContextTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
package com.marcospassos.phpserializer;
22

3+
import java.util.ArrayList;
4+
import org.junit.Before;
5+
import org.junit.Test;
6+
37
import static org.junit.Assert.assertArrayEquals;
48
import static org.junit.Assert.assertEquals;
59
import static org.junit.Assert.assertSame;
@@ -8,10 +12,6 @@
812
import static org.mockito.Mockito.verify;
913
import static org.mockito.Mockito.when;
1014

11-
import java.util.ArrayList;
12-
import org.junit.Before;
13-
import org.junit.Test;
14-
1515
/**
1616
* @author Marcos Passos
1717
* @since 1.0

Diff for: ‎src/test/java/com/marcospassos/phpserializer/SerializerBuilderTest.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
package com.marcospassos.phpserializer;
22

3+
import java.lang.reflect.Field;
4+
import java.util.Map;
5+
import com.marcospassos.phpserializer.exclusion.DisjunctionExclusionStrategy;
6+
import com.marcospassos.phpserializer.exclusion.NoExclusionStrategy;
7+
import com.marcospassos.phpserializer.naming.PsrNamingStrategy;
8+
import org.junit.Test;
9+
import org.mockito.ArgumentCaptor;
10+
311
import static org.junit.Assert.assertFalse;
412
import static org.junit.Assert.assertSame;
513
import static org.junit.Assert.assertTrue;
@@ -8,14 +16,6 @@
816
import static org.mockito.Mockito.verify;
917
import static org.mockito.Mockito.when;
1018

11-
import com.marcospassos.phpserializer.exclusion.DisjunctionExclusionStrategy;
12-
import com.marcospassos.phpserializer.exclusion.NoExclusionStrategy;
13-
import com.marcospassos.phpserializer.naming.PsrNamingStrategy;
14-
import java.lang.reflect.Field;
15-
import java.util.Map;
16-
import org.junit.Test;
17-
import org.mockito.ArgumentCaptor;
18-
1919
/**
2020
* @author Marcos Passos
2121
* @since 1.0

Diff for: ‎src/test/java/com/marcospassos/phpserializer/SerializerTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.marcospassos.phpserializer;
22

3-
import static org.junit.Assert.assertEquals;
4-
53
import com.marcospassos.phpserializer.adapter.IntegerAdapter;
64
import com.marcospassos.phpserializer.exclusion.NoExclusionStrategy;
75
import com.marcospassos.phpserializer.naming.PsrNamingStrategy;
86
import org.junit.Test;
97

8+
import static org.junit.Assert.assertEquals;
9+
1010
/**
1111
* @author Marcos Passos
1212
* @since 1.0

Diff for: ‎src/test/java/com/marcospassos/phpserializer/WriterTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.marcospassos.phpserializer;
22

3-
import static org.junit.Assert.assertEquals;
4-
53
import java.lang.reflect.Modifier;
64
import org.junit.Test;
75

6+
import static org.junit.Assert.assertEquals;
7+
88
/**
99
* @author Marcos Passos
1010
* @since 1.0

Diff for: ‎src/test/java/com/marcospassos/phpserializer/adapter/ArrayAdapterTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.marcospassos.phpserializer.adapter;
22

3-
import static org.mockito.Mockito.inOrder;
4-
import static org.mockito.Mockito.mock;
5-
63
import com.marcospassos.phpserializer.Context;
74
import com.marcospassos.phpserializer.Writer;
85
import org.junit.Test;
96
import org.mockito.InOrder;
107

8+
import static org.mockito.Mockito.inOrder;
9+
import static org.mockito.Mockito.mock;
10+
1111
/**
1212
* @author Marcos Passos
1313
* @since 1.0

Diff for: ‎src/test/java/com/marcospassos/phpserializer/adapter/BooleanAdapterTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.marcospassos.phpserializer.adapter;
22

3-
import static org.mockito.Mockito.mock;
4-
import static org.mockito.Mockito.verify;
5-
import static org.mockito.Mockito.verifyNoMoreInteractions;
6-
73
import com.marcospassos.phpserializer.Context;
84
import com.marcospassos.phpserializer.Writer;
95
import org.junit.Test;
106

7+
import static org.mockito.Mockito.mock;
8+
import static org.mockito.Mockito.verify;
9+
import static org.mockito.Mockito.verifyNoMoreInteractions;
10+
1111
/**
1212
* @author Marcos Passos
1313
* @since 1.0

Diff for: ‎src/test/java/com/marcospassos/phpserializer/adapter/CollectionAdapterTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package com.marcospassos.phpserializer.adapter;
22

3-
import static org.mockito.Mockito.inOrder;
4-
import static org.mockito.Mockito.mock;
5-
6-
import com.marcospassos.phpserializer.Context;
7-
import com.marcospassos.phpserializer.Writer;
83
import java.util.Arrays;
94
import java.util.Collection;
5+
import com.marcospassos.phpserializer.Context;
6+
import com.marcospassos.phpserializer.Writer;
107
import org.junit.Test;
118
import org.mockito.InOrder;
129

10+
import static org.mockito.Mockito.inOrder;
11+
import static org.mockito.Mockito.mock;
12+
1313
/**
1414
* @author Marcos Passos
1515
* @since 1.0

Diff for: ‎src/test/java/com/marcospassos/phpserializer/adapter/DoubleAdapterTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.marcospassos.phpserializer.adapter;
22

3-
import static org.mockito.Mockito.mock;
4-
import static org.mockito.Mockito.verify;
5-
import static org.mockito.Mockito.verifyNoMoreInteractions;
6-
73
import com.marcospassos.phpserializer.Context;
84
import com.marcospassos.phpserializer.Writer;
95
import org.junit.Test;
106

7+
import static org.mockito.Mockito.mock;
8+
import static org.mockito.Mockito.verify;
9+
import static org.mockito.Mockito.verifyNoMoreInteractions;
10+
1111
/**
1212
* @author Marcos Passos
1313
* @since 1.0

Diff for: ‎src/test/java/com/marcospassos/phpserializer/adapter/IntegerAdapterTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.marcospassos.phpserializer.adapter;
22

3-
import static org.mockito.Mockito.mock;
4-
import static org.mockito.Mockito.verify;
5-
import static org.mockito.Mockito.verifyNoMoreInteractions;
6-
73
import com.marcospassos.phpserializer.Context;
84
import com.marcospassos.phpserializer.Writer;
95
import org.junit.Test;
106

7+
import static org.mockito.Mockito.mock;
8+
import static org.mockito.Mockito.verify;
9+
import static org.mockito.Mockito.verifyNoMoreInteractions;
10+
1111
/**
1212
* @author Marcos Passos
1313
* @since 1.0

Diff for: ‎src/test/java/com/marcospassos/phpserializer/adapter/MapAdapterTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package com.marcospassos.phpserializer.adapter;
22

3-
import static org.mockito.Mockito.inOrder;
4-
import static org.mockito.Mockito.mock;
5-
6-
import com.marcospassos.phpserializer.Context;
7-
import com.marcospassos.phpserializer.Writer;
83
import java.util.HashMap;
94
import java.util.Map;
5+
import com.marcospassos.phpserializer.Context;
6+
import com.marcospassos.phpserializer.Writer;
107
import org.junit.Test;
118
import org.mockito.InOrder;
129

10+
import static org.mockito.Mockito.inOrder;
11+
import static org.mockito.Mockito.mock;
12+
1313
/**
1414
* @author Marcos Passos
1515
* @since 1.0

Diff for: ‎src/test/java/com/marcospassos/phpserializer/adapter/ObjectAdapterTest.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
package com.marcospassos.phpserializer.adapter;
22

3-
import static org.mockito.ArgumentMatchers.any;
4-
import static org.mockito.Mockito.inOrder;
5-
import static org.mockito.Mockito.mock;
6-
import static org.mockito.Mockito.when;
7-
3+
import java.lang.reflect.Field;
4+
import java.lang.reflect.Modifier;
85
import com.marcospassos.phpserializer.Context;
96
import com.marcospassos.phpserializer.FieldExclusionStrategy;
107
import com.marcospassos.phpserializer.NamingStrategy;
118
import com.marcospassos.phpserializer.Writer;
12-
import java.lang.reflect.Field;
13-
import java.lang.reflect.Modifier;
149
import org.junit.Test;
1510
import org.mockito.InOrder;
1611
import org.mockito.invocation.InvocationOnMock;
1712
import org.mockito.stubbing.Answer;
1813

14+
import static org.mockito.ArgumentMatchers.any;
15+
import static org.mockito.Mockito.inOrder;
16+
import static org.mockito.Mockito.mock;
17+
import static org.mockito.Mockito.when;
18+
1919
public class ObjectAdapterTest
2020
{
2121
private class Subject

Diff for: ‎src/test/java/com/marcospassos/phpserializer/adapter/ReferableObjectAdapterTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package com.marcospassos.phpserializer.adapter;
22

3-
import static org.mockito.Mockito.mock;
4-
import static org.mockito.Mockito.times;
5-
import static org.mockito.Mockito.verify;
6-
import static org.mockito.Mockito.when;
7-
83
import com.marcospassos.phpserializer.Context;
94
import com.marcospassos.phpserializer.TypeAdapter;
105
import com.marcospassos.phpserializer.Writer;
116
import org.junit.Test;
127

8+
import static org.mockito.Mockito.mock;
9+
import static org.mockito.Mockito.times;
10+
import static org.mockito.Mockito.verify;
11+
import static org.mockito.Mockito.when;
12+
1313
/**
1414
* @author Marcos Passos
1515
* @since 1.0

Diff for: ‎src/test/java/com/marcospassos/phpserializer/adapter/StringAdapterTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.marcospassos.phpserializer.adapter;
22

3-
import static org.mockito.Mockito.mock;
4-
import static org.mockito.Mockito.verify;
5-
import static org.mockito.Mockito.verifyNoMoreInteractions;
6-
73
import com.marcospassos.phpserializer.Context;
84
import com.marcospassos.phpserializer.Writer;
95
import org.junit.Test;
106

7+
import static org.mockito.Mockito.mock;
8+
import static org.mockito.Mockito.verify;
9+
import static org.mockito.Mockito.verifyNoMoreInteractions;
10+
1111
/**
1212
* @author Marcos Passos
1313
* @since 1.0

Diff for: ‎src/test/java/com/marcospassos/phpserializer/exclusion/DisjunctionExclusionStrategyTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
package com.marcospassos.phpserializer.exclusion;
22

3+
import java.lang.reflect.Field;
4+
import com.marcospassos.phpserializer.FieldExclusionStrategy;
5+
import org.junit.Test;
6+
37
import static org.junit.Assert.assertFalse;
48
import static org.junit.Assert.assertTrue;
59
import static org.mockito.Mockito.mock;
610
import static org.mockito.Mockito.times;
711
import static org.mockito.Mockito.verify;
812
import static org.mockito.Mockito.when;
913

10-
import com.marcospassos.phpserializer.FieldExclusionStrategy;
11-
import java.lang.reflect.Field;
12-
import org.junit.Test;
13-
1414
/**
1515
* @author Marcos Passos
1616
* @since 1.0

0 commit comments

Comments
 (0)