Skip to content

Commit cf708e0

Browse files
Plow74Plow74
committed
Merge branch 'release/1.0.13'
2 parents 4fae685 + 09d77fd commit cf708e0

File tree

4 files changed

+27
-22
lines changed

4 files changed

+27
-22
lines changed

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<groupId>org.sitenv.vocabulary</groupId>
55
<artifactId>codevalidator-api</artifactId>
6-
<version>1.0.12</version>
6+
<version>1.0.13</version>
77
<name>Code Validator API</name>
88
<url>http://www.sitenv.org</url>
99

‎src/main/java/org/sitenv/vocabularies/validation/repositories/CodeRepository.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,33 @@
77
import org.springframework.stereotype.Repository;
88

99
import java.util.List;
10+
import java.util.Set;
1011

1112
/**
1213
* Created by Brian on 2/7/2016.
1314
*/
1415
@Repository
1516
public interface CodeRepository extends JpaRepository<Code, Integer> {
1617
@Query("SELECT CASE WHEN COUNT(c) > 0 THEN true ELSE false END FROM Code c WHERE c.codeSystem in (:codesystems)")
17-
boolean foundCodesystems(@Param("codesystems")List<String> codesystems);
18+
boolean foundCodesystems(@Param("codesystems")Set<String> codesystems);
1819

1920
@Query("SELECT CASE WHEN COUNT(c) > 0 THEN true ELSE false END FROM Code c WHERE c.code = :code and c.displayName = :displayName and c.codeSystem in (:codesystems)")
2021
boolean foundCodeAndDisplayNameInCodesystem(@Param("code")String code, @Param("displayName")String displayName, @Param("codesystems")List<String> codesystems);
2122

2223
@Query("SELECT CASE WHEN COUNT(c) > 0 THEN true ELSE false END FROM Code c WHERE c.code = :code and c.displayName = :displayName and c.codeSystemOID = :codeSystemOID and c.codeSystem in (:codesystems) and c.active = true")
23-
boolean foundActiveCodeAndDisplayNameAndCodeSystemOIDInCodesystem(@Param("code")String code, @Param("displayName")String displayName, @Param("codeSystemOID")String codeSystemOID, @Param("codesystems")List<String> codesystems);
24+
boolean foundActiveCodeAndDisplayNameAndCodeSystemOIDInCodesystem(@Param("code")String code, @Param("displayName")String displayName, @Param("codeSystemOID")String codeSystemOID, @Param("codesystems")Set<String> codesystems);
2425

2526
@Query("SELECT CASE WHEN COUNT(c) > 0 THEN true ELSE false END FROM Code c WHERE c.code = :code and c.codeSystem in (:codesystems)")
26-
boolean foundCodeInCodesystems(@Param("code")String code, @Param("codesystems")List<String> codesystems);
27+
boolean foundCodeInCodesystems(@Param("code")String code, @Param("codesystems")Set<String> codesystems);
2728

2829
@Query("SELECT CASE WHEN COUNT(c) > 0 THEN true ELSE false END FROM Code c WHERE c.displayName = :displayName and c.codeSystem in (:codesystems)")
29-
boolean foundDisplayNameInCodesystems(@Param("displayName")String displayName, @Param("codesystems")List<String> codesystems);
30+
boolean foundDisplayNameInCodesystems(@Param("displayName")String displayName, @Param("codesystems")Set<String> codesystems);
3031

3132
@Query("SELECT CASE WHEN COUNT(c) > 0 THEN true ELSE false END FROM Code c WHERE c.codeSystemOID = :codeSystemOID and c.codeSystem in (:codesystems)")
32-
boolean foundCodeSystemOIDInCodesystems(@Param("codeSystemOID")String codeSystemOID, @Param("codesystems")List<String> codesystems);
33+
boolean foundCodeSystemOIDInCodesystems(@Param("codeSystemOID")String codeSystemOID, @Param("codesystems")Set<String> codesystems);
3334

3435
List<Code> findByCodeAndCodeSystemIn(String code, List<String> codesystems);
3536

36-
@Query("SELECT c.active FROM Code c WHERE c.code = :code and c.codeSystem in (:codesystems)")
37-
boolean codeIsActive(@Param("code")String code, @Param("codesystems")List<String> codesystems);
37+
@Query("SELECT c.active FROM Code c WHERE c.active = 1 AND c.code = :code and c.codeSystem in (:codesystems)")
38+
boolean codeIsActive(@Param("code")String code, @Param("codesystems")Set<String> codesystems);
3839
}

