Rename interface method

Author: msm1992

components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIConsumerImpl.java

@@ -3624,14 +3624,14 @@ private Map<String, String> getHostWithSchemeMappingForEnvironment(API api, Stri
                 if (StringUtils.containsIgnoreCase(api.getTransports(), APIConstants.HTTP_PROTOCOL)
                         && vhost.getHttpPort() != -1) {
                     String httpUrl = gatewayDeployer != null ?
-                            gatewayDeployer.getResolvedAPIInvocationUrl(api.getUuid(), vhost.getHttpUrl(), environment) :
+                            gatewayDeployer.getAPIExecutionURL(api.getUuid(), vhost.getHttpUrl(), environment) :
                             vhost.getHttpUrl();
                     hostsWithSchemes.put(APIConstants.HTTP_PROTOCOL, httpUrl);
                 }
                 if (StringUtils.containsIgnoreCase(api.getTransports(), APIConstants.HTTPS_PROTOCOL)
                         && vhost.getHttpsPort() != -1) {
                     String httpsUrl = gatewayDeployer != null ?
-                            gatewayDeployer.getResolvedAPIInvocationUrl(api.getUuid(), vhost.getHttpsUrl(), environment) :
+                            gatewayDeployer.getAPIExecutionURL(api.getUuid(), vhost.getHttpsUrl(), environment) :
                             vhost.getHttpsUrl();
                     hostsWithSchemes.put(APIConstants.HTTPS_PROTOCOL, httpsUrl);
                 }

components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/deployer/ExternalGatewayDeployer.java

@@ -90,12 +90,9 @@ public boolean undeploy(String apiID, String apiName, String apiVersion, String
     public List<String> validateApi(API api) throws DeployerException;
 
     /**
-     * This method returns the resolved API invocation URL by replacing all placeholders appropriately
+     * This method returns the resolved API execution URL by replacing all placeholders appropriately
      *
-     * @return String resolved url
+     * @return String api execution url
      */
-    public default String getResolvedAPIInvocationUrl(String apiId, String url, Environment environment)
-            throws DeployerException {
-        return url;
-    }
+    public String getAPIExecutionURL(String apiId, String url, Environment environment) throws DeployerException;
 }

components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/src/gen/java/org/wso2/carbon/apimgt/rest/api/admin/v1/dto/VHostDTO.java

@@ -40,7 +40,7 @@ public VHostDTO host(String host) {
   @ApiModelProperty(example = "mg.wso2.com", required = true, value = "")
   @JsonProperty("host")
   @NotNull
- @Size(min=1,max=255)  public String getHost() {
+ @Pattern(regexp="^(([a-zA-Z0-9\\{\\}]|[a-zA-Z0-9\\{\\}][a-zA-Z0-9\\-\\{\\}]*[a-zA-Z0-9\\{\\}])\\.)*([A-Za-z0-9\\{\\}]|[A-Za-z0-9\\{\\}][A-Za-z0-9\\-\\{\\}]*[A-Za-z0-9\\{\\}])$") @Size(min=1,max=255)  public String getHost() {
     return host;
   }
   public void setHost(String host) {

components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/src/main/resources/admin-api.yaml

@@ -4832,7 +4832,8 @@ components:
           maxLength: 255
           minLength: 1
           # hostname regex as per RFC 1123 (http://tools.ietf.org/html/rfc1123) and appended *
-          #pattern: '^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$'
+          # included {} to allow hostname templates
+          pattern: '^(([a-zA-Z0-9\{\}]|[a-zA-Z0-9\{\}][a-zA-Z0-9\-\{\}]*[a-zA-Z0-9\{\}])\.)*([A-Za-z0-9\{\}]|[A-Za-z0-9\{\}][A-Za-z0-9\-\{\}]*[A-Za-z0-9\{\}])$'
           type: string
           example: mg.wso2.com
         httpContext:

components/apimgt/org.wso2.carbon.apimgt.rest.api.common/src/main/resources/admin-api.yaml

@@ -4832,7 +4832,8 @@ components:
           maxLength: 255
           minLength: 1
           # hostname regex as per RFC 1123 (http://tools.ietf.org/html/rfc1123) and appended *
-          #pattern: '^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$'
+          # included {} to allow hostname templates
+          pattern: '^(([a-zA-Z0-9\{\}]|[a-zA-Z0-9\{\}][a-zA-Z0-9\-\{\}]*[a-zA-Z0-9\{\}])\.)*([A-Za-z0-9\{\}]|[A-Za-z0-9\{\}][A-Za-z0-9\-\{\}]*[A-Za-z0-9\{\}])$'
           type: string
           example: mg.wso2.com
         httpContext: