Skip to content

Commit e980369

Browse files
phaxphax
committed
Consistency improvements
1 parent 00438eb commit e980369

File tree

8 files changed

+38
-41
lines changed

8 files changed

+38
-41
lines changed

‎phase2-lib/src/main/java/com/helger/phase2/crypto/BCCryptoHelper.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ public MimeBodyPart encrypt (@NonNull final MimeBodyPart aPart,
509509
return aGen.generate (aPart, aEncryptor);
510510
}
511511

512-
private static Map <ASN1ObjectIdentifier, String> NEW_SIGN_ALGOS;
512+
private static final Map <ASN1ObjectIdentifier, String> NEW_SIGN_ALGOS;
513513

514514
static
515515
{
@@ -715,11 +715,9 @@ public MimeBodyPart verify (@NonNull final MimeBodyPart aPart,
715715
// Get only once and check
716716
// Throws "ParseException" if it is not a MIME message
717717
final Object aContent = aPart.getContent ();
718-
if (!(aContent instanceof MimeMultipart))
718+
if (!(aContent instanceof final MimeMultipart aMainPart))
719719
throw new IllegalStateException ("Expected Part content to be MimeMultipart but it isn't. It is " +
720720
ClassHelper.getClassName (aContent));
721-
final MimeMultipart aMainPart = (MimeMultipart) aContent;
722-
723721
// SMIMESignedParser uses "7bit" as the default - AS2 wants "binary"
724722
final SMIMESignedParser aSignedParser = new SMIMESignedParser (new JcaDigestCalculatorProviderBuilder ().setProvider (m_sSecurityProviderName)
725723
.build (),

‎phase2-lib/src/main/java/com/helger/phase2/util/AS2XMLHelper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
*/
3333
package com.helger.phase2.util;
3434

35-
import java.util.LinkedHashMap;
3635
import java.util.Locale;
3736
import java.util.Map;
3837

@@ -46,6 +45,7 @@
4645
import com.helger.base.enforce.ValueEnforcer;
4746
import com.helger.base.reflection.GenericReflection;
4847
import com.helger.collection.commons.CommonsLinkedHashMap;
48+
import com.helger.collection.commons.ICommonsMap;
4949
import com.helger.collection.commons.ICommonsOrderedMap;
5050
import com.helger.phase2.IDynamicComponent;
5151
import com.helger.phase2.exception.AS2Exception;
@@ -150,7 +150,7 @@ private static void _updateDirectories (@NonNull final StringMap aAttributes, @N
150150
}
151151
}
152152

153-
private static Map <String, String> PHASE2_PACKAGE_MAP = new LinkedHashMap <> ();
153+
private static final ICommonsMap <String, String> PHASE2_PACKAGE_MAP = new CommonsLinkedHashMap <> ();
154154
static
155155
{
156156
// Order is important

phase2-lib/src/test/java/com/helger/phase2/cert/CertificateFactoryByteArray.java renamed to phase2-lib/src/test/java/com/helger/phase2/cert/MockCertificateFactoryByteArray.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import com.helger.phase2.session.IAS2Session;
3838
import com.helger.typeconvert.collection.IStringMap;
3939

40-
public class CertificateFactoryByteArray extends CertificateFactory
40+
public class MockCertificateFactoryByteArray extends CertificateFactory
4141
{
4242
@Override
4343
public void initDynamicComponent (final IAS2Session aSession, final IStringMap aOptions) throws AS2Exception

‎phase2-lib/src/test/java/com/helger/phase2/processor/sender/ReadMDNFuncTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,12 @@
6262

6363
import jakarta.mail.internet.MimeBodyPart;
6464

65-
public class ReadMDNFuncTest
65+
public final class ReadMDNFuncTest
6666
{
6767
@Test
6868
public void testReadMDN02 () throws Exception
6969
{
70-
String sPrefix = "external/mdn/4af6f84c-d882-4466-8e0c-305a7fbe37b3";
71-
sPrefix = "external/mdn/20190925-david";
70+
String sPrefix = "external/mdn/20190925-david";
7271
final IReadableResource aHeaderRes = new ClassPathResource (sPrefix + ".header");
7372
assertTrue (aHeaderRes.exists ());
7473
final IReadableResource aPayloadRes = new ClassPathResource (sPrefix + ".payload");

‎phase2-lib/src/test/java/com/helger/phase2/util/cert/AS2KeyStoreHelper.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ private AS2KeyStoreHelper ()
6464
{}
6565

6666
@NonNull
67-
public static AS2KeyStore readKeyStore (@NonNull final IKeyStoreType aKeyStoreType,
67+
public static MockAS2KeyStore readKeyStore (@NonNull final IKeyStoreType aKeyStoreType,
6868
@NonNull final String sFilename,
6969
@NonNull final char [] aPassword,
7070
@NonNull final ICryptoHelper aCryptoHelper) throws Exception
@@ -76,15 +76,15 @@ public static AS2KeyStore readKeyStore (@NonNull final IKeyStoreType aKeyStoreTy
7676
try
7777
{
7878
final KeyStore aKeyStore = aCryptoHelper.loadKeyStore (aKeyStoreType, aIS, aPassword);
79-
return new AS2KeyStore (aKeyStore);
79+
return new MockAS2KeyStore (aKeyStore);
8080
}
8181
finally
8282
{
8383
StreamHelper.close (aIS);
8484
}
8585
}
8686

87-
public static void writeKeyStore (@NonNull final AS2KeyStore aKeyStore,
87+
public static void writeKeyStore (@NonNull final MockAS2KeyStore aKeyStore,
8888
@NonNull final String sFilename,
8989
@NonNull final char [] aPassword) throws GeneralSecurityException, IOException
9090
{

‎phase2-lib/src/test/java/com/helger/phase2/util/cert/ICertificateStore.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,22 +50,22 @@ public interface ICertificateStore
5050
{
5151
@NonNull
5252
@ReturnsMutableCopy
53-
ICommonsList <String> getAliases () throws AS2CertificateException;
53+
ICommonsList <String> getAliases () throws MockAS2CertificateException;
5454

5555
@Nullable
56-
Certificate getCertificate (@Nullable String sAlias) throws AS2CertificateException;
56+
Certificate getCertificate (@Nullable String sAlias) throws MockAS2CertificateException;
5757

58-
void setCertificate (@NonNull String sAlias, @NonNull Certificate aCert) throws AS2CertificateException;
58+
void setCertificate (@NonNull String sAlias, @NonNull Certificate aCert) throws MockAS2CertificateException;
5959

6060
@Nullable
61-
String getAlias (@Nullable Certificate aCert) throws AS2CertificateException;
61+
String getAlias (@Nullable Certificate aCert) throws MockAS2CertificateException;
6262

63-
void removeCertificate (@Nullable String sAlias) throws AS2CertificateException;
63+
void removeCertificate (@Nullable String sAlias) throws MockAS2CertificateException;
6464

65-
void clearCertificates () throws AS2CertificateException;
65+
void clearCertificates () throws MockAS2CertificateException;
6666

6767
@Nullable
68-
Key getKey (@Nullable String sAlias, char [] aPassword) throws AS2CertificateException;
68+
Key getKey (@Nullable String sAlias, char [] aPassword) throws MockAS2CertificateException;
6969

70-
void setKey (@NonNull String sAlias, @NonNull Key aKey, char [] aPassword) throws AS2CertificateException;
70+
void setKey (@NonNull String sAlias, @NonNull Key aKey, char [] aPassword) throws MockAS2CertificateException;
7171
}

phase2-lib/src/test/java/com/helger/phase2/util/cert/AS2CertificateException.java renamed to phase2-lib/src/test/java/com/helger/phase2/util/cert/MockAS2CertificateException.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
*
4040
* @author Philip Helger
4141
*/
42-
public class AS2CertificateException extends AS2Exception
42+
public class MockAS2CertificateException extends AS2Exception
4343
{
44-
public AS2CertificateException (final String sMsg, final Throwable aCause)
44+
public MockAS2CertificateException (final String sMsg, final Throwable aCause)
4545
{
4646
super (sMsg, aCause);
4747
}

phase2-lib/src/test/java/com/helger/phase2/util/cert/AS2KeyStore.java renamed to phase2-lib/src/test/java/com/helger/phase2/util/cert/MockAS2KeyStore.java

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@
4747
import com.helger.collection.commons.CommonsArrayList;
4848
import com.helger.collection.commons.ICommonsList;
4949

50-
public class AS2KeyStore implements ICertificateStore
50+
public class MockAS2KeyStore implements ICertificateStore
5151
{
5252
private final KeyStore m_aKeyStore;
5353

54-
public AS2KeyStore (@NonNull final KeyStore aKeyStore)
54+
public MockAS2KeyStore (@NonNull final KeyStore aKeyStore)
5555
{
5656
m_aKeyStore = ValueEnforcer.notNull (aKeyStore, "KeyStore");
5757
}
@@ -64,20 +64,20 @@ public KeyStore getKeyStore ()
6464

6565
@NonNull
6666
@ReturnsMutableCopy
67-
public ICommonsList <String> getAliases () throws AS2CertificateException
67+
public ICommonsList <String> getAliases () throws MockAS2CertificateException
6868
{
6969
try
7070
{
7171
return new CommonsArrayList <> (getKeyStore ().aliases ());
7272
}
7373
catch (final KeyStoreException kse)
7474
{
75-
throw new AS2CertificateException ("Error getting aliases", kse);
75+
throw new MockAS2CertificateException ("Error getting aliases", kse);
7676
}
7777
}
7878

7979
@Nullable
80-
public Certificate getCertificate (@Nullable final String sAlias) throws AS2CertificateException
80+
public Certificate getCertificate (@Nullable final String sAlias) throws MockAS2CertificateException
8181
{
8282
if (sAlias == null)
8383
return null;
@@ -88,12 +88,12 @@ public Certificate getCertificate (@Nullable final String sAlias) throws AS2Cert
8888
}
8989
catch (final KeyStoreException kse)
9090
{
91-
throw new AS2CertificateException ("Error getting certificate for alias: " + sAlias, kse);
91+
throw new MockAS2CertificateException ("Error getting certificate for alias: " + sAlias, kse);
9292
}
9393
}
9494

9595
public void setCertificate (@NonNull final String sAlias, @NonNull final Certificate aCert)
96-
throws AS2CertificateException
96+
throws MockAS2CertificateException
9797
{
9898
ValueEnforcer.notNull (sAlias, "Alias");
9999
ValueEnforcer.notNull (aCert, "Certificate");
@@ -104,12 +104,12 @@ public void setCertificate (@NonNull final String sAlias, @NonNull final Certifi
104104
}
105105
catch (final KeyStoreException kse)
106106
{
107-
throw new AS2CertificateException ("Error setting certificate: " + sAlias, kse);
107+
throw new MockAS2CertificateException ("Error setting certificate: " + sAlias, kse);
108108
}
109109
}
110110

111111
@Nullable
112-
public String getAlias (@Nullable final Certificate aCert) throws AS2CertificateException
112+
public String getAlias (@Nullable final Certificate aCert) throws MockAS2CertificateException
113113
{
114114
if (aCert == null)
115115
return null;
@@ -120,11 +120,11 @@ public String getAlias (@Nullable final Certificate aCert) throws AS2Certificate
120120
}
121121
catch (final KeyStoreException kse)
122122
{
123-
throw new AS2CertificateException ("Error getting alias for certificate: " + aCert.toString (), kse);
123+
throw new MockAS2CertificateException ("Error getting alias for certificate: " + aCert.toString (), kse);
124124
}
125125
}
126126

127-
public void removeCertificate (@Nullable final String sAlias) throws AS2CertificateException
127+
public void removeCertificate (@Nullable final String sAlias) throws MockAS2CertificateException
128128
{
129129
if (sAlias != null)
130130
try
@@ -133,11 +133,11 @@ public void removeCertificate (@Nullable final String sAlias) throws AS2Certific
133133
}
134134
catch (final KeyStoreException kse)
135135
{
136-
throw new AS2CertificateException ("Error while removing certificate: " + sAlias, kse);
136+
throw new MockAS2CertificateException ("Error while removing certificate: " + sAlias, kse);
137137
}
138138
}
139139

140-
public void clearCertificates () throws AS2CertificateException
140+
public void clearCertificates () throws MockAS2CertificateException
141141
{
142142
try
143143
{
@@ -150,12 +150,12 @@ public void clearCertificates () throws AS2CertificateException
150150
}
151151
catch (final KeyStoreException kse)
152152
{
153-
throw new AS2CertificateException ("Error clearing certificates", kse);
153+
throw new MockAS2CertificateException ("Error clearing certificates", kse);
154154
}
155155
}
156156

157157
@Nullable
158-
public Key getKey (@Nullable final String sAlias, @Nullable final char [] aPassword) throws AS2CertificateException
158+
public Key getKey (@Nullable final String sAlias, @Nullable final char [] aPassword) throws MockAS2CertificateException
159159
{
160160
if (sAlias == null)
161161
return null;
@@ -166,12 +166,12 @@ public Key getKey (@Nullable final String sAlias, @Nullable final char [] aPassw
166166
}
167167
catch (final GeneralSecurityException gse)
168168
{
169-
throw new AS2CertificateException ("Error getting key for alias: " + sAlias, gse);
169+
throw new MockAS2CertificateException ("Error getting key for alias: " + sAlias, gse);
170170
}
171171
}
172172

173173
public void setKey (@NonNull final String sAlias, @NonNull final Key aKey, @Nullable final char [] aPassword)
174-
throws AS2CertificateException
174+
throws MockAS2CertificateException
175175
{
176176
ValueEnforcer.notNull (sAlias, "Alias");
177177
ValueEnforcer.notNull (aKey, "Key");
@@ -184,7 +184,7 @@ public void setKey (@NonNull final String sAlias, @NonNull final Key aKey, @Null
184184
}
185185
catch (final KeyStoreException kse)
186186
{
187-
throw new AS2CertificateException ("Error setting key for alias: " + sAlias, kse);
187+
throw new MockAS2CertificateException ("Error setting key for alias: " + sAlias, kse);
188188
}
189189
}
190190
}

0 commit comments

Comments
 (0)