Make sure both tokenCache and tokenExpiryCache are initialized if needed

[dwnusbaum]

It is possible for users who have a AbstractVaultTokenCredentialWithExpiration that was created after #223 and has not been resaved since #325 to still have a non-null tokenCache field on disk (and a non-null tokenExpiry field).

As of #336, this causes problems, because the following logic only checks for a non-null tokenCache to decide if the transient fields need to be initialized:

hashicorp-vault-plugin/src/main/java/com/datapipe/jenkins/vault/credentials/AbstractVaultTokenCredentialWithExpiration.java

Line 110 in 946b535

if (tokenCache == null) {

We need to adjust this logic to check for both tokenCache and the newly-renamed tokenExpiryCache to avoid issues for users who have gone through this upgrade path.

Fixes #340.

Testing done

Untested.

The regression should be able to be reproduced in a JenkinsRule test if desired, but I do not see any existing JenkinsRule tests for the credentials types that are subclasses of AbstractVaultTokenCredentialWithExpiration, so it might take some effort.

Submitter checklist

• Make sure you are opening from a topic/feature/bugfix branch (right side) and not your main branch!
• Ensure that the pull request title represents the desired changelog entry
• Please describe what you did
• Link to relevant issues in GitHub or Jira
• Link to relevant pull requests, esp. upstream and downstream changes
• Ensure you have provided tests - that demonstrates feature works or fixes the issue