directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From plusplusjia...@apache.org
Subject [2/5] directory-kerby git commit: Revert "Use star import of MyEnum."
Date Tue, 15 Dec 2015 03:10:03 GMT
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/ticket/EncTicketPart.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/ticket/EncTicketPart.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/ticket/EncTicketPart.java
index 92228a1..4865faa 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/ticket/EncTicketPart.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/ticket/EncTicketPart.java
@@ -19,12 +19,29 @@
  */
 package org.apache.kerby.kerberos.kerb.type.ticket;
 
-import org.apache.kerby.asn1.*;
-import org.apache.kerby.kerberos.kerb.type.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.ExplicitField;
+import org.apache.kerby.kerberos.kerb.type.KerberosString;
+import org.apache.kerby.kerberos.kerb.type.KerberosTime;
+import org.apache.kerby.kerberos.kerb.type.KrbAppSequenceType;
 import org.apache.kerby.kerberos.kerb.type.ad.AuthorizationData;
-import org.apache.kerby.kerberos.kerb.type.base.*;
-
-import static org.apache.kerby.kerberos.kerb.type.ticket.EncTicketPart.MyEnum.*;
+import org.apache.kerby.kerberos.kerb.type.base.EncryptionKey;
+import org.apache.kerby.kerberos.kerb.type.base.HostAddresses;
+import org.apache.kerby.kerberos.kerb.type.base.PrincipalName;
+import org.apache.kerby.kerberos.kerb.type.base.TransitedEncoding;
+
+import static org.apache.kerby.kerberos.kerb.type.ticket.EncTicketPart.MyEnum.AUTHORIZATION_DATA;
+import static org.apache.kerby.kerberos.kerb.type.ticket.EncTicketPart.MyEnum.AUTHTIME;
+import static org.apache.kerby.kerberos.kerb.type.ticket.EncTicketPart.MyEnum.CADDR;
+import static org.apache.kerby.kerberos.kerb.type.ticket.EncTicketPart.MyEnum.CNAME;
+import static org.apache.kerby.kerberos.kerb.type.ticket.EncTicketPart.MyEnum.CREALM;
+import static org.apache.kerby.kerberos.kerb.type.ticket.EncTicketPart.MyEnum.ENDTIME;
+import static org.apache.kerby.kerberos.kerb.type.ticket.EncTicketPart.MyEnum.FLAGS;
+import static org.apache.kerby.kerberos.kerb.type.ticket.EncTicketPart.MyEnum.KEY;
+import static org.apache.kerby.kerberos.kerb.type.ticket.EncTicketPart.MyEnum.RENEW_TILL;
+import static org.apache.kerby.kerberos.kerb.type.ticket.EncTicketPart.MyEnum.STARTTIME;
+import static org.apache.kerby.kerberos.kerb.type.ticket.EncTicketPart.MyEnum.TRANSITED;
 
 /**
  -- Encrypted part of ticket
@@ -42,6 +59,7 @@ import static org.apache.kerby.kerberos.kerb.type.ticket.EncTicketPart.MyEnum.*;
  authorization-data      [10] AuthorizationData OPTIONAL
  }
  */
