X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cadi%2Fcore%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2Fconfig%2FConfig.java;h=b4e31f2f33a95f78dada07c84093b27f2cc0442b;hb=442d8fb117c9086ec2ec468f661af082becafbb8;hp=b74ccb36d87ad806e579361ae177514d96584f60;hpb=ca76fbda94492f1b0c895ff0f4070381f17472f0;p=aaf%2Fauthz.git

diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java b/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java
index b74ccb36..b4e31f2f 100644
--- a/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java
+++ b/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java
@@ -259,7 +259,7 @@ public class Config {
 		
 		access.log(Level.INIT, "Hostname set to",hostname);
 		// Get appropriate TAFs
-		ArrayList<HttpTaf> htlist = new ArrayList<HttpTaf>();
+		ArrayList<HttpTaf> htlist = new ArrayList<>();
 
 		/////////////////////////////////////////////////////
 		// Add a Denial of Service TAF
@@ -474,6 +474,14 @@ public class Config {
 			}
 		}
 		
+		// Add BasicAuth, if any, to x509Taf
+		if(x509TAF!=null) {
+			for( HttpTaf ht : htlist) {
+				if(ht instanceof BasicHttpTaf) {
+					x509TAF.add((BasicHttpTaf)ht);
+				}
+			}
+		}
 		/////////////////////////////////////////////////////
 		// Create EpiTaf from configured TAFs
 		/////////////////////////////////////////////////////
@@ -507,7 +515,7 @@ public class Config {
 	
 	public static Lur configLur(SecurityInfoC<HttpURLConnection> si, Connector con, Object ... additionalTafLurs) throws CadiException {
 		Access access = si.access;
-		List<Lur> lurs = new ArrayList<Lur>();
+		List<Lur> lurs = new ArrayList<>();
 		
 		/////////////////////////////////////////////////////
 		// Configure a Local Property Based RBAC/LUR
@@ -671,7 +679,7 @@ public class Config {
 					aafConClass = loadClass(access, AAF_V2_0_AAF_CON_HTTP);
 					if (aafConClass != null) {
 						for (Constructor<?> c : aafConClass.getConstructors()) {
-							List<Object> lo = new ArrayList<Object>();
+							List<Object> lo = new ArrayList<>();
 							for (Class<?> pc : c.getParameterTypes()) {
 								if (pc.equals(Access.class)) {
 									lo.add(access);