code clean up using eclipse formatter and cleaner

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/AccessResult.java

@@ -8,7 +8,9 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-import org.openmuc.jasn1.ber.*;
+
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
 
 public class AccessResult implements Serializable {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/AlternateAccess.java

@@ -7,11 +7,14 @@ package org.openmuc.openiec61850.internal.mms.asn1;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.List;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.io.Serializable;
+import java.util.List;
-import org.openmuc.jasn1.ber.*;
+
+import org.openmuc.jasn1.ber.BerLength;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
 
 public class AlternateAccess implements Serializable {
 
@@ -118,7 +121,7 @@ public class AlternateAccess implements Serializable {
     private List<CHOICE> seqOf = null;
 
     public AlternateAccess() {
-        seqOf = new ArrayList<CHOICE>();
+        seqOf = new ArrayList<>();
     }
 
     public AlternateAccess(byte[] code) {
@@ -127,7 +130,7 @@ public class AlternateAccess implements Serializable {
 
     public List<CHOICE> getCHOICE() {
         if (seqOf == null) {
-            seqOf = new ArrayList<CHOICE>();
+            seqOf = new ArrayList<>();
         }
         return seqOf;
     }

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/AlternateAccessSelection.java

@@ -8,8 +8,11 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-import org.openmuc.jasn1.ber.*;
+
-import org.openmuc.jasn1.ber.types.*;
+import org.openmuc.jasn1.ber.BerLength;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
+import org.openmuc.jasn1.ber.types.BerNull;
 import org.openmuc.jasn1.ber.types.string.BerVisibleString;
 
 public class AlternateAccessSelection implements Serializable {

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/BasicIdentifier.java

@@ -4,7 +4,7 @@
 
 package org.openmuc.openiec61850.internal.mms.asn1;
 
-import org.openmuc.jasn1.ber.types.string.*;
+import org.openmuc.jasn1.ber.types.string.BerVisibleString;
 
 public class BasicIdentifier extends BerVisibleString {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ConcludeRequestPDU.java

@@ -4,7 +4,7 @@
 
 package org.openmuc.openiec61850.internal.mms.asn1;
 
-import org.openmuc.jasn1.ber.types.*;
+import org.openmuc.jasn1.ber.types.BerNull;
 
 public class ConcludeRequestPDU extends BerNull {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ConfirmedErrorPDU.java

@@ -8,7 +8,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-import org.openmuc.jasn1.ber.*;
+
+import org.openmuc.jasn1.ber.BerLength;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
 
 public class ConfirmedErrorPDU implements Serializable {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ConfirmedRequestPDU.java

@@ -8,8 +8,11 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-import org.openmuc.jasn1.ber.*;
+
-import org.openmuc.jasn1.ber.types.*;
+import org.openmuc.jasn1.ber.BerLength;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
+import org.openmuc.jasn1.ber.types.BerInteger;
 
 public class ConfirmedRequestPDU implements Serializable {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ConfirmedResponsePDU.java

@@ -8,7 +8,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-import org.openmuc.jasn1.ber.*;
+
+import org.openmuc.jasn1.ber.BerLength;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
 import org.openmuc.jasn1.ber.types.BerInteger;
 
 public class ConfirmedResponsePDU implements Serializable {

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ConfirmedServiceRequest.java

@@ -8,7 +8,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-import org.openmuc.jasn1.ber.*;
+
+import org.openmuc.jasn1.ber.BerLength;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
 
 public class ConfirmedServiceRequest implements Serializable {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ConfirmedServiceResponse.java

@@ -8,7 +8,9 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-import org.openmuc.jasn1.ber.*;
+
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
 
 public class ConfirmedServiceResponse implements Serializable {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Data.java

@@ -7,13 +7,19 @@ package org.openmuc.openiec61850.internal.mms.asn1;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.List;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.io.Serializable;
+import java.util.List;
-import org.openmuc.jasn1.ber.*;
+
-import org.openmuc.jasn1.ber.types.*;
+import org.openmuc.jasn1.ber.BerLength;
-import org.openmuc.jasn1.ber.types.string.*;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
+import org.openmuc.jasn1.ber.types.BerBitString;
+import org.openmuc.jasn1.ber.types.BerBoolean;
+import org.openmuc.jasn1.ber.types.BerInteger;
+import org.openmuc.jasn1.ber.types.BerOctetString;
+import org.openmuc.jasn1.ber.types.string.BerVisibleString;
 
 public class Data implements Serializable {
 
@@ -30,7 +36,7 @@ public class Data implements Serializable {
         private List<Data> seqOf = null;
 
         public Array() {
-            seqOf = new ArrayList<Data>();
+            seqOf = new ArrayList<>();
         }
 
         public Array(byte[] code) {
@@ -39,7 +45,7 @@ public class Data implements Serializable {
 
         public List<Data> getData() {
             if (seqOf == null) {
-                seqOf = new ArrayList<Data>();
+                seqOf = new ArrayList<>();
             }
             return seqOf;
         }
@@ -158,7 +164,7 @@ public class Data implements Serializable {
         private List<Data> seqOf = null;
 
         public Structure() {
-            seqOf = new ArrayList<Data>();
+            seqOf = new ArrayList<>();
         }
 
         public Structure(byte[] code) {
@@ -167,7 +173,7 @@ public class Data implements Serializable {
 
         public List<Data> getData() {
             if (seqOf == null) {
-                seqOf = new ArrayList<Data>();
+                seqOf = new ArrayList<>();
             }
             return seqOf;
         }

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/DataAccessError.java

@@ -5,7 +5,8 @@
 package org.openmuc.openiec61850.internal.mms.asn1;
 
 import java.math.BigInteger;
-import org.openmuc.jasn1.ber.types.*;
+
+import org.openmuc.jasn1.ber.types.BerInteger;
 
 public class DataAccessError extends BerInteger {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/DefineNamedVariableListRequest.java

@@ -8,7 +8,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-import org.openmuc.jasn1.ber.*;
+
+import org.openmuc.jasn1.ber.BerLength;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
 
 public class DefineNamedVariableListRequest implements Serializable {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/DefineNamedVariableListResponse.java

@@ -4,7 +4,7 @@
 
 package org.openmuc.openiec61850.internal.mms.asn1;
 
-import org.openmuc.jasn1.ber.types.*;
+import org.openmuc.jasn1.ber.types.BerNull;
 
 public class DefineNamedVariableListResponse extends BerNull {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/DeleteNamedVariableListRequest.java

@@ -7,12 +7,15 @@ package org.openmuc.openiec61850.internal.mms.asn1;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.List;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.io.Serializable;
+import java.util.List;
-import org.openmuc.jasn1.ber.*;
+
-import org.openmuc.jasn1.ber.types.*;
+import org.openmuc.jasn1.ber.BerLength;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
+import org.openmuc.jasn1.ber.types.BerInteger;
 import org.openmuc.jasn1.ber.types.string.BerVisibleString;
 
 public class DeleteNamedVariableListRequest implements Serializable {
@@ -28,7 +31,7 @@ public class DeleteNamedVariableListRequest implements Serializable {
         private List<ObjectName> seqOf = null;
 
         public ListOfVariableListName() {
-            seqOf = new ArrayList<ObjectName>();
+            seqOf = new ArrayList<>();
         }
 
         public ListOfVariableListName(byte[] code) {
@@ -37,7 +40,7 @@ public class DeleteNamedVariableListRequest implements Serializable {
 
         public List<ObjectName> getObjectName() {
             if (seqOf == null) {
-                seqOf = new ArrayList<ObjectName>();
+                seqOf = new ArrayList<>();
             }
             return seqOf;
         }

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/DeleteNamedVariableListResponse.java

@@ -8,7 +8,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-import org.openmuc.jasn1.ber.*;
+
+import org.openmuc.jasn1.ber.BerLength;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
 
 public class DeleteNamedVariableListResponse implements Serializable {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/DirectoryEntry.java

@@ -8,7 +8,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-import org.openmuc.jasn1.ber.*;
+
+import org.openmuc.jasn1.ber.BerLength;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
 
 public class DirectoryEntry implements Serializable {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/FileAttributes.java

@@ -8,8 +8,11 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-import org.openmuc.jasn1.ber.*;
+
-import org.openmuc.jasn1.ber.types.*;
+import org.openmuc.jasn1.ber.BerLength;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
+import org.openmuc.jasn1.ber.types.BerGeneralizedTime;
 
 public class FileAttributes implements Serializable {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/FileCloseResponse.java

@@ -4,7 +4,7 @@
 
 package org.openmuc.openiec61850.internal.mms.asn1;
 
-import org.openmuc.jasn1.ber.types.*;
+import org.openmuc.jasn1.ber.types.BerNull;
 
 public class FileCloseResponse extends BerNull {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/FileDeleteResponse.java

@@ -4,7 +4,7 @@
 
 package org.openmuc.openiec61850.internal.mms.asn1;
 
-import org.openmuc.jasn1.ber.types.*;
+import org.openmuc.jasn1.ber.types.BerNull;
 
 public class FileDeleteResponse extends BerNull {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/FileDirectoryRequest.java

@@ -8,7 +8,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-import org.openmuc.jasn1.ber.*;
+
+import org.openmuc.jasn1.ber.BerLength;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
 
 public class FileDirectoryRequest implements Serializable {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/FileDirectoryResponse.java

@@ -7,12 +7,15 @@ package org.openmuc.openiec61850.internal.mms.asn1;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.List;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.io.Serializable;
+import java.util.List;
-import org.openmuc.jasn1.ber.*;
+
-import org.openmuc.jasn1.ber.types.*;
+import org.openmuc.jasn1.ber.BerLength;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
+import org.openmuc.jasn1.ber.types.BerBoolean;
 
 public class FileDirectoryResponse implements Serializable {
 
@@ -27,7 +30,7 @@ public class FileDirectoryResponse implements Serializable {
         private List<DirectoryEntry> seqOf = null;
 
         public ListOfDirectoryEntry() {
-            seqOf = new ArrayList<DirectoryEntry>();
+            seqOf = new ArrayList<>();
         }
 
         public ListOfDirectoryEntry(byte[] code) {
@@ -36,7 +39,7 @@ public class FileDirectoryResponse implements Serializable {
 
         public List<DirectoryEntry> getDirectoryEntry() {
             if (seqOf == null) {
-                seqOf = new ArrayList<DirectoryEntry>();
+                seqOf = new ArrayList<>();
             }
             return seqOf;
         }

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/FileName.java

@@ -7,12 +7,15 @@ package org.openmuc.openiec61850.internal.mms.asn1;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.List;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.io.Serializable;
+import java.util.List;
-import org.openmuc.jasn1.ber.*;
+
-import org.openmuc.jasn1.ber.types.string.*;
+import org.openmuc.jasn1.ber.BerLength;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
+import org.openmuc.jasn1.ber.types.string.BerGraphicString;
 
 public class FileName implements Serializable {
 
@@ -23,7 +26,7 @@ public class FileName implements Serializable {
     private List<BerGraphicString> seqOf = null;
 
     public FileName() {
-        seqOf = new ArrayList<BerGraphicString>();
+        seqOf = new ArrayList<>();
     }
 
     public FileName(byte[] code) {
@@ -32,7 +35,7 @@ public class FileName implements Serializable {
 
     public List<BerGraphicString> getBerGraphicString() {
         if (seqOf == null) {
-            seqOf = new ArrayList<BerGraphicString>();
+            seqOf = new ArrayList<>();
         }
         return seqOf;
     }

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/FileOpenRequest.java

@@ -8,7 +8,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-import org.openmuc.jasn1.ber.*;
+
+import org.openmuc.jasn1.ber.BerLength;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
 
 public class FileOpenRequest implements Serializable {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/FileOpenResponse.java

@@ -8,7 +8,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-import org.openmuc.jasn1.ber.*;
+
+import org.openmuc.jasn1.ber.BerLength;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
 
 public class FileOpenResponse implements Serializable {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/FileReadResponse.java

@@ -8,8 +8,12 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-import org.openmuc.jasn1.ber.*;
+
-import org.openmuc.jasn1.ber.types.*;
+import org.openmuc.jasn1.ber.BerLength;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
+import org.openmuc.jasn1.ber.types.BerBoolean;
+import org.openmuc.jasn1.ber.types.BerOctetString;
 
 public class FileReadResponse implements Serializable {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/FloatingPoint.java

@@ -4,7 +4,7 @@
 
 package org.openmuc.openiec61850.internal.mms.asn1;
 
-import org.openmuc.jasn1.ber.types.*;
+import org.openmuc.jasn1.ber.types.BerOctetString;
 
 public class FloatingPoint extends BerOctetString {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/GetNameListRequest.java

@@ -8,8 +8,11 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-import org.openmuc.jasn1.ber.*;
+
-import org.openmuc.jasn1.ber.types.*;
+import org.openmuc.jasn1.ber.BerLength;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
+import org.openmuc.jasn1.ber.types.BerNull;
 
 public class GetNameListRequest implements Serializable {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/GetNameListResponse.java

@@ -7,12 +7,15 @@ package org.openmuc.openiec61850.internal.mms.asn1;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.List;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.io.Serializable;
+import java.util.List;
-import org.openmuc.jasn1.ber.*;
+
-import org.openmuc.jasn1.ber.types.*;
+import org.openmuc.jasn1.ber.BerLength;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
+import org.openmuc.jasn1.ber.types.BerBoolean;
 
 public class GetNameListResponse implements Serializable {
 
@@ -27,7 +30,7 @@ public class GetNameListResponse implements Serializable {
         private List<Identifier> seqOf = null;
 
         public ListOfIdentifier() {
-            seqOf = new ArrayList<Identifier>();
+            seqOf = new ArrayList<>();
         }
 
         public ListOfIdentifier(byte[] code) {
@@ -36,7 +39,7 @@ public class GetNameListResponse implements Serializable {
 
         public List<Identifier> getIdentifier() {
             if (seqOf == null) {
-                seqOf = new ArrayList<Identifier>();
+                seqOf = new ArrayList<>();
             }
             return seqOf;
         }

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/GetNamedVariableListAttributesResponse.java

@@ -8,8 +8,11 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-import org.openmuc.jasn1.ber.*;
+
-import org.openmuc.jasn1.ber.types.*;
+import org.openmuc.jasn1.ber.BerLength;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
+import org.openmuc.jasn1.ber.types.BerBoolean;
 
 public class GetNamedVariableListAttributesResponse implements Serializable {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/GetVariableAccessAttributesRequest.java

@@ -8,7 +8,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-import org.openmuc.jasn1.ber.*;
+
+import org.openmuc.jasn1.ber.BerLength;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
 
 public class GetVariableAccessAttributesRequest implements Serializable {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/GetVariableAccessAttributesResponse.java

@@ -8,8 +8,11 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-import org.openmuc.jasn1.ber.*;
+
-import org.openmuc.jasn1.ber.types.*;
+import org.openmuc.jasn1.ber.BerLength;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
+import org.openmuc.jasn1.ber.types.BerBoolean;
 
 public class GetVariableAccessAttributesResponse implements Serializable {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Identifier.java

@@ -4,7 +4,7 @@
 
 package org.openmuc.openiec61850.internal.mms.asn1;
 
-import org.openmuc.jasn1.ber.types.string.*;
+import org.openmuc.jasn1.ber.types.string.BerVisibleString;
 
 public class Identifier extends BerVisibleString {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/InformationReport.java

@@ -7,11 +7,14 @@ package org.openmuc.openiec61850.internal.mms.asn1;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.List;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.io.Serializable;
+import java.util.List;
-import org.openmuc.jasn1.ber.*;
+
+import org.openmuc.jasn1.ber.BerLength;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
 
 public class InformationReport implements Serializable {
 
@@ -26,7 +29,7 @@ public class InformationReport implements Serializable {
         private List<AccessResult> seqOf = null;
 
         public ListOfAccessResult() {
-            seqOf = new ArrayList<AccessResult>();
+            seqOf = new ArrayList<>();
         }
 
         public ListOfAccessResult(byte[] code) {
@@ -35,7 +38,7 @@ public class InformationReport implements Serializable {
 
         public List<AccessResult> getAccessResult() {
             if (seqOf == null) {
-                seqOf = new ArrayList<AccessResult>();
+                seqOf = new ArrayList<>();
             }
             return seqOf;
         }

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/InitiateRequestPDU.java

@@ -8,7 +8,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-import org.openmuc.jasn1.ber.*;
+
+import org.openmuc.jasn1.ber.BerLength;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
 
 public class InitiateRequestPDU implements Serializable {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/InitiateResponsePDU.java

@@ -8,7 +8,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-import org.openmuc.jasn1.ber.*;
+
+import org.openmuc.jasn1.ber.BerLength;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
 
 public class InitiateResponsePDU implements Serializable {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Integer16.java

@@ -5,7 +5,8 @@
 package org.openmuc.openiec61850.internal.mms.asn1;
 
 import java.math.BigInteger;
-import org.openmuc.jasn1.ber.types.*;
+
+import org.openmuc.jasn1.ber.types.BerInteger;
 
 public class Integer16 extends BerInteger {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Integer32.java

@@ -5,7 +5,8 @@
 package org.openmuc.openiec61850.internal.mms.asn1;
 
 import java.math.BigInteger;
-import org.openmuc.jasn1.ber.types.*;
+
+import org.openmuc.jasn1.ber.types.BerInteger;
 
 public class Integer32 extends BerInteger {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Integer8.java

@@ -5,7 +5,8 @@
 package org.openmuc.openiec61850.internal.mms.asn1;
 
 import java.math.BigInteger;
-import org.openmuc.jasn1.ber.types.*;
+
+import org.openmuc.jasn1.ber.types.BerInteger;
 
 public class Integer8 extends BerInteger {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/MMSString.java

@@ -4,7 +4,7 @@
 
 package org.openmuc.openiec61850.internal.mms.asn1;
 
-import org.openmuc.jasn1.ber.types.string.*;
+import org.openmuc.jasn1.ber.types.string.BerVisibleString;
 
 public class MMSString extends BerVisibleString {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/MMSpdu.java

@@ -8,7 +8,9 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-import org.openmuc.jasn1.ber.*;
+
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
 
 public class MMSpdu implements Serializable {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ObjectClass.java

@@ -8,8 +8,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-import org.openmuc.jasn1.ber.*;
+
-import org.openmuc.jasn1.ber.types.*;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
+import org.openmuc.jasn1.ber.types.BerInteger;
 
 public class ObjectClass implements Serializable {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ObjectName.java

@@ -8,7 +8,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-import org.openmuc.jasn1.ber.*;
+
+import org.openmuc.jasn1.ber.BerLength;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
 import org.openmuc.jasn1.ber.types.string.BerVisibleString;
 
 public class ObjectName implements Serializable {

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ParameterSupportOptions.java

@@ -4,7 +4,7 @@
 
 package org.openmuc.openiec61850.internal.mms.asn1;
 
-import org.openmuc.jasn1.ber.types.*;
+import org.openmuc.jasn1.ber.types.BerBitString;
 
 public class ParameterSupportOptions extends BerBitString {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ReadRequest.java

@@ -8,8 +8,11 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-import org.openmuc.jasn1.ber.*;
+
-import org.openmuc.jasn1.ber.types.*;
+import org.openmuc.jasn1.ber.BerLength;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
+import org.openmuc.jasn1.ber.types.BerBoolean;
 
 public class ReadRequest implements Serializable {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ReadResponse.java

@@ -7,11 +7,14 @@ package org.openmuc.openiec61850.internal.mms.asn1;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.List;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.io.Serializable;
+import java.util.List;
-import org.openmuc.jasn1.ber.*;
+
+import org.openmuc.jasn1.ber.BerLength;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
 
 public class ReadResponse implements Serializable {
 
@@ -26,7 +29,7 @@ public class ReadResponse implements Serializable {
         private List<AccessResult> seqOf = null;
 
         public ListOfAccessResult() {
-            seqOf = new ArrayList<AccessResult>();
+            seqOf = new ArrayList<>();
         }
 
         public ListOfAccessResult(byte[] code) {
@@ -35,7 +38,7 @@ public class ReadResponse implements Serializable {
 
         public List<AccessResult> getAccessResult() {
             if (seqOf == null) {
-                seqOf = new ArrayList<AccessResult>();
+                seqOf = new ArrayList<>();
             }
             return seqOf;
         }

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/RejectPDU.java

@@ -8,8 +8,11 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-import org.openmuc.jasn1.ber.*;
+
-import org.openmuc.jasn1.ber.types.*;
+import org.openmuc.jasn1.ber.BerLength;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
+import org.openmuc.jasn1.ber.types.BerInteger;
 
 public class RejectPDU implements Serializable {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ServiceError.java

@@ -8,9 +8,12 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-import org.openmuc.jasn1.ber.*;
+
-import org.openmuc.jasn1.ber.types.*;
+import org.openmuc.jasn1.ber.BerLength;
-import org.openmuc.jasn1.ber.types.string.*;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
+import org.openmuc.jasn1.ber.types.BerInteger;
+import org.openmuc.jasn1.ber.types.string.BerVisibleString;
 
 public class ServiceError implements Serializable {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/ServiceSupportOptions.java

@@ -4,7 +4,7 @@
 
 package org.openmuc.openiec61850.internal.mms.asn1;
 
-import org.openmuc.jasn1.ber.types.*;
+import org.openmuc.jasn1.ber.types.BerBitString;
 
 public class ServiceSupportOptions extends BerBitString {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/TimeOfDay.java

@@ -4,7 +4,7 @@
 
 package org.openmuc.openiec61850.internal.mms.asn1;
 
-import org.openmuc.jasn1.ber.types.*;
+import org.openmuc.jasn1.ber.types.BerOctetString;
 
 public class TimeOfDay extends BerOctetString {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/TypeDescription.java

@@ -7,12 +7,17 @@ package org.openmuc.openiec61850.internal.mms.asn1;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.List;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.io.Serializable;
+import java.util.List;
-import org.openmuc.jasn1.ber.*;
+
-import org.openmuc.jasn1.ber.types.*;
+import org.openmuc.jasn1.ber.BerLength;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
+import org.openmuc.jasn1.ber.types.BerBoolean;
+import org.openmuc.jasn1.ber.types.BerInteger;
+import org.openmuc.jasn1.ber.types.BerNull;
 
 public class TypeDescription implements Serializable {
 
@@ -395,7 +400,7 @@ public class TypeDescription implements Serializable {
             private List<SEQUENCE> seqOf = null;
 
             public Components() {
-                seqOf = new ArrayList<SEQUENCE>();
+                seqOf = new ArrayList<>();
             }
 
             public Components(byte[] code) {
@@ -404,7 +409,7 @@ public class TypeDescription implements Serializable {
 
             public List<SEQUENCE> getSEQUENCE() {
                 if (seqOf == null) {
-                    seqOf = new ArrayList<SEQUENCE>();
+                    seqOf = new ArrayList<>();
                 }
                 return seqOf;
             }

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/TypeSpecification.java

@@ -8,7 +8,9 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-import org.openmuc.jasn1.ber.*;
+
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
 
 public class TypeSpecification implements Serializable {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/UnconfirmedPDU.java

@@ -8,7 +8,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-import org.openmuc.jasn1.ber.*;
+
+import org.openmuc.jasn1.ber.BerLength;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
 
 public class UnconfirmedPDU implements Serializable {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/UnconfirmedService.java

@@ -8,7 +8,9 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-import org.openmuc.jasn1.ber.*;
+
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
 
 public class UnconfirmedService implements Serializable {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Unsigned16.java

@@ -5,7 +5,8 @@
 package org.openmuc.openiec61850.internal.mms.asn1;
 
 import java.math.BigInteger;
-import org.openmuc.jasn1.ber.types.*;
+
+import org.openmuc.jasn1.ber.types.BerInteger;
 
 public class Unsigned16 extends BerInteger {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Unsigned32.java

@@ -5,7 +5,8 @@
 package org.openmuc.openiec61850.internal.mms.asn1;
 
 import java.math.BigInteger;
-import org.openmuc.jasn1.ber.types.*;
+
+import org.openmuc.jasn1.ber.types.BerInteger;
 
 public class Unsigned32 extends BerInteger {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/Unsigned8.java

@@ -5,7 +5,8 @@
 package org.openmuc.openiec61850.internal.mms.asn1;
 
 import java.math.BigInteger;
-import org.openmuc.jasn1.ber.types.*;
+
+import org.openmuc.jasn1.ber.types.BerInteger;
 
 public class Unsigned8 extends BerInteger {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/UtcTime.java

@@ -4,7 +4,7 @@
 
 package org.openmuc.openiec61850.internal.mms.asn1;
 
-import org.openmuc.jasn1.ber.types.*;
+import org.openmuc.jasn1.ber.types.BerOctetString;
 
 public class UtcTime extends BerOctetString {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/VariableAccessSpecification.java

@@ -8,7 +8,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-import org.openmuc.jasn1.ber.*;
+
+import org.openmuc.jasn1.ber.BerLength;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
 
 public class VariableAccessSpecification implements Serializable {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/VariableDefs.java

@@ -7,11 +7,14 @@ package org.openmuc.openiec61850.internal.mms.asn1;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.List;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.io.Serializable;
+import java.util.List;
-import org.openmuc.jasn1.ber.*;
+
+import org.openmuc.jasn1.ber.BerLength;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
 
 public class VariableDefs implements Serializable {
 
@@ -176,7 +179,7 @@ public class VariableDefs implements Serializable {
     private List<SEQUENCE> seqOf = null;
 
     public VariableDefs() {
-        seqOf = new ArrayList<SEQUENCE>();
+        seqOf = new ArrayList<>();
     }
 
     public VariableDefs(byte[] code) {
@@ -185,7 +188,7 @@ public class VariableDefs implements Serializable {
 
     public List<SEQUENCE> getSEQUENCE() {
         if (seqOf == null) {
-            seqOf = new ArrayList<SEQUENCE>();
+            seqOf = new ArrayList<>();
         }
         return seqOf;
     }

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/VariableSpecification.java

@@ -8,7 +8,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-import org.openmuc.jasn1.ber.*;
+
+import org.openmuc.jasn1.ber.BerLength;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
 
 public class VariableSpecification implements Serializable {
 

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/WriteRequest.java

@@ -7,11 +7,14 @@ package org.openmuc.openiec61850.internal.mms.asn1;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.List;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.io.Serializable;
+import java.util.List;
-import org.openmuc.jasn1.ber.*;
+
+import org.openmuc.jasn1.ber.BerLength;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
 
 public class WriteRequest implements Serializable {
 
@@ -26,7 +29,7 @@ public class WriteRequest implements Serializable {
         private List<Data> seqOf = null;
 
         public ListOfData() {
-            seqOf = new ArrayList<Data>();
+            seqOf = new ArrayList<>();
         }
 
         public ListOfData(byte[] code) {
@@ -35,7 +38,7 @@ public class WriteRequest implements Serializable {
 
         public List<Data> getData() {
             if (seqOf == null) {
-                seqOf = new ArrayList<Data>();
+                seqOf = new ArrayList<>();
             }
             return seqOf;
         }

src/main/java-gen/org/openmuc/openiec61850/internal/mms/asn1/WriteResponse.java

@@ -7,12 +7,15 @@ package org.openmuc.openiec61850.internal.mms.asn1;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.List;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.io.Serializable;
+import java.util.List;
-import org.openmuc.jasn1.ber.*;
+
-import org.openmuc.jasn1.ber.types.*;
+import org.openmuc.jasn1.ber.BerLength;
+import org.openmuc.jasn1.ber.BerTag;
+import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
+import org.openmuc.jasn1.ber.types.BerNull;
 
 public class WriteResponse implements Serializable {
 
@@ -146,7 +149,7 @@ public class WriteResponse implements Serializable {
     private List<CHOICE> seqOf = null;
 
     public WriteResponse() {
-        seqOf = new ArrayList<CHOICE>();
+        seqOf = new ArrayList<>();
     }
 
     public WriteResponse(byte[] code) {
@@ -155,7 +158,7 @@ public class WriteResponse implements Serializable {
 
     public List<CHOICE> getCHOICE() {
         if (seqOf == null) {
-            seqOf = new ArrayList<CHOICE>();
+            seqOf = new ArrayList<>();
         }
         return seqOf;
     }

src/main/java/org/openmuc/jositransport/ClientTSap.java

@@ -20,6 +20,7 @@ import java.io.IOException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.Socket;
+
 import javax.net.SocketFactory;
 
 /**

src/main/java/org/openmuc/openiec61850/ClientAssociation.java

@@ -20,7 +20,6 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -946,11 +945,11 @@ public final class ClientAssociation {
 
             Calendar lastModified = null;
 
-            
             try {
 
-            	if (entry.getFileAttributes().getLastModified() != null)
+                if (entry.getFileAttributes().getLastModified() != null) {
                     lastModified = entry.getFileAttributes().getLastModified().asCalendar();
+                }
 
             } catch (ParseException e) {
                 throw new ServiceError(ServiceError.FAILED_DUE_TO_COMMUNICATIONS_CONSTRAINT,
@@ -983,7 +982,7 @@ public final class ClientAssociation {
      *             after this exception is thrown.
      */
     public List<FileInformation> getFileDirectory(String directoryName) throws ServiceError, IOException {
-        List<FileInformation> files = new LinkedList<FileInformation>();
+        List<FileInformation> files = new LinkedList<>();
 
         boolean moreFollows = true;
 
@@ -1015,9 +1014,10 @@ public final class ClientAssociation {
 
             moreFollows = decodeGetFileDirectoryResponse(confirmedServiceResponse, files);
 
-            if (moreFollows)
+            if (moreFollows) {
                 continueAfter = files.get(files.size() - 1).getFilename();
             }
+        }
 
         return files;
     }
@@ -1091,15 +1091,17 @@ public final class ClientAssociation {
 
         boolean moreFollows = true;
 
-        if (confirmedServiceResponse.getFileRead().getMoreFollows() != null)
+        if (confirmedServiceResponse.getFileRead().getMoreFollows() != null) {
             moreFollows = confirmedServiceResponse.getFileRead().getMoreFollows().value;
+        }
 
         if (listener != null) {
             boolean continueRead = listener.dataReceived(fileData, moreFollows);
 
-            if (moreFollows == true)
+            if (moreFollows == true) {
                 moreFollows = continueRead;
             }
+        }
 
         return moreFollows;
     }

src/main/java/org/openmuc/openiec61850/FileInformation.java

@@ -7,11 +7,11 @@ import java.util.Calendar;
  */
 public class FileInformation {
 
-    private String filename;
+    private final String filename;
 
-    private long fileSize;
+    private final long fileSize;
 
-    private Calendar lastModified;
+    private final Calendar lastModified;
 
     public String getFilename() {
         return filename;