Skip to content

Commit

Permalink
Merge branch 'refs/heads/master' into Idle-Account-Suspension-API
Browse files Browse the repository at this point in the history
# Conflicts:
#	pom.xml
  • Loading branch information
KaveeshaPiumini committed Jan 16, 2025
2 parents c80df88 + d73362b commit 0e0565f
Show file tree
Hide file tree
Showing 115 changed files with 1,463 additions and 143 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
<version>1.3.19-SNAPSHOT</version>
<version>1.3.21-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
<version>1.3.19-SNAPSHOT</version>
<version>1.3.21-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<artifactId>identity-api-server</artifactId>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<version>1.3.19-SNAPSHOT</version>
<version>1.3.21-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
<version>1.3.19-SNAPSHOT</version>
<version>1.3.21-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
<version>1.3.19-SNAPSHOT</version>
<version>1.3.21-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<artifactId>identity-api-server</artifactId>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<version>1.3.19-SNAPSHOT</version>
<version>1.3.21-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>org.wso2.carbon.identity.api.server.action.management</artifactId>
<version>1.3.19-SNAPSHOT</version>
<version>1.3.21-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>org.wso2.carbon.identity.api.server.action.management</artifactId>
<version>1.3.19-SNAPSHOT</version>
<version>1.3.21-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,168 @@
/*
* Copyright (c) 2024, 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.carbon.identity.api.server.action.management.v1;

import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.ArrayList;
import java.util.List;
import org.wso2.carbon.identity.api.server.action.management.v1.Expression;
import javax.validation.constraints.*;

/**
* Expressions combined with AND condition.
**/

import io.swagger.annotations.*;
import java.util.Objects;
import javax.validation.Valid;
import javax.xml.bind.annotation.*;
@ApiModel(description = "Expressions combined with AND condition.")
public class ANDRule {


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

@XmlEnumValue("AND") AND(String.valueOf("AND"));


private String value;

ConditionEnum(String v) {
value = v;
}

public String value() {
return value;
}

@Override
public String toString() {
return String.valueOf(value);
}

public static ConditionEnum fromValue(String value) {
for (ConditionEnum b : ConditionEnum.values()) {
if (b.value.equals(value)) {
return b;
}
}
throw new IllegalArgumentException("Unexpected value '" + value + "'");
}
}

private ConditionEnum condition;
private List<Expression> expressions = new ArrayList<Expression>();


/**
**/
public ANDRule condition(ConditionEnum condition) {

this.condition = condition;
return this;
}

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

public ConditionEnum getCondition() {
return condition;
}
public void setCondition(ConditionEnum condition) {
this.condition = condition;
}

/**
**/
public ANDRule expressions(List<Expression> expressions) {

this.expressions = expressions;
return this;
}

@ApiModelProperty(required = true, value = "")
@JsonProperty("expressions")
@Valid
@NotNull(message = "Property expressions cannot be null.")
@Size(min=1)
public List<Expression> getExpressions() {
return expressions;
}
public void setExpressions(List<Expression> expressions) {
this.expressions = expressions;
}

public ANDRule addExpressionsItem(Expression expressionsItem) {
this.expressions.add(expressionsItem);
return this;
}



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

if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
ANDRule anDRule = (ANDRule) o;
return Objects.equals(this.condition, anDRule.condition) &&
Objects.equals(this.expressions, anDRule.expressions);
}

@Override
public int hashCode() {
return Objects.hash(condition, expressions);
}

@Override
public String toString() {

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

sb.append(" condition: ").append(toIndentedString(condition)).append("\n");
sb.append(" expressions: ").append(toIndentedString(expressions)).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");
}
}

Loading

0 comments on commit 0e0565f

Please sign in to comment.