Skip to content

Commit fae2114

Browse files
committed
Add change to set default hostname template in admin settings API
1 parent 8d9f376 commit fae2114

File tree

5 files changed

+37
-2
lines changed

5 files changed

+37
-2
lines changed

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

+7
Original file line numberDiff line numberDiff line change
@@ -103,4 +103,11 @@ public boolean undeploy(String apiID, String apiName, String apiVersion, String
103103
* @return API api object
104104
*/
105105
public void applyGatewayStandards(API api) throws DeployerException;
106+
107+
/**
108+
* This method returns the default hostname template of the external gateway
109+
*
110+
* @return String default hostname template
111+
*/
112+
public String getDefaultHostnameTemplate();
106113
}

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

+22-2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public class SettingsGatewayConfigurationDTO {
2626
private String type = null;
2727
private String displayName = null;
2828
private List<GatewayConfigurationDTO> configurations = new ArrayList<GatewayConfigurationDTO>();
29+
private String defaultHostnameTemplate = null;
2930

3031
/**
3132
**/
@@ -79,6 +80,23 @@ public void setConfigurations(List<GatewayConfigurationDTO> configurations) {
7980
this.configurations = configurations;
8081
}
8182

83+
/**
84+
**/
85+
public SettingsGatewayConfigurationDTO defaultHostnameTemplate(String defaultHostnameTemplate) {
86+
this.defaultHostnameTemplate = defaultHostnameTemplate;
87+
return this;
88+
}
89+
90+
91+
@ApiModelProperty(example = "{apiId}.execute-api.{region}.amazonaws.com", value = "")
92+
@JsonProperty("defaultHostnameTemplate")
93+
public String getDefaultHostnameTemplate() {
94+
return defaultHostnameTemplate;
95+
}
96+
public void setDefaultHostnameTemplate(String defaultHostnameTemplate) {
97+
this.defaultHostnameTemplate = defaultHostnameTemplate;
98+
}
99+
82100

83101
@Override
84102
public boolean equals(java.lang.Object o) {
@@ -91,12 +109,13 @@ public boolean equals(java.lang.Object o) {
91109
SettingsGatewayConfigurationDTO settingsGatewayConfiguration = (SettingsGatewayConfigurationDTO) o;
92110
return Objects.equals(type, settingsGatewayConfiguration.type) &&
93111
Objects.equals(displayName, settingsGatewayConfiguration.displayName) &&
94-
Objects.equals(configurations, settingsGatewayConfiguration.configurations);
112+
Objects.equals(configurations, settingsGatewayConfiguration.configurations) &&
113+
Objects.equals(defaultHostnameTemplate, settingsGatewayConfiguration.defaultHostnameTemplate);
95114
}
96115

97116
@Override
98117
public int hashCode() {
99-
return Objects.hash(type, displayName, configurations);
118+
return Objects.hash(type, displayName, configurations, defaultHostnameTemplate);
100119
}
101120

102121
@Override
@@ -107,6 +126,7 @@ public String toString() {
107126
sb.append(" type: ").append(toIndentedString(type)).append("\n");
108127
sb.append(" displayName: ").append(toIndentedString(displayName)).append("\n");
109128
sb.append(" configurations: ").append(toIndentedString(configurations)).append("\n");
129+
sb.append(" defaultHostnameTemplate: ").append(toIndentedString(defaultHostnameTemplate)).append("\n");
110130
sb.append("}");
111131
return sb.toString();
112132
}

components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/admin/v1/utils/mappings/SettingsMappingUtil.java

+1
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ private static List<SettingsGatewayConfigurationDTO> getSettingsGatewayConfigura
152152
new SettingsGatewayConfigurationDTO();
153153
settingsFederatedGatewayConfigurationDTO.setType(gatewayConfiguration.getType());
154154
settingsFederatedGatewayConfigurationDTO.setDisplayName(gatewayConfiguration.getType());
155+
settingsFederatedGatewayConfigurationDTO.setDefaultHostnameTemplate(gatewayConfiguration.getDefaultHostnameTemplate());
155156
List<ConfigurationDto> connectionConfigurations = gatewayConfiguration.getConnectionConfigurations();
156157
if (connectionConfigurations != null) {
157158
for (ConfigurationDto dto : connectionConfigurations) {

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

+3
Original file line numberDiff line numberDiff line change
@@ -5485,6 +5485,9 @@ components:
54855485
type: array
54865486
items:
54875487
$ref: '#/components/schemas/GatewayConfiguration'
5488+
defaultHostnameTemplate:
5489+
type: string
5490+
example: '{apiId}.execute-api.{region}.amazonaws.com'
54885491
analyticsEnabled:
54895492
type: boolean
54905493
description: To determine whether analytics is enabled or not

components/apimgt/org.wso2.carbon.apimgt.solace/src/main/java/org/wso2/carbon/apimgt/solace/deployer/SolaceBrokerDeployer.java

+4
Original file line numberDiff line numberDiff line change
@@ -380,4 +380,8 @@ public void applyGatewayStandards(API api) throws DeployerException {
380380
// No need to implement
381381
}
382382

383+
@Override
384+
public String getDefaultHostnameTemplate() {
385+
return "";
386+
}
383387
}

0 commit comments

Comments
 (0)