/**\r
* ============LICENSE_START=======================================================\r
- * RestClient\r
+ * org.onap.aai\r
* ================================================================================\r
- * Copyright © 2017 AT&T Intellectual Property.\r
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.\r
* Copyright © 2017 Amdocs\r
- * All rights reserved.\r
* ================================================================================\r
* Licensed under the Apache License, Version 2.0 (the "License");\r
* you may not use this file except in compliance with the License.\r
* You may obtain a copy of the License at\r
*\r
- * http://www.apache.org/licenses/LICENSE-2.0\r
+ * http://www.apache.org/licenses/LICENSE-2.0\r
*\r
* Unless required by applicable law or agreed to in writing, software\r
* distributed under the License is distributed on an "AS IS" BASIS,\r
* limitations under the License.\r
* ============LICENSE_END=========================================================\r
*\r
- * ECOMP and OpenECOMP are trademarks\r
- * and service marks of AT&T Intellectual Property.\r
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
*/\r
package org.openecomp.restclient.rest;\r
\r
public static final String DEFAULT_TRUST_STORE_FILENAME = null;\r
public static final int DEFAULT_CONNECT_TIMEOUT_MS = 60000;\r
public static final int DEFAULT_READ_TIMEOUT_MS = 60000;\r
- public static final RestAuthenticationMode DEFAULT_AUTH_MODE = RestAuthenticationMode.HTTP_NOAUTH;\r
+ public static final RestAuthenticationMode DEFAULT_AUTH_MODE = RestAuthenticationMode.SSL_CERT;\r
public static final String DEFAULT_BASIC_AUTH_USERNAME = "";\r
public static final String DEFAULT_BASIC_AUTH_PASSWORD = "";\r
\r
private static final String SSL_PROTOCOL = "TLS";\r
private static final String KEYSTORE_ALGORITHM = "SunX509";\r
private static final String KEYSTORE_TYPE = "PKCS12";\r
+ private static final String TRUST_STORE_PROPERTY = "javax.net.ssl.trustStore";\r
\r
private boolean validateServerHostname;\r
private boolean validateServerCertChain;\r
truststoreFilename = DEFAULT_TRUST_STORE_FILENAME;\r
connectTimeoutInMs = DEFAULT_CONNECT_TIMEOUT_MS;\r
readTimeoutInMs = DEFAULT_READ_TIMEOUT_MS;\r
- authenticationMode = RestAuthenticationMode.HTTP_NOAUTH;\r
+ authenticationMode = DEFAULT_AUTH_MODE;\r
basicAuthUsername = DEFAULT_BASIC_AUTH_USERNAME;\r
basicAuthPassword = DEFAULT_BASIC_AUTH_PASSWORD;\r
}\r
TrustManager[] trustAllCerts = null;\r
if (validateServerCertChain) {\r
if (truststoreFilename != null) {\r
- System.setProperty("javax.net.ssl.trustStore", truststoreFilename);\r
+ System.setProperty(TRUST_STORE_PROPERTY, truststoreFilename);\r
} else {\r
throw new IllegalArgumentException("Trust store filename must be set!");\r
}\r