Merge pull request #5 from garcia-jj/ot-usingmodernapis

Ot usingmodernapis

Author: exabrial

src/org/beanio/BeanReaderErrorHandlerSupport.java

@@ -37,6 +37,7 @@ public BeanReaderErrorHandlerSupport() { }
      * @throws Exception if the BeanReaderException is rethrown or this error
      *   handler throws a new Exception
      */
+    @Override
     public final void handleError(BeanReaderException ex) throws Exception {
         if (ex instanceof InvalidRecordException) {
             invalidRecord((InvalidRecordException)ex);

src/org/beanio/Marshaller.java

@@ -75,6 +75,7 @@ public interface Marshaller extends Debuggable {
      * @return the record text
      * @throws BeanWriterException if a fatal error occurs
      */
+    @Override
     public String toString() throws BeanWriterException;
 
     /**

src/org/beanio/builder/CsvParserBuilder.java

@@ -79,7 +79,7 @@ public CsvParserBuilder alwaysQuote() throws BeanIOConfigurationException {
 
     @Override
     public BeanConfig<RecordParserFactory> build() {
-        BeanConfig<RecordParserFactory> config = new BeanConfig<RecordParserFactory>();
+        BeanConfig<RecordParserFactory> config = new BeanConfig<>();
         config.setInstance(parser);
         return config;
     }

src/org/beanio/builder/DelimitedParserBuilder.java

@@ -62,7 +62,7 @@ public DelimitedParserBuilder enableComments(String... comments) {
 
     @Override
     public BeanConfig<RecordParserFactory> build() {
-        BeanConfig<RecordParserFactory> config = new BeanConfig<RecordParserFactory>();
+        BeanConfig<RecordParserFactory> config = new BeanConfig<>();
         config.setInstance(parser);
         return config;
     }

src/org/beanio/builder/FixedLengthParserBuilder.java

@@ -66,7 +66,7 @@ public FixedLengthParserBuilder enableComments(String... comments) {
 
     @Override
     public BeanConfig<RecordParserFactory> build() {
-        BeanConfig<RecordParserFactory> config = new BeanConfig<RecordParserFactory>();
+        BeanConfig<RecordParserFactory> config = new BeanConfig<>();
         config.setInstance(parser);
         return config;
     }

src/org/beanio/builder/SegmentBuilderSupport.java

@@ -27,6 +27,7 @@ public abstract class SegmentBuilderSupport<T extends SegmentBuilderSupport<T>>
 
     SegmentBuilderSupport() { }
 
+    @Override
     protected abstract SegmentConfig getConfig();
 
     /**

src/org/beanio/builder/StreamBuilder.java

@@ -76,7 +76,7 @@ public StreamBuilder format(String format) {
      * @return this
      */
     public StreamBuilder parser(RecordParserFactory parser) {
-        BeanConfig<RecordParserFactory> bc = new BeanConfig<RecordParserFactory>();
+        BeanConfig<RecordParserFactory> bc = new BeanConfig<>();
         bc.setInstance(parser);
         config.setParserFactory(bc);
         return this;

src/org/beanio/builder/XmlParserBuilder.java

@@ -70,7 +70,7 @@ public XmlParserBuilder lineSeparator(String sep) {
 
     @Override
     public BeanConfig<RecordParserFactory> build() {
-        BeanConfig<RecordParserFactory> config = new BeanConfig<RecordParserFactory>();
+        BeanConfig<RecordParserFactory> config = new BeanConfig<>();
         config.setInstance(parser);
         return config;
     }

src/org/beanio/internal/DefaultStreamFactory.java

@@ -35,7 +35,7 @@
 public class DefaultStreamFactory extends StreamFactory {
 
     private StreamCompiler compiler;
-    private Map<String, Stream> contextMap = new ConcurrentHashMap<String, Stream>();
+    private Map<String, Stream> contextMap = new ConcurrentHashMap<>();
 
     /**
      * Constructs a new <tt>DefaultStreamFactory</tt>.

src/org/beanio/internal/compiler/ParserFactorySupport.java

@@ -62,8 +62,8 @@ public abstract class ParserFactorySupport extends ProcessorSupport implements P
     private PropertyAccessorFactory accessorFactory;
     private ClassLoader classLoader;
 
-    private LinkedList<Component> parserStack = new LinkedList<Component>();
-    private LinkedList<Component> propertyStack = new LinkedList<Component>();
+    private LinkedList<Component> parserStack = new LinkedList<>();
+    private LinkedList<Component> propertyStack = new LinkedList<>();
 
     /**
      * Constructs a new <tt>ParserFactory</tt>.
@@ -76,6 +76,7 @@ public ParserFactorySupport() { }
      * @return the new {@link Stream}
      * @throws BeanIOConfigurationException if the configuration is invalid
      */
+    @Override
     public Stream createStream(StreamConfig config) throws BeanIOConfigurationException {
         if (config.getName() == null) {
             throw new BeanIOConfigurationException("stream name not configured");
@@ -232,7 +233,7 @@ protected void updateConstructor(Bean bean) {
 
             if (property.getAccessor().isConstructorArgument()) {
                 if (args == null) {
-                    args = new ArrayList<Property>();
+                    args = new ArrayList<>();
                 }
                 args.add(property);
             }
@@ -245,6 +246,7 @@ protected void updateConstructor(Bean bean) {
 
         // sort arguments by constructor index
         Collections.sort(args, new Comparator<Property>() {
+            @Override
             public int compare(Property o1, Property o2) {
                 return o1.getAccessor().getConstructorArgumentIndex() -
                     o2.getAccessor().getConstructorArgumentIndex();
@@ -1527,7 +1529,7 @@ protected Property createProperty(PropertyConfig config) {
             if (config.getComponentType() == ComponentConfig.SEGMENT) {
                 required = config.getMinOccurs() > 0 && !config.isNillable();
             }
-            boolean matchNull = !required && new Integer(0).equals(config.getMinOccurs());
+            boolean matchNull = !required && Integer.valueOf(0).equals(config.getMinOccurs());
 
             CollectionBean collection = new CollectionBean();
             collection.setName(config.getName());
@@ -1538,7 +1540,7 @@ protected Property createProperty(PropertyConfig config) {
         }
         else {
             boolean required = propertyStack.isEmpty();
-            boolean matchNull = !required && new Integer(0).equals(config.getMinOccurs());
+            boolean matchNull = !required && Integer.valueOf(0).equals(config.getMinOccurs());
 
             Bean bean = new Bean();
             bean.setName(config.getName());
@@ -1652,6 +1654,7 @@ protected Object parseDefaultValue(Field field, String text) {
      * @param typeHandlerFactory the <tt>TypeHandlerFactory</tt> to use to
      *   create the stream definition
      */
+    @Override
     public void setTypeHandlerFactory(TypeHandlerFactory typeHandlerFactory) {
         this.typeHandlerFactory = typeHandlerFactory;
     }
@@ -1721,6 +1724,7 @@ else if (parserFactoryBean.getInstance() != null) {
      * (non-Javadoc)
      * @see org.beanio.factory.ParserFactory#setClassLoader(java.lang.ClassLoader)
      */
+    @Override
     public void setClassLoader(ClassLoader classLoader) {
         this.classLoader = classLoader;
     }