Dropped support for Java 6

drasil · drasil · commit ef5d5fdd473e · 2015-05-21T13:05:08.000+02:00
diff --git a/BNCompiler/src/main/java/org/bn/compiler/Module.java b/BNCompiler/src/main/java/org/bn/compiler/Module.java
@@ -47,7 +47,7 @@ public Module(String moduleName, String outputDir) throws IOException, URISyntax
         this.moduleName = moduleName;
         this.outputDir = outputDir;
         
-        this.moduleFiles = new ArrayList<String>(1);
+        this.moduleFiles = new ArrayList<>(1);
         URL modulesURL = this.getClass().getResource("/modules");
         if ( "file".equals(modulesURL.getProtocol()) ) { // when running tests
             File moduleFolder = new File(new File(modulesURL.toURI()), moduleName);
@@ -86,7 +86,7 @@ public void translate(InputStream stream) throws TransformerException {
             @Override
             public Source resolve(String href, String base) throws TransformerException {
                 String systemId = base.substring(0, base.lastIndexOf('/')+1) + href;
-                String resourcePath = systemId.substring(systemId.indexOf("/modules/"));;
+                String resourcePath = systemId.substring(systemId.indexOf("/modules/"));
                 return new StreamSource(this.getClass().getResourceAsStream(resourcePath), systemId);
             }
         });
