Skip to content

Commit 6b7a72e

Browse files
author
Derek Wasinger
committed
config file resource and removed unused resources
1 parent 8ebe5c4 commit 6b7a72e

File tree

13 files changed

+147
-474
lines changed

13 files changed

+147
-474
lines changed
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
package com.redhat.labs.omp.resource;
2+
3+
import javax.inject.Inject;
4+
import javax.ws.rs.Consumes;
5+
import javax.ws.rs.GET;
6+
import javax.ws.rs.Path;
7+
import javax.ws.rs.Produces;
8+
import javax.ws.rs.core.MediaType;
9+
10+
import com.redhat.labs.omp.models.gitlab.File;
11+
import com.redhat.labs.omp.service.ConfigService;
12+
13+
@Path("/api/v1/config")
14+
@Produces(MediaType.APPLICATION_JSON)
15+
@Consumes(MediaType.APPLICATION_JSON)
16+
public class ConfigResource {
17+
18+
@Inject
19+
ConfigService configService;
20+
21+
@GET
22+
public File get() {
23+
return configService.getConfigFile();
24+
}
25+
26+
}

src/main/java/com/redhat/labs/omp/resource/FileResource.java

Lines changed: 0 additions & 105 deletions
This file was deleted.

src/main/java/com/redhat/labs/omp/resource/GroupResource.java

Lines changed: 0 additions & 90 deletions
This file was deleted.

src/main/java/com/redhat/labs/omp/resource/ProjectResource.java

Lines changed: 0 additions & 105 deletions
This file was deleted.
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
package com.redhat.labs.omp.service;
2+
3+
import java.util.Optional;
4+
5+
import javax.enterprise.context.ApplicationScoped;
6+
import javax.inject.Inject;
7+
8+
import org.eclipse.microprofile.config.inject.ConfigProperty;
9+
10+
import com.redhat.labs.exception.FileNotFoundException;
11+
import com.redhat.labs.omp.models.gitlab.File;
12+
13+
@ApplicationScoped
14+
public class ConfigService {
15+
16+
@ConfigProperty(name = "config.file", defaultValue = "schema/config.yml")
17+
String configFile;
18+
19+
@ConfigProperty(name = "config.repository.id", defaultValue = "9407")
20+
String configRepositoryId;
21+
22+
@Inject
23+
FileService fileService;
24+
25+
public File getConfigFile() {
26+
27+
Optional<File> optional = fileService.getFile(Integer.valueOf(configRepositoryId), configFile);
28+
29+
if (!optional.isPresent()) {
30+
throw new FileNotFoundException("the configured file was not found in the gitlab repository.");
31+
}
32+
33+
return optional.get();
34+
35+
}
36+
37+
}

0 commit comments

Comments
 (0)