Skip to content

Commit 3a3c77a

Browse files
wowasawowasa
committed
issue #192 
1 parent 9d8a5fa commit 3a3c77a

File tree

29 files changed

+365
-485
lines changed

29 files changed

+365
-485
lines changed

‎curation-api/src/main/java/eu/clarin/cmdi/curation/api/subprocessor/instance/InstanceFacetProcessor.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import eu.clarin.cmdi.curation.ccr.exception.CCRServiceNotAvailableException;
1919
import eu.clarin.cmdi.curation.api.exception.MalFunctioningProcessorException;
2020
import eu.clarin.cmdi.curation.cr.CRService;
21-
import eu.clarin.cmdi.curation.cr.exception.CRServiceStorageException;
2221
import eu.clarin.cmdi.curation.cr.exception.NoCRCacheEntryException;
2322
import eu.clarin.cmdi.curation.cr.exception.PPHCacheException;
2423
import eu.clarin.cmdi.curation.cr.profile_parser.CMDINode;
@@ -189,7 +188,7 @@ public void process(CMDInstance instance, CMDInstanceReport instanceReport) thro
189188
instanceReport.details.add(new Detail(Severity.FATAL, "file", "can't parse file '" + instance.getPath().getFileName() + "'"));
190189
instanceReport.isProcessable = false;
191190
}
192-
catch (CRServiceStorageException | CCRServiceNotAvailableException | PPHCacheException e) {
191+
catch (CCRServiceNotAvailableException | PPHCacheException e) {
193192
throw new MalFunctioningProcessorException(e);
194193
}
195194
}

‎curation-api/src/main/java/eu/clarin/cmdi/curation/api/subprocessor/instance/XmlValidator.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import eu.clarin.cmdi.curation.ccr.exception.CCRServiceNotAvailableException;
1212
import eu.clarin.cmdi.curation.api.exception.MalFunctioningProcessorException;
1313
import eu.clarin.cmdi.curation.cr.CRService;
14-
import eu.clarin.cmdi.curation.cr.exception.CRServiceStorageException;
1514
import eu.clarin.cmdi.curation.cr.exception.NoCRCacheEntryException;
1615
import eu.clarin.cmdi.curation.cr.exception.PPHCacheException;
1716
import lombok.extern.slf4j.Slf4j;
@@ -60,7 +59,7 @@ public void process(CMDInstance instance, CMDInstanceReport report) throws MalFu
6059

6160
return;
6261
}
63-
catch (CRServiceStorageException | CCRServiceNotAvailableException | PPHCacheException e) {
62+
catch (CCRServiceNotAvailableException | PPHCacheException e) {
6463

6564
throw new MalFunctioningProcessorException(e);
6665
}

‎curation-api/src/main/java/eu/clarin/cmdi/curation/api/subprocessor/profile/ProfileConceptHandler.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import eu.clarin.cmdi.curation.ccr.exception.CCRServiceNotAvailableException;
1414
import eu.clarin.cmdi.curation.api.exception.MalFunctioningProcessorException;
1515
import eu.clarin.cmdi.curation.cr.CRService;
16-
import eu.clarin.cmdi.curation.cr.exception.CRServiceStorageException;
1716
import eu.clarin.cmdi.curation.cr.exception.NoCRCacheEntryException;
1817
import eu.clarin.cmdi.curation.cr.exception.PPHCacheException;
1918
import eu.clarin.cmdi.curation.cr.profile_parser.ParsedProfile;
@@ -58,7 +57,7 @@ public void process(CMDProfile profile, CMDProfileReport report) throws MalFunct
5857
log.debug("can't parse profile '{}'", profile.getSchemaLocation());
5958
return;
6059
}
61-
catch (CRServiceStorageException | CCRServiceNotAvailableException | PPHCacheException e) {
60+
catch (CCRServiceNotAvailableException | PPHCacheException e) {
6261

6362
throw new MalFunctioningProcessorException(e);
6463
}

‎curation-api/src/main/java/eu/clarin/cmdi/curation/api/subprocessor/profile/ProfileFacetHandler.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import eu.clarin.cmdi.curation.ccr.exception.CCRServiceNotAvailableException;
1616
import eu.clarin.cmdi.curation.api.exception.MalFunctioningProcessorException;
1717
import eu.clarin.cmdi.curation.cr.CRService;
18-
import eu.clarin.cmdi.curation.cr.exception.CRServiceStorageException;
1918
import eu.clarin.cmdi.curation.cr.exception.NoCRCacheEntryException;
2019
import eu.clarin.cmdi.curation.cr.exception.PPHCacheException;
2120
import eu.clarin.cmdi.curation.cr.profile_parser.CMDINode;
@@ -81,7 +80,7 @@ public void process(CMDProfile profile, CMDProfileReport report) throws MalFunct
8180
report.details.add(new Detail(Severity.FATAL,"facet" , "no ParsedProfile for profile location " + profile.getSchemaLocation()));
8281

8382
}
84-
catch (CRServiceStorageException | CCRServiceNotAvailableException | PPHCacheException e) {
83+
catch (CCRServiceNotAvailableException | PPHCacheException e) {
8584
throw new MalFunctioningProcessorException(e);
8685
}
8786
report.facetReport.percProfileCoverage = (double) report.facetReport.numOfFacetsCoveredByProfile/report.facetReport.numOfFacets;

‎curation-api/src/main/java/eu/clarin/cmdi/curation/api/subprocessor/profile/ProfileHeaderHandler.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import eu.clarin.cmdi.curation.api.exception.MalFunctioningProcessorException;
1111
import eu.clarin.cmdi.curation.ccr.exception.CCRServiceNotAvailableException;
1212
import eu.clarin.cmdi.curation.cr.CRService;
13-
import eu.clarin.cmdi.curation.cr.exception.CRServiceStorageException;
1413
import eu.clarin.cmdi.curation.cr.exception.NoCRCacheEntryException;
1514
import eu.clarin.cmdi.curation.cr.exception.PPHCacheException;
1615
import eu.clarin.cmdi.curation.cr.profile_parser.ProfileHeader;
@@ -74,7 +73,7 @@ public void process(CMDProfile profile, CMDProfileReport report) throws MalFunct
7473
return;
7574

7675
}
77-
catch (CRServiceStorageException | CCRServiceNotAvailableException | PPHCacheException e) {
76+
catch (CCRServiceNotAvailableException | PPHCacheException e) {
7877
throw new MalFunctioningProcessorException(e);
7978
}
8079
}

