[ELY-1734] Clean up the 'wildfly-elytron-asn1' module as it currently…

… contains public and private API
wildfly-security-incubator · Feb 5, 2019 · 83c2f9e · 83c2f9e
1 parent 7487958
commit 83c2f9e
Show file tree

Hide file tree

Showing 23 changed files with 30 additions and 54 deletions.
diff --git a/.../org/wildfly/security/asn1/util/ASN1.java → .../java/org/wildfly/security/asn1/ASN1.java b/.../org/wildfly/security/asn1/util/ASN1.java → .../java/org/wildfly/security/asn1/ASN1.java
@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-package org.wildfly.security.asn1.util;
+package org.wildfly.security.asn1;
 
-import static org.wildfly.security.asn1._private.ElytronMessages.log;
+import static org.wildfly.security.asn1.ElytronMessages.log;
 
 import org.wildfly.common.array.Arrays2;
 import org.wildfly.security.asn1.ASN1Decoder;

diff --git a/asn1/src/main/java/org/wildfly/security/asn1/DERDecoder.java b/asn1/src/main/java/org/wildfly/security/asn1/DERDecoder.java
@@ -18,8 +18,8 @@
 
 package org.wildfly.security.asn1;
 
-import static org.wildfly.security.asn1._private.ElytronMessages.log;
-import static org.wildfly.security.asn1.util.ASN1.*;
+import static org.wildfly.security.asn1.ElytronMessages.log;
+import static org.wildfly.security.asn1.ASN1.*;
 
 import java.io.UnsupportedEncodingException;
 import java.math.BigInteger;

diff --git a/asn1/src/main/java/org/wildfly/security/asn1/DEREncoder.java b/asn1/src/main/java/org/wildfly/security/asn1/DEREncoder.java
@@ -18,8 +18,8 @@
 
 package org.wildfly.security.asn1;
 
-import static org.wildfly.security.asn1._private.ElytronMessages.log;
-import static org.wildfly.security.asn1.util.ASN1.*;
+import static org.wildfly.security.asn1.ElytronMessages.log;
+import static org.wildfly.security.asn1.ASN1.*;
 
 import java.math.BigInteger;
 import java.nio.charset.Charset;

diff --git a/...curity/asn1/_private/ElytronMessages.java → ...ildfly/security/asn1/ElytronMessages.java b/...curity/asn1/_private/ElytronMessages.java → ...ildfly/security/asn1/ElytronMessages.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.wildfly.security.asn1._private;
+package org.wildfly.security.asn1;
 
 import java.io.EOFException;
 import java.io.IOException;

diff --git a/.../wildfly/security/asn1/util/OidsUtil.java → ...a/org/wildfly/security/asn1/OidsUtil.java b/.../wildfly/security/asn1/util/OidsUtil.java → ...a/org/wildfly/security/asn1/OidsUtil.java
@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package org.wildfly.security.asn1.util;
+package org.wildfly.security.asn1;
 
 import org.wildfly.common.Assert;
-import org.wildfly.security.asn1._private.ElytronMessages;
+import org.wildfly.security.asn1.ElytronMessages;
 
 import java.io.InputStream;
 import java.util.HashMap;
@@ -94,4 +94,4 @@ public static String oidToAttributeName(Category category, String oid) {
         return oidToAttributeNameTable.get(category).get(oid);
     }
 
-}
+}
diff --git a/...ildfly/security/asn1/util/oids.properties → ...org/wildfly/security/asn1/oids.properties b/...ildfly/security/asn1/util/oids.properties → ...org/wildfly/security/asn1/oids.properties
diff --git a/asn1/src/main/java/org/wildfly/security/asn1/util/package-info.java b/asn1/src/main/java/org/wildfly/security/asn1/util/package-info.java
diff --git a/asn1/src/test/java/org/wildfly/security/asn1/DEREncoderTest.java b/asn1/src/test/java/org/wildfly/security/asn1/DEREncoderTest.java
@@ -20,7 +20,6 @@
 
 import org.junit.Test;
 import org.wildfly.common.bytes.ByteStringBuilder;
-import org.wildfly.security.asn1.util.ASN1;
 
 import java.math.BigInteger;
 import java.security.KeyFactory;

diff --git a/...dfly/security/asn1/util/OidsUtilTest.java → ...g/wildfly/security/asn1/OidsUtilTest.java b/...dfly/security/asn1/util/OidsUtilTest.java → ...g/wildfly/security/asn1/OidsUtilTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.wildfly.security.asn1.util;
+package org.wildfly.security.asn1;
 
 import org.junit.Assert;
 import org.junit.Test;