+@SuppressWarnings("PMD.TooManyStaticImports")
 public class EncTicketPart extends KrbAppSequenceType {
     public static final int TAG = 3;
 

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/ticket/Ticket.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/ticket/Ticket.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/ticket/Ticket.java
index 44d3ebf..c3f9f61 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/ticket/Ticket.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/ticket/Ticket.java
@@ -19,13 +19,20 @@
  */
 package org.apache.kerby.kerberos.kerb.type.ticket;
 
-import org.apache.kerby.asn1.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.ExplicitField;
 import org.apache.kerby.asn1.type.Asn1Integer;
 import org.apache.kerby.kerberos.kerb.KrbConstant;
-import org.apache.kerby.kerberos.kerb.type.*;
-import org.apache.kerby.kerberos.kerb.type.base.*;
-
-import static org.apache.kerby.kerberos.kerb.type.ticket.Ticket.MyEnum.*;
+import org.apache.kerby.kerberos.kerb.type.KerberosString;
+import org.apache.kerby.kerberos.kerb.type.KrbAppSequenceType;
+import org.apache.kerby.kerberos.kerb.type.base.EncryptedData;
+import org.apache.kerby.kerberos.kerb.type.base.PrincipalName;
+
+import static org.apache.kerby.kerberos.kerb.type.ticket.Ticket.MyEnum.ENC_PART;
+import static org.apache.kerby.kerberos.kerb.type.ticket.Ticket.MyEnum.REALM;
+import static org.apache.kerby.kerberos.kerb.type.ticket.Ticket.MyEnum.SNAME;
+import static org.apache.kerby.kerberos.kerb.type.ticket.Ticket.MyEnum.TKT_VNO;
 
 /**
  Ticket          ::= [APPLICATION 1] SEQUENCE {

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/cms/type/Attribute.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/cms/type/Attribute.java b/kerby-pkix/src/main/java/org/apache/kerby/cms/type/Attribute.java
index 9fa53d6..bb5355d 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/cms/type/Attribute.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/cms/type/Attribute.java
@@ -19,11 +19,14 @@
  */
 package org.apache.kerby.cms.type;
 
-import org.apache.kerby.asn1.*;
-import org.apache.kerby.asn1.type.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.type.Asn1ObjectIdentifier;
+import org.apache.kerby.asn1.type.Asn1SequenceType;
 import org.apache.kerby.x509.type.AttributeValues;
 
-import static org.apache.kerby.cms.type.Attribute.MyEnum.*;
+import static org.apache.kerby.cms.type.Attribute.MyEnum.ATTR_TYPE;
+import static org.apache.kerby.cms.type.Attribute.MyEnum.ATTR_VALUES;
 
 /**
  * Ref. RFC 5652

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/cms/type/AttributeCertificateInfoV1.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/cms/type/AttributeCertificateInfoV1.java b/kerby-pkix/src/main/java/org/apache/kerby/cms/type/AttributeCertificateInfoV1.java
index 1b4d6f2..2844ca2 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/cms/type/AttributeCertificateInfoV1.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/cms/type/AttributeCertificateInfoV1.java
@@ -19,11 +19,27 @@
  */
 package org.apache.kerby.cms.type;
 
-import org.apache.kerby.asn1.*;
-import org.apache.kerby.asn1.type.*;
-import org.apache.kerby.x509.type.*;
-
-import static org.apache.kerby.cms.type.AttributeCertificateInfoV1.MyEnum.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.type.Asn1BitString;
+import org.apache.kerby.asn1.type.Asn1Integer;
+import org.apache.kerby.asn1.type.Asn1SequenceType;
+import org.apache.kerby.x509.type.AlgorithmIdentifier;
+import org.apache.kerby.x509.type.AttCertIssuer;
+import org.apache.kerby.x509.type.AttCertValidityPeriod;
+import org.apache.kerby.x509.type.Attributes;
+import org.apache.kerby.x509.type.CertificateSerialNumber;
+import org.apache.kerby.x509.type.Extensions;
+
+import static org.apache.kerby.cms.type.AttributeCertificateInfoV1.MyEnum.ATTRIBUTES;
+import static org.apache.kerby.cms.type.AttributeCertificateInfoV1.MyEnum.ATTR_CERT_VALIDITY_PERIOD;
+import static org.apache.kerby.cms.type.AttributeCertificateInfoV1.MyEnum.EXTENSIONS;
+import static org.apache.kerby.cms.type.AttributeCertificateInfoV1.MyEnum.ISSUER;
+import static org.apache.kerby.cms.type.AttributeCertificateInfoV1.MyEnum.ISSUER_UNIQUE_ID;
+import static org.apache.kerby.cms.type.AttributeCertificateInfoV1.MyEnum.SERIAL_NUMBER;
+import static org.apache.kerby.cms.type.AttributeCertificateInfoV1.MyEnum.SIGNATURE;
+import static org.apache.kerby.cms.type.AttributeCertificateInfoV1.MyEnum.SUBJECT;
+import static org.apache.kerby.cms.type.AttributeCertificateInfoV1.MyEnum.VERSION;
 
 /**
  * AttributeCertificateInfoV1 ::= SEQUENCE {
@@ -40,6 +56,7 @@ import static org.apache.kerby.cms.type.AttributeCertificateInfoV1.MyEnum.*;
  *
  * AttCertVersionV1 ::= INTEGER { v1(0) }
  */
+@SuppressWarnings("PMD.TooManyStaticImports")
 public class AttributeCertificateInfoV1 extends Asn1SequenceType {
     protected enum MyEnum implements EnumType {
         VERSION,

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/cms/type/AttributeCertificateV1.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/cms/type/AttributeCertificateV1.java b/kerby-pkix/src/main/java/org/apache/kerby/cms/type/AttributeCertificateV1.java
index 8968b33..0bb3424 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/cms/type/AttributeCertificateV1.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/cms/type/AttributeCertificateV1.java
@@ -19,11 +19,16 @@
  */
 package org.apache.kerby.cms.type;
 
-import org.apache.kerby.asn1.*;
-import org.apache.kerby.asn1.type.*;
-import org.apache.kerby.x509.type.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.type.Asn1BitString;
+import org.apache.kerby.asn1.type.Asn1SequenceType;
+import org.apache.kerby.x509.type.AlgorithmIdentifier;
+import org.apache.kerby.x509.type.AttributeCertificateInfo;
 
-import static org.apache.kerby.cms.type.AttributeCertificateV1.MyEnum.*;
+import static org.apache.kerby.cms.type.AttributeCertificateV1.MyEnum.ACI_INFO;
+import static org.apache.kerby.cms.type.AttributeCertificateV1.MyEnum.SIGNATURE;
+import static org.apache.kerby.cms.type.AttributeCertificateV1.MyEnum.SIGNATURE_ALGORITHM;
 
 /**
  * AttributeCertificateV1 ::= SEQUENCE {

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/cms/type/CertificateChoices.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/cms/type/CertificateChoices.java b/kerby-pkix/src/main/java/org/apache/kerby/cms/type/CertificateChoices.java
index 760ccf9..9d722b2 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/cms/type/CertificateChoices.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/cms/type/CertificateChoices.java
@@ -19,11 +19,17 @@
  */
 package org.apache.kerby.cms.type;
 
-import org.apache.kerby.asn1.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.ImplicitField;
 import org.apache.kerby.asn1.type.Asn1Choice;
 import org.apache.kerby.x509.type.Certificate;
 
-import static org.apache.kerby.cms.type.CertificateChoices.MyEnum.*;
+import static org.apache.kerby.cms.type.CertificateChoices.MyEnum.CERTIFICATE;
+import static org.apache.kerby.cms.type.CertificateChoices.MyEnum.EXTENDED_CERTIFICATE;
+import static org.apache.kerby.cms.type.CertificateChoices.MyEnum.OTHER;
+import static org.apache.kerby.cms.type.CertificateChoices.MyEnum.V1_ATTR_CERT;
+import static org.apache.kerby.cms.type.CertificateChoices.MyEnum.V2_ATTR_CERT;
 
 /**
  * CertificateChoices ::= CHOICE {
@@ -33,6 +39,7 @@ import static org.apache.kerby.cms.type.CertificateChoices.MyEnum.*;
  *   v2AttrCert [2] IMPLICIT AttributeCertificateV2,
  *   other [3] IMPLICIT OtherCertificateFormat }
  */
+@SuppressWarnings("PMD.TooManyStaticImports")
 public class CertificateChoices extends Asn1Choice {
     protected enum MyEnum implements EnumType {
         CERTIFICATE,

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/cms/type/CompressedData.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/cms/type/CompressedData.java b/kerby-pkix/src/main/java/org/apache/kerby/cms/type/CompressedData.java
index caef35b..072ca7f 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/cms/type/CompressedData.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/cms/type/CompressedData.java
@@ -19,11 +19,14 @@
  */
 package org.apache.kerby.cms.type;
 
-import org.apache.kerby.asn1.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
 import org.apache.kerby.asn1.type.Asn1SequenceType;
 import org.apache.kerby.x509.type.AlgorithmIdentifier;
 
-import static org.apache.kerby.cms.type.CompressedData.MyEnum.*;
+import static org.apache.kerby.cms.type.CompressedData.MyEnum.COMPRESSION_ALGORITHM;
+import static org.apache.kerby.cms.type.CompressedData.MyEnum.ENCAP_CONTENT_INFO;
+import static org.apache.kerby.cms.type.CompressedData.MyEnum.VERSION;
 
 /** 
  * Ref. RFC 3274

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/cms/type/ContentInfo.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/cms/type/ContentInfo.java b/kerby-pkix/src/main/java/org/apache/kerby/cms/type/ContentInfo.java
index 25a121e..cefe646 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/cms/type/ContentInfo.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/cms/type/ContentInfo.java
@@ -19,10 +19,16 @@
  */
 package org.apache.kerby.cms.type;
 
-import org.apache.kerby.asn1.*;
-import org.apache.kerby.asn1.type.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.ExplicitField;
+import org.apache.kerby.asn1.type.Asn1Any;
+import org.apache.kerby.asn1.type.Asn1ObjectIdentifier;
+import org.apache.kerby.asn1.type.Asn1SequenceType;
+import org.apache.kerby.asn1.type.Asn1Type;
 
-import static org.apache.kerby.cms.type.ContentInfo.MyEnum.*;
+import static org.apache.kerby.cms.type.ContentInfo.MyEnum.CONTENT;
+import static org.apache.kerby.cms.type.ContentInfo.MyEnum.CONTENT_TYPE;
 
 /**
  * Ref. RFC 5652

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/cms/type/EncapsulatedContentInfo.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/cms/type/EncapsulatedContentInfo.java b/kerby-pkix/src/main/java/org/apache/kerby/cms/type/EncapsulatedContentInfo.java
index 7736261..d8506bc 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/cms/type/EncapsulatedContentInfo.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/cms/type/EncapsulatedContentInfo.java
@@ -19,10 +19,15 @@
  */
 package org.apache.kerby.cms.type;
 
-import org.apache.kerby.asn1.*;
-import org.apache.kerby.asn1.type.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.ExplicitField;
+import org.apache.kerby.asn1.type.Asn1ObjectIdentifier;
+import org.apache.kerby.asn1.type.Asn1OctetString;
+import org.apache.kerby.asn1.type.Asn1SequenceType;
 
-import static org.apache.kerby.cms.type.EncapsulatedContentInfo.MyEnum.*;
+import static org.apache.kerby.cms.type.EncapsulatedContentInfo.MyEnum.CONTENT;
+import static org.apache.kerby.cms.type.EncapsulatedContentInfo.MyEnum.CONTENT_TYPE;
 
 /**
  * EncapsulatedContentInfo ::= SEQUENCE {

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/cms/type/ExtendedCertificate.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/cms/type/ExtendedCertificate.java b/kerby-pkix/src/main/java/org/apache/kerby/cms/type/ExtendedCertificate.java
index 7afbab7..d63d550 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/cms/type/ExtendedCertificate.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/cms/type/ExtendedCertificate.java
@@ -19,10 +19,13 @@
  */
 package org.apache.kerby.cms.type;
 
-import org.apache.kerby.asn1.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
 import org.apache.kerby.asn1.type.Asn1SequenceType;
 
-import static org.apache.kerby.cms.type.ExtendedCertificate.MyEnum.*;
+import static org.apache.kerby.cms.type.ExtendedCertificate.MyEnum.EXTENDED_CERTIFICATE_INFO;
+import static org.apache.kerby.cms.type.ExtendedCertificate.MyEnum.SIGNATURE;
+import static org.apache.kerby.cms.type.ExtendedCertificate.MyEnum.SIGNATURE_ALGORITHMS;
 
 /**
  * ExtendedCertificate ::= SEQUENCE {

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/cms/type/ExtendedCertificateInfo.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/cms/type/ExtendedCertificateInfo.java b/kerby-pkix/src/main/java/org/apache/kerby/cms/type/ExtendedCertificateInfo.java
index cb1ae89..91648be 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/cms/type/ExtendedCertificateInfo.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/cms/type/ExtendedCertificateInfo.java
@@ -19,10 +19,13 @@
  */
 package org.apache.kerby.cms.type;
 
-import org.apache.kerby.asn1.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
 import org.apache.kerby.asn1.type.Asn1SequenceType;
 
-import static org.apache.kerby.cms.type.ExtendedCertificateInfo.MyEnum.*;
+import static org.apache.kerby.cms.type.ExtendedCertificateInfo.MyEnum.ATTRIBUTES;
+import static org.apache.kerby.cms.type.ExtendedCertificateInfo.MyEnum.CERTIFICATE;
+import static org.apache.kerby.cms.type.ExtendedCertificateInfo.MyEnum.CMS_VERSION;
 
 /**
  * ExtendedCertificateInfo ::= SEQUENCE {

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/cms/type/IssuerAndSerialNumber.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/cms/type/IssuerAndSerialNumber.java b/kerby-pkix/src/main/java/org/apache/kerby/cms/type/IssuerAndSerialNumber.java
index 7221021..0fc33c2 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/cms/type/IssuerAndSerialNumber.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/cms/type/IssuerAndSerialNumber.java
@@ -19,11 +19,14 @@
  */
 package org.apache.kerby.cms.type;
 
-import org.apache.kerby.asn1.*;
-import org.apache.kerby.asn1.type.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.type.Asn1Integer;
+import org.apache.kerby.asn1.type.Asn1SequenceType;
 import org.apache.kerby.x500.type.Name;
 
-import static org.apache.kerby.cms.type.IssuerAndSerialNumber.MyEnum.*;
+import static org.apache.kerby.cms.type.IssuerAndSerialNumber.MyEnum.ISSUER;
+import static org.apache.kerby.cms.type.IssuerAndSerialNumber.MyEnum.SERIAL_NUMBER;
 
 /**
  * Ref. RFC5652

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/cms/type/OtherCertificateFormat.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/cms/type/OtherCertificateFormat.java b/kerby-pkix/src/main/java/org/apache/kerby/cms/type/OtherCertificateFormat.java
index a8918d9..604109f 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/cms/type/OtherCertificateFormat.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/cms/type/OtherCertificateFormat.java
@@ -19,10 +19,15 @@
  */
 package org.apache.kerby.cms.type;
 
-import org.apache.kerby.asn1.*;
-import org.apache.kerby.asn1.type.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.type.Asn1Any;
+import org.apache.kerby.asn1.type.Asn1ObjectIdentifier;
+import org.apache.kerby.asn1.type.Asn1SequenceType;
+import org.apache.kerby.asn1.type.Asn1Type;
 
-import static org.apache.kerby.cms.type.OtherCertificateFormat.MyEnum.*;
+import static org.apache.kerby.cms.type.OtherCertificateFormat.MyEnum.OTHER_CERT;
+import static org.apache.kerby.cms.type.OtherCertificateFormat.MyEnum.OTHER_CERT_FORMAT;
 
 /**
  * OtherCertificateFormat ::= SEQUENCE {

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/cms/type/OtherRevocationInfoFormat.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/cms/type/OtherRevocationInfoFormat.java b/kerby-pkix/src/main/java/org/apache/kerby/cms/type/OtherRevocationInfoFormat.java
index afd428c..5602c01 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/cms/type/OtherRevocationInfoFormat.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/cms/type/OtherRevocationInfoFormat.java
@@ -19,10 +19,15 @@
  */
 package org.apache.kerby.cms.type;
 
-import org.apache.kerby.asn1.*;
-import org.apache.kerby.asn1.type.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.type.Asn1Any;
+import org.apache.kerby.asn1.type.Asn1ObjectIdentifier;
+import org.apache.kerby.asn1.type.Asn1SequenceType;
+import org.apache.kerby.asn1.type.Asn1Type;
 
-import static org.apache.kerby.cms.type.OtherRevocationInfoFormat.MyEnum.*;
+import static org.apache.kerby.cms.type.OtherRevocationInfoFormat.MyEnum.OTHER_REV_INFO;
+import static org.apache.kerby.cms.type.OtherRevocationInfoFormat.MyEnum.OTHER_REV_INFO_FORMAT;
 
 /**
  * OtherRevocationInfoFormat ::= SEQUENCE {

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/cms/type/RevocationInfoChoice.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/cms/type/RevocationInfoChoice.java b/kerby-pkix/src/main/java/org/apache/kerby/cms/type/RevocationInfoChoice.java
index f73558b..ebcd3ec 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/cms/type/RevocationInfoChoice.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/cms/type/RevocationInfoChoice.java
@@ -19,11 +19,14 @@
  */
 package org.apache.kerby.cms.type;
 
-import org.apache.kerby.asn1.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.ImplicitField;
 import org.apache.kerby.asn1.type.Asn1Choice;
 import org.apache.kerby.x509.type.CertificateList;
 
-import static org.apache.kerby.cms.type.RevocationInfoChoice.MyEnum.*;
+import static org.apache.kerby.cms.type.RevocationInfoChoice.MyEnum.CRL;
+import static org.apache.kerby.cms.type.RevocationInfoChoice.MyEnum.OTHER;
 
 /**
  * RevocationInfoChoice ::= CHOICE {

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/cms/type/SignedData.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/cms/type/SignedData.java b/kerby-pkix/src/main/java/org/apache/kerby/cms/type/SignedData.java
index 6155a42..ab761a8 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/cms/type/SignedData.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/cms/type/SignedData.java
@@ -19,10 +19,17 @@
  */
 package org.apache.kerby.cms.type;
 
-import org.apache.kerby.asn1.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.ImplicitField;
 import org.apache.kerby.asn1.type.Asn1SequenceType;
 
-import static org.apache.kerby.cms.type.SignedData.MyEnum.*;
+import static org.apache.kerby.cms.type.SignedData.MyEnum.CERTIFICATES;
+import static org.apache.kerby.cms.type.SignedData.MyEnum.CMS_VERSION;
+import static org.apache.kerby.cms.type.SignedData.MyEnum.CRLS;
+import static org.apache.kerby.cms.type.SignedData.MyEnum.DIGEST_ALGORITHMS;
+import static org.apache.kerby.cms.type.SignedData.MyEnum.ENCAP_CONTENT_INFO;
+import static org.apache.kerby.cms.type.SignedData.MyEnum.SIGNER_INFOS;
 
 /**
  * Ref. RFC 5652
@@ -38,6 +45,7 @@ import static org.apache.kerby.cms.type.SignedData.MyEnum.*;
  * </pre>
  *
  */
+@SuppressWarnings("PMD.TooManyStaticImports")
 public class SignedData extends Asn1SequenceType {
     protected enum MyEnum implements EnumType {
         CMS_VERSION,

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/cms/type/SignerIdentifier.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/cms/type/SignerIdentifier.java b/kerby-pkix/src/main/java/org/apache/kerby/cms/type/SignerIdentifier.java
index f40cb4c..38a173d 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/cms/type/SignerIdentifier.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/cms/type/SignerIdentifier.java
@@ -19,11 +19,14 @@
  */
 package org.apache.kerby.cms.type;
 
-import org.apache.kerby.asn1.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.ExplicitField;
 import org.apache.kerby.asn1.type.Asn1Choice;
 import org.apache.kerby.x509.type.SubjectKeyIdentifier;
 
-import static org.apache.kerby.cms.type.SignerIdentifier.MyEnum.*;
+import static org.apache.kerby.cms.type.SignerIdentifier.MyEnum.ISSUER_AND_SERIAL_NUMBER;
+import static org.apache.kerby.cms.type.SignerIdentifier.MyEnum.SUBJECT_KEY_IDENTIFIER;
 
 /**
  * Ref. RFC 5652

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/cms/type/SignerInfo.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/cms/type/SignerInfo.java b/kerby-pkix/src/main/java/org/apache/kerby/cms/type/SignerInfo.java
index a2fb24c..518364e 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/cms/type/SignerInfo.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/cms/type/SignerInfo.java
@@ -19,10 +19,18 @@
  */
 package org.apache.kerby.cms.type;
 
-import org.apache.kerby.asn1.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.ImplicitField;
 import org.apache.kerby.asn1.type.Asn1SequenceType;
 
-import static org.apache.kerby.cms.type.SignerInfo.MyEnum.*;
+import static org.apache.kerby.cms.type.SignerInfo.MyEnum.CMS_VERSION;
+import static org.apache.kerby.cms.type.SignerInfo.MyEnum.DIGEST_ALGORITHM;
+import static org.apache.kerby.cms.type.SignerInfo.MyEnum.SID;
+import static org.apache.kerby.cms.type.SignerInfo.MyEnum.SIGNATURE;
+import static org.apache.kerby.cms.type.SignerInfo.MyEnum.SIGNATURE_ALGORITHMS;
+import static org.apache.kerby.cms.type.SignerInfo.MyEnum.SIGNED_ATTRS;
+import static org.apache.kerby.cms.type.SignerInfo.MyEnum.UNSIGNED_ATTRS;
 
 /**
  * Ref. RFC 5652
@@ -39,6 +47,7 @@ import static org.apache.kerby.cms.type.SignerInfo.MyEnum.*;
  *
  * </pre>
  */
+@SuppressWarnings("PMD.TooManyStaticImports")
 public class SignerInfo extends Asn1SequenceType {
     protected enum MyEnum implements EnumType {
         CMS_VERSION,

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/cms/type/Subject.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/cms/type/Subject.java b/kerby-pkix/src/main/java/org/apache/kerby/cms/type/Subject.java
index 6f69547..bbd4f6e 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/cms/type/Subject.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/cms/type/Subject.java
@@ -19,11 +19,15 @@
  */
 package org.apache.kerby.cms.type;
 
-import org.apache.kerby.asn1.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.ExplicitField;
 import org.apache.kerby.asn1.type.Asn1Choice;
-import org.apache.kerby.x509.type.*;
+import org.apache.kerby.x509.type.GeneralNames;
+import org.apache.kerby.x509.type.IssuerSerial;
 
-import static org.apache.kerby.cms.type.Subject.MyEnum.*;
+import static org.apache.kerby.cms.type.Subject.MyEnum.BASE_CERTIFICATE_ID;
+import static org.apache.kerby.cms.type.Subject.MyEnum.SUBJECT_NAME;
 
 /**
  * subject CHOICE {

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x500/type/AttributeTypeAndValue.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x500/type/AttributeTypeAndValue.java b/kerby-pkix/src/main/java/org/apache/kerby/x500/type/AttributeTypeAndValue.java
index 8a12ae2..7ec8bee 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x500/type/AttributeTypeAndValue.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x500/type/AttributeTypeAndValue.java
@@ -19,10 +19,15 @@
  */
 package org.apache.kerby.x500.type;
 
-import org.apache.kerby.asn1.*;
-import org.apache.kerby.asn1.type.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.type.Asn1Any;
+import org.apache.kerby.asn1.type.Asn1ObjectIdentifier;
+import org.apache.kerby.asn1.type.Asn1SequenceType;
+import org.apache.kerby.asn1.type.Asn1Type;
 
-import static org.apache.kerby.x500.type.AttributeTypeAndValue.MyEnum.*;
+import static org.apache.kerby.x500.type.AttributeTypeAndValue.MyEnum.TYPE;
+import static org.apache.kerby.x500.type.AttributeTypeAndValue.MyEnum.VALUE;
 
 /**
  * AttributeTypeAndValue ::= SEQUENCE {

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x500/type/Name.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x500/type/Name.java b/kerby-pkix/src/main/java/org/apache/kerby/x500/type/Name.java
index e3bcc1e..5263ee1 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x500/type/Name.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x500/type/Name.java
@@ -19,7 +19,8 @@
  */
 package org.apache.kerby.x500.type;
 
-import org.apache.kerby.asn1.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
 import org.apache.kerby.asn1.type.Asn1Choice;
 
 import static org.apache.kerby.x500.type.Name.MyEnum.RDN_SEQUENCE;

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AccessDescription.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AccessDescription.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AccessDescription.java
index 339bc9e..0b8f909 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AccessDescription.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AccessDescription.java
@@ -19,10 +19,13 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
-import org.apache.kerby.asn1.type.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.type.Asn1ObjectIdentifier;
+import org.apache.kerby.asn1.type.Asn1SequenceType;
 
-import static org.apache.kerby.x509.type.AccessDescription.MyEnum.*;
+import static org.apache.kerby.x509.type.AccessDescription.MyEnum.ACCESS_LOCATION;
+import static org.apache.kerby.x509.type.AccessDescription.MyEnum.ACCESS_METHOD;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AlgorithmIdentifier.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AlgorithmIdentifier.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AlgorithmIdentifier.java
index f71f23b..a1dbd25 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AlgorithmIdentifier.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AlgorithmIdentifier.java
@@ -19,10 +19,15 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
-import org.apache.kerby.asn1.type.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.type.Asn1Any;
+import org.apache.kerby.asn1.type.Asn1ObjectIdentifier;
+import org.apache.kerby.asn1.type.Asn1SequenceType;
+import org.apache.kerby.asn1.type.Asn1Type;
 
-import static org.apache.kerby.x509.type.AlgorithmIdentifier.MyEnum.*;
+import static org.apache.kerby.x509.type.AlgorithmIdentifier.MyEnum.ALGORITHM;
+import static org.apache.kerby.x509.type.AlgorithmIdentifier.MyEnum.PARAMETERS;
 
 /**
  * AlgorithmIdentifier  ::=  SEQUENCE  {

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AttCertIssuer.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AttCertIssuer.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AttCertIssuer.java
index af853bd..81a9da1 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AttCertIssuer.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AttCertIssuer.java
@@ -19,10 +19,13 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.ExplicitField;
 import org.apache.kerby.asn1.type.Asn1Choice;
 
-import static org.apache.kerby.x509.type.AttCertIssuer.MyEnum.*;
+import static org.apache.kerby.x509.type.AttCertIssuer.MyEnum.V1_FORM;
+import static org.apache.kerby.x509.type.AttCertIssuer.MyEnum.V2_FORM;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AttCertValidityPeriod.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AttCertValidityPeriod.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AttCertValidityPeriod.java
index 6808089..c5d9bf4 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AttCertValidityPeriod.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AttCertValidityPeriod.java
@@ -19,10 +19,14 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
-import org.apache.kerby.asn1.type.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.type.Asn1GeneralizedTime;
+import org.apache.kerby.asn1.type.Asn1SequenceType;
+import org.apache.kerby.asn1.type.Asn1UtcTime;
 
-import static org.apache.kerby.x509.type.AttCertValidityPeriod.MyEnum.*;
+import static org.apache.kerby.x509.type.AttCertValidityPeriod.MyEnum.NOT_AFTER;
+import static org.apache.kerby.x509.type.AttCertValidityPeriod.MyEnum.NOT_BEFORE;
 
 /**
  * <pre>

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/Attribute.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/Attribute.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/Attribute.java
index 46b351f..b19edea 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/Attribute.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/Attribute.java
@@ -19,10 +19,13 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
-import org.apache.kerby.asn1.type.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.type.Asn1ObjectIdentifier;
+import org.apache.kerby.asn1.type.Asn1SequenceType;
 
-import static org.apache.kerby.x509.type.Attribute.MyEnum.*;
+import static org.apache.kerby.x509.type.Attribute.MyEnum.ATTR_TYPE;
+import static org.apache.kerby.x509.type.Attribute.MyEnum.ATTR_VALUES;
 
 /**
  * <pre>

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AttributeCertificate.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AttributeCertificate.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AttributeCertificate.java
index 9b78d8e..9470ae0 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AttributeCertificate.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AttributeCertificate.java
@@ -19,10 +19,14 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
-import org.apache.kerby.asn1.type.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.type.Asn1BitString;
+import org.apache.kerby.asn1.type.Asn1SequenceType;
 
-import static org.apache.kerby.x509.type.AttributeCertificate.MyEnum.*;
+import static org.apache.kerby.x509.type.AttributeCertificate.MyEnum.ACI_INFO;
+import static org.apache.kerby.x509.type.AttributeCertificate.MyEnum.SIGNATURE_ALGORITHM;
+import static org.apache.kerby.x509.type.AttributeCertificate.MyEnum.SIGNATURE_VALUE;
 
 /**
  * <pre>

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AttributeCertificateInfo.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AttributeCertificateInfo.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AttributeCertificateInfo.java
index 9eac463..fc6e36b 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AttributeCertificateInfo.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AttributeCertificateInfo.java
@@ -19,10 +19,21 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
-import org.apache.kerby.asn1.type.*;
-
-import static org.apache.kerby.x509.type.AttributeCertificateInfo.MyEnum.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.type.Asn1BitString;
+import org.apache.kerby.asn1.type.Asn1Integer;
+import org.apache.kerby.asn1.type.Asn1SequenceType;
+
+import static org.apache.kerby.x509.type.AttributeCertificateInfo.MyEnum.ATTRIBUTES;
+import static org.apache.kerby.x509.type.AttributeCertificateInfo.MyEnum.ATTR_CERT_VALIDITY_PERIOD;
+import static org.apache.kerby.x509.type.AttributeCertificateInfo.MyEnum.EXTENSIONS;
+import static org.apache.kerby.x509.type.AttributeCertificateInfo.MyEnum.HOLDER;
+import static org.apache.kerby.x509.type.AttributeCertificateInfo.MyEnum.ISSUER;
+import static org.apache.kerby.x509.type.AttributeCertificateInfo.MyEnum.ISSUER_UNIQUE_ID;
+import static org.apache.kerby.x509.type.AttributeCertificateInfo.MyEnum.SERIAL_NUMBER;
+import static org.apache.kerby.x509.type.AttributeCertificateInfo.MyEnum.SIGNATURE;
+import static org.apache.kerby.x509.type.AttributeCertificateInfo.MyEnum.VERSION;
 
 /**
  *
@@ -44,6 +55,7 @@ import static org.apache.kerby.x509.type.AttributeCertificateInfo.MyEnum.*;
  *  UniqueIdentifier  ::=  BIT STRING
  * </pre>
  */
+@SuppressWarnings("PMD.TooManyStaticImports")
 public class AttributeCertificateInfo extends Asn1SequenceType {
     protected enum MyEnum implements EnumType {
         VERSION,

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AttributeValues.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AttributeValues.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AttributeValues.java
index e35ee1d..027ade3 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AttributeValues.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AttributeValues.java
@@ -19,7 +19,8 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.type.*;
+import org.apache.kerby.asn1.type.Asn1Any;
+import org.apache.kerby.asn1.type.Asn1SetOf;
 
 /**
  * Ref. RFC 5652

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AuthorityKeyIdentifier.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AuthorityKeyIdentifier.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AuthorityKeyIdentifier.java
index 174b013..1312666 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AuthorityKeyIdentifier.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AuthorityKeyIdentifier.java
@@ -19,10 +19,14 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.ImplicitField;
 import org.apache.kerby.asn1.type.Asn1SequenceType;
 
-import static org.apache.kerby.x509.type.AuthorityKeyIdentifier.MyEnum.*;
+import static org.apache.kerby.x509.type.AuthorityKeyIdentifier.MyEnum.AUTHORITY_CERT_ISSUER;
+import static org.apache.kerby.x509.type.AuthorityKeyIdentifier.MyEnum.AUTHORITY_CERT_SERIAL_NUMBER;
+import static org.apache.kerby.x509.type.AuthorityKeyIdentifier.MyEnum.KEY_IDENTIFIER;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/BasicConstraints.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/BasicConstraints.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/BasicConstraints.java
index 8818461..21aee8a 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/BasicConstraints.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/BasicConstraints.java
@@ -19,12 +19,16 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
-import org.apache.kerby.asn1.type.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.type.Asn1Boolean;
+import org.apache.kerby.asn1.type.Asn1Integer;
+import org.apache.kerby.asn1.type.Asn1SequenceType;
 
 import java.math.BigInteger;
 
-import static org.apache.kerby.x509.type.BasicConstraints.MyEnum.*;
+import static org.apache.kerby.x509.type.BasicConstraints.MyEnum.CA;
+import static org.apache.kerby.x509.type.BasicConstraints.MyEnum.PATH_LEN_CONSTRAINT;
 
 /**
  * <pre>

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/Certificate.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/Certificate.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/Certificate.java
index dc709ff..1597f88 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/Certificate.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/Certificate.java
@@ -19,10 +19,14 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
-import org.apache.kerby.asn1.type.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.type.Asn1BitString;
+import org.apache.kerby.asn1.type.Asn1SequenceType;
 
-import static org.apache.kerby.x509.type.Certificate.MyEnum.*;
+import static org.apache.kerby.x509.type.Certificate.MyEnum.SIGNATURE;
+import static org.apache.kerby.x509.type.Certificate.MyEnum.SIGNATURE_ALGORITHM;
+import static org.apache.kerby.x509.type.Certificate.MyEnum.TBS_CERTIFICATE;
 
 /**
  * <pre>

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/CertificateList.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/CertificateList.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/CertificateList.java
index 091bcc2..a18f784 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/CertificateList.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/CertificateList.java
@@ -19,10 +19,14 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
-import org.apache.kerby.asn1.type.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.type.Asn1BitString;
+import org.apache.kerby.asn1.type.Asn1SequenceType;
 
-import static org.apache.kerby.x509.type.CertificateList.MyEnum.*;
+import static org.apache.kerby.x509.type.CertificateList.MyEnum.SIGNATURE_ALGORITHMS;
+import static org.apache.kerby.x509.type.CertificateList.MyEnum.SIGNATURE_VALUE;
+import static org.apache.kerby.x509.type.CertificateList.MyEnum.TBS_CERT_LIST;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/CertificatePair.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/CertificatePair.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/CertificatePair.java
index 5414f6f..db0bd4a 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/CertificatePair.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/CertificatePair.java
@@ -19,10 +19,13 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.ExplicitField;
 import org.apache.kerby.asn1.type.Asn1SequenceType;
 
-import static org.apache.kerby.x509.type.CertificatePair.MyEnum.*;
+import static org.apache.kerby.x509.type.CertificatePair.MyEnum.FORWARD;
+import static org.apache.kerby.x509.type.CertificatePair.MyEnum.REVERSE;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DHParameter.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DHParameter.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DHParameter.java
index 93b672d..c5cfeee 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DHParameter.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DHParameter.java
@@ -1,11 +1,15 @@
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
-import org.apache.kerby.asn1.type.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.type.Asn1Integer;
+import org.apache.kerby.asn1.type.Asn1SequenceType;
 
 import java.math.BigInteger;
 
-import static org.apache.kerby.x509.type.DHParameter.MyEnum.*;
+import static org.apache.kerby.x509.type.DHParameter.MyEnum.G;
+import static org.apache.kerby.x509.type.DHParameter.MyEnum.P;
+import static org.apache.kerby.x509.type.DHParameter.MyEnum.Q;
 
 public class DHParameter extends Asn1SequenceType {
     protected static enum MyEnum implements EnumType {

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DSAParameter.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DSAParameter.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DSAParameter.java
index be1d723..b7b39ad 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DSAParameter.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DSAParameter.java
@@ -19,12 +19,16 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
-import org.apache.kerby.asn1.type.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.type.Asn1Integer;
+import org.apache.kerby.asn1.type.Asn1SequenceType;
 
 import java.math.BigInteger;
 
-import static org.apache.kerby.x509.type.DSAParameter.MyEnum.*;
+import static org.apache.kerby.x509.type.DSAParameter.MyEnum.G;
+import static org.apache.kerby.x509.type.DSAParameter.MyEnum.P;
+import static org.apache.kerby.x509.type.DSAParameter.MyEnum.Q;
 
 public class DSAParameter extends Asn1SequenceType {
     protected enum MyEnum implements EnumType {

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DigestInfo.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DigestInfo.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DigestInfo.java
index 32a4475..14c24c9 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DigestInfo.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DigestInfo.java
@@ -19,10 +19,13 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
-import org.apache.kerby.asn1.type.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.type.Asn1OctetString;
+import org.apache.kerby.asn1.type.Asn1SequenceType;
 
-import static org.apache.kerby.x509.type.DigestInfo.MyEnum.*;
+import static org.apache.kerby.x509.type.DigestInfo.MyEnum.DIGEST;
+import static org.apache.kerby.x509.type.DigestInfo.MyEnum.DIGEST_ALGORITHM;
 
 /**
  * <pre>

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DirectoryString.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DirectoryString.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DirectoryString.java
index 4b446d2..381ca77 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DirectoryString.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DirectoryString.java
@@ -19,10 +19,20 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
-import org.apache.kerby.asn1.type.*;
-
-import static org.apache.kerby.x509.type.DirectoryString.MyEnum.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.type.Asn1BmpString;
+import org.apache.kerby.asn1.type.Asn1Choice;
+import org.apache.kerby.asn1.type.Asn1PrintableString;
+import org.apache.kerby.asn1.type.Asn1T61String;
+import org.apache.kerby.asn1.type.Asn1UniversalString;
+import org.apache.kerby.asn1.type.Asn1Utf8String;
+
+import static org.apache.kerby.x509.type.DirectoryString.MyEnum.BMP_STRING;
+import static org.apache.kerby.x509.type.DirectoryString.MyEnum.PRINTABLE_STRING;
+import static org.apache.kerby.x509.type.DirectoryString.MyEnum.TELETEX_STRING;
+import static org.apache.kerby.x509.type.DirectoryString.MyEnum.UNIVERSAL_STRING;
+import static org.apache.kerby.x509.type.DirectoryString.MyEnum.UTF8_STRING;
 
 /**
  * <pre>
@@ -35,6 +45,7 @@ import static org.apache.kerby.x509.type.DirectoryString.MyEnum.*;
  * }
  * </pre>
  */
+@SuppressWarnings("PMD.TooManyStaticImports")
 public class DirectoryString extends Asn1Choice {
     protected enum MyEnum implements EnumType {
         TELETEX_STRING,

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DisplayText.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DisplayText.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DisplayText.java
index e868b42..1409c21 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DisplayText.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DisplayText.java
@@ -19,10 +19,18 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
-import org.apache.kerby.asn1.type.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.type.Asn1BmpString;
+import org.apache.kerby.asn1.type.Asn1Choice;
+import org.apache.kerby.asn1.type.Asn1IA5String;
+import org.apache.kerby.asn1.type.Asn1Utf8String;
+import org.apache.kerby.asn1.type.Asn1VisibleString;
 
-import static org.apache.kerby.x509.type.DisplayText.MyEnum.*;
+import static org.apache.kerby.x509.type.DisplayText.MyEnum.BMP_STRING;
+import static org.apache.kerby.x509.type.DisplayText.MyEnum.IA5_STRING;
+import static org.apache.kerby.x509.type.DisplayText.MyEnum.UTF8_STRING;
+import static org.apache.kerby.x509.type.DisplayText.MyEnum.VISIBLE_STRING;
 
 /**
  * <pre>

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DistributionPoint.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DistributionPoint.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DistributionPoint.java
index 159e20e..3cd23de 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DistributionPoint.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DistributionPoint.java
@@ -19,10 +19,14 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.ExplicitField;
 import org.apache.kerby.asn1.type.Asn1SequenceType;
 
-import static org.apache.kerby.x509.type.DistributionPoint.MyEnum.*;
+import static org.apache.kerby.x509.type.DistributionPoint.MyEnum.CRL_ISSUER;
+import static org.apache.kerby.x509.type.DistributionPoint.MyEnum.DISTRIBUTION_POINT;
+import static org.apache.kerby.x509.type.DistributionPoint.MyEnum.REASONS;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DistributionPointName.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DistributionPointName.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DistributionPointName.java
index 70ac541..8add69d 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DistributionPointName.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DistributionPointName.java
@@ -19,11 +19,14 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.ExplicitField;
 import org.apache.kerby.asn1.type.Asn1Choice;
 import org.apache.kerby.x500.type.RelativeDistinguishedName;
 
-import static org.apache.kerby.x509.type.DistributionPointName.MyEnum.*;
+import static org.apache.kerby.x509.type.DistributionPointName.MyEnum.FULL_NAME;
+import static org.apache.kerby.x509.type.DistributionPointName.MyEnum.NAME_RELATIVE_TO_CRL_ISSUER;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/EDIPartyName.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/EDIPartyName.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/EDIPartyName.java
index baf44c0..2d06a88 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/EDIPartyName.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/EDIPartyName.java
@@ -19,10 +19,13 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.ExplicitField;
 import org.apache.kerby.asn1.type.Asn1Choice;
 
-import static org.apache.kerby.x509.type.EDIPartyName.MyEnum.*;
+import static org.apache.kerby.x509.type.EDIPartyName.MyEnum.NAME_ASSIGNER;
+import static org.apache.kerby.x509.type.EDIPartyName.MyEnum.PARTY_NAME;
 
 /**
  * <pre>

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/Extension.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/Extension.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/Extension.java
index f234637..a996e1f 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/Extension.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/Extension.java
@@ -19,10 +19,16 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
-import org.apache.kerby.asn1.type.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.type.Asn1Boolean;
+import org.apache.kerby.asn1.type.Asn1ObjectIdentifier;
+import org.apache.kerby.asn1.type.Asn1OctetString;
+import org.apache.kerby.asn1.type.Asn1SequenceType;
 
-import static org.apache.kerby.x509.type.Extension.MyEnum.*;
+import static org.apache.kerby.x509.type.Extension.MyEnum.CRITICAL;
+import static org.apache.kerby.x509.type.Extension.MyEnum.EXTN_ID;
+import static org.apache.kerby.x509.type.Extension.MyEnum.EXTN_VALUE;
 
 /**
  * Ref. X.509 V3 extension

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/GeneralName.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/GeneralName.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/GeneralName.java
index 34f9b7c..7c7ec66 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/GeneralName.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/GeneralName.java
@@ -19,11 +19,26 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
-import org.apache.kerby.asn1.type.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.ExplicitField;
+import org.apache.kerby.asn1.ImplicitField;
+import org.apache.kerby.asn1.type.Asn1Any;
+import org.apache.kerby.asn1.type.Asn1Choice;
+import org.apache.kerby.asn1.type.Asn1IA5String;
+import org.apache.kerby.asn1.type.Asn1ObjectIdentifier;
+import org.apache.kerby.asn1.type.Asn1OctetString;
 import org.apache.kerby.x500.type.Name;
 
-import static org.apache.kerby.x509.type.GeneralName.MyEnum.*;
+import static org.apache.kerby.x509.type.GeneralName.MyEnum.DIRECTORY_NAME;
+import static org.apache.kerby.x509.type.GeneralName.MyEnum.DNS_NAME;
+import static org.apache.kerby.x509.type.GeneralName.MyEnum.EDI_PARTY_NAME;
+import static org.apache.kerby.x509.type.GeneralName.MyEnum.IP_ADDRESS;
+import static org.apache.kerby.x509.type.GeneralName.MyEnum.OTHER_NAME;
+import static org.apache.kerby.x509.type.GeneralName.MyEnum.REGISTERED_ID;
+import static org.apache.kerby.x509.type.GeneralName.MyEnum.RFC822_NAME;
+import static org.apache.kerby.x509.type.GeneralName.MyEnum.UNIFORM_RESOURCE_IDENTIFIER;
+import static org.apache.kerby.x509.type.GeneralName.MyEnum.X400_ADDRESS;
 
 /**
  *
@@ -41,6 +56,7 @@ import static org.apache.kerby.x509.type.GeneralName.MyEnum.*;
  *  }
  * </pre>
  */
+@SuppressWarnings("PMD.TooManyStaticImports")
 public class GeneralName extends Asn1Choice {
     protected enum MyEnum implements EnumType {
         OTHER_NAME,

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/GeneralSubtree.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/GeneralSubtree.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/GeneralSubtree.java
index e9e43a6..52f8654 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/GeneralSubtree.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/GeneralSubtree.java
@@ -19,10 +19,15 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
-import org.apache.kerby.asn1.type.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.ExplicitField;
+import org.apache.kerby.asn1.type.Asn1Integer;
+import org.apache.kerby.asn1.type.Asn1SequenceType;
 
-import static org.apache.kerby.x509.type.GeneralSubtree.MyEnum.*;
+import static org.apache.kerby.x509.type.GeneralSubtree.MyEnum.BASE;
+import static org.apache.kerby.x509.type.GeneralSubtree.MyEnum.MAXMUM;
+import static org.apache.kerby.x509.type.GeneralSubtree.MyEnum.MINIMUM;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/Holder.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/Holder.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/Holder.java
index ba764cb..98b706c 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/Holder.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/Holder.java
@@ -19,10 +19,14 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.ExplicitField;
 import org.apache.kerby.asn1.type.Asn1SequenceType;
 
-import static org.apache.kerby.x509.type.Holder.MyEnum.*;
+import static org.apache.kerby.x509.type.Holder.MyEnum.BASE_CERTIFICATE_ID;
+import static org.apache.kerby.x509.type.Holder.MyEnum.ENTITY_NAME;
+import static org.apache.kerby.x509.type.Holder.MyEnum.OBJECT_DIGEST_INFO;
 
 /**
  * <pre>

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/IetfAttrSyntax.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/IetfAttrSyntax.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/IetfAttrSyntax.java
index 5a82668..b92c73b 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/IetfAttrSyntax.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/IetfAttrSyntax.java
@@ -19,10 +19,13 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.ExplicitField;
 import org.apache.kerby.asn1.type.Asn1SequenceType;
 
-import static org.apache.kerby.x509.type.IetfAttrSyntax.MyEnum.*;
+import static org.apache.kerby.x509.type.IetfAttrSyntax.MyEnum.POLICY_AUTHORITY;
+import static org.apache.kerby.x509.type.IetfAttrSyntax.MyEnum.VALUES;
 
 /**
  * Ref. RFC3281

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/IetfAttrSyntaxChoice.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/IetfAttrSyntaxChoice.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/IetfAttrSyntaxChoice.java
index 916e9a2..b2b4bcc 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/IetfAttrSyntaxChoice.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/IetfAttrSyntaxChoice.java
@@ -19,10 +19,15 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
-import org.apache.kerby.asn1.type.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.type.Asn1Choice;
+import org.apache.kerby.asn1.type.Asn1ObjectIdentifier;
+import org.apache.kerby.asn1.type.Asn1OctetString;
 
-import static org.apache.kerby.x509.type.IetfAttrSyntaxChoice.MyEnum.*;
+import static org.apache.kerby.x509.type.IetfAttrSyntaxChoice.MyEnum.OCTETS;
+import static org.apache.kerby.x509.type.IetfAttrSyntaxChoice.MyEnum.OID;
+import static org.apache.kerby.x509.type.IetfAttrSyntaxChoice.MyEnum.UTF8;
 
 /**
  * Ref. RFC3281

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/IssuerSerial.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/IssuerSerial.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/IssuerSerial.java
index ac3ab2d..9003bf9 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/IssuerSerial.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/IssuerSerial.java
@@ -19,10 +19,14 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
-import org.apache.kerby.asn1.type.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.type.Asn1BitString;
+import org.apache.kerby.asn1.type.Asn1SequenceType;
 
-import static org.apache.kerby.x509.type.IssuerSerial.MyEnum.*;
+import static org.apache.kerby.x509.type.IssuerSerial.MyEnum.ISSUER;
+import static org.apache.kerby.x509.type.IssuerSerial.MyEnum.ISSUER_UID;
+import static org.apache.kerby.x509.type.IssuerSerial.MyEnum.SERIAL;
 
 /**
  * <pre>

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/IssuingDistributionPoint.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/IssuingDistributionPoint.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/IssuingDistributionPoint.java
index 022573b..3a7108e 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/IssuingDistributionPoint.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/IssuingDistributionPoint.java
@@ -19,10 +19,18 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
-import org.apache.kerby.asn1.type.*;
-
-import static org.apache.kerby.x509.type.IssuingDistributionPoint.MyEnum.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.ExplicitField;
+import org.apache.kerby.asn1.type.Asn1Boolean;
+import org.apache.kerby.asn1.type.Asn1SequenceType;
+
+import static org.apache.kerby.x509.type.IssuingDistributionPoint.MyEnum.DISTRIBUTION_POINT;
+import static org.apache.kerby.x509.type.IssuingDistributionPoint.MyEnum.INDIRECT_CRL;
+import static org.apache.kerby.x509.type.IssuingDistributionPoint.MyEnum.ONLY_CONTAINS_ATTRIBUTE_CERTS;
+import static org.apache.kerby.x509.type.IssuingDistributionPoint.MyEnum.ONLY_CONTAINS_CA_CERTS;
+import static org.apache.kerby.x509.type.IssuingDistributionPoint.MyEnum.ONLY_CONTAINS_USER_CERTS;
+import static org.apache.kerby.x509.type.IssuingDistributionPoint.MyEnum.ONLY_SOME_REASONS;
 
 /**
  * <pre>
@@ -36,6 +44,7 @@ import static org.apache.kerby.x509.type.IssuingDistributionPoint.MyEnum.*;
  * }
  * </pre>
  */
+@SuppressWarnings("PMD.TooManyStaticImports")
 public class IssuingDistributionPoint extends Asn1SequenceType {
     protected enum MyEnum implements EnumType {
         DISTRIBUTION_POINT,

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/NameConstraints.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/NameConstraints.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/NameConstraints.java
index b6280df..bf54539 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/NameConstraints.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/NameConstraints.java
@@ -19,10 +19,13 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.ExplicitField;
 import org.apache.kerby.asn1.type.Asn1SequenceType;
 
-import static org.apache.kerby.x509.type.NameConstraints.MyEnum.*;
+import static org.apache.kerby.x509.type.NameConstraints.MyEnum.EXCLUDED_SUBTREES;
+import static org.apache.kerby.x509.type.NameConstraints.MyEnum.PERMITTED_SUBTREES;
 
 /*
  * NameConstraints ::= SEQUENCE {

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/NoticeNumbers.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/NoticeNumbers.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/NoticeNumbers.java
index f8802b6..798e905 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/NoticeNumbers.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/NoticeNumbers.java
@@ -19,7 +19,8 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.type.*;
+import org.apache.kerby.asn1.type.Asn1Integer;
+import org.apache.kerby.asn1.type.Asn1SequenceOf;
 
 /**
  * <pre>

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/NoticeReference.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/NoticeReference.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/NoticeReference.java
index c740e0c..444c341 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/NoticeReference.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/NoticeReference.java
@@ -19,10 +19,12 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
 import org.apache.kerby.asn1.type.Asn1SequenceType;
 
-import static org.apache.kerby.x509.type.NoticeReference.MyEnum.*;
+import static org.apache.kerby.x509.type.NoticeReference.MyEnum.NOTICE_NUMBERS;
+import static org.apache.kerby.x509.type.NoticeReference.MyEnum.ORGANIZATION;
 
 /**
  * <pre>

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/ObjectDigestInfo.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/ObjectDigestInfo.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/ObjectDigestInfo.java
index b3ff30d..76e4e0a 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/ObjectDigestInfo.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/ObjectDigestInfo.java
@@ -19,10 +19,16 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
-import org.apache.kerby.asn1.type.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.type.Asn1BitString;
+import org.apache.kerby.asn1.type.Asn1ObjectIdentifier;
+import org.apache.kerby.asn1.type.Asn1SequenceType;
 
-import static org.apache.kerby.x509.type.ObjectDigestInfo.MyEnum.*;
+import static org.apache.kerby.x509.type.ObjectDigestInfo.MyEnum.DIGESTED_OBJECT_TYPE;
+import static org.apache.kerby.x509.type.ObjectDigestInfo.MyEnum.DIGEST_ALGORITHM;
+import static org.apache.kerby.x509.type.ObjectDigestInfo.MyEnum.OBJECT_DIGEST;
+import static org.apache.kerby.x509.type.ObjectDigestInfo.MyEnum.OTHER_OBJECT_TYPE_ID;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/OtherName.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/OtherName.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/OtherName.java
index 1f1c0e0..e137a67 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/OtherName.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/OtherName.java
@@ -19,10 +19,16 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
-import org.apache.kerby.asn1.type.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.ExplicitField;
+import org.apache.kerby.asn1.type.Asn1Any;
+import org.apache.kerby.asn1.type.Asn1ObjectIdentifier;
+import org.apache.kerby.asn1.type.Asn1SequenceType;
+import org.apache.kerby.asn1.type.Asn1Type;
 
-import static org.apache.kerby.x509.type.OtherName.MyEnum.*;
+import static org.apache.kerby.x509.type.OtherName.MyEnum.TYPE_ID;
+import static org.apache.kerby.x509.type.OtherName.MyEnum.VALUE;
 
 /**
  * <pre>

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/PolicyConstraints.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/PolicyConstraints.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/PolicyConstraints.java
index 2316379..d404881 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/PolicyConstraints.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/PolicyConstraints.java
@@ -19,10 +19,14 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
-import org.apache.kerby.asn1.type.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.ExplicitField;
+import org.apache.kerby.asn1.type.Asn1Integer;
+import org.apache.kerby.asn1.type.Asn1SequenceType;
 
-import static org.apache.kerby.x509.type.PolicyConstraints.MyEnum.*;
+import static org.apache.kerby.x509.type.PolicyConstraints.MyEnum.INHIBIT_POLICY_MAPPING;
+import static org.apache.kerby.x509.type.PolicyConstraints.MyEnum.REQUIRE_EXPLICIT_POLICY;
 
 /**
  * Ref. RFC 5280

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/PolicyInformation.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/PolicyInformation.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/PolicyInformation.java
index 3720a32..1b263c4 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/PolicyInformation.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/PolicyInformation.java
@@ -19,10 +19,12 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
 import org.apache.kerby.asn1.type.Asn1SequenceType;
 
-import static org.apache.kerby.x509.type.PolicyInformation.MyEnum.*;
+import static org.apache.kerby.x509.type.PolicyInformation.MyEnum.POLICY_IDENTIFIER;
+import static org.apache.kerby.x509.type.PolicyInformation.MyEnum.POLICY_QUALIFIERS;
 
 /*
  * <pre>

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/PolicyMapping.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/PolicyMapping.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/PolicyMapping.java
index 68e00bd..0757482 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/PolicyMapping.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/PolicyMapping.java
@@ -19,10 +19,12 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
 import org.apache.kerby.asn1.type.Asn1SequenceType;
 
-import static org.apache.kerby.x509.type.PolicyMapping.MyEnum.*;
+import static org.apache.kerby.x509.type.PolicyMapping.MyEnum.ISSUER_DOMAIN_POLICY;
+import static org.apache.kerby.x509.type.PolicyMapping.MyEnum.SUBJECT_DOMAIN_POLICY;
 
 /**
  * Ref. RFC3280

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/PolicyQualifierInfo.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/PolicyQualifierInfo.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/PolicyQualifierInfo.java
index 392762d..7ece2c7 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/PolicyQualifierInfo.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/PolicyQualifierInfo.java
@@ -19,10 +19,14 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
-import org.apache.kerby.asn1.type.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.type.Asn1Any;
+import org.apache.kerby.asn1.type.Asn1SequenceType;
+import org.apache.kerby.asn1.type.Asn1Type;
 
-import static org.apache.kerby.x509.type.PolicyQualifierInfo.MyEnum.*;
+import static org.apache.kerby.x509.type.PolicyQualifierInfo.MyEnum.POLICY_QUALIFIER_ID;
+import static org.apache.kerby.x509.type.PolicyQualifierInfo.MyEnum.QUALIFIER;
 
 /**
  * 

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/PrivateKeyUsagePeriod.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/PrivateKeyUsagePeriod.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/PrivateKeyUsagePeriod.java
index ce73685..2f3b3ea 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/PrivateKeyUsagePeriod.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/PrivateKeyUsagePeriod.java
@@ -19,10 +19,14 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
-import org.apache.kerby.asn1.type.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.ExplicitField;
+import org.apache.kerby.asn1.type.Asn1GeneralizedTime;
+import org.apache.kerby.asn1.type.Asn1SequenceType;
 
-import static org.apache.kerby.x509.type.PrivateKeyUsagePeriod.MyEnum.*;
+import static org.apache.kerby.x509.type.PrivateKeyUsagePeriod.MyEnum.NOT_AFTER;
+import static org.apache.kerby.x509.type.PrivateKeyUsagePeriod.MyEnum.NOT_BEFORE;
 
 /**
  * <pre>

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/RevokedCertificate.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/RevokedCertificate.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/RevokedCertificate.java
index f2090d9..ec8dfa9 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/RevokedCertificate.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/RevokedCertificate.java
@@ -19,10 +19,13 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
 import org.apache.kerby.asn1.type.Asn1SequenceType;
 
-import static org.apache.kerby.x509.type.RevokedCertificate.MyEnum.*;
+import static org.apache.kerby.x509.type.RevokedCertificate.MyEnum.CRL_ENTRY_EXTENSIONS;
+import static org.apache.kerby.x509.type.RevokedCertificate.MyEnum.REVOCATION_DATA;
+import static org.apache.kerby.x509.type.RevokedCertificate.MyEnum.USER_CERTIFICATE;
 
 /**
  * Ref. RFC 2459

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/RoleSyntax.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/RoleSyntax.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/RoleSyntax.java
index 9a84ac8..ffecefd 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/RoleSyntax.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/RoleSyntax.java
@@ -19,10 +19,13 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.ExplicitField;
 import org.apache.kerby.asn1.type.Asn1SequenceType;
 
-import static org.apache.kerby.x509.type.RoleSyntax.MyEnum.*;
+import static org.apache.kerby.x509.type.RoleSyntax.MyEnum.ROLE_AUTHORITY;
+import static org.apache.kerby.x509.type.RoleSyntax.MyEnum.ROLE_NAME;
 
 /**
  *Ref. RFC3281

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/SubjectPublicKeyInfo.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/SubjectPublicKeyInfo.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/SubjectPublicKeyInfo.java
index 85b0d87..c1718d4 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/SubjectPublicKeyInfo.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/SubjectPublicKeyInfo.java
@@ -19,10 +19,13 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
-import org.apache.kerby.asn1.type.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.type.Asn1BitString;
+import org.apache.kerby.asn1.type.Asn1SequenceType;
 
-import static org.apache.kerby.x509.type.SubjectPublicKeyInfo.MyEnum.*;
+import static org.apache.kerby.x509.type.SubjectPublicKeyInfo.MyEnum.ALGORITHM;
+import static org.apache.kerby.x509.type.SubjectPublicKeyInfo.MyEnum.SUBJECT_PUBLIC_KEY;
 
 /**
  * SubjectPublicKeyInfo  ::=  SEQUENCE  {

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/TBSCertList.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/TBSCertList.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/TBSCertList.java
index 0628644..f23bd73 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/TBSCertList.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/TBSCertList.java
@@ -26,7 +26,13 @@ import org.apache.kerby.asn1.type.Asn1Integer;
 import org.apache.kerby.asn1.type.Asn1SequenceType;
 import org.apache.kerby.x500.type.Name;
 
-import static org.apache.kerby.x509.type.TBSCertList.MyEnum.*;
+import static org.apache.kerby.x509.type.TBSCertList.MyEnum.CRL_EXTENSIONS;
+import static org.apache.kerby.x509.type.TBSCertList.MyEnum.ISSUER;
+import static org.apache.kerby.x509.type.TBSCertList.MyEnum.NEXT_UPDATE;
+import static org.apache.kerby.x509.type.TBSCertList.MyEnum.REVOKED_CERTIFICATES;
+import static org.apache.kerby.x509.type.TBSCertList.MyEnum.SIGNATURE;
+import static org.apache.kerby.x509.type.TBSCertList.MyEnum.THIS_UPDATA;
+import static org.apache.kerby.x509.type.TBSCertList.MyEnum.VERSION;
 
 /**
  * Ref. RFC-2459
@@ -49,6 +55,7 @@ import static org.apache.kerby.x509.type.TBSCertList.MyEnum.*;
  *                                }
  * </pre>
  */
+@SuppressWarnings("PMD.TooManyStaticImports")
 public class TBSCertList extends Asn1SequenceType {
     protected enum MyEnum implements EnumType {
         VERSION,

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/TBSCertificate.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/TBSCertificate.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/TBSCertificate.java
index 195b17e..71deb42 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/TBSCertificate.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/TBSCertificate.java
@@ -19,11 +19,25 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
-import org.apache.kerby.asn1.type.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.ExplicitField;
+import org.apache.kerby.asn1.ImplicitField;
+import org.apache.kerby.asn1.type.Asn1BitString;
+import org.apache.kerby.asn1.type.Asn1Integer;
+import org.apache.kerby.asn1.type.Asn1SequenceType;
 import org.apache.kerby.x500.type.Name;
 
-import static org.apache.kerby.x509.type.TBSCertificate.MyEnum.*;
+import static org.apache.kerby.x509.type.TBSCertificate.MyEnum.EXTENSIONS;
+import static org.apache.kerby.x509.type.TBSCertificate.MyEnum.ISSUER;
+import static org.apache.kerby.x509.type.TBSCertificate.MyEnum.ISSUER_UNIQUE_ID;
+import static org.apache.kerby.x509.type.TBSCertificate.MyEnum.SERIAL_NUMBER;
+import static org.apache.kerby.x509.type.TBSCertificate.MyEnum.SIGNATURE;
+import static org.apache.kerby.x509.type.TBSCertificate.MyEnum.SUBJECT;
+import static org.apache.kerby.x509.type.TBSCertificate.MyEnum.SUBJECT_PUBLIC_KEY_INFO;
+import static org.apache.kerby.x509.type.TBSCertificate.MyEnum.SUBJECT_UNIQUE_ID;
+import static org.apache.kerby.x509.type.TBSCertificate.MyEnum.VALIDITY;
+import static org.apache.kerby.x509.type.TBSCertificate.MyEnum.VERSION;
 
 
 /**
@@ -42,6 +56,7 @@ import static org.apache.kerby.x509.type.TBSCertificate.MyEnum.*;
  *  }
  * </pre>
  */
+@SuppressWarnings("PMD.TooManyStaticImports")
 public class TBSCertificate extends Asn1SequenceType {
     protected enum MyEnum implements EnumType {
         VERSION,

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/Target.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/Target.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/Target.java
index d8c6de5..6f5d64c 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/Target.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/Target.java
@@ -19,10 +19,14 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.ExplicitField;
 import org.apache.kerby.asn1.type.Asn1Choice;
 
-import static org.apache.kerby.x509.type.Target.MyEnum.*;
+import static org.apache.kerby.x509.type.Target.MyEnum.TARGET_CERT;
+import static org.apache.kerby.x509.type.Target.MyEnum.TARGET_GROUP;
+import static org.apache.kerby.x509.type.Target.MyEnum.TARGET_NAME;
 
 /**
  * Ref. RFC 3281

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/TargetCert.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/TargetCert.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/TargetCert.java
index bb4b9b2..447ce8e 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/TargetCert.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/TargetCert.java
@@ -19,10 +19,13 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
 import org.apache.kerby.asn1.type.Asn1SequenceType;
 
-import static org.apache.kerby.x509.type.TargetCert.MyEnum.*;
+import static org.apache.kerby.x509.type.TargetCert.MyEnum.CERT_DIGEST_INFO;
+import static org.apache.kerby.x509.type.TargetCert.MyEnum.TARGET_CERTIFICATE;
+import static org.apache.kerby.x509.type.TargetCert.MyEnum.TARGET_NAME;
 
 /**
  * TargetCert  ::= SEQUENCE {

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dee1decc/kerby-pkix/src/main/java/org/apache/kerby/x509/type/Time.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/Time.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/Time.java
index 93e6873..56ccc41 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/Time.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/Time.java
@@ -19,12 +19,16 @@
  */
 package org.apache.kerby.x509.type;
 
-import org.apache.kerby.asn1.*;
-import org.apache.kerby.asn1.type.*;
+import org.apache.kerby.asn1.Asn1FieldInfo;
+import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.type.Asn1Choice;
+import org.apache.kerby.asn1.type.Asn1GeneralizedTime;
+import org.apache.kerby.asn1.type.Asn1UtcTime;
 
 import java.util.Date;
 
-import static org.apache.kerby.x509.type.Time.MyEnum.*;
+import static org.apache.kerby.x509.type.Time.MyEnum.GENERAL_TIME;
+import static org.apache.kerby.x509.type.Time.MyEnum.UTC_TIME;
 
 /**
  *


Mime
View raw message