Code Review
/
aaf
/
authz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix AAF Locator for ONAP
[aaf/authz.git]
/
cadi
/
aaf
/
src
/
main
/
java
/
org
/
onap
/
aaf
/
cadi
/
oauth
/
TokenClientFactory.java
diff --git
a/cadi/aaf/src/main/java/org/onap/aaf/cadi/oauth/TokenClientFactory.java
b/cadi/aaf/src/main/java/org/onap/aaf/cadi/oauth/TokenClientFactory.java
index
3f6fa59
..
e52df96
100644
(file)
--- a/
cadi/aaf/src/main/java/org/onap/aaf/cadi/oauth/TokenClientFactory.java
+++ b/
cadi/aaf/src/main/java/org/onap/aaf/cadi/oauth/TokenClientFactory.java
@@
-158,10
+158,8
@@
public class TokenClientFactory extends Persist<Token,TimedToken> {
if(locatorURL==null) {
throw new LocatorException("Cannot have a null locatorURL in bestLocator");
}
if(locatorURL==null) {
throw new LocatorException("Cannot have a null locatorURL in bestLocator");
}
- if(locatePattern.matcher(locatorURL).matches()) {
+ if(locat
orURL.startsWith("https://AAF_LOCATE_URL/") || locat
ePattern.matcher(locatorURL).matches()) {
return new AAFLocator(hsi,new URI(locatorURL));
return new AAFLocator(hsi,new URI(locatorURL));
- } else if(locatorURL.contains("//DME2RESOLVE/")) {
- throw new LocatorException("DME2Locator doesn't exist. Use DME2 specific Clients");
} else {
return new PropertyLocator(locatorURL);
}
} else {
return new PropertyLocator(locatorURL);
}