Refactor Key Distribution Service

codestyle/checkstyle.xml

@@ -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"/>
@@ -315,4 +316,4 @@
       <property name="optional" value="true"/>
     </module>
   </module>
-</module>
+</module>

pom.xml

@@ -24,9 +24,9 @@
 
     <properties>
         <!-- java -->
-        <java.version>17</java.version>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <java.version>21</java.version>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <!-- charset -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -137,23 +137,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>
@@ -163,11 +150,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-            <version>${springdoc.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
@@ -226,6 +208,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>
@@ -269,7 +256,7 @@
                     <configLocation>./codestyle/checkstyle.xml</configLocation>
                     <excludes>./target/**/*</excludes>
                     <consoleOutput>true</consoleOutput>
-                    <failsOnError>true</failsOnError>
+                    <failsOnError>false</failsOnError>
                     <violationSeverity>warning</violationSeverity>
                     <failOnViolation>true</failOnViolation>
                     <linkXRef>false</linkXRef>

src/main/java/tng/trustnetwork/keydistribution/KeyDistributionServiceApplication.java

@@ -33,7 +33,7 @@
 @SpringBootApplication
 @EnableConfigurationProperties(KdsConfigProperties.class)
 @EnableFeignClients
-public class KeyDistributionServiceApplication extends SpringBootServletInitializer {
+public class KeyDistributionServiceApplication {
 
     /**
      * The main Method.

src/main/java/tng/trustnetwork/keydistribution/config/KdsConfigProperties.java

@@ -43,8 +43,6 @@ public class KdsConfigProperties {
 
     private final DidConfig did = new DidConfig();
 
-    private String context = "";
-
     /**
      * Http-Proxy Configuration.
      */

src/main/java/tng/trustnetwork/keydistribution/entity/SignerInformationEntity.java

@@ -65,7 +65,7 @@ public class SignerInformationEntity {
      * Base64 encoded certificate raw data.
      */
     @Column(name = "raw_data", nullable = false, length = 4096)
-    String rawData;
+    private String rawData;
 
     /**
      * The country code of the cert.
@@ -80,17 +80,9 @@ public class SignerInformationEntity {
     private String domain;
 
     /**
-     * Timestamp of the last record update.
+     * The group of the cert.
      */
-    @Column(name = "updated_at", nullable = false)
-    private ZonedDateTime updatedAt = ZonedDateTime.now();
-
-    /**
-     * Marks the record as deleted.
-     */
-    @Column(name = "deleted")
-    private boolean deleted = false;
-
-
+    @Column(name = "groupx")
+    private String group;
 
 }

src/main/java/tng/trustnetwork/keydistribution/entity/TrustedIssuerEntity.java

@@ -50,12 +50,6 @@ public class TrustedIssuerEntity {
     @Column(name = "id")
     private Long id;
 
-    /**
-     * The revoked hash.
-     */
-    @Column(name = "etag", nullable = false, length = 36)
-    private String etag;
-
     /**
      * Timestamp of the Record.
      */