diff --git a/auth/client/src/main/java/org/wildfly/security/auth/client/ElytronXmlParser.java b/auth/client/src/main/java/org/wildfly/security/auth/client/ElytronXmlParser.java
@@ -103,7 +103,7 @@
 import org.wildfly.security.WildFlyElytronSaslOTPProvider;
 import org.wildfly.security.WildFlyElytronSaslPlainProvider;
 import org.wildfly.security.WildFlyElytronSaslScramProvider;
-import org.wildfly.security.asn1.util.OidsUtil;
+import org.wildfly.security.asn1.OidsUtil;
 import org.wildfly.security.auth.server.IdentityCredentials;
 import org.wildfly.security.auth.server.NameRewriter;
 import org.wildfly.security.auth.util.ElytronAuthenticator;

diff --git a/auth/server/base/src/main/java/org/wildfly/security/ssl/TLSServerEndPointChannelBinding.java b/auth/server/base/src/main/java/org/wildfly/security/ssl/TLSServerEndPointChannelBinding.java
@@ -25,7 +25,7 @@
 
 import javax.security.auth.callback.UnsupportedCallbackException;
 
-import org.wildfly.security.asn1.util.ASN1;
+import org.wildfly.security.asn1.ASN1;
 import org.wildfly.security.auth.callback.CallbackUtil;
 import org.wildfly.security.auth.callback.ChannelBindingCallback;
 

diff --git a/sasl/entity/src/main/java/org/wildfly/security/sasl/entity/Entity.java b/sasl/entity/src/main/java/org/wildfly/security/sasl/entity/Entity.java
@@ -18,7 +18,7 @@
 
 package org.wildfly.security.sasl.entity;
 
