Contains two minor functional changes. First is the replace of "osaaf"
with "onap.aaf" in pathing. Second is to have connection retries attempt
to exhaust all located services before expiring.
Issue-ID: AAF-1193
Signed-off-by: Hassan, Sean (sh265m) <sean.hassan@att.com>
Change-Id: Ie8d8ad76104ead18eb568d0c48882e7cbead041a
30 files changed:
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>parent</artifactId>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>parent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.7.1-SNAPSHOT</version>
</parent>
<artifactId>aaf-auth-client</artifactId>
</parent>
<artifactId>aaf-auth-client</artifactId>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>authparent</artifactId>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>authparent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<relativePath>../pom.xml</relativePath>
</parent>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>authparent</artifactId>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>authparent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<relativePath>../pom.xml</relativePath>
</parent>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>authparent</artifactId>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>authparent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<relativePath>../pom.xml</relativePath>
</parent>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>authparent</artifactId>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>authparent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<relativePath>../pom.xml</relativePath>
</parent>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>authparent</artifactId>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>authparent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>authparent</artifactId>
<relativePath>../pom.xml</relativePath>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>authparent</artifactId>
<relativePath>../pom.xml</relativePath>
<groupId>org.onap.aaf.authz</groupId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.7.1-SNAPSHOT</version>
</parent>
<artifactId>aaf-auth-deforg</artifactId>
</parent>
<artifactId>aaf-auth-deforg</artifactId>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>authparent</artifactId>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>authparent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<relativePath>../pom.xml</relativePath>
</parent>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>authparent</artifactId>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>authparent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<relativePath>../pom.xml</relativePath>
</parent>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>authparent</artifactId>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>authparent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<relativePath>../pom.xml</relativePath>
</parent>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>authparent</artifactId>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>authparent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<relativePath>../pom.xml</relativePath>
</parent>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>authparent</artifactId>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>authparent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<relativePath>../pom.xml</relativePath>
</parent>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>authparent</artifactId>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>authparent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<relativePath>../pom.xml</relativePath>
</parent>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>authparent</artifactId>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>authparent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<relativePath>../pom.xml</relativePath>
</parent>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>parent</artifactId>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>parent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.7.1-SNAPSHOT</version>
</parent>
<artifactId>authparent</artifactId>
<name>AAF Auth Parent</name>
</parent>
<artifactId>authparent</artifactId>
<name>AAF Auth Parent</name>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>cadiparent</artifactId>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>cadiparent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.7.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<relativePath>..</relativePath>
</parent>
import java.util.List;
import org.onap.aaf.cadi.AbsUserCache;
import java.util.List;
import org.onap.aaf.cadi.AbsUserCache;
+import org.onap.aaf.cadi.Access;
import org.onap.aaf.cadi.CachedPrincipal;
import org.onap.aaf.cadi.CadiException;
import org.onap.aaf.cadi.User;
import org.onap.aaf.cadi.CachedPrincipal;
import org.onap.aaf.cadi.CadiException;
import org.onap.aaf.cadi.User;
}
public Resp revalidate(Object state) {
}
public Resp revalidate(Object state) {
+ int maxRetries = 15;
+ try { // these SHOULD be AAFConHttp and AAFLocator objects, but put in a try anyway to be safe
+ AAFConHttp forceCastCon = (AAFConHttp) con;
+ AAFLocator forceCastLoc = (AAFLocator) forceCastCon.hman().loc;
+ maxRetries = forceCastLoc.maxIters();
+ } catch (Exception e) {
+ access.log(Access.Level.DEBUG, e);
+ }
List<URI> attemptedUris = new ArrayList<>();
URI thisUri = null;
for (int retries = 0;; retries++) {
List<URI> attemptedUris = new ArrayList<>();
URI thisUri = null;
for (int retries = 0;; retries++) {
attemptedUris.add(thisUri);
}
con.access.log(e);
attemptedUris.add(thisUri);
}
con.access.log(e);
+ if (retries > maxRetries) {
return Resp.INACCESSIBLE;
}
}
return Resp.INACCESSIBLE;
}
}
*
*/
public class AAFLurPerm extends AbsAAFLur<AAFPermission> {
*
*/
public class AAFLurPerm extends AbsAAFLur<AAFPermission> {
- private static final String ORG_OSAAF_CADI_OAUTH_O_AUTH2_LUR = "org.osaaf.cadi.oauth.OAuth2Lur";
+ private static final String ORG_ONAP_AAF_CADI_OAUTH_OAUTH_2_LUR = "org.onap.aaf.cadi.oauth.OAuth2Lur";
/**
* Need to be able to transmutate a Principal into either Person or AppID, which are the only ones accepted at this
/**
* Need to be able to transmutate a Principal into either Person or AppID, which are the only ones accepted at this
private void attachOAuth2(AAFCon<?> con) throws APIException {
String oauth2_url;
private void attachOAuth2(AAFCon<?> con) throws APIException {
String oauth2_url;
- Class<?> tmcls = Config.loadClass(access,"org.osaaf.cadi.oauth.TokenMgr");
+ Class<?> tmcls = Config.loadClass(access,"org.onap.aaf.cadi.oauth.TokenMgr");
if (tmcls!=null) {
if ((oauth2_url = con.access.getProperty(Config.CADI_OAUTH2_URL,null))!=null) {
try {
Constructor<?> tmconst = tmcls.getConstructor(AAFCon.class,String.class);
Object tokMangr = tmconst.newInstance(con,oauth2_url);
@SuppressWarnings("unchecked")
if (tmcls!=null) {
if ((oauth2_url = con.access.getProperty(Config.CADI_OAUTH2_URL,null))!=null) {
try {
Constructor<?> tmconst = tmcls.getConstructor(AAFCon.class,String.class);
Object tokMangr = tmconst.newInstance(con,oauth2_url);
@SuppressWarnings("unchecked")
- Class<Lur> oa2cls = (Class<Lur>)Config.loadClass(access,ORG_OSAAF_CADI_OAUTH_O_AUTH2_LUR);
+ Class<Lur> oa2cls = (Class<Lur>)Config.loadClass(access, ORG_ONAP_AAF_CADI_OAUTH_OAUTH_2_LUR);
Constructor<Lur> oa2const = oa2cls.getConstructor(tmcls);
Lur oa2 = oa2const.newInstance(tokMangr);
setPreemptiveLur(oa2);
Constructor<Lur> oa2const = oa2cls.getConstructor(tmcls);
Lur oa2 = oa2const.newInstance(tokMangr);
setPreemptiveLur(oa2);
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>cadiparent</artifactId>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>cadiparent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.7.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<relativePath>..</relativePath>
</parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>cadiparent</artifactId>
<relativePath>..</relativePath>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>cadiparent</artifactId>
<relativePath>..</relativePath>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.7.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>cadiparent</artifactId>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>cadiparent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.7.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<relativePath>..</relativePath>
</parent>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>parent</artifactId>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>parent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.7.1-SNAPSHOT</version>
</parent>
<artifactId>cadiparent</artifactId>
<name>AAF CADI Parent (Code, Access, Data, Identity)</name>
</parent>
<artifactId>cadiparent</artifactId>
<name>AAF CADI Parent (Code, Access, Data, Identity)</name>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>cadiparent</artifactId>
<relativePath>..</relativePath>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>cadiparent</artifactId>
<relativePath>..</relativePath>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.7.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>CADI Servlet Sample (Test Only)</name>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>CADI Servlet Sample (Test Only)</name>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>miscparent</artifactId>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>miscparent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.7.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<relativePath>..</relativePath>
</parent>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>miscparent</artifactId>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>miscparent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.7.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<relativePath>..</relativePath>
</parent>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>parent</artifactId>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>parent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.7.1-SNAPSHOT</version>
</parent>
<artifactId>miscparent</artifactId>
<name>AAF Misc Parent</name>
</parent>
<artifactId>miscparent</artifactId>
<name>AAF Misc Parent</name>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>miscparent</artifactId>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>miscparent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.7.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<relativePath>..</relativePath>
</parent>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>miscparent</artifactId>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>miscparent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.7.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>parent</artifactId>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>parent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.7.1-SNAPSHOT</version>
<name>aaf-authz</name>
<packaging>pom</packaging>
<name>aaf-authz</name>
<packaging>pom</packaging>
# This TAG <version>2.7.0-SNAPSHOT</version> is here to help remember to change this file. Keep it up to date with the following "real" entries:
major=2
minor=7
# This TAG <version>2.7.0-SNAPSHOT</version> is here to help remember to change this file. Keep it up to date with the following "real" entries:
major=2
minor=7
base_version=${major}.${minor}.${patch}
base_version=${major}.${minor}.${patch}