-
Notifications
You must be signed in to change notification settings - Fork 44
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into issue-391-show-group-labels-in-account-ho…
…me-page
- Loading branch information
Showing
74 changed files
with
2,419 additions
and
1,095 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
iam-login-service/src/main/java/it/infn/mw/iam/api/common/form/PaginatedRequestForm.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| /** | ||
| * Copyright (c) Istituto Nazionale di Fisica Nucleare (INFN). 2016-2019 | ||
| * | ||
| * Licensed 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 it.infn.mw.iam.api.common.form; | ||
|
|
||
| import javax.validation.constraints.Min; | ||
|
|
||
| public class PaginatedRequestForm { | ||
|
|
||
| @Min(value = 0, message = "must be >=0") | ||
| private Integer count; | ||
|
|
||
| @Min(value = 1, message = "must be >=1") | ||
| private Integer startIndex; | ||
|
|
||
| public Integer getCount() { | ||
| return count; | ||
| } | ||
|
|
||
| public void setCount(Integer count) { | ||
| this.count = count; | ||
| } | ||
|
|
||
| public Integer getStartIndex() { | ||
| return startIndex; | ||
| } | ||
|
|
||
| public void setStartIndex(Integer startIndex) { | ||
| this.startIndex = startIndex; | ||
| } | ||
| } |
36 changes: 36 additions & 0 deletions
36
...-service/src/main/java/it/infn/mw/iam/api/common/form/PaginatedRequestWithFilterForm.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| /** | ||
| * Copyright (c) Istituto Nazionale di Fisica Nucleare (INFN). 2016-2019 | ||
| * | ||
| * Licensed 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 it.infn.mw.iam.api.common.form; | ||
|
|
||
| import javax.validation.constraints.Size; | ||
|
|
||
| import it.infn.mw.iam.api.common.validator.NullableNonBlankString; | ||
|
|
||
| public class PaginatedRequestWithFilterForm extends PaginatedRequestForm { | ||
|
|
||
| @NullableNonBlankString(message = "Please provide a non-blank filter string") | ||
| @Size(min = 2, max = 64, message = "Please provide a filter that is between 2 and 64 chars long") | ||
| private String filter; | ||
|
|
||
| public String getFilter() { | ||
| return filter; | ||
| } | ||
|
|
||
| public void setFilter(String filter) { | ||
| this.filter = filter; | ||
| } | ||
|
|
||
| } |
39 changes: 39 additions & 0 deletions
39
...gin-service/src/main/java/it/infn/mw/iam/api/common/validator/NullableNonBlankString.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| /** | ||
| * Copyright (c) Istituto Nazionale di Fisica Nucleare (INFN). 2016-2019 | ||
| * | ||
| * Licensed 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 it.infn.mw.iam.api.common.validator; | ||
|
|
||
| import static java.lang.annotation.ElementType.FIELD; | ||
| import static java.lang.annotation.ElementType.METHOD; | ||
| import static java.lang.annotation.RetentionPolicy.RUNTIME; | ||
|
|
||
| import java.lang.annotation.Retention; | ||
| import java.lang.annotation.Target; | ||
|
|
||
| import javax.validation.Constraint; | ||
| import javax.validation.Payload; | ||
|
|
||
| @Retention(RUNTIME) | ||
| @Target({FIELD, METHOD}) | ||
| @Constraint(validatedBy = NullableNonBlankStringValidator.class) | ||
| public @interface NullableNonBlankString { | ||
|
|
||
| String message() default "The string, if not null, must not be blank"; | ||
|
|
||
| Class<?>[] groups() default {}; | ||
|
|
||
| Class<? extends Payload>[] payload() default {}; | ||
|
|
||
| } |
38 changes: 38 additions & 0 deletions
38
...ce/src/main/java/it/infn/mw/iam/api/common/validator/NullableNonBlankStringValidator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| /** | ||
| * Copyright (c) Istituto Nazionale di Fisica Nucleare (INFN). 2016-2019 | ||
| * | ||
| * Licensed 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 it.infn.mw.iam.api.common.validator; | ||
|
|
||
| import static java.util.Objects.isNull; | ||
|
|
||
| import javax.validation.ConstraintValidator; | ||
| import javax.validation.ConstraintValidatorContext; | ||
|
|
||
| public class NullableNonBlankStringValidator | ||
| implements ConstraintValidator<NullableNonBlankString, String> { | ||
|
|
||
| public NullableNonBlankStringValidator() { | ||
| } | ||
|
|
||
| @Override | ||
| public void initialize(NullableNonBlankString constraintAnnotation) { | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isValid(String value, ConstraintValidatorContext context) { | ||
| return isNull(value) || value.trim().length() > 0; | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.