-import static org.wildfly.security.asn1.util.ASN1.*;
+import static org.wildfly.security.asn1.ASN1.*;
 
 /**
  * Constants for the ISO/IEC 9798-3 authentication SASL mechanism.

diff --git a/sasl/entity/src/main/java/org/wildfly/security/sasl/entity/EntitySaslClient.java b/sasl/entity/src/main/java/org/wildfly/security/sasl/entity/EntitySaslClient.java
@@ -18,7 +18,7 @@
 
 package org.wildfly.security.sasl.entity;
 
-import static org.wildfly.security.asn1.util.ASN1.CONTEXT_SPECIFIC_MASK;
+import static org.wildfly.security.asn1.ASN1.CONTEXT_SPECIFIC_MASK;
 import static org.wildfly.security.mechanism._private.ElytronMessages.saslEntity;
 import static org.wildfly.security.sasl.entity.Entity.keyType;
 

diff --git a/sasl/entity/src/main/java/org/wildfly/security/sasl/entity/EntitySaslServer.java b/sasl/entity/src/main/java/org/wildfly/security/sasl/entity/EntitySaslServer.java
@@ -18,7 +18,7 @@
 
 package org.wildfly.security.sasl.entity;
 
-import static org.wildfly.security.asn1.util.ASN1.CONTEXT_SPECIFIC_MASK;
+import static org.wildfly.security.asn1.ASN1.CONTEXT_SPECIFIC_MASK;
 import static org.wildfly.security.mechanism._private.ElytronMessages.saslEntity;
 import static org.wildfly.security.sasl.entity.Entity.keyType;
 

diff --git a/sasl/entity/src/main/java/org/wildfly/security/sasl/entity/EntityUtil.java b/sasl/entity/src/main/java/org/wildfly/security/sasl/entity/EntityUtil.java
@@ -18,7 +18,7 @@
 
 package org.wildfly.security.sasl.entity;
 
-import static org.wildfly.security.asn1.util.ASN1.*;
+import static org.wildfly.security.asn1.ASN1.*;
 import static org.wildfly.security.mechanism._private.ElytronMessages.saslEntity;
 import static org.wildfly.security.sasl.entity.Entity.*;
 import static org.wildfly.security.x500.GeneralName.*;

diff --git a/sasl/gs2/src/main/java/org/wildfly/security/sasl/gs2/Gs2SaslClient.java b/sasl/gs2/src/main/java/org/wildfly/security/sasl/gs2/Gs2SaslClient.java
@@ -18,7 +18,7 @@
 
 package org.wildfly.security.sasl.gs2;
 
-import static org.wildfly.security.asn1.util.ASN1.APPLICATION_SPECIFIC_MASK;
+import static org.wildfly.security.asn1.ASN1.APPLICATION_SPECIFIC_MASK;
 import static org.wildfly.security.mechanism._private.ElytronMessages.saslGs2;
 import static org.wildfly.security.sasl.gs2.Gs2Util.TOKEN_HEADER_TAG;
 

diff --git a/sasl/gs2/src/main/java/org/wildfly/security/sasl/gs2/Gs2SaslServer.java b/sasl/gs2/src/main/java/org/wildfly/security/sasl/gs2/Gs2SaslServer.java
@@ -18,7 +18,7 @@
 
 package org.wildfly.security.sasl.gs2;
 
-import static org.wildfly.security.asn1.util.ASN1.APPLICATION_SPECIFIC_MASK;
+import static org.wildfly.security.asn1.ASN1.APPLICATION_SPECIFIC_MASK;
 import static org.wildfly.security.mechanism._private.ElytronMessages.saslGs2;
 
 import java.io.IOException;

diff --git a/tests/base/src/test/java/org/wildfly/security/asn1/DERDecoderTest.java b/tests/base/src/test/java/org/wildfly/security/asn1/DERDecoderTest.java
@@ -19,12 +19,12 @@
 package org.wildfly.security.asn1;
 
 import static org.junit.Assert.*;
-import static org.wildfly.security.asn1.util.ASN1.*;
+import static org.wildfly.security.asn1.ASN1.*;
 import static org.wildfly.security.pem.Pem.extractDerContent;
 
 import org.junit.Test;
 import org.wildfly.common.iteration.CodePointIterator;
-import org.wildfly.security.asn1.util.ASN1;
+import org.wildfly.security.asn1.ASN1;
 
 import java.util.ArrayList;
 

diff --git a/x500/base/src/main/java/org/wildfly/security/x500/util/X500PrincipalUtil.java b/x500/base/src/main/java/org/wildfly/security/x500/util/X500PrincipalUtil.java
@@ -19,11 +19,11 @@
 package org.wildfly.security.x500.util;
 
 import static org.wildfly.security.x500._private.ElytronMessages.log;
-import static org.wildfly.security.asn1.util.ASN1.BMP_STRING_TYPE;
-import static org.wildfly.security.asn1.util.ASN1.IA5_STRING_TYPE;
-import static org.wildfly.security.asn1.util.ASN1.PRINTABLE_STRING_TYPE;
-import static org.wildfly.security.asn1.util.ASN1.UNIVERSAL_STRING_TYPE;
-import static org.wildfly.security.asn1.util.ASN1.UTF8_STRING_TYPE;
+import static org.wildfly.security.asn1.ASN1.BMP_STRING_TYPE;
+import static org.wildfly.security.asn1.ASN1.IA5_STRING_TYPE;
+import static org.wildfly.security.asn1.ASN1.PRINTABLE_STRING_TYPE;
+import static org.wildfly.security.asn1.ASN1.UNIVERSAL_STRING_TYPE;
+import static org.wildfly.security.asn1.ASN1.UTF8_STRING_TYPE;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;

diff --git a/x500/base/src/test/java/org/wildfly/security/x500/util/X500PrincipalUtilTest.java b/x500/base/src/test/java/org/wildfly/security/x500/util/X500PrincipalUtilTest.java
@@ -24,7 +24,7 @@
 
 import org.junit.Test;
 import org.wildfly.security.asn1.ASN1Encodable;
-import org.wildfly.security.asn1.util.ASN1;
+import org.wildfly.security.asn1.ASN1;
 import org.wildfly.security.asn1.DERDecoder;
 import org.wildfly.security.x500.X500;
 import org.wildfly.security.x500.X500AttributeTypeAndValue;

diff --git a/x500/cert/base/src/main/java/org/wildfly/security/pem/Pem.java b/x500/cert/base/src/main/java/org/wildfly/security/pem/Pem.java
@@ -39,7 +39,7 @@
 import org.wildfly.common.bytes.ByteStringBuilder;
 import org.wildfly.common.iteration.ByteIterator;
 import org.wildfly.common.iteration.CodePointIterator;
-import org.wildfly.security.asn1.util.ASN1;
+import org.wildfly.security.asn1.ASN1;
 import org.wildfly.security.asn1.DERDecoder;
 import org.wildfly.security.x500.cert.PKCS10CertificateSigningRequest;
 

diff --git a/...rt/base/src/main/java/org/wildfly/security/x500/cert/PKCS10CertificateSigningRequest.java b/...rt/base/src/main/java/org/wildfly/security/x500/cert/PKCS10CertificateSigningRequest.java
@@ -40,7 +40,7 @@
 
 import org.wildfly.common.Assert;
 import org.wildfly.common.bytes.ByteStringBuilder;
-import org.wildfly.security.asn1.util.ASN1;
+import org.wildfly.security.asn1.ASN1;
 import org.wildfly.security.asn1.DEREncoder;
 import org.wildfly.security.pem.Pem;
 

diff --git a/x500/cert/base/src/main/java/org/wildfly/security/x500/cert/X509CertificateBuilder.java b/x500/cert/base/src/main/java/org/wildfly/security/x500/cert/X509CertificateBuilder.java
@@ -43,7 +43,7 @@
 import javax.security.auth.x500.X500Principal;
 
 import org.wildfly.common.Assert;
-import org.wildfly.security.asn1.util.ASN1;
+import org.wildfly.security.asn1.ASN1;
 import org.wildfly.security.asn1.DEREncoder;
 
 /**