import org.onap.aaf.cadi.Access.Level;
import org.onap.aaf.cadi.CadiException;
import org.onap.aaf.cadi.LocatorException;
+import org.onap.aaf.cadi.aaf.Defaults;
import org.onap.aaf.cadi.aaf.v2_0.AAFConHttp;
import org.onap.aaf.cadi.client.Rcli;
import org.onap.aaf.cadi.client.Retryable;
locator_deploy = null;
} else {
locator_deploy = Split.splitTrim(':', component);
+ if(locator_deploy.length>1 && "AAF_RELEASE".equals(locator_deploy[1])) {
+ locator_deploy[1]=access.getProperty(Config.AAF_RELEASE, Defaults.AAF_VERSION);
+ int snapshot = locator_deploy[1].indexOf("-SNAPSHOT");
+ if(snapshot>0) {
+ locator_deploy[1]=locator_deploy[1].substring(0, snapshot);
+ }
+ }
}
if (component == null || locator_deploy==null || locator_deploy.length<2) {
}
public Rcli<?> client() throws CadiException {
- return aafCon.client(Config.AAF_DEFAULT_VERSION);
+ return aafCon.client();
}
public Rcli<?> clientAsUser(TaggedPrincipal p) throws CadiException {
- return aafCon.client(Config.AAF_DEFAULT_VERSION).forUser(
+ return aafCon.client().forUser(
new HTransferSS(p,app_name, aafCon.securityInfo()));
}