‎curation-api/src/main/java/eu/clarin/cmdi/curation/api/vlo_extension/FacetsMappingCacheFactory.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import eu.clarin.cmdi.curation.api.cache.FacetMappingCache;
44
import eu.clarin.cmdi.curation.ccr.exception.CCRServiceNotAvailableException;
55
import eu.clarin.cmdi.curation.cr.CRService;
6-
import eu.clarin.cmdi.curation.cr.exception.CRServiceStorageException;
76
import eu.clarin.cmdi.curation.cr.exception.NoCRCacheEntryException;
87
import eu.clarin.cmdi.curation.cr.exception.PPHCacheException;
98
import eu.clarin.cmdi.vlo.config.VloConfig;
@@ -104,7 +103,7 @@ public Map<String, List<Pattern>> createConceptLinkPathMapping() {
104103
log.error("no ProfileCacheEntry object for schemaLocation '{}'", schemaLocation);
105104

106105
}
107-
catch (CRServiceStorageException | CCRServiceNotAvailableException | PPHCacheException e) {
106+
catch (CCRServiceNotAvailableException | PPHCacheException e) {
108107
throw new RuntimeException(e);
109108
}
110109

‎curation-ccr/README.md‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
# Concept Registry Service (CCR)
22

33
## What it does
4-
The CCR service is managing instances of CCRConcept. A CRRConcept is a Java object which contains information on URI,
5-
preferred label and status of a specific concept.
4+
5+
The CCR service is managing instances of CCRConcept. A CRRConcept is a Java object which contains information on URI,
6+
preferred label and status of a specific concept.
67

78
## How it works
8-
The application.yml defines a curation.ccr-service.restApi and a curation.ccr-service.query. Both strings are concatenated
9-
to a URL and a get request is send towards this URL. This request returns a JSON array of JSON objects, which are parsed
10-
to instances of CCRConcept.
9+
10+
The application.yml defines a curation.ccr-service.restApi and a curation.ccr-service.query. Both strings are
11+
concatenated
12+
to a URL and a get request is send towards this URL. This request returns a JSON array of JSON objects, which are parsed
13+
to instances of CCRConcept.
1114

1215
## What should I look for
16+
1317
The module makes use of Spring Boot's caching functionality. All classes that contain methods with cached results are in
1418
the cache-package. Whenever you use the module you must make sure to enable caching (@EnableCaching).

‎curation-ccr/pom.xml‎

Lines changed: 43 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,44 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
2-
<modelVersion>4.0.0</modelVersion>
3-
<parent>
4-
<groupId>eu.clarin.cmdi</groupId>
5-
<artifactId>curation-dashboard</artifactId>
6-
<version>${revision}</version>
7-
</parent>
8-
<artifactId>curation-ccr</artifactId>
9-
<dependencies>
10-
<dependency>
11-
<groupId>org.apache.commons</groupId>
12-
<artifactId>commons-lang3</artifactId>
13-
</dependency>
14-
<dependency>
15-
<groupId>commons-io</groupId>
16-
<artifactId>commons-io</artifactId>
17-
<version>2.11.0</version>
18-
</dependency>
19-
<dependency>
20-
<groupId>com.google.code.gson</groupId>
21-
<artifactId>gson</artifactId>
22-
</dependency>
23-
<dependency>
24-
<groupId>org.springframework.boot</groupId>
25-
<artifactId>spring-boot-starter-cache</artifactId>
26-
</dependency>
27-
<dependency>
28-
<groupId>org.springframework.boot</groupId>
29-
<artifactId>spring-boot-configuration-processor</artifactId>
30-
<optional>true</optional>
31-
</dependency>
32-
<dependency>
33-
<groupId>eu.clarin.cmdi</groupId>
34-
<artifactId>curation-commons</artifactId>
35-
<version>${project.version}</version>
36-
</dependency>
37-
<dependency>
38-
<groupId>org.mock-server</groupId>
39-
<artifactId>mockserver-spring-test-listener</artifactId>
40-
<scope>test</scope>
41-
</dependency>
42-
</dependencies>
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<parent>
5+
<groupId>eu.clarin.cmdi</groupId>
6+
<artifactId>curation-dashboard</artifactId>
7+
<version>${revision}</version>
8+
</parent>
9+
<artifactId>curation-ccr</artifactId>
10+
<dependencies>
11+
<dependency>
12+
<groupId>org.apache.commons</groupId>
13+
<artifactId>commons-lang3</artifactId>
14+
</dependency>
15+
<dependency>
16+
<groupId>commons-io</groupId>
17+
<artifactId>commons-io</artifactId>
18+
<version>2.11.0</version>
19+
</dependency>
20+
<dependency>
21+
<groupId>com.google.code.gson</groupId>
22+
<artifactId>gson</artifactId>
23+
</dependency>
24+
<dependency>
25+
<groupId>org.springframework.boot</groupId>
26+
<artifactId>spring-boot-starter-cache</artifactId>
27+
</dependency>
28+
<dependency>
29+
<groupId>org.springframework.boot</groupId>
30+
<artifactId>spring-boot-configuration-processor</artifactId>
31+
<optional>true</optional>
32+
</dependency>
33+
<dependency>
34+
<groupId>eu.clarin.cmdi</groupId>
35+
<artifactId>curation-commons</artifactId>
36+
<version>${project.version}</version>
37+
</dependency>
38+
<dependency>
39+
<groupId>org.mock-server</groupId>
40+
<artifactId>mockserver-spring-test-listener</artifactId>
41+
<scope>test</scope>
42+
</dependency>
43+
</dependencies>
4344
</project>

‎curation-ccr/src/main/java/eu/clarin/cmdi/curation/ccr/CCRConcept.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
@Data
1111
public class CCRConcept implements Serializable {
1212

13-
private final String uri;
14-
15-
private final String prefLabel;
16-
17-
private final CCRStatus status;
13+
private final String uri;
14+
15+
private final String prefLabel;
16+
17+
private final CCRStatus status;
1818

1919
}

‎curation-ccr/src/main/java/eu/clarin/cmdi/curation/ccr/CCRService.java‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44

55

66
public interface CCRService {
7-
/**
8-
* Returns a CCR concepts for a given uri
9-
* or null if concept doesn't exist
10-
*
11-
*
12-
* @param uri the uri of a concept
13-
* @return single concept or null
14-
* @throws CCRServiceNotAvailableException
15-
* @see CCRConcept
16-
*/
17-
public CCRConcept getConcept(String uri) throws CCRServiceNotAvailableException;
7+
/**
8+
* Returns a CCR concepts for a given uri
9+
* or null if concept doesn't exist
10+
*
11+
* @param uri the uri of a concept
12+
* @throws CCRServiceNotAvailableException
13+
* @return single concept or null
14+
* @see CCRConcept
15+
*/
16+
public CCRConcept getConcept(String uri) throws CCRServiceNotAvailableException;
1817
}

0 commit comments

Comments
 (0)