Skip to content

Commit

Permalink
Merge pull request #1 from wso2/master
Browse files Browse the repository at this point in the history 
merge with wso2/carbon-apimgt 10/10/2016
  • Loading branch information
@irham0019
irham0019 committed Oct 10, 2016
2 parents c497f75 + c9283f4 commit 69683de
Show file tree
Hide file tree
Showing 222 changed files with 23,130 additions and 10,116 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ features/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.feature/src/main/resou
features/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.feature/src/main/resources/api-docs/package.json
features/apimgt/org.wso2.carbon.apimgt.rest.api.store.feature/src/main/resources/api-docs/main.js
features/apimgt/org.wso2.carbon.apimgt.rest.api.store.feature/src/main/resources/api-docs/package.json
features/apimgt/org.wso2.carbon.apimgt.rest.api.admin.feature/src/main/resources/api-docs/main.js
features/apimgt/org.wso2.carbon.apimgt.rest.api.admin.feature/src/main/resources/api-docs/package.json
8 changes: 7 additions & 1 deletion ...y/src/main/java/org/wso2/carbon/apimgt/gateway/handlers/logging/APILogMessageHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.wso2.carbon.apimgt.gateway.handlers.logging;

import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.description.WSDL2Constants;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
Expand Down Expand Up @@ -64,9 +65,14 @@ private boolean mediate(MessageContext messageContext, String direction) {
if (endUserName != null) {
logMessage = logMessage + " , userName=" + endUserName;
}
String httpMethod = String.valueOf(axisMC.getProperty(Constants.Configuration.HTTP_METHOD));
if (httpMethod != null) {
logMessage = logMessage + " , httpMethod=" + httpMethod;
}
Map headers = (Map) axisMC.getProperty(org.apache.axis2.context.MessageContext.TRANSPORT_HEADERS);
String logID = (String) headers.get(APIConstants.ACTIVITY_ID);


if (DIRECTION_OUT.equals(direction) && logID == null) {
try {
org.apache.axis2.context.MessageContext inMessageContext =
Expand Down Expand Up @@ -123,7 +129,7 @@ private boolean mediate(MessageContext messageContext, String direction) {
if (DIRECTION_OUT.equals(direction)) {
String statusCode = String.valueOf(axisMC.getProperty(NhttpConstants.HTTP_SC));

if (StringUtils.isEmpty(statusCode)) {
if (StringUtils.isNotEmpty(statusCode)) {
logMessage = logMessage + " , statusCode=" + statusCode;
}
}
Expand Down
70 changes: 34 additions & 36 deletions ....apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/service/APIGatewayAdmin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ public class APIGatewayAdmin extends org.wso2.carbon.core.AbstractAdmin {
* @param tenantDomain
* @throws AxisFault
*/
public void addApiForTenant(String apiProviderName, String apiName, String version, String apiConfig,
public boolean addApiForTenant(String apiProviderName, String apiName, String version, String apiConfig,
String tenantDomain) throws AxisFault {
RESTAPIAdminClient restClient = new RESTAPIAdminClient(apiProviderName, apiName, version);
restClient.addApi(apiConfig, tenantDomain);
return restClient.addApi(apiConfig, tenantDomain);
}

public void addApi(String apiProviderName, String apiName, String version, String apiConfig) throws AxisFault {
public boolean addApi(String apiProviderName, String apiName, String version, String apiConfig) throws AxisFault {
RESTAPIAdminClient restClient = new RESTAPIAdminClient(apiProviderName, apiName, version);
restClient.addApi(apiConfig);
return restClient.addApi(apiConfig);
}

/**
Expand All @@ -54,28 +54,28 @@ public void addApi(String apiProviderName, String apiName, String version, Strin
* @param tenantDomain
* @throws AxisFault
*/
public void addPrototypeApiScriptImplForTenant(String apiProviderName, String apiName, String version,
public boolean addPrototypeApiScriptImplForTenant(String apiProviderName, String apiName, String version,
String apiConfig, String tenantDomain) throws AxisFault {
RESTAPIAdminClient restClient = new RESTAPIAdminClient(apiProviderName, apiName, version);
restClient.addPrototypeApiScriptImpl(apiConfig, tenantDomain);
return restClient.addPrototypeApiScriptImpl(apiConfig, tenantDomain);
}

public void addPrototypeApiScriptImpl(String apiProviderName, String apiName, String version, String apiConfig)
public boolean addPrototypeApiScriptImpl(String apiProviderName, String apiName, String version, String apiConfig)
throws AxisFault {
RESTAPIAdminClient restClient = new RESTAPIAdminClient(apiProviderName, apiName, version);
restClient.addPrototypeApiScriptImpl(apiConfig);
return restClient.addPrototypeApiScriptImpl(apiConfig);
}

public void addDefaultAPIForTenant(String apiProviderName, String apiName, String version, String apiConfig,
public boolean addDefaultAPIForTenant(String apiProviderName, String apiName, String version, String apiConfig,
String tenantDomain) throws AxisFault {
RESTAPIAdminClient restClient = new RESTAPIAdminClient(apiProviderName, apiName, version);
restClient.addDefaultAPI(apiConfig, tenantDomain);
return restClient.addDefaultAPI(apiConfig, tenantDomain);
}

public void addDefaultAPI(String apiProviderName, String apiName, String version, String apiConfig)
public boolean addDefaultAPI(String apiProviderName, String apiName, String version, String apiConfig)
throws AxisFault {
RESTAPIAdminClient restClient = new RESTAPIAdminClient(apiProviderName, apiName, version);
restClient.addDefaultAPI(apiConfig);
return restClient.addDefaultAPI(apiConfig);
}

/**
Expand Down Expand Up @@ -122,15 +122,15 @@ public org.wso2.carbon.apimgt.gateway.dto.APIData getDefaultApi(String apiProvid
* @param tenantDomain
* @throws AxisFault
*/
public void updateApiForTenant(String apiProviderName, String apiName, String version, String apiConfig,
public boolean updateApiForTenant(String apiProviderName, String apiName, String version, String apiConfig,
String tenantDomain) throws AxisFault {
RESTAPIAdminClient restClient = new RESTAPIAdminClient(apiProviderName, apiName, version);
restClient.updateApi(apiConfig, tenantDomain);
return restClient.updateApi(apiConfig, tenantDomain);
}

public void updateApi(String apiProviderName, String apiName, String version, String apiConfig) throws AxisFault {
public boolean updateApi(String apiProviderName, String apiName, String version, String apiConfig) throws AxisFault {
RESTAPIAdminClient restClient = new RESTAPIAdminClient(apiProviderName, apiName, version);
restClient.updateApi(apiConfig);
return restClient.updateApi(apiConfig);
}

/**
Expand All @@ -140,28 +140,28 @@ public void updateApi(String apiProviderName, String apiName, String version, St
* @param tenantDomain
* @throws AxisFault
*/
public void updateApiForInlineScriptForTenant(String apiProviderName, String apiName, String version,
public boolean updateApiForInlineScriptForTenant(String apiProviderName, String apiName, String version,
String apiConfig, String tenantDomain) throws AxisFault {
RESTAPIAdminClient restClient = new RESTAPIAdminClient(apiProviderName, apiName, version);
restClient.updateApiForInlineScript(apiConfig, tenantDomain);
return restClient.updateApiForInlineScript(apiConfig, tenantDomain);
}

public void updateApiForInlineScript(String apiProviderName, String apiName, String version, String apiConfig)
public boolean updateApiForInlineScript(String apiProviderName, String apiName, String version, String apiConfig)
throws AxisFault {
RESTAPIAdminClient restClient = new RESTAPIAdminClient(apiProviderName, apiName, version);
restClient.updateApiForInlineScript(apiConfig);
return restClient.updateApiForInlineScript(apiConfig);
}

public void updateDefaultApiForTenant(String apiProviderName, String apiName, String version, String apiConfig,
public boolean updateDefaultApiForTenant(String apiProviderName, String apiName, String version, String apiConfig,
String tenantDomain) throws AxisFault {
RESTAPIAdminClient restClient = new RESTAPIAdminClient(apiProviderName, apiName, version);
restClient.updateDefaultApi(apiConfig, tenantDomain);
return restClient.updateDefaultApi(apiConfig, tenantDomain);
}

public void updateDefaultApi(String apiProviderName, String apiName, String version, String apiConfig)
public boolean updateDefaultApi(String apiProviderName, String apiName, String version, String apiConfig)
throws AxisFault {
RESTAPIAdminClient restClient = new RESTAPIAdminClient(apiProviderName, apiName, version);
restClient.updateDefaultApi(apiConfig);
return restClient.updateDefaultApi(apiConfig);
}


Expand All @@ -171,27 +171,27 @@ public void updateDefaultApi(String apiProviderName, String apiName, String vers
* @param tenantDomain
* @throws AxisFault
*/
public void deleteApiForTenant(String apiProviderName, String apiName, String version, String tenantDomain)
public boolean deleteApiForTenant(String apiProviderName, String apiName, String version, String tenantDomain)
throws AxisFault {
RESTAPIAdminClient restClient = new RESTAPIAdminClient(apiProviderName, apiName, version);
restClient.deleteApi(tenantDomain);
return restClient.deleteApi(tenantDomain);
}

public void deleteApi(String apiProviderName, String apiName, String version) throws AxisFault {
public boolean deleteApi(String apiProviderName, String apiName, String version) throws AxisFault {
RESTAPIAdminClient restClient = new RESTAPIAdminClient(apiProviderName, apiName, version);
restClient.deleteApi();
return restClient.deleteApi();
}


public void deleteDefaultApiForTenant(String apiProviderName, String apiName, String version, String tenantDomain)
public boolean deleteDefaultApiForTenant(String apiProviderName, String apiName, String version, String tenantDomain)
throws AxisFault {
RESTAPIAdminClient restClient = new RESTAPIAdminClient(apiProviderName, apiName, version);
restClient.deleteDefaultApi(tenantDomain);
return restClient.deleteDefaultApi(tenantDomain);
}

public void deleteDefaultApi(String apiProviderName, String apiName, String version) throws AxisFault {
public boolean deleteDefaultApi(String apiProviderName, String apiName, String version) throws AxisFault {
RESTAPIAdminClient restClient = new RESTAPIAdminClient(apiProviderName, apiName, version);
restClient.deleteDefaultApi();
return restClient.deleteDefaultApi();
}

private org.wso2.carbon.apimgt.gateway.dto.APIData convert(
Expand Down Expand Up @@ -262,6 +262,7 @@ public void addSequence(String sequence) throws AxisFault {

/**
* Deploy the sequence to the gateway
*
* @param sequence
* @param tenantDomain
* @throws AxisFault
Expand All @@ -283,7 +284,6 @@ public void addSequenceForTenant(String sequence, String tenantDomain) throws Ax
* Undeploy the sequence from gateway
*
* @param sequenceName -The sequence name, which need to be undeployed from synapse configuration
* @param tenantDomain
* @throws AxisFault
*/
public void deleteSequence(String sequenceName) throws AxisFault {
Expand All @@ -299,8 +299,7 @@ public void deleteSequenceForTenant(String sequenceName, String tenantDomain) th
/**
* get the sequence from gateway
*
* @param sequenceName -The sequence name,
* @param tenantDomain
* @param sequenceName -The sequence name
* @throws AxisFault
*/
public OMElement getSequence(String sequenceName) throws AxisFault {
Expand All @@ -326,7 +325,6 @@ public boolean isExistingSequenceForTenant(String sequenceName, String tenantDom
/**
* encrypt the plain text password
*
* @param cipher init cipher
* @param plainTextPass plain text password
* @return encrypted password
* @throws APIManagementException
Expand Down

0 comments on commit 69683de

Please sign in to comment.