Skip to content

Commit

Permalink
Merge pull request #26 from WorldHealthOrganization/feature/did-trusl…
Browse files Browse the repository at this point in the history 
…ist-generator-v2

feat: did truslist generator v2.0.0
  • Loading branch information
@tence
tence authored May 23, 2024
2 parents 4dca96c + a072319 commit f88e205
Show file tree
Hide file tree
Showing 56 changed files with 941 additions and 3,201 deletions.
3 changes: 2 additions & 1 deletion codestyle/checkstyle.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
</module>

<module name="TreeWalker">
<module name="SuppressionCommentFilter" />
<module name="OuterTypeFilename"/>
<module name="IllegalTokenText">
<property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
Expand Down Expand Up @@ -315,4 +316,4 @@
<property name="optional" value="true"/>
</module>
</module>
</module>
</module>
100 changes: 19 additions & 81 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,9 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<!-- dependencies -->
<owasp.version>8.3.1</owasp.version>
<springdoc.version>2.1.0</springdoc.version>
<mapstruct.version>1.5.5.Final</mapstruct.version>
<shedlock.version>5.12.0</shedlock.version>
<bcpkix.version>1.77</bcpkix.version>
<bcpkix.version>1.78.1</bcpkix.version>
<!-- plugins -->
<plugin.checkstyle.version>3.3.0</plugin.checkstyle.version>
<plugin.jacoco.version>0.8.10</plugin.jacoco.version>
Expand Down Expand Up @@ -72,45 +71,6 @@
<url>https://github.com/WorldHealthOrganization/tng-key-distribution</url>
</scm>

<profiles>
<profile>
<id>docker</id>
<properties>
<build.profile.id>docker</build.profile.id>
<packaging.format>jar</packaging.format>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<outputDirectory>${project.build.directory}/docker</outputDirectory>
<finalName>ddccg</finalName>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>make-zip-ACC</id>
<phase>none</phase>
</execution>
<execution>
<id>make-zip-test</id>
<phase>none</phase>
</execution>
<execution>
<id>make-zip-PRD</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<repositories>
<repository>
<id>who-github</id>
Expand All @@ -137,23 +97,10 @@
</dependency>

<!-- Spring Boot Dependencies -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>6.1.6</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
Expand All @@ -164,13 +111,23 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>${springdoc.version}</version>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>6.1.6</version>
</dependency>

<!-- Persistence Dependencies -->
Expand Down Expand Up @@ -226,6 +183,11 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
<version>3.1.8</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
Expand All @@ -252,14 +214,6 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>repackage</goal>
<goal>build-info</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -351,22 +305,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-maven-plugin</artifactId>
<version>1.3</version>
<configuration>
<apiDocsUrl>http://localhost:8080/api/docs</apiDocsUrl>
</configuration>
<executions>
<execution>
<phase>integration-test</phase>
<goals>
<goal>generate</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tng/trustnetwork/keydistribution/KeyDistributionServiceApplication.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
@SpringBootApplication
@EnableConfigurationProperties(KdsConfigProperties.class)
@EnableFeignClients
public class KeyDistributionServiceApplication extends SpringBootServletInitializer {
public class KeyDistributionServiceApplication {

/**
* The main Method.
Expand Down
79 changes: 0 additions & 79 deletions src/main/java/tng/trustnetwork/keydistribution/config/ErrorHandler.java
View file

This file was deleted.

9 changes: 6 additions & 3 deletions src/main/java/tng/trustnetwork/keydistribution/config/KdsConfigProperties.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ public class KdsConfigProperties {

private final DidConfig did = new DidConfig();

private String context = "";

/**
* Http-Proxy Configuration.
*/
Expand Down Expand Up @@ -100,12 +98,14 @@ public static class DidConfig {
private String didId;
private String didController;

private String trustListPath;
private String trustListRefPath;

private String trustListIdPrefix;
private String trustListControllerPrefix;

private String ldProofVerificationMethod;
private String ldProofDomain;
private String ldProofNonce;

private String didSigningProvider;
private String didUploadProvider;
Expand All @@ -118,6 +118,9 @@ public static class DidConfig {

private DgcGatewayConnectorConfigProperties.KeyStoreWithAlias localKeyStore =
new DgcGatewayConnectorConfigProperties.KeyStoreWithAlias();

private List<String> groupDenyList = new ArrayList<>();
private Map<String, String> groupNameMapping = new HashMap<>();

@Getter
@Setter
Expand Down
55 changes: 0 additions & 55 deletions src/main/java/tng/trustnetwork/keydistribution/config/OpenApiConfig.java
View file

This file was deleted.

Loading

0 comments on commit f88e205

Please sign in to comment.