Skip to content

Commit

Permalink
fix integration failures due to new attribute in ApplicationResponseM…
Browse files Browse the repository at this point in the history
…odel in application api v1
  • Loading branch information
AnuradhaSK committed Oct 24, 2023
1 parent 3b6ff0b commit 0170e89
Show file tree
Hide file tree
Showing 3 changed files with 326 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ public class ApplicationResponseModel {
private String issuer;
private String templateId;
private Boolean isManagementApp;
private Boolean isB2BSelfServiceApp;
private AssociatedRolesConfig associatedRoles;
private ClaimConfiguration claimConfiguration;
private List<InboundProtocolListItem> inboundProtocols = null;
private AuthenticationSequence authenticationSequence;
Expand Down Expand Up @@ -245,6 +247,27 @@ public void setIsManagementApp(Boolean isManagementApp) {
this.isManagementApp = isManagementApp;
}

/**
*
**/
public ApplicationResponseModel associatedRoles(AssociatedRolesConfig associatedRoles) {

this.associatedRoles = associatedRoles;
return this;
}

@ApiModelProperty(value = "")
@JsonProperty("associatedRoles")
@Valid
public AssociatedRolesConfig getAssociatedRoles() {

return associatedRoles;
}

public void setAssociatedRoles(AssociatedRolesConfig associatedRoles) {

this.associatedRoles = associatedRoles;
}

/**
**/
Expand Down Expand Up @@ -398,13 +421,15 @@ public boolean equals(Object o) {
Objects.equals(this.authenticationSequence, applicationResponseModel.authenticationSequence) &&
Objects.equals(this.appRoleConfigurations, applicationResponseModel.appRoleConfigurations) &&
Objects.equals(this.advancedConfigurations, applicationResponseModel.advancedConfigurations) &&
Objects.equals(this.provisioningConfigurations, applicationResponseModel.provisioningConfigurations) &&
Objects.equals(this.access, applicationResponseModel.access);
Objects.equals(this.provisioningConfigurations, applicationResponseModel.provisioningConfigurations) && Objects.equals(this.access, applicationResponseModel.access) && Objects.equals(this.associatedRoles, applicationResponseModel.associatedRoles);
}

@Override
public int hashCode() {
return Objects.hash(id, name, description, imageUrl, accessUrl, clientId, issuer, templateId, isManagementApp, claimConfiguration, inboundProtocols, authenticationSequence, appRoleConfigurations, advancedConfigurations, provisioningConfigurations, access);

return Objects.hash(id, name, description, imageUrl, accessUrl, clientId, issuer, templateId, isManagementApp,
claimConfiguration, inboundProtocols, associatedRoles, authenticationSequence, appRoleConfigurations,
advancedConfigurations, provisioningConfigurations, access);
}

@Override
Expand All @@ -420,6 +445,7 @@ public String toString() {
" issuer: " + toIndentedString(issuer) + "\n" +
" templateId: " + toIndentedString(templateId) + "\n" +
" isManagementApp: " + toIndentedString(isManagementApp) + "\n" +
" associatedRoles: " + toIndentedString(associatedRoles) + "\n" +
" claimConfiguration: " + toIndentedString(claimConfiguration) + "\n" +
" inboundProtocols: " + toIndentedString(inboundProtocols) + "\n" +
" authenticationSequence: " + toIndentedString(authenticationSequence) + "\n" +
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,174 @@
/*
* Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
*
* WSO2 LLC. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
* in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

package org.wso2.identity.integration.test.rest.api.server.application.management.v1.model;

import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModelProperty;

import java.util.ArrayList;
import java.util.List;
import java.util.Objects;

import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import javax.xml.bind.annotation.XmlEnum;
import javax.xml.bind.annotation.XmlEnumValue;
import javax.xml.bind.annotation.XmlType;

public class AssociatedRolesConfig {

@XmlType(name = "AllowedAudienceEnum")
@XmlEnum(String.class)
public enum AllowedAudienceEnum {

@XmlEnumValue("ORGANIZATION") ORGANIZATION(
String.valueOf("ORGANIZATION")), @XmlEnumValue("APPLICATION") APPLICATION(
String.valueOf("APPLICATION"));

private String value;

AllowedAudienceEnum(String v) {

value = v;
}

public String value() {

return value;
}

@Override
public String toString() {

return String.valueOf(value);
}

public static AllowedAudienceEnum fromValue(String value) {

for (AllowedAudienceEnum b : AllowedAudienceEnum.values()) {
if (b.value.equals(value)) {
return b;
}
}
throw new IllegalArgumentException("Unexpected value '" + value + "'");
}
}

private AllowedAudienceEnum allowedAudience = AllowedAudienceEnum.ORGANIZATION;
private List<Role> roles = null;

/**
*
**/
public AssociatedRolesConfig allowedAudience(AllowedAudienceEnum allowedAudience) {

this.allowedAudience = allowedAudience;
return this;
}

@ApiModelProperty(example = "ORGANIZATION", required = true, value = "")
@JsonProperty("allowedAudience")
@Valid
@NotNull(message = "Property allowedAudience cannot be null.")

public AllowedAudienceEnum getAllowedAudience() {

return allowedAudience;
}

public void setAllowedAudience(AllowedAudienceEnum allowedAudience) {

this.allowedAudience = allowedAudience;
}

/**
*
**/
public AssociatedRolesConfig roles(List<Role> roles) {

this.roles = roles;
return this;
}

@ApiModelProperty(value = "")
@JsonProperty("roles")
@Valid
public List<Role> getRoles() {

return roles;
}

public void setRoles(List<Role> roles) {

this.roles = roles;
}

public AssociatedRolesConfig addRolesItem(Role rolesItem) {

if (this.roles == null) {
this.roles = new ArrayList<>();
}
this.roles.add(rolesItem);
return this;
}

@Override
public boolean equals(java.lang.Object o) {

if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
AssociatedRolesConfig associatedRolesConfig = (AssociatedRolesConfig) o;
return Objects.equals(this.allowedAudience, associatedRolesConfig.allowedAudience) &&
Objects.equals(this.roles, associatedRolesConfig.roles);
}

@Override
public int hashCode() {

return Objects.hash(allowedAudience, roles);
}

@Override
public String toString() {

StringBuilder sb = new StringBuilder();
sb.append("class AssociatedRolesConfig {\n");

sb.append(" allowedAudience: ").append(toIndentedString(allowedAudience)).append("\n");
sb.append(" roles: ").append(toIndentedString(roles)).append("\n");
sb.append("}");
return sb.toString();
}

/**
* Convert the given object to string with each line indented by 4 spaces
* (except the first line).
*/
private String toIndentedString(java.lang.Object o) {

if (o == null) {
return "null";
}
return o.toString().replace("\n", "\n");
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
/*
* Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
*
* WSO2 LLC. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
* in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

package org.wso2.identity.integration.test.rest.api.server.application.management.v1.model;

import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModelProperty;

import java.util.Objects;

import javax.validation.Valid;
import javax.validation.constraints.NotNull;

public class Role {

private String id;
private String name;

/**
*
**/
public Role id(String id) {

this.id = id;
return this;
}

@ApiModelProperty(example = "bf5abd05-3667-4a2a-a6c2-2fb9f4d26e47", required = true, value = "")
@JsonProperty("id")
@Valid
@NotNull(message = "Property id cannot be null.")

public String getId() {

return id;
}

public void setId(String id) {

this.id = id;
}

/**
*
**/
public Role name(String name) {

this.name = name;
return this;
}

@ApiModelProperty(example = "RoleA", value = "")
@JsonProperty("name")
@Valid
public String getName() {

return name;
}

public void setName(String name) {

this.name = name;
}

@Override
public boolean equals(java.lang.Object o) {

if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
Role role = (Role) o;
return Objects.equals(this.id, role.id) &&
Objects.equals(this.name, role.name);
}

@Override
public int hashCode() {

return Objects.hash(id, name);
}

@Override
public String toString() {

StringBuilder sb = new StringBuilder();
sb.append("class Role {\n");

sb.append(" id: ").append(toIndentedString(id)).append("\n");
sb.append(" name: ").append(toIndentedString(name)).append("\n");
sb.append("}");
return sb.toString();
}

/**
* Convert the given object to string with each line indented by 4 spaces
* (except the first line).
*/
private String toIndentedString(java.lang.Object o) {

if (o == null) {
return "null";
}
return o.toString().replace("\n", "\n");
}
}

0 comments on commit 0170e89

Please sign in to comment.