Hello, one bug to report and one possible place for optimization:

1.) (bug) The initTrustStore() method in the autogenerated Saml20HOKCallbackHandler class (and very possibly the
others--HOK 1.0 and SV 1.0 and SV 2.0) created when you have a SOAP client using SAML has a bug.  It should be
trustStore = TrustStore.getInstance(...) in the first line of the code below.

Example from Saml20HOKCallbackHandler

    private void initTrustStore() throws IOException {
        try {
            trustStore = KeyStore.getInstance(trustStoreType);  <-- bug
            trustStore.load(new FileInputStream(trustStoreURL), trustStorePassword.toCharArray());
        } catch (Exception e) {
            throw new IOException(e.getMessage());
        }
    }


2. (possible optimization) getDefaultPrivKeyCert() is calling keyStore.getCertificate(...) twice on the certificate it
actually needs (once with currentAlias, once with uniqueAlias)--I wonder if that could be easily optimized to once.