diff options
author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2017-10-19 14:45:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-19 14:45:28 +0200 |
commit | dca1e05b7a15a3a0ae8f1b5f8b533eb990be1a96 (patch) | |
tree | 647ab6e3a682dbf8ab33a3981886a44a2edf6244 /container-disc | |
parent | 4aebf696cdf02151b993f407666acb7690932116 (diff) |
Revert "Add back SslKeyStoreFactoryProvider as a temporary workaround"
Diffstat (limited to 'container-disc')
-rw-r--r-- | container-disc/src/main/java/com/yahoo/container/jdisc/SslKeyStoreFactoryProvider.java | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/SslKeyStoreFactoryProvider.java b/container-disc/src/main/java/com/yahoo/container/jdisc/SslKeyStoreFactoryProvider.java deleted file mode 100644 index 64773af905e..00000000000 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/SslKeyStoreFactoryProvider.java +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.container.jdisc; - -import com.yahoo.container.di.componentgraph.Provider; -import com.yahoo.jdisc.http.ssl.ReaderForPath; -import com.yahoo.jdisc.http.ssl.SslKeyStore; -import com.yahoo.jdisc.http.ssl.SslKeyStoreFactory; - -/** - * An SSL key store provider which provides a factory which throws exception on - * invocation as no SSL key store is currently provided by default. - * The purpose of this is to provide a ssl store factory for injection in the case where - * no secret store component is provided. - * - * @author bratseth - */ -public class SslKeyStoreFactoryProvider implements Provider<SslKeyStoreFactory> { - - private static final ThrowingSslKeyStoreFactory instance = new ThrowingSslKeyStoreFactory(); - - @Override - public SslKeyStoreFactory get() { return instance; } - - @Override - public void deconstruct() { } - - private static final class ThrowingSslKeyStoreFactory implements SslKeyStoreFactory { - - @Override - public SslKeyStore createKeyStore(ReaderForPath certificateFile, ReaderForPath keyFile) { - throw new UnsupportedOperationException("A SSL key store factory component is not available"); - } - - @Override - public SslKeyStore createTrustStore(ReaderForPath certificateFile) { - throw new UnsupportedOperationException("A SSL key store factory component is not available"); - } - - } - -} |