formatting & cleaning up code

uniVocity · Jul 15, 2015 · 8d8dc7f · 8d8dc7f
1 parent 312ce78
commit 8d8dc7f
Show file tree

Hide file tree

Showing 198 changed files with 1,733 additions and 1,721 deletions.
diff --git a/LICENSE-2.0.html b/LICENSE-2.0.html
diff --git a/pom.xml b/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.univocity</groupId>
@@ -207,7 +208,7 @@
 										</goals>
 									</pluginExecutionFilter>
 									<action>
-										<ignore />
+										<ignore/>
 									</action>
 								</pluginExecution>
 								<pluginExecution>
@@ -221,7 +222,7 @@
 										</goals>
 									</pluginExecutionFilter>
 									<action>
-										<ignore />
+										<ignore/>
 									</action>
 								</pluginExecution>
 							</pluginExecutions>

diff --git a/src/main/java/com/univocity/parsers/annotations/BooleanString.java b/src/main/java/com/univocity/parsers/annotations/BooleanString.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
  * Copyright 2014 uniVocity Software Pty Ltd
- *
+ * <p/>
  * 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
- *
+ * <p/>
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p/>
  * 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.
@@ -15,11 +15,11 @@
  ******************************************************************************/
 package com.univocity.parsers.annotations;
 
-import java.lang.annotation.*;
-
 import com.univocity.parsers.common.processor.*;
 import com.univocity.parsers.conversions.*;
 
+import java.lang.annotation.*;
+
 /**
  * Indicates that parsed values such as "y", "No" or "null" should be interpreted as boolean values.
  * If a parsed value exists in {@link BooleanString#trueStrings()}, then the field will receive true.
@@ -37,7 +37,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Inherited
-@Target(value = { ElementType.FIELD })
+@Target(value = {ElementType.FIELD})
 public @interface BooleanString {
 	/**
 	 * A set of Strings that represent the boolean value {@code true} (e.g. "y", "yes", "1")

diff --git a/src/main/java/com/univocity/parsers/annotations/Convert.java b/src/main/java/com/univocity/parsers/annotations/Convert.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
  * Copyright 2014 uniVocity Software Pty Ltd
- *
+ * <p/>
  * 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
- *
+ * <p/>
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p/>
  * 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.
@@ -15,11 +15,11 @@
  ******************************************************************************/
 package com.univocity.parsers.annotations;
 
-import java.lang.annotation.*;
-
 import com.univocity.parsers.common.processor.*;
 import com.univocity.parsers.conversions.*;
 
+import java.lang.annotation.*;
+
 /**
  * Assigns a custom implementation of {@link Conversion} to be executed when writing to/reading from the field.
  *
@@ -35,15 +35,14 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Inherited
-@Target(value = { ElementType.FIELD })
+@Target(value = {ElementType.FIELD})
 public @interface Convert {
 
 	/**
 	 * A user provided implementation of {@link Conversion} which will be instantiated using the arguments provided by {@link Convert#args()}
 	 * @return custom class used to convert values
 	 */
-	@SuppressWarnings("rawtypes")
-	Class<? extends Conversion> conversionClass();
+	@SuppressWarnings("rawtypes") Class<? extends Conversion> conversionClass();
 
 	/**
 	 * The arguments to use when invoking the constructor of the class given by {@link Convert#conversionClass()}.

diff --git a/src/main/java/com/univocity/parsers/annotations/EnumOptions.java b/src/main/java/com/univocity/parsers/annotations/EnumOptions.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
  * Copyright 2015 uniVocity Software Pty Ltd
- *
+ * <p/>
  * 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
- *
+ * <p/>
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p/>
  * 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.
@@ -15,11 +15,11 @@
  ******************************************************************************/
 package com.univocity.parsers.annotations;
 
-import java.lang.annotation.*;
-
 import com.univocity.parsers.common.processor.*;
 import com.univocity.parsers.conversions.*;
 
+import java.lang.annotation.*;
+
 /**
  * The {@code EnumSelector} annotation is meant to be used in conjunction with enumeration attributes.
  *
@@ -50,7 +50,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Inherited
-@Target(value = { ElementType.FIELD, ElementType.METHOD })
+@Target(value = {ElementType.FIELD, ElementType.METHOD})
 public @interface EnumOptions {
 
 	/**
@@ -63,7 +63,7 @@
 	 * </ul>
 	 * @return the sequence of properties of the enumeration type to match against the parsed input.
 	 */
-	EnumSelector[] selectors() default { EnumSelector.NAME, EnumSelector.ORDINAL, EnumSelector.STRING };
+	EnumSelector[] selectors() default {EnumSelector.NAME, EnumSelector.ORDINAL, EnumSelector.STRING};
 
 	/**
 	 *

diff --git a/src/main/java/com/univocity/parsers/annotations/Format.java b/src/main/java/com/univocity/parsers/annotations/Format.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
  * Copyright 2014 uniVocity Software Pty Ltd
- *
+ * <p/>
  * 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
- *
+ * <p/>
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p/>
  * 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.
@@ -15,11 +15,11 @@
  ******************************************************************************/
 package com.univocity.parsers.annotations;
 
-import java.lang.annotation.*;
-
 import com.univocity.parsers.common.processor.*;
 import com.univocity.parsers.conversions.*;
 
