Skip to content

Commit d306496

Browse files
mhmxsbiharitomi
authored andcommitted
BUG-94531 API v2 validation fix
1 parent 6251c08 commit d306496

File tree

5 files changed

+8
-3
lines changed

5 files changed

+8
-3
lines changed

core-api/src/main/java/com/sequenceiq/cloudbreak/api/model/ClusterRequest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ public class ClusterRequest implements JsonEntity {
6767
@ApiModelProperty(value = StackModelDescription.PASSWORD, required = true)
6868
private String password;
6969

70+
@Valid
7071
private KerberosRequest kerberos;
7172

7273
@ApiModelProperty(ClusterModelDescription.LDAP_CONFIG_ID)

core-api/src/main/java/com/sequenceiq/cloudbreak/api/model/StackAuthenticationBase.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
@JsonIgnoreProperties(ignoreUnknown = true)
99
public class StackAuthenticationBase implements JsonEntity {
1010

11-
@ApiModelProperty(value = ModelDescriptions.StackAuthenticationBase.PUBLIC_KEY)
11+
@ApiModelProperty(ModelDescriptions.StackAuthenticationBase.PUBLIC_KEY)
1212
private String publicKey;
1313

14-
@ApiModelProperty(value = ModelDescriptions.StackAuthenticationBase.PUBLIC_KEY_ID)
14+
@ApiModelProperty(ModelDescriptions.StackAuthenticationBase.PUBLIC_KEY_ID)
1515
private String publicKeyId;
1616

17-
@ApiModelProperty(value = ModelDescriptions.StackAuthenticationBase.LOGIN_USERNAME)
17+
@ApiModelProperty(ModelDescriptions.StackAuthenticationBase.LOGIN_USERNAME)
1818
private String loginUserName;
1919

2020
public String getPublicKey() {

core-api/src/main/java/com/sequenceiq/cloudbreak/api/model/v2/AmbariV2Request.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public class AmbariV2Request implements JsonEntity {
5353
@ApiModelProperty(value = ModelDescriptions.StackModelDescription.PASSWORD, required = true)
5454
private String password;
5555

56+
@Valid
5657
private KerberosRequest kerberos;
5758

5859
@ApiModelProperty(ModelDescriptions.ClusterModelDescription.VALIDATE_BLUEPRINT)

core-api/src/main/java/com/sequenceiq/cloudbreak/api/model/v2/InstanceGroupV2Request.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import java.util.Map;
66
import java.util.Set;
77

8+
import javax.validation.Valid;
89
import javax.validation.constraints.Digits;
910
import javax.validation.constraints.Max;
1011
import javax.validation.constraints.Min;
@@ -46,6 +47,7 @@ public class InstanceGroupV2Request implements JsonEntity {
4647
@ApiModelProperty(InstanceGroupModelDescription.TEMPLATE)
4748
private TemplateV2Request template;
4849

50+
@Valid
4951
@ApiModelProperty(InstanceGroupModelDescription.SECURITYGROUP)
5052
private SecurityGroupV2Request securityGroup;
5153

core-api/src/main/java/com/sequenceiq/cloudbreak/api/model/v2/StackV2Request.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ public class StackV2Request implements JsonEntity {
8989
@ApiModelProperty(StackModelDescription.AUTHENTICATION)
9090
private StackAuthenticationRequest stackAuthentication;
9191

92+
@Valid
9293
@ApiModelProperty(StackModelDescription.NETWORK)
9394
private NetworkV2Request network;
9495

0 commit comments

Comments
 (0)