‎src/main/java/org/sitenv/vocabularies/validation/services/VocabularyCodeService.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
package org.sitenv.vocabularies.validation.services;
22

3+
import java.util.ArrayList;
4+
import java.util.HashSet;
5+
import java.util.List;
6+
import java.util.Set;
7+
38
import org.sitenv.vocabularies.validation.entities.Code;
49
import org.sitenv.vocabularies.validation.repositories.CodeRepository;
510
import org.springframework.beans.factory.annotation.Autowired;
611
import org.springframework.stereotype.Service;
712

8-
import java.util.ArrayList;
9-
import java.util.List;
10-
import java.util.Set;
11-
1213
/**
1314
* Created by Brian on 2/23/2016.
1415
*/
@@ -34,7 +35,7 @@ public boolean isFoundByCodeAndDisplayNameInCodeSystems(String code, String disp
3435

3536
public boolean isFoundByCodeInCodeSystems(String code, Set<String> codeSystems){
3637
String cleanedCode = code.trim().toUpperCase();
37-
ArrayList<String> cleanedCodeSystems = new ArrayList<>();
38+
Set<String> cleanedCodeSystems = new HashSet<>();
3839
for(String codeSystem : codeSystems){
3940
cleanedCodeSystems.add(codeSystem.trim().toUpperCase());
4041
}

‎src/main/java/org/sitenv/vocabularies/validation/validators/nodetypes/CodeSystemCodeValidator.java

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
package org.sitenv.vocabularies.validation.validators.nodetypes;
22

3+
import java.util.ArrayList;
4+
import java.util.Arrays;
5+
import java.util.HashSet;
6+
import java.util.List;
7+
import java.util.Set;
8+
9+
import javax.xml.xpath.XPath;
10+
import javax.xml.xpath.XPathConstants;
11+
import javax.xml.xpath.XPathExpression;
12+
import javax.xml.xpath.XPathExpressionException;
13+
314
import org.apache.log4j.Logger;
415
import org.sitenv.vocabularies.configuration.ConfiguredValidationResultSeverityLevel;
516
import org.sitenv.vocabularies.configuration.ConfiguredValidator;
@@ -13,14 +24,6 @@
1324
import org.springframework.stereotype.Component;
1425
import org.w3c.dom.Node;
1526

16-
import javax.xml.xpath.XPath;
17-
import javax.xml.xpath.XPathConstants;
18-
import javax.xml.xpath.XPathExpression;
19-
import javax.xml.xpath.XPathExpressionException;
20-
import java.util.ArrayList;
21-
import java.util.Arrays;
22-
import java.util.List;
23-
2427
@Component(value = "CodeSystemCodeValidator")
2528
public class CodeSystemCodeValidator extends NodeValidator {
2629
private static final Logger logger = Logger.getLogger(CodeSystemCodeValidator.class);
@@ -51,7 +54,7 @@ public List<VocabularyValidationResult> validateNode(ConfiguredValidator configu
5154
throw new RuntimeException("ERROR getting node values " + e.getMessage());
5255
}
5356

54-
List<String> allowedConfiguredCodeSystemNames = new ArrayList<>(Arrays.asList(configuredValidator.getAllowedCodesystemNames().split(",")));
57+
Set<String> allowedConfiguredCodeSystemNames = new HashSet<>(Arrays.asList(configuredValidator.getAllowedCodesystemNames().split(",")));
5558

5659
NodeValidationResult nodeValidationResult = new NodeValidationResult();
5760
nodeValidationResult.setValidatedDocumentXpathExpression(XpathUtils.buildXpathFromNode(node));

0 commit comments

Comments
 (0)