Skip to content

Commit edcebe1

Browse files
Fix errors after rebase
1 parent e0ef6d4 commit edcebe1

File tree

4 files changed

+40
-9
lines changed

4 files changed

+40
-9
lines changed

iam-login-service/src/main/java/it/infn/mw/iam/api/requests/exception/GroupRequestValidationError.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ public class GroupRequestValidationError extends IllegalArgumentException {
2222
public GroupRequestValidationError(String message) {
2323
super(message);
2424
}
25-
}
25+
}

iam-login-service/src/test/java/it/infn/mw/iam/test/api/aup/AupIntegrationTests.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ public class AupIntegrationTests extends AupTestSupport {
6565
private final String INVALID_AUP_URL =
6666
"https://iam.local.io/\"</script><script>alert(8);</script>";
6767

68-
private final static String DEFAULT_AUP_TEXT = null;
69-
private final static String DEFAULT_AUP_URL = "http://updated-aup-text.org/";
70-
private final static String DEFAULT_AUP_DESC = "desc";
68+
private static final String DEFAULT_AUP_TEXT = null;
69+
private static final String DEFAULT_AUP_URL = "http://updated-aup-text.org/";
70+
private static final String DEFAULT_AUP_DESC = "desc";
7171

7272

7373
@Autowired

iam-persistence/pom.xml

-5
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,6 @@
4444
<artifactId>spring-boot-starter-validation</artifactId>
4545
</dependency>
4646

47-
<dependency>
48-
<groupId>org.springframework.boot</groupId>
49-
<artifactId>spring-boot-starter-validation</artifactId>
50-
</dependency>
51-
5247
<dependency>
5348
<groupId>org.springframework.boot</groupId>
5449
<artifactId>spring-boot-starter-data-jpa</artifactId>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
/**
2+
* Copyright (c) Istituto Nazionale di Fisica Nucleare (INFN). 2016-2021
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package it.infn.mw.iam.persistence.repository;
17+
18+
import java.util.List;
19+
import java.util.Optional;
20+
21+
import org.springframework.data.jpa.repository.Query;
22+
import org.springframework.data.repository.PagingAndSortingRepository;
23+
import org.springframework.data.repository.query.Param;
24+
25+
import it.infn.mw.iam.persistence.model.IamAccount;
26+
import it.infn.mw.iam.persistence.model.IamX509Certificate;
27+
28+
public interface IamX509CertificateRepository
29+
extends PagingAndSortingRepository<IamX509Certificate, Long> {
30+
31+
@Query("select c.account from IamX509Certificate c where c.subjectDn = :subject")
32+
List<IamAccount> findBySubjectDn(@Param("subject") String subject);
33+
34+
public Optional<IamX509Certificate> findBySubjectDnAndIssuerDn(String subjectDn, String issuerDn);
35+
36+
}

0 commit comments

Comments
 (0)