+import java.lang.annotation.*;
+
 /**
  * Indicates that a parsed value is formatted and must be parsed before being assigned.
  * <p>The {@link Conversion} type assigned to this field will depend on its type.</p>
@@ -44,7 +44,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Inherited
-@Target(value = { ElementType.FIELD, ElementType.METHOD })
+@Target(value = {ElementType.FIELD, ElementType.METHOD})
 public @interface Format {
 	/**
 	 * Formats that define how a value can be formatted. When reading, the values parsed from the input will be parsed according to the specified format. If multiple formats

diff --git a/src/main/java/com/univocity/parsers/annotations/Headers.java b/src/main/java/com/univocity/parsers/annotations/Headers.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
  * Copyright 2015 uniVocity Software Pty Ltd
- *
+ * <p/>
  * 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
- *
+ * <p/>
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p/>
  * 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.
@@ -15,11 +15,11 @@
  ******************************************************************************/
 package com.univocity.parsers.annotations;
 
-import java.lang.annotation.*;
-
 import com.univocity.parsers.common.*;
 import com.univocity.parsers.common.processor.*;
 
+import java.lang.annotation.*;
+
 /**
  * The {@code Headers} annotation allows java beans to configure how to handle field names in a given input/output
  *
@@ -48,7 +48,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Inherited
-@Target(value = { ElementType.TYPE })
+@Target(value = {ElementType.TYPE})
 public @interface Headers {
 
 	/**

diff --git a/src/main/java/com/univocity/parsers/annotations/LowerCase.java b/src/main/java/com/univocity/parsers/annotations/LowerCase.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
  * Copyright 2014 uniVocity Software Pty Ltd
- *
+ * <p/>
  * 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
- *
+ * <p/>
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p/>
  * 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.
@@ -15,11 +15,11 @@
  ******************************************************************************/
 package com.univocity.parsers.annotations;
 
-import java.lang.annotation.*;
-
 import com.univocity.parsers.common.processor.*;
 import com.univocity.parsers.conversions.*;
 
+import java.lang.annotation.*;
+
 /**
  * Indicates the String value of a field must be converted to lower case using {@link LowerCaseConversion}.
  *
@@ -35,7 +35,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Inherited
-@Target(value = { ElementType.FIELD })
+@Target(value = {ElementType.FIELD})
 public @interface LowerCase {
 
 }
diff --git a/src/main/java/com/univocity/parsers/annotations/NullString.java b/src/main/java/com/univocity/parsers/annotations/NullString.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
  * Copyright 2014 uniVocity Software Pty Ltd
- *
+ * <p/>
  * 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
- *
+ * <p/>
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p/>
  * 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.
@@ -15,11 +15,11 @@
  ******************************************************************************/
 package com.univocity.parsers.annotations;
 
-import java.lang.annotation.*;
-
 import com.univocity.parsers.common.processor.*;
 import com.univocity.parsers.conversions.*;
 
+import java.lang.annotation.*;
+
 /**
  * Indicates that parsed values such as "", "?" or "null" should be interpreted as null. If a parsed value exists in {@link NullString#nulls()}, then the field must be set to null.
  * <p>A {@link NullStringConversion}  will be assigned to this field
@@ -36,7 +36,7 @@
 
 @Retention(RetentionPolicy.RUNTIME)
 @Inherited
-@Target(value = { ElementType.FIELD, ElementType.METHOD })
+@Target(value = {ElementType.FIELD, ElementType.METHOD})
 public @interface NullString {
 	/**
 	 * A set of Strings that represent a null value instead of a valid String (e.g. "?", "empty", "null" )

diff --git a/src/main/java/com/univocity/parsers/annotations/Parsed.java b/src/main/java/com/univocity/parsers/annotations/Parsed.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
  * Copyright 2014 uniVocity Software Pty Ltd
- *
+ * <p/>
  * 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
- *
+ * <p/>
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p/>
  * 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.
@@ -15,12 +15,12 @@
  ******************************************************************************/
 package com.univocity.parsers.annotations;
 
-import java.lang.annotation.*;
-
 import com.univocity.parsers.annotations.helpers.*;
 import com.univocity.parsers.common.processor.*;
 import com.univocity.parsers.conversions.*;
 
+import java.lang.annotation.*;
+
 /**
  * Indicates the field is parsed. If the annotated field type is not a String, it will be automatically converted using one
  * of the existing {@link Conversion} implementations in package {@link com.univocity.parsers.conversions}.
@@ -40,7 +40,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Inherited
-@Target(value = { ElementType.FIELD, ElementType.METHOD })
+@Target(value = {ElementType.FIELD, ElementType.METHOD})
 public @interface Parsed {
 	/**
 	 * The field name in a parsed record

diff --git a/src/main/java/com/univocity/parsers/annotations/Replace.java b/src/main/java/com/univocity/parsers/annotations/Replace.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
  * Copyright 2014 uniVocity Software Pty Ltd
- *
+ * <p/>
  * 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
- *
+ * <p/>
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p/>
  * 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.
@@ -15,11 +15,11 @@
  ******************************************************************************/
 package com.univocity.parsers.annotations;
 
-import java.lang.annotation.*;
-
 import com.univocity.parsers.common.processor.*;
 import com.univocity.parsers.conversions.*;
 
+import java.lang.annotation.*;
+
 /**
  * Indicates the String value of a field must have some of its contents replaced using {@link RegexConversion}.
  *
@@ -35,7 +35,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Inherited
-@Target(value = { ElementType.FIELD, ElementType.METHOD })
+@Target(value = {ElementType.FIELD, ElementType.METHOD})
 public @interface Replace {
 	/**
 	 * The regular expression to be executed against the String value of the annotated field