Skip to content

Commit ee1d492

Browse files
author
Chris Wiechmann
committed
Added the feature to set the API-Mgr. REST-API Basepath
Fixes issue #141
1 parent 2af69cb commit ee1d492

22 files changed

Lines changed: 126 additions & 74 deletions

‎modules/apim-adapter/assembly/conf/env.api-env.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# File used for demo purposed as it points to the
2+
# File used for demo purposes as it points to the
33
# Reference-Environment with hostname: api-env
44
#
55

‎modules/apim-adapter/assembly/conf/env.properties.sample‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,3 +88,10 @@ admin_password=changeme
8888
# httpProxyPort=8987
8989
# httpProxyUsername=proxyUser
9090
# httpProxyPassword=proxyPassword
91+
92+
# If the API-Manager REST-API endpoint is not exposed at the standard location (e.g. /api/portal/v1.3)
93+
# you can use this parameter to override it.
94+
# Best is to configure it an environment file, but you can also use a command line argument:
95+
# (-apiBasepath /fr/apim/v13/portal)
96+
# Example:
97+
# apiBasepath=/fr/apim/v13/portal

‎modules/apim-adapter/src/main/java/com/axway/apim/adapter/APIManagerAdapter.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public class APIManagerAdapter {
9898
public final static String TYPE_FRONT_END = "proxies";
9999
public final static String TYPE_BACK_END = "apirepo";
100100

101-
private CoreParameters cmd;
101+
private static CoreParameters cmd;
102102

103103
private static CacheManager cacheManager;
104104

@@ -194,7 +194,7 @@ public void loginToAPIManager(boolean useAdminClient) throws AppException {
194194
if(hasAdminAccount && useAdminClient) return; // Already logged in with an Admin-Account.
195195
HttpResponse httpResponse = null;
196196
try {
197-
uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(RestAPICall.API_VERSION+"/login").build();
197+
uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(cmd.getApiBasepath()+"/login").build();
198198
List<NameValuePair> params = new ArrayList<NameValuePair>();
199199
String username;
200200
String password;
@@ -256,7 +256,7 @@ public void logoutFromAPIManager(boolean orgAdmin) throws AppException {
256256
URI uri;
257257
HttpResponse httpResponse = null;
258258
try {
259-
uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(RestAPICall.API_VERSION+"/login").build();
259+
uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(cmd.getApiBasepath()+"/login").build();
260260
DELRequest logoutRequest = new DELRequest(uri, orgAdmin);
261261
httpResponse = logoutRequest.execute();
262262
int statusCode = httpResponse.getStatusLine().getStatusCode();
@@ -285,7 +285,7 @@ public static User getCurrentUser(boolean useAdminClient) throws AppException {
285285
HttpResponse response = null;
286286
JsonNode jsonResponse = null;
287287
try {
288-
uri = new URIBuilder(CoreParameters.getInstance().getAPIManagerURL()).setPath(RestAPICall.API_VERSION+"/currentuser").build();
288+
uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(cmd.getApiBasepath()+"/currentuser").build();
289289
GETRequest currentUserRequest = new GETRequest(uri, useAdminClient);
290290
response = currentUserRequest.execute();
291291
getCsrfToken(response, useAdminClient); // Starting from 7.6.2 SP3 the CSRF token is returned on CurrentUser request
@@ -454,7 +454,7 @@ public ClientApplication getAppIdForCredential(String credential, String type) t
454454
String response = null;
455455
URI uri;
456456
try {
457-
uri = new URIBuilder(CoreParameters.getInstance().getAPIManagerURL()).setPath(RestAPICall.API_VERSION + "/applications/"+app.getId()+"/"+type+"").build();
457+
uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(cmd.getApiBasepath() + "/applications/"+app.getId()+"/"+type+"").build();
458458
LOG.debug("Loading credentials of type: '" + type + "' for application: '" + app.getName() + "' from API-Manager.");
459459
RestAPICall getRequest = new GETRequest(uri, true);
460460
httpResponse = getRequest.execute();
@@ -558,7 +558,7 @@ public static JsonNode getCertInfo(InputStream certFile, CaCert cert) throws App
558558
URI uri;
559559
HttpResponse httpResponse = null;
560560
try {
561-
uri = new URIBuilder(CoreParameters.getInstance().getAPIManagerURL()).setPath(RestAPICall.API_VERSION + "/certinfo/").build();
561+
uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(cmd.getApiBasepath() + "/certinfo/").build();
562562

563563
HttpEntity entity = MultipartEntityBuilder.create()
564564
.addBinaryBody("file", IOUtils.toByteArray(certFile), ContentType.create("application/x-x509-ca-cert"), cert.getCertFile())
@@ -597,7 +597,7 @@ public static JsonNode getFileData(byte[] certificate, String filename) throws A
597597
URI uri;
598598
HttpResponse httpResponse = null;
599599
try {
600-
uri = new URIBuilder(CoreParameters.getInstance().getAPIManagerURL()).setPath(RestAPICall.API_VERSION + "/filedata/").build();
600+
uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(cmd.getApiBasepath() + "/filedata/").build();
601601

602602
HttpEntity entity = MultipartEntityBuilder.create()
603603
.addBinaryBody("file", certificate, ContentType.create("application/x-pkcs12"), filename)

‎modules/apim-adapter/src/main/java/com/axway/apim/adapter/apis/APIManagerAPIAccessAdapter.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ private Type(String niceName) {
5454

5555
ObjectMapper mapper = APIManagerAdapter.mapper;
5656

57+
CoreParameters cmd = CoreParameters.getInstance();
58+
5759
private Map<Type, Cache<String, String>> caches = new HashMap<Type, Cache<String, String>>();
5860

5961
public APIManagerAPIAccessAdapter() {
@@ -77,7 +79,7 @@ private void readAPIAccessFromAPIManager(Type type, String id) throws AppExcepti
7779
URI uri;
7880
HttpResponse httpResponse = null;
7981
try {
80-
uri = new URIBuilder(CoreParameters.getInstance().getAPIManagerURL()).setPath(RestAPICall.API_VERSION + "/"+type+"/"+id+"/apis").build();
82+
uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(cmd.getApiBasepath() + "/"+type+"/"+id+"/apis").build();
8183
RestAPICall getRequest = new GETRequest(uri, APIManagerAdapter.hasAdminAccount());
8284
httpResponse = getRequest.execute();
8385
response = EntityUtils.toString(httpResponse.getEntity());
@@ -179,7 +181,7 @@ public APIAccess createAPIAccess(APIAccess apiAccess, AbstractEntity parentEntit
179181
URI uri;
180182
HttpResponse httpResponse = null;
181183
try {
182-
uri = new URIBuilder(CoreParameters.getInstance().getAPIManagerURL()).setPath(RestAPICall.API_VERSION+"/"+type+"/"+parentEntity.getId()+"/apis").build();
184+
uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(cmd.getApiBasepath()+"/"+type+"/"+parentEntity.getId()+"/apis").build();
183185
mapper.setSerializationInclusion(Include.NON_NULL);
184186
FilterProvider filter = new SimpleFilterProvider().setDefaultFilter(
185187
SimpleBeanPropertyFilter.serializeAllExcept(new String[] {"apiName"}));
@@ -234,7 +236,7 @@ public void deleteAPIAccess(APIAccess apiAccess, AbstractEntity parentEntity, Ty
234236
URI uri;
235237
HttpResponse httpResponse = null;
236238
try {
237-
uri = new URIBuilder(CoreParameters.getInstance().getAPIManagerURL()).setPath(RestAPICall.API_VERSION+"/"+type+"/"+parentEntity.getId()+"/apis/"+apiAccess.getId()).build();
239+
uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(cmd.getApiBasepath()+"/"+type+"/"+parentEntity.getId()+"/apis/"+apiAccess.getId()).build();
238240
// Use an admin account for this request
239241
RestAPICall request = new DELRequest(uri, APIManagerAdapter.hasAdminAccount());
240242
request.setContentType("application/json");

‎modules/apim-adapter/src/main/java/com/axway/apim/adapter/apis/APIManagerAPIAdapter.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public class APIManagerAPIAdapter {
8888

8989
ObjectMapper mapper = new ObjectMapper();
9090

91-
CoreParameters cmd = CoreParameters.getInstance();
91+
static CoreParameters cmd = CoreParameters.getInstance();
9292

9393
/**
9494
* Maps the provided status to the REST-API endpoint to change the status!
@@ -194,7 +194,7 @@ URI getAPIRequestUri(APIFilter filter) throws URISyntaxException {
194194
if(filter.getId()!=null) {
195195
requestedId = "/"+filter.getId();
196196
}
197-
URI uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(RestAPICall.API_VERSION + "/"+filter.getApiType() + requestedId)
197+
URI uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(cmd.getApiBasepath() + "/"+filter.getApiType() + requestedId)
198198
.addParameters(filter.getFilters())
199199
.build();
200200
return uri;
@@ -268,7 +268,7 @@ private void addImageFromAPIM(API api, boolean includeImage) throws AppException
268268
URI uri;
269269
HttpResponse httpResponse = null;
270270
try {
271-
uri = new URIBuilder(CoreParameters.getInstance().getAPIManagerURL()).setPath(RestAPICall.API_VERSION + "/proxies/"+api.getId()+"/image").build();
271+
uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(cmd.getApiBasepath() + "/proxies/"+api.getId()+"/image").build();
272272
RestAPICall getRequest = new GETRequest(uri);
273273
httpResponse = getRequest.execute();
274274
if(httpResponse == null || httpResponse.getEntity() == null || httpResponse.getStatusLine().getStatusCode() == HttpStatus.SC_NOT_FOUND) {
@@ -321,7 +321,7 @@ public void updateAPIImage(API api, Image image) throws AppException {
321321
HttpResponse httpResponse = null;
322322

323323
try {
324-
uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(RestAPICall.API_VERSION+"/proxies/"+api.getId()+"/image").build();
324+
uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(cmd.getApiBasepath()+"/proxies/"+api.getId()+"/image").build();
325325

326326
entity = MultipartEntityBuilder.create()
327327
.addBinaryBody("file", api.getImage().getInputStream(), ContentType.create("image/jpeg"), api.getImage().getBaseFilename())
@@ -470,11 +470,11 @@ private static void addOriginalAPIDefinitionFromAPIM(API api, APIFilter filter)
470470
HttpResponse httpResponse = null;
471471
try {
472472
if(filter.isUseFEAPIDefinition()) {
473-
uri = new URIBuilder(CoreParameters.getInstance().getAPIManagerURL()).setPath(RestAPICall.API_VERSION + "/discovery/swagger/api/id/"+api.getId())
473+
uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(cmd.getApiBasepath() + "/discovery/swagger/api/id/"+api.getId())
474474
.setParameter("swaggerVersion", "2.0").build();
475475
LOG.debug("Loading API-Definition from FE-API: ");
476476
} else {
477-
uri = new URIBuilder(CoreParameters.getInstance().getAPIManagerURL()).setPath(RestAPICall.API_VERSION + "/apirepo/"+api.getApiId()+"/download")
477+
uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(cmd.getApiBasepath() + "/apirepo/"+api.getApiId()+"/download")
478478
.setParameter("original", "true").build();
479479
}
480480
RestAPICall getRequest = new GETRequest(uri, APIManagerAdapter.hasAdminAccount());
@@ -502,7 +502,7 @@ public API createAPIProxy(API api) throws AppException {
502502
HttpEntity entity;
503503
HttpResponse httpResponse = null;
504504
try {
505-
uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(RestAPICall.API_VERSION+"/proxies/").build();
505+
uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(cmd.getApiBasepath()+"/proxies/").build();
506506
entity = new StringEntity("{\"apiId\":\"" + api.getApiId() + "\",\"organizationId\":\"" + api.getOrganization().getId() + "\"}");
507507

508508
RestAPICall request = new POSTRequest(entity, uri);
@@ -538,7 +538,7 @@ public API updateAPIProxy(API api) throws AppException {
538538
HttpResponse httpResponse = null;
539539
translateMethodIds(api, api.getId(), METHOD_TRANSLATION.AS_ID);
540540
try {
541-
uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(RestAPICall.API_VERSION+"/proxies/"+api.getId()).build();
541+
uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(cmd.getApiBasepath()+"/proxies/"+api.getId()).build();
542542
entity = new StringEntity(mapper.writeValueAsString(api), ContentType.APPLICATION_JSON);
543543

544544
RestAPICall request = new PUTRequest(entity, uri);
@@ -572,7 +572,7 @@ public void deleteAPIProxy(API api) throws AppException {
572572
URI uri;
573573
HttpResponse httpResponse = null;
574574
try {
575-
uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(RestAPICall.API_VERSION+"/proxies/"+api.getId()).build();
575+
uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(cmd.getApiBasepath()+"/proxies/"+api.getId()).build();
576576

577577
RestAPICall request = new DELRequest(uri);
578578
httpResponse = request.execute();
@@ -597,7 +597,7 @@ public void deleteBackendAPI(API api) throws AppException {
597597
URI uri;
598598
HttpResponse httpResponse = null;
599599
try {
600-
uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(RestAPICall.API_VERSION+"/apirepo/"+api.getApiId()).build();
600+
uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(cmd.getApiBasepath()+"/apirepo/"+api.getApiId()).build();
601601

602602
RestAPICall request = new DELRequest(uri);
603603
httpResponse = request.execute();
@@ -631,7 +631,7 @@ public void updateAPIStatus(API api, String desiredState, String vhost) throws A
631631
RestAPICall request;
632632
try {
633633
uri = new URIBuilder(cmd.getAPIManagerURL())
634-
.setPath(RestAPICall.API_VERSION+"/proxies/"+api.getId()+"/"+StatusEndpoint.valueOf(desiredState).endpoint)
634+
.setPath(cmd.getApiBasepath()+"/proxies/"+api.getId()+"/"+StatusEndpoint.valueOf(desiredState).endpoint)
635635
.build();
636636
if(vhost!=null && desiredState.equals(API.STATE_PUBLISHED)) { // During publish, it might be required to also set the VHost (See issue: #98)
637637
HttpEntity entity = new StringEntity("vhost="+vhost, ContentType.APPLICATION_JSON);
@@ -687,7 +687,7 @@ public void updateRetirementDate(API api, Long retirementDate) throws AppExcepti
687687
return;
688688
}
689689
URI uri = new URIBuilder(cmd.getAPIManagerURL())
690-
.setPath(RestAPICall.API_VERSION+"/proxies/"+api.getId()+"/deprecate").build();
690+
.setPath(cmd.getApiBasepath()+"/proxies/"+api.getId()+"/deprecate").build();
691691
RestAPICall apiCall = new POSTRequest(new StringEntity("retirementDate="+formatRetirementDate(retirementDate)), uri, true);
692692
apiCall.setContentType("application/x-www-form-urlencoded");
693693
httpResponse = apiCall.execute();
@@ -745,7 +745,7 @@ private JsonNode importFromWSDL(API api) throws URISyntaxException, AppException
745745
pass=extractPassword(completeWsdlUrl);
746746

747747
try {
748-
URIBuilder uriBuilder = new URIBuilder(cmd.getAPIManagerURL()).setPath(RestAPICall.API_VERSION+"/apirepo/importFromUrl/")
748+
URIBuilder uriBuilder = new URIBuilder(cmd.getAPIManagerURL()).setPath(cmd.getApiBasepath()+"/apirepo/importFromUrl/")
749749
.setParameter("organizationId", api.getOrganization().getId())
750750
.setParameter("type", "wsdl")
751751
.setParameter("url", wsdlUrl)
@@ -780,10 +780,10 @@ private JsonNode importFromSwagger(API api) throws URISyntaxException, AppExcept
780780
HttpEntity entity;
781781
HttpResponse httpResponse = null;
782782
if(APIManagerAdapter.hasAPIManagerVersion("7.6.2")) {
783-
uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(RestAPICall.API_VERSION+"/apirepo/import/").build();
783+
uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(cmd.getApiBasepath()+"/apirepo/import/").build();
784784
} else {
785785
// Not sure, if 7.5.3 still needs it that way!
786-
uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(RestAPICall.API_VERSION+"/apirepo/import/")
786+
uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(cmd.getApiBasepath()+"/apirepo/import/")
787787
.setParameter("field", "name").setParameter("op", "eq").setParameter("value", "API Development").build();
788788
}
789789
try {
@@ -845,7 +845,7 @@ public void upgradeAccessToNewerAPI(API apiToUpgradeAccess, API referenceAPI) th
845845
if(updateAppQuota) {
846846
LOG.info("Taking over existing quota config for application: '"+app.getName()+"' to newly created API.");
847847
try {
848-
uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(RestAPICall.API_VERSION+"/applications/"+app.getId()+"/quota").build();
848+
uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(cmd.getApiBasepath()+"/applications/"+app.getId()+"/quota").build();
849849
entity = new StringEntity(mapper.writeValueAsString(app.getAppQuota()), ContentType.APPLICATION_JSON);
850850

851851
request = new PUTRequest(entity, uri, true);
@@ -886,7 +886,7 @@ public boolean upgradeAccessToNewerAPI(API apiToUpgradeAccess, API referenceAPI,
886886
RestAPICall request;
887887
HttpResponse httpResponse = null;
888888
try {
889-
uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(RestAPICall.API_VERSION+"/proxies/upgrade/"+referenceAPI.getId()).build();
889+
uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(cmd.getApiBasepath()+"/proxies/upgrade/"+referenceAPI.getId()).build();
890890

891891
List<NameValuePair> params = new Vector<NameValuePair>();
892892
params.add(new BasicNameValuePair("upgradeApiId", apiToUpgradeAccess.getId()));
@@ -945,7 +945,7 @@ public void grantClientOrganization(List<Organization> grantAccessToOrgs, API ap
945945
}
946946
}
947947
try {
948-
uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(RestAPICall.API_VERSION+"/proxies/grantaccess").build();
948+
uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(cmd.getApiBasepath()+"/proxies/grantaccess").build();
949949
entity = new StringEntity(formBody);
950950
apiCall = new POSTRequest(entity, uri, true);
951951
apiCall.setContentType("application/x-www-form-urlencoded");

‎modules/apim-adapter/src/main/java/com/axway/apim/adapter/apis/APIManagerAPIMethodAdapter.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ public class APIManagerAPIMethodAdapter {
3030
private static Logger LOG = LoggerFactory.getLogger(APIManagerAPIMethodAdapter.class);
3131

3232
ObjectMapper mapper = APIManagerAdapter.mapper;
33+
34+
CoreParameters cmd = CoreParameters.getInstance();
3335

3436
public APIManagerAPIMethodAdapter() {}
3537

@@ -41,7 +43,7 @@ private void readMethodsFromAPIManager(String apiId) throws AppException {
4143
URI uri;
4244
HttpResponse httpResponse = null;
4345
try {
44-
uri = new URIBuilder(CoreParameters.getInstance().getAPIManagerURL()).setPath(RestAPICall.API_VERSION + "/proxies/"+apiId+"/operations").build();
46+
uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(cmd.getApiBasepath() + "/proxies/"+apiId+"/operations").build();
4547
RestAPICall getRequest = new GETRequest(uri, APIManagerAdapter.hasAdminAccount());
4648
httpResponse = getRequest.execute();
4749
this.apiManagerResponse.put(apiId,EntityUtils.toString(httpResponse.getEntity()));

‎modules/apim-adapter/src/main/java/com/axway/apim/adapter/apis/APIManagerAlertsAdapter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ private void readAlertsFromAPIManager() throws AppException {
4747
URI uri;
4848
HttpResponse httpResponse = null;
4949
try {
50-
uri = new URIBuilder(CoreParameters.getInstance().getAPIManagerURL()).setPath(RestAPICall.API_VERSION + "/alerts").build();
50+
uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(cmd.getApiBasepath() + "/alerts").build();
5151
RestAPICall getRequest = new GETRequest(uri, true);
5252
httpResponse = getRequest.execute();
5353
String response = EntityUtils.toString(httpResponse.getEntity());
@@ -88,7 +88,7 @@ public Alerts updateAlerts(Alerts alerts) throws AppException {
8888
ErrorState.getInstance().setError("An Admin Account is required to update the API-Manager alerts configuration.", ErrorCode.NO_ADMIN_ROLE_USER, false);
8989
throw new AppException("An Admin Account is required to update the API-Manager alerts configuration.", ErrorCode.NO_ADMIN_ROLE_USER);
9090
}
91-
URI uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(RestAPICall.API_VERSION+"/alerts").build();
91+
URI uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(cmd.getApiBasepath()+"/alerts").build();
9292
FilterProvider filter = new SimpleFilterProvider().setDefaultFilter(
9393
SimpleBeanPropertyFilter.serializeAllExcept());
9494
mapper.setFilterProvider(filter);

‎modules/apim-adapter/src/main/java/com/axway/apim/adapter/apis/APIManagerConfigAdapter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ private void readConfigFromAPIManager(boolean useAdmin) throws AppException {
9090
URI uri;
9191
HttpResponse httpResponse = null;
9292
try {
93-
uri = new URIBuilder(CoreParameters.getInstance().getAPIManagerURL()).setPath(RestAPICall.API_VERSION + "/config").build();
93+
uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(cmd.getApiBasepath() + "/config").build();
9494
RestAPICall getRequest = new GETRequest(uri, useAdmin);
9595
httpResponse = getRequest.execute();
9696
String response = EntityUtils.toString(httpResponse.getEntity());
@@ -131,7 +131,7 @@ public Config updateConfiguration(Config desiredConfig) throws AppException {
131131
ErrorState.getInstance().setError("An Admin Account is required to update the API-Manager configuration.", ErrorCode.NO_ADMIN_ROLE_USER, false);
132132
throw new AppException("An Admin Account is required to update the API-Manager configuration.", ErrorCode.NO_ADMIN_ROLE_USER);
133133
}
134-
URI uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(RestAPICall.API_VERSION+"/config").build();
134+
URI uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(cmd.getApiBasepath()+"/config").build();
135135
FilterProvider filter = new SimpleFilterProvider().setDefaultFilter(
136136
SimpleBeanPropertyFilter.serializeAllExcept(ConfigFields.getIgnoredFields()));
137137
mapper.setFilterProvider(filter);

0 commit comments

Comments
 (0)