Skip to content

Commit

Permalink
Updated application tags association with applications
Browse files Browse the repository at this point in the history
  • Loading branch information
@ashanthamara
ashanthamara committed Oct 1, 2023
1 parent 957129d commit 017d427
Show file tree
Hide file tree
Showing 36 changed files with 3,582 additions and 15 deletions.
1 change: 1 addition & 0 deletions ...bon/identity/api/server/application/management/common/ApplicationManagementConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ private ApplicationManagementConstants() {
public static final String NAME = "name";
public static final String CLIENT_ID = "clientId";
public static final String ISSUER = "issuer";
public static final String TAGS = "tags";

public static final String NON_EXISTING_USER_CODE = "30007 - ";

Expand Down
36 changes: 34 additions & 2 deletions ...va/org/wso2/carbon/identity/api/server/application/management/v1/ApplicationListItem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,13 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import org.wso2.carbon.identity.api.server.application.management.v1.AdvancedApplicationConfiguration;
import org.wso2.carbon.identity.api.server.application.management.v1.TagItem;
import javax.validation.constraints.*;


import io.swagger.annotations.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import javax.validation.Valid;
import javax.xml.bind.annotation.*;
Expand Down Expand Up @@ -77,6 +80,7 @@ public static AccessEnum fromValue(String value) {
private String self;
private AdvancedApplicationConfiguration advancedConfigurations;
private String templateId;
private List<TagItem> tags = null;

/**
**/
Expand Down Expand Up @@ -276,6 +280,32 @@ public void setTemplateId(String templateId) {
this.templateId = templateId;
}

/**
**/
public ApplicationListItem tags(List<TagItem> tags) {

this.tags = tags;
return this;
}

@ApiModelProperty(value = "")
@JsonProperty("tags")
@Valid
public List<TagItem> getTags() {
return tags;
}
public void setTags(List<TagItem> tags) {
this.tags = tags;
}

public ApplicationListItem addTagsItem(TagItem tagsItem) {
if (this.tags == null) {
this.tags = new ArrayList<>();
}
this.tags.add(tagsItem);
return this;
}



@Override
Expand All @@ -298,12 +328,13 @@ public boolean equals(java.lang.Object o) {
Objects.equals(this.access, applicationListItem.access) &&
Objects.equals(this.self, applicationListItem.self) &&
Objects.equals(this.advancedConfigurations, applicationListItem.advancedConfigurations) &&
Objects.equals(this.templateId, applicationListItem.templateId);
Objects.equals(this.templateId, applicationListItem.templateId) &&
Objects.equals(this.tags, applicationListItem.tags);
}

@Override
public int hashCode() {
return Objects.hash(id, name, description, image, accessUrl, clientId, issuer, access, self, advancedConfigurations, templateId);
return Objects.hash(id, name, description, image, accessUrl, clientId, issuer, access, self, advancedConfigurations, templateId, tags);
}

@Override
Expand All @@ -323,6 +354,7 @@ public String toString() {
sb.append(" self: ").append(toIndentedString(self)).append("\n");
sb.append(" advancedConfigurations: ").append(toIndentedString(advancedConfigurations)).append("\n");
sb.append(" templateId: ").append(toIndentedString(templateId)).append("\n");
sb.append(" tags: ").append(toIndentedString(tags)).append("\n");
sb.append("}");
return sb.toString();
}
Expand Down
36 changes: 34 additions & 2 deletions .../java/org/wso2/carbon/identity/api/server/application/management/v1/ApplicationModel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,13 @@
import org.wso2.carbon.identity.api.server.application.management.v1.ClaimConfiguration;
import org.wso2.carbon.identity.api.server.application.management.v1.InboundProtocols;
import org.wso2.carbon.identity.api.server.application.management.v1.ProvisioningConfiguration;
import org.wso2.carbon.identity.api.server.application.management.v1.ListValue;
import javax.validation.constraints.*;


import io.swagger.annotations.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import javax.validation.Valid;
import javax.xml.bind.annotation.*;
Expand All @@ -50,6 +53,7 @@ public class ApplicationModel {
private AuthenticationSequence authenticationSequence;
private AdvancedApplicationConfiguration advancedConfigurations;
private ProvisioningConfiguration provisioningConfigurations;
private List<ListValue> tags = null;

/**
**/
Expand Down Expand Up @@ -287,6 +291,32 @@ public void setProvisioningConfigurations(ProvisioningConfiguration provisioning
this.provisioningConfigurations = provisioningConfigurations;
}

/**
**/
public ApplicationModel tags(List<ListValue> tags) {

this.tags = tags;
return this;
}

@ApiModelProperty(value = "")
@JsonProperty("tags")
@Valid
public List<ListValue> getTags() {
return tags;
}
public void setTags(List<ListValue> tags) {
this.tags = tags;
}

public ApplicationModel addTagsItem(ListValue tagsItem) {
if (this.tags == null) {
this.tags = new ArrayList<>();
}
this.tags.add(tagsItem);
return this;
}



@Override
Expand All @@ -311,12 +341,13 @@ public boolean equals(java.lang.Object o) {
Objects.equals(this.inboundProtocolConfiguration, applicationModel.inboundProtocolConfiguration) &&
Objects.equals(this.authenticationSequence, applicationModel.authenticationSequence) &&
Objects.equals(this.advancedConfigurations, applicationModel.advancedConfigurations) &&
Objects.equals(this.provisioningConfigurations, applicationModel.provisioningConfigurations);
Objects.equals(this.provisioningConfigurations, applicationModel.provisioningConfigurations) &&
Objects.equals(this.tags, applicationModel.tags);
}

@Override
public int hashCode() {
return Objects.hash(id, name, description, imageUrl, accessUrl, templateId, isManagementApp, isB2BSelfServiceApp, claimConfiguration, inboundProtocolConfiguration, authenticationSequence, advancedConfigurations, provisioningConfigurations);
return Objects.hash(id, name, description, imageUrl, accessUrl, templateId, isManagementApp, isB2BSelfServiceApp, claimConfiguration, inboundProtocolConfiguration, authenticationSequence, advancedConfigurations, provisioningConfigurations, tags);
}

@Override
Expand All @@ -338,6 +369,7 @@ public String toString() {
sb.append(" authenticationSequence: ").append(toIndentedString(authenticationSequence)).append("\n");
sb.append(" advancedConfigurations: ").append(toIndentedString(advancedConfigurations)).append("\n");
sb.append(" provisioningConfigurations: ").append(toIndentedString(provisioningConfigurations)).append("\n");
sb.append(" tags: ").append(toIndentedString(tags)).append("\n");
sb.append("}");
return sb.toString();
}
Expand Down
35 changes: 33 additions & 2 deletions .../org/wso2/carbon/identity/api/server/application/management/v1/ApplicationPatchModel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@


import io.swagger.annotations.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import javax.validation.Valid;
import javax.xml.bind.annotation.*;
Expand All @@ -45,6 +47,7 @@ public class ApplicationPatchModel {
private AuthenticationSequence authenticationSequence;
private AdvancedApplicationConfiguration advancedConfigurations;
private ProvisioningConfiguration provisioningConfigurations;
private List<TagsPatchRequest> tags = null;

/**
**/
Expand Down Expand Up @@ -208,6 +211,32 @@ public void setProvisioningConfigurations(ProvisioningConfiguration provisioning
this.provisioningConfigurations = provisioningConfigurations;
}

/**
**/
public ApplicationPatchModel tags(List<TagsPatchRequest> tags) {

this.tags = tags;
return this;
}

@ApiModelProperty(value = "")
@JsonProperty("tags")
@Valid
public List<TagsPatchRequest> getTags() {
return tags;
}
public void setTags(List<TagsPatchRequest> tags) {
this.tags = tags;
}

public ApplicationPatchModel addTagsItem(TagsPatchRequest tagsItem) {
if (this.tags == null) {
this.tags = new ArrayList<>();
}
this.tags.add(tagsItem);
return this;
}



@Override
Expand All @@ -228,12 +257,13 @@ public boolean equals(java.lang.Object o) {
Objects.equals(this.claimConfiguration, applicationPatchModel.claimConfiguration) &&
Objects.equals(this.authenticationSequence, applicationPatchModel.authenticationSequence) &&
Objects.equals(this.advancedConfigurations, applicationPatchModel.advancedConfigurations) &&
Objects.equals(this.provisioningConfigurations, applicationPatchModel.provisioningConfigurations);
Objects.equals(this.provisioningConfigurations, applicationPatchModel.provisioningConfigurations) &&
Objects.equals(this.tags, applicationPatchModel.tags);
}

@Override
public int hashCode() {
return Objects.hash(name, description, imageUrl, accessUrl, templateId, claimConfiguration, authenticationSequence, advancedConfigurations, provisioningConfigurations);
return Objects.hash(name, description, imageUrl, accessUrl, templateId, claimConfiguration, authenticationSequence, advancedConfigurations, provisioningConfigurations, tags);
}

@Override
Expand All @@ -251,6 +281,7 @@ public String toString() {
sb.append(" authenticationSequence: ").append(toIndentedString(authenticationSequence)).append("\n");
sb.append(" advancedConfigurations: ").append(toIndentedString(advancedConfigurations)).append("\n");
sb.append(" provisioningConfigurations: ").append(toIndentedString(provisioningConfigurations)).append("\n");
sb.append(" tags: ").append(toIndentedString(tags)).append("\n");
sb.append("}");
return sb.toString();
}
Expand Down
34 changes: 32 additions & 2 deletions ...g/wso2/carbon/identity/api/server/application/management/v1/ApplicationResponseModel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.wso2.carbon.identity.api.server.application.management.v1.ClaimConfiguration;
import org.wso2.carbon.identity.api.server.application.management.v1.InboundProtocolListItem;
import org.wso2.carbon.identity.api.server.application.management.v1.ProvisioningConfiguration;
import org.wso2.carbon.identity.api.server.application.management.v1.TagItem;
import javax.validation.constraints.*;


Expand Down Expand Up @@ -89,6 +90,7 @@ public static AccessEnum fromValue(String value) {
}

private AccessEnum access = AccessEnum.READ;
private List<TagItem> tags = null;

/**
**/
Expand Down Expand Up @@ -388,6 +390,32 @@ public void setAccess(AccessEnum access) {
this.access = access;
}

/**
**/
public ApplicationResponseModel tags(List<TagItem> tags) {

this.tags = tags;
return this;
}

@ApiModelProperty(value = "")
@JsonProperty("tags")
@Valid
public List<TagItem> getTags() {
return tags;
}
public void setTags(List<TagItem> tags) {
this.tags = tags;
}

public ApplicationResponseModel addTagsItem(TagItem tagsItem) {
if (this.tags == null) {
this.tags = new ArrayList<>();
}
this.tags.add(tagsItem);
return this;
}



@Override
Expand Down Expand Up @@ -415,12 +443,13 @@ public boolean equals(java.lang.Object o) {
Objects.equals(this.authenticationSequence, applicationResponseModel.authenticationSequence) &&
Objects.equals(this.advancedConfigurations, applicationResponseModel.advancedConfigurations) &&
Objects.equals(this.provisioningConfigurations, applicationResponseModel.provisioningConfigurations) &&
Objects.equals(this.access, applicationResponseModel.access);
Objects.equals(this.access, applicationResponseModel.access) &&
Objects.equals(this.tags, applicationResponseModel.tags);
}

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

@Override
Expand All @@ -445,6 +474,7 @@ public String toString() {
sb.append(" advancedConfigurations: ").append(toIndentedString(advancedConfigurations)).append("\n");
sb.append(" provisioningConfigurations: ").append(toIndentedString(provisioningConfigurations)).append("\n");
sb.append(" access: ").append(toIndentedString(access)).append("\n");
sb.append(" tags: ").append(toIndentedString(tags)).append("\n");
sb.append("}");
return sb.toString();
}
Expand Down
Loading

0 comments on commit 017d427

Please sign in to comment.