diff --git a/BNCompiler/src/main/java/org/bn/compiler/parser/model/ASNModule.java b/BNCompiler/src/main/java/org/bn/compiler/parser/model/ASNModule.java
@@ -19,11 +19,11 @@ public class ASNModule {
     public String                       tagDefault;
 
     public ASNModule() {
-        exportSymbolList           = new ArrayList<String>();
+        exportSymbolList           = new ArrayList<>();
         importSymbolList           = new ArrayList();
-        importSymbolFromModuleList = new ArrayList<SymbolsFromModule>();
+        importSymbolFromModuleList = new ArrayList<>();
         asnTypes                   = new AsnTypes();
-        asnValues                  = new ArrayList<AsnValue>();
+        asnValues                  = new ArrayList<>();
         tagDefault                 = "";
     }
 
diff --git a/BNCompiler/src/main/java/org/bn/compiler/parser/model/ASNModules.java b/BNCompiler/src/main/java/org/bn/compiler/parser/model/ASNModules.java
@@ -8,7 +8,7 @@ public class ASNModules {
     final ArrayList<ASNModule> module_list;
 
     ASNModules() {
-        module_list = new ArrayList<ASNModule>();
+        module_list = new ArrayList<>();
     }
 
     public void add(ASNModule module) {
diff --git a/BNCompiler/src/main/java/org/bn/compiler/parser/model/AsnBitOrOctetStringValue.java b/BNCompiler/src/main/java/org/bn/compiler/parser/model/AsnBitOrOctetStringValue.java
@@ -10,7 +10,7 @@ public class AsnBitOrOctetStringValue {
     public boolean           isHString;
 
     public AsnBitOrOctetStringValue() {
-        idlist = new ArrayList<String>();
+        idlist = new ArrayList<>();
     }
 
     @Override
diff --git a/BNCompiler/src/main/java/org/bn/compiler/parser/model/AsnCharacterStringValue.java b/BNCompiler/src/main/java/org/bn/compiler/parser/model/AsnCharacterStringValue.java
@@ -12,8 +12,8 @@ public class AsnCharacterStringValue {
     public ArrayList<AsnSignedNumber> tupleQuad;
 
     public AsnCharacterStringValue() {
-        charDefsList = new ArrayList<CharDef>();
-        tupleQuad    = new ArrayList<AsnSignedNumber>();
+        charDefsList = new ArrayList<>();
+        tupleQuad    = new ArrayList<>();
     }
 
     @Override
diff --git a/BNCompiler/src/main/java/org/bn/compiler/parser/model/AsnElementTypeList.java b/BNCompiler/src/main/java/org/bn/compiler/parser/model/AsnElementTypeList.java
@@ -7,7 +7,7 @@ public class AsnElementTypeList {
     public ArrayList<AsnElementType> elements;
 
     public AsnElementTypeList() {
-        elements = new ArrayList<AsnElementType>();
+        elements = new ArrayList<>();
     }
 
     @Override
diff --git a/BNCompiler/src/main/java/org/bn/compiler/parser/model/AsnNamedNumberList.java b/BNCompiler/src/main/java/org/bn/compiler/parser/model/AsnNamedNumberList.java
@@ -7,7 +7,7 @@ public class AsnNamedNumberList {
     public ArrayList<AsnNamedNumber> namedNumbers;
 
     public AsnNamedNumberList() {
-        namedNumbers = new ArrayList<AsnNamedNumber>();
+        namedNumbers = new ArrayList<>();
     }
 
     /** Returns the total number of elements in the list */
diff --git a/BNCompiler/src/main/java/org/bn/compiler/parser/model/AsnOidComponentList.java b/BNCompiler/src/main/java/org/bn/compiler/parser/model/AsnOidComponentList.java
@@ -9,7 +9,7 @@ public class AsnOidComponentList {
     public boolean                    isDefinitive;
 
     public AsnOidComponentList() {
-        components = new ArrayList<AsnOidComponent>();
+        components = new ArrayList<>();
     }
 
     @Override
diff --git a/BNCompiler/src/main/java/org/bn/compiler/parser/model/AsnSequenceOfValue.java b/BNCompiler/src/main/java/org/bn/compiler/parser/model/AsnSequenceOfValue.java
@@ -8,7 +8,7 @@ public class AsnSequenceOfValue {
     public ArrayList<AsnValue> value;
 
     public AsnSequenceOfValue() {
-        value = new ArrayList<AsnValue>();
+        value = new ArrayList<>();
     }
 
     @Override
diff --git a/BNCompiler/src/main/java/org/bn/compiler/parser/model/AsnSequenceValue.java b/BNCompiler/src/main/java/org/bn/compiler/parser/model/AsnSequenceValue.java
@@ -8,7 +8,7 @@ public class AsnSequenceValue {
     public ArrayList<AsnNamedValue> namedValueList;
 
     public AsnSequenceValue() {
-        namedValueList = new ArrayList<AsnNamedValue>();
+        namedValueList = new ArrayList<>();
     }
 
     @Override
diff --git a/BNCompiler/src/main/java/org/bn/compiler/parser/model/AsnTypes.java b/BNCompiler/src/main/java/org/bn/compiler/parser/model/AsnTypes.java
@@ -28,26 +28,26 @@ public class AsnTypes {
     public ArrayList<AsnTaggedType> taggeds;
 
     AsnTypes() {
-        anys              = new ArrayList<AsnAny>();
-        bitStrings        = new ArrayList<AsnBitString>();
-        booleans          = new ArrayList<AsnBoolean>();
-        characterStrings  = new ArrayList<AsnCharacterString>();
-        choices           = new ArrayList<AsnChoice>();
-        enums             = new ArrayList<AsnEnum>();
-        integers          = new ArrayList<AsnInteger>();
-        nulls             = new ArrayList<AsnNull>();
-        objectIdentifiers = new ArrayList<AsnObjectIdentifier>();
-        octetStrings      = new ArrayList<AsnOctetString>();
-        reals             = new ArrayList<AsnReal>();
-        sequenceSets      = new ArrayList<AsnSequenceSet>();
-        sequenceSetsOf    = new ArrayList<AsnSequenceOf>();
-        externals         = new ArrayList<AsnExternal>();
-        relativeOids      = new ArrayList<AsnRelativeOid>();
-        selections        = new ArrayList<AsnSelectionType>();
-        taggeds           = new ArrayList<AsnTaggedType>();
-        defineds          = new ArrayList<AsnDefinedType>();
-        macroOperations   = new ArrayList<OperationMacro>();
-        macroErrors       = new ArrayList<ErrorMacro>();
+        anys              = new ArrayList<>();
+        bitStrings        = new ArrayList<>();
+        booleans          = new ArrayList<>();
+        characterStrings  = new ArrayList<>();
+        choices           = new ArrayList<>();
+        enums             = new ArrayList<>();
+        integers          = new ArrayList<>();
+        nulls             = new ArrayList<>();
+        objectIdentifiers = new ArrayList<>();
+        octetStrings      = new ArrayList<>();
+        reals             = new ArrayList<>();
+        sequenceSets      = new ArrayList<>();
+        sequenceSetsOf    = new ArrayList<>();
+        externals         = new ArrayList<>();
+        relativeOids      = new ArrayList<>();
+        selections        = new ArrayList<>();
+        taggeds           = new ArrayList<>();
+        defineds          = new ArrayList<>();
+        macroOperations   = new ArrayList<>();
+        macroErrors       = new ArrayList<>();
         macroObjectTypes  = new ArrayList();
     }
 
diff --git a/BNCompiler/src/main/java/org/bn/compiler/parser/model/CharDef.java b/BNCompiler/src/main/java/org/bn/compiler/parser/model/CharDef.java
@@ -13,7 +13,7 @@ public class CharDef {
     public ArrayList<AsnSignedNumber> tupleQuad;
 
     public CharDef() {
-        tupleQuad = new ArrayList<AsnSignedNumber>();
+        tupleQuad = new ArrayList<>();
     }
 
     @Override
diff --git a/BNCompiler/src/main/java/org/bn/compiler/parser/model/ConstraintElements.java b/BNCompiler/src/main/java/org/bn/compiler/parser/model/ConstraintElements.java
@@ -26,7 +26,7 @@ public class ConstraintElements {
     public AsnValue                   value;
 
     public ConstraintElements() {
-        typeConstraintList = new ArrayList<NamedConstraint>();
+        typeConstraintList = new ArrayList<>();
     }
 
     @Override
diff --git a/BNCompiler/src/main/java/org/bn/compiler/parser/model/ElementSetSpec.java b/BNCompiler/src/main/java/org/bn/compiler/parser/model/ElementSetSpec.java
@@ -9,7 +9,7 @@ public class ElementSetSpec {
     public boolean                 isAllExcept;
 
     public ElementSetSpec() {
-        intersectionList = new ArrayList<Intersection>();
+        intersectionList = new ArrayList<>();
     }
 
     @Override
diff --git a/BNCompiler/src/main/java/org/bn/compiler/parser/model/Intersection.java b/BNCompiler/src/main/java/org/bn/compiler/parser/model/Intersection.java
@@ -10,8 +10,8 @@ public class Intersection {
     public boolean                       isInterSection;
 
     public Intersection() {
-        cnsElemList   = new ArrayList<ConstraintElements>();
-        exceptCnsElem = new ArrayList<ConstraintElements>();
+        cnsElemList   = new ArrayList<>();
+        exceptCnsElem = new ArrayList<>();
     }
 
     @Override
diff --git a/BNCompiler/src/main/java/org/bn/compiler/parser/model/ObjectType.java b/BNCompiler/src/main/java/org/bn/compiler/parser/model/ObjectType.java
@@ -13,7 +13,7 @@ public class ObjectType {
     public AsnValue          value;
 
     public ObjectType() {
-        elements = new ArrayList<Object>();
+        elements = new ArrayList<>();
     }
 
     @Override
diff --git a/BNCompiler/src/main/java/org/bn/compiler/parser/model/OperationMacro.java b/BNCompiler/src/main/java/org/bn/compiler/parser/model/OperationMacro.java
@@ -20,8 +20,8 @@ public class OperationMacro {
     public String            resultTypeIdentifier;    // Result NamedType identifier
 
     public OperationMacro() {
-        errorList    = new ArrayList<Object>();
-        linkedOpList = new ArrayList<Object>();
+        errorList    = new ArrayList<>();
+        linkedOpList = new ArrayList<>();
     }
 
     // Get the first linked operationName
diff --git a/BNCompiler/src/main/java/org/bn/compiler/parser/model/SymbolsFromModule.java b/BNCompiler/src/main/java/org/bn/compiler/parser/model/SymbolsFromModule.java
@@ -12,7 +12,7 @@ public class SymbolsFromModule {
     public ArrayList<String>   symbolList;
 
     public SymbolsFromModule() {
-        symbolList = new ArrayList<String>();
+        symbolList = new ArrayList<>();
     }
 
     @Override
diff --git a/JavaLibrary/src/main/java/org/bn/coders/ASN1PreparedElementData.java b/JavaLibrary/src/main/java/org/bn/coders/ASN1PreparedElementData.java
@@ -214,29 +214,25 @@ private void setupAccessors(Class<?> objectClass, Field field) {
         try {
             doSelectedMethod = CoderUtils.findDoSelectMethodForField(field, objectClass, field.getType());
             doSelectedMethod.setAccessible(true);
-        } catch (NoSuchMethodException e) {
-        } catch (SecurityException ex) {
+        } catch (NoSuchMethodException | SecurityException e) {
         }
 
         try {
             isSelectedMethod = CoderUtils.findIsSelectedMethodForField(field, objectClass);
             isSelectedMethod.setAccessible(true);
-        } catch (NoSuchMethodException e) {
-        } catch (SecurityException ex) {
+        } catch (NoSuchMethodException | SecurityException e) {
         }
 
         try {
             getterMethod = CoderUtils.findGetterMethodForField(field, objectClass);
             getterMethod.setAccessible(true);
-        } catch (NoSuchMethodException e) {
-        } catch (SecurityException ex) {
+        } catch (NoSuchMethodException | SecurityException e) {
         }
 
         try {
             setterMethod = CoderUtils.findSetterMethodForField(field, objectClass, field.getType());
             setterMethod.setAccessible(true);
-        } catch (NoSuchMethodException e) {
-        } catch (SecurityException ex) {
+        } catch (NoSuchMethodException | SecurityException e) {
         }
         setInstanceFactoryInfo(field.getType());
     }
@@ -246,8 +242,7 @@ public void setInstanceFactoryInfo(Class<?> objClass) {
             newInstanceClass = objClass;
             newInstanceConstructor = objClass.getDeclaredConstructor();
             newInstanceConstructor.setAccessible(true);
-        } catch (NoSuchMethodException e) {
-        } catch (SecurityException ex) {
+        } catch (NoSuchMethodException | SecurityException e) {
         }
     }
 
diff --git a/JavaLibrary/src/main/java/org/bn/coders/CoderUtils.java b/JavaLibrary/src/main/java/org/bn/coders/CoderUtils.java
@@ -164,7 +164,7 @@ private static BitString hexStringToOctetString(String bhString) {
     }
 
     public static SortedMap<Integer, Field> getSetOrder(Class<?> objectClass) {
-        SortedMap<Integer, Field> fieldOrder = new TreeMap<Integer, Field>();
+        SortedMap<Integer, Field> fieldOrder = new TreeMap<>();
         int tagNA = -1;
         for (Field field : objectClass.getDeclaredFields()) {
             ASN1Element element = field.getAnnotation(ASN1Element.class);
diff --git a/JavaLibrary/src/main/java/org/bn/coders/Decoder.java b/JavaLibrary/src/main/java/org/bn/coders/Decoder.java
@@ -248,7 +248,7 @@ public DecodedObject decodeSequence(DecodedObject<Integer> decodedTag, Class obj
          ElementInfo info = createSequenceFieldInfo(elementInfo, sequence, field, curFieldIdx);                
          CoderUtils.checkForOptionalField(field, info);
          } */
-        return new DecodedObject<Object>(sequence, sizeOfSequence);
+        return new DecodedObject<>(sequence, sizeOfSequence);
     }
 
     protected ElementInfo createSequenceFieldInfo(ElementInfo elementInfo, Object sequenceObj, Field field, int fieldIdx) {
@@ -320,7 +320,7 @@ public DecodedObject decodeChoice(DecodedObject<Integer> decodedTag, Class objec
         if (value == null && !CoderUtils.isOptional(elementInfo)) {
             throw new IllegalArgumentException("The choice '" + objectClass.toString() + "' does not have a selected item!");
         } else {
-            return new DecodedObject<Object>(choice, value != null ? value.getSize() : 0);
+            return new DecodedObject<>(choice, value != null ? value.getSize() : 0);
         }
     }
 
@@ -351,7 +351,7 @@ public <T> DecodedObject<T> decodeEnum(DecodedObject<Integer> decodedTag, Class<
                 }
             }
             invokeSetterMethodForField(field, result, param.get(null), null);
-            return new DecodedObject<T>(result, itemValue.getSize());
+            return new DecodedObject<>(result, itemValue.getSize());
         } else {
             return null;
         }
@@ -366,7 +366,7 @@ public DecodedObject<?> decodeElement(DecodedObject<Integer> decodedTag, Class o
     @Override
     public DecodedObject decodeBoxedType(DecodedObject<Integer> decodedTag, Class objectClass, ElementInfo elementInfo, InputStream stream) throws Exception {
         Object resultObj = createInstanceForElement(objectClass, elementInfo);
-        DecodedObject<Object> result = new DecodedObject<Object>(resultObj);
+        DecodedObject<Object> result = new DecodedObject<>(resultObj);
 
         Field field = elementInfo.hasPreparedInfo() ? elementInfo.getPreparedInfo().getValueField() : objectClass.getDeclaredField("value");
         elementInfo.setAnnotatedClass(field);
diff --git a/JavaLibrary/src/main/java/org/bn/coders/ber/BERCoderUtils.java b/JavaLibrary/src/main/java/org/bn/coders/ber/BERCoderUtils.java
@@ -24,7 +24,7 @@
 public class BERCoderUtils {
 
     public static DecodedObject<Integer> getTagValueForElement(ElementInfo info, int tagClass, int elemenType, int universalTag) {
-        DecodedObject<Integer> result = new DecodedObject<Integer>();
+        DecodedObject<Integer> result = new DecodedObject<>();
         result.setSize(1);
         // result.setValue(tagClass | elemenType | universalTag);
         if (universalTag < UniversalTag.LastUniversal) {
@@ -56,7 +56,7 @@ public static DecodedObject<Integer> getTagValueForElement(ElementInfo info, int
     }
 
     private static DecodedObject<Integer> getTagValue(int tagClass, int elemenType, int universalTag, int userTag, int userTagClass) {
-        DecodedObject<Integer> resultObj = new DecodedObject<Integer>();
+        DecodedObject<Integer> resultObj = new DecodedObject<>();
         int result;
 
         tagClass = userTagClass;
diff --git a/JavaLibrary/src/main/java/org/bn/coders/ber/BERDecoder.java b/JavaLibrary/src/main/java/org/bn/coders/ber/BERDecoder.java
diff --git a/JavaLibrary/src/main/java/org/bn/coders/ber/BERObjectIdentifier.java b/JavaLibrary/src/main/java/org/bn/coders/ber/BERObjectIdentifier.java
diff --git a/JavaLibrary/src/main/java/org/bn/coders/per/PERAlignedDecoder.java b/JavaLibrary/src/main/java/org/bn/coders/per/PERAlignedDecoder.java
diff --git a/JavaLibrary/src/main/java/org/bn/coders/per/PERCoderUtils.java b/JavaLibrary/src/main/java/org/bn/coders/per/PERCoderUtils.java
diff --git a/JavaLibrary/src/main/java/org/bn/coders/per/PERUnalignedDecoder.java b/JavaLibrary/src/main/java/org/bn/coders/per/PERUnalignedDecoder.java
diff --git a/JavaLibrary/src/main/java/org/bn/coders/per/PERUnalignedEncoder.java b/JavaLibrary/src/main/java/org/bn/coders/per/PERUnalignedEncoder.java
diff --git a/JavaLibrary/src/main/java/org/bn/metadata/ASN1BoxedTypeMetadata.java b/JavaLibrary/src/main/java/org/bn/metadata/ASN1BoxedTypeMetadata.java
diff --git a/JavaLibrary/src/test/java/org/bn/coders/CoderTestUtilities.java b/JavaLibrary/src/test/java/org/bn/coders/CoderTestUtilities.java
diff --git a/JavaLibrary/src/test/java/org/bn/utils/ByteTools.java b/JavaLibrary/src/test/java/org/bn/utils/ByteTools.java
diff --git a/pom.xml b/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public class ASNModules {`
`8`	`8`	`final ArrayList<ASNModule> module_list;`
`9`	`9`
`10`	`10`	`ASNModules() {`
`11`		`- module_list = new ArrayList<ASNModule>();`
	`11`	`+ module_list = new ArrayList<>();`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`public void add(ASNModule module) {`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public class AsnBitOrOctetStringValue {`
`10`	`10`	`public boolean isHString;`
`11`	`11`
`12`	`12`	`public AsnBitOrOctetStringValue() {`
`13`		`- idlist = new ArrayList<String>();`
	`13`	`+ idlist = new ArrayList<>();`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ public class AsnCharacterStringValue {`
`12`	`12`	`public ArrayList<AsnSignedNumber> tupleQuad;`
`13`	`13`
`14`	`14`	`public AsnCharacterStringValue() {`
`15`		`- charDefsList = new ArrayList<CharDef>();`
`16`		`- tupleQuad = new ArrayList<AsnSignedNumber>();`
	`15`	`+ charDefsList = new ArrayList<>();`
	`16`	`+ tupleQuad = new ArrayList<>();`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ public class AsnElementTypeList {`
`7`	`7`	`public ArrayList<AsnElementType> elements;`
`8`	`8`
`9`	`9`	`public AsnElementTypeList() {`
`10`		`- elements = new ArrayList<AsnElementType>();`
	`10`	`+ elements = new ArrayList<>();`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ public class AsnNamedNumberList {`
`7`	`7`	`public ArrayList<AsnNamedNumber> namedNumbers;`
`8`	`8`
`9`	`9`	`public AsnNamedNumberList() {`
`10`		`- namedNumbers = new ArrayList<AsnNamedNumber>();`
	`10`	`+ namedNumbers = new ArrayList<>();`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`/** Returns the total number of elements in the list */`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public class AsnOidComponentList {`
`9`	`9`	`public boolean isDefinitive;`
`10`	`10`
`11`	`11`	`public AsnOidComponentList() {`
`12`		`- components = new ArrayList<AsnOidComponent>();`
	`12`	`+ components = new ArrayList<>();`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public class AsnSequenceOfValue {`
`8`	`8`	`public ArrayList<AsnValue> value;`
`9`	`9`
`10`	`10`	`public AsnSequenceOfValue() {`
`11`		`- value = new ArrayList<AsnValue>();`
	`11`	`+ value = new ArrayList<>();`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public class AsnSequenceValue {`
`8`	`8`	`public ArrayList<AsnNamedValue> namedValueList;`
`9`	`9`
`10`	`10`	`public AsnSequenceValue() {`
`11`		`- namedValueList = new ArrayList<AsnNamedValue>();`
	`11`	`+ namedValueList = new ArrayList<>();`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`@Override`