diff options
| author | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2020-02-20 09:43:03 +0100 |
|---|---|---|
| committer | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2020-02-20 09:43:03 +0100 |
| commit | a57a2ed851b818456421f3ce082dc6813da6b736 (patch) | |
| tree | b4c9c4c9f7c317ff3f0686d7427366203bdd9347 /eaaf_core_utils/src/main | |
| parent | 9e26dd0833cd3a6bfb6f15cc11727cdc8e14d260 (diff) | |
| download | EAAF-Components-a57a2ed851b818456421f3ce082dc6813da6b736.tar.gz EAAF-Components-a57a2ed851b818456421f3ce082dc6813da6b736.tar.bz2 EAAF-Components-a57a2ed851b818456421f3ce082dc6813da6b736.zip | |
add two jUnit test and CodeStyle modifications
Diffstat (limited to 'eaaf_core_utils/src/main')
| -rw-r--r-- | eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/EaafKeyStoreFactory.java | 5 | ||||
| -rw-r--r-- | eaaf_core_utils/src/main/resources/spring/eaaf_utils.beans.xml | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/EaafKeyStoreFactory.java b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/EaafKeyStoreFactory.java index 5936e106..f69efd49 100644 --- a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/EaafKeyStoreFactory.java +++ b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/EaafKeyStoreFactory.java @@ -68,8 +68,9 @@ public class EaafKeyStoreFactory { * Get a new KeyStore based on a KeyStore configuration-object. * * @param config KeyStore configuration - * @return {@link Pair} of a new KeyStore instance and an optional {@link Provider}. If the {@link Provider} - * is not <code>null</code> this {@link KeyStore} requires a specific {@link Provider} for {@link Key} operations. + * @return {@link Pair} of a new {@link KeyStore} instance and an optional {@link Provider}. + * The {@link KeyStore} is {@link Nonnull}. If the {@link Provider} is not <code>null</code> + * this {@link KeyStore} requires a specific {@link Provider} for {@link Key} operations. * @throws EaafException In case of a KeyStore initialization error */ @Nonnull diff --git a/eaaf_core_utils/src/main/resources/spring/eaaf_utils.beans.xml b/eaaf_core_utils/src/main/resources/spring/eaaf_utils.beans.xml index 7568f423..ab631e34 100644 --- a/eaaf_core_utils/src/main/resources/spring/eaaf_utils.beans.xml +++ b/eaaf_core_utils/src/main/resources/spring/eaaf_utils.beans.xml @@ -10,11 +10,13 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd" > + <bean id="eaafHttpClientFactory" + class="at.gv.egiz.eaaf.core.impl.utils.HttpClientFactory" /> + <bean id="eaafKeyStoreFactory" class="at.gv.egiz.eaaf.core.impl.credential.EaafKeyStoreFactory" /> <bean id="eaafUtilsMessageSource" class="at.gv.egiz.eaaf.core.impl.logging.EaafUtilsMessageSource" /> - </beans>
\ No newline at end of file |