Merge branch 'develop' into 'main'

From develop into main

See merge request !6

openapi.json

-{"openapi":"3.0.1","info":{"title":"EDC Connector Adapter Application API","description":"OpenApi documentation for the EDC Connector Adapter Application API","version":"1.0"},"servers":[{"url":"https://edc-connector-adapter.dev.simpl-europe.eu"}],"paths":{"/api/v1/registration/register":{"post":{"tags":["Registation Controller"],"summary":"Register a SD json and return it enriched by EDC registration data","description":"Registers asset and policies into the provider EDC, creates a contract definition on EDC connector","operationId":"register","parameters":[{"name":"ecosystem","in":"query","description":"Ecosystem name","required":true,"schema":{"type":"string","description":"Ecosystem name","example":"simpl"},"example":"simpl"},{"name":"shapeFileName","in":"query","description":"File name","required":true,"schema":{"type":"string","description":"File name","example":"data-offeringShape.ttl"},"example":"data-offeringShape.ttl"}],"requestBody":{"content":{"multipart/form-data":{"schema":{"type":"object","properties":{"jsonFile":{"type":"string","description":"SD json file","format":"binary"}}}}}},"responses":{"500":{"description":"Internal Server Error","content":{"application/problem+json":{"schema":{"$ref":"#/components/schemas/ErrorResponse"}}}},"503":{"description":"Service Unavailable","content":{"application/problem+json":{"schema":{"$ref":"#/components/schemas/ErrorResponse"}}}},"401":{"description":"Unauthorized","content":{"application/problem+json":{"schema":{"$ref":"#/components/schemas/ErrorResponse"}}}},"400":{"description":"Bad Request","content":{"application/problem+json":{"schema":{"$ref":"#/components/schemas/ErrorResponse"}}}},"200":{"description":"Successfully registered SD json","content":{"application/json":{"schema":{"type":"object"},"examples":{"SD json file registered":{"description":"SD json file registered","value":"SD json file registered"}}}}}}}},"/api/v1/configuration/participant":{"get":{"tags":["Configuration Controller"],"summary":"Return the configured EDC participant id","description":"Return the configured EDC participant id to be used as Assigner in ODRL policies","operationId":"getParticipant","responses":{"500":{"description":"Internal Server Error","content":{"application/problem+json":{"schema":{"$ref":"#/components/schemas/ErrorResponse"}}}},"503":{"description":"Service Unavailable","content":{"application/problem+json":{"schema":{"$ref":"#/components/schemas/ErrorResponse"}}}},"401":{"description":"Unauthorized","content":{"application/problem+json":{"schema":{"$ref":"#/components/schemas/ErrorResponse"}}}},"400":{"description":"Bad Request","content":{"application/problem+json":{"schema":{"$ref":"#/components/schemas/ErrorResponse"}}}},"200":{"description":"OK","content":{"application/json":{"schema":{"type":"string"}}}}}}}},"components":{"schemas":{"ErrorResponse":{"type":"object","properties":{"errorTitle":{"type":"string"},"errorDescription":{"type":"string"}}}}}}
\ No newline at end of file
+{"openapi":"3.0.1","info":{"title":"EDC Connector Adapter Application API","description":"OpenApi documentation for the EDC Connector Adapter Application API","version":"1.0"},"servers":[{"url":"https://edc-connector-adapter.dev.simpl-europe.eu"}],"paths":{"/api/v1/registration/register":{"post":{"tags":["Registation Controller"],"summary":"Register a SD json and return it enriched by EDC registration data","description":"Registers asset and policies into the provider EDC, creates a contract definition on EDC connector","operationId":"register","parameters":[{"name":"ecosystem","in":"query","description":"Ecosystem name","required":true,"schema":{"type":"string","description":"Ecosystem name","example":"simpl"},"example":"simpl"},{"name":"shapeFileName","in":"query","description":"File name","required":true,"schema":{"type":"string","description":"File name","example":"data-offeringShape.ttl"},"example":"data-offeringShape.ttl"}],"requestBody":{"content":{"multipart/form-data":{"schema":{"type":"object","properties":{"jsonFile":{"type":"string","description":"SD json file","format":"binary"}}}}}},"responses":{"500":{"description":"Internal Server Error","content":{"application/problem+json":{"schema":{"$ref":"#/components/schemas/ErrorResponse"}}}},"400":{"description":"Bad Request","content":{"application/problem+json":{"schema":{"$ref":"#/components/schemas/ErrorResponse"}}}},"401":{"description":"Unauthorized","content":{"application/problem+json":{"schema":{"$ref":"#/components/schemas/ErrorResponse"}}}},"503":{"description":"Service Unavailable","content":{"application/problem+json":{"schema":{"$ref":"#/components/schemas/ErrorResponse"}}}},"200":{"description":"Successfully registered SD json","content":{"application/json":{"schema":{"type":"object"},"examples":{"SD json file registered":{"description":"SD json file registered","value":"SD json file registered"}}}}}}}},"/api/v1/configuration/participant":{"get":{"tags":["Configuration Controller"],"summary":"Return the configured EDC participant id","description":"Return the configured EDC participant id to be used as Assigner in ODRL policies","operationId":"getParticipant","responses":{"500":{"description":"Internal Server Error","content":{"application/problem+json":{"schema":{"$ref":"#/components/schemas/ErrorResponse"}}}},"400":{"description":"Bad Request","content":{"application/problem+json":{"schema":{"$ref":"#/components/schemas/ErrorResponse"}}}},"401":{"description":"Unauthorized","content":{"application/problem+json":{"schema":{"$ref":"#/components/schemas/ErrorResponse"}}}},"503":{"description":"Service Unavailable","content":{"application/problem+json":{"schema":{"$ref":"#/components/schemas/ErrorResponse"}}}},"200":{"description":"OK","content":{"application/json":{"schema":{"type":"string"}}}}}}}},"components":{"schemas":{"ErrorResponse":{"type":"object","properties":{"errorTitle":{"type":"string"},"errorDescription":{"type":"string"}}}}}}
\ No newline at end of file

pipeline.variables.sh

-PROJECT_VERSION_NUMBER="1.0.1"
\ No newline at end of file
+PROJECT_VERSION_NUMBER="1.0.2"
\ No newline at end of file

pom.xml

@@ -21,7 +21,7 @@
     <properties>
         <java.version>21</java.version>
         
-        <sdtool.common.version>0.0.3</sdtool.common.version>
+        <sdtool.common.version>0.0.3-RC1</sdtool.common.version>
         <spring.cloud.version>2024.0.0</spring.cloud.version>
 
         <!-- plugins -->
@@ -84,6 +84,12 @@
             <artifactId>json-path</artifactId>
         </dependency>
 	    
+	    <dependency>
+		    <groupId>org.ehcache</groupId>
+		    <artifactId>ehcache</artifactId>
+		    <classifier>jakarta</classifier>
+		</dependency>
+        
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -95,9 +101,17 @@
             <artifactId>spring-boot-configuration-processor</artifactId>
             <optional>true</optional>
         </dependency>
+        
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
+	        <groupId>org.springframework.boot</groupId>
+	        <artifactId>spring-boot-starter-cache</artifactId>
+	        <exclusions>
+                <!-- disable logback logging -->
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+            </exclusions>
 	    </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -116,6 +130,11 @@
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
         
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

src/main/java/eu/europa/ec/simpl/edcconnectoradapter/EDCConnectorAdapterApplication.java

@@ -4,6 +4,7 @@ import eu.europa.ec.simpl.sdtool.common.util.PipelineVariablesUtil;
 import java.util.Properties;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
@@ -12,6 +13,7 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 @EnableWebMvc
 @EnableFeignClients(basePackages = "eu.europa.ec.simpl.edcconnectoradapter")
 @ComponentScan(basePackages = "eu.europa.ec.simpl.edcconnectoradapter")
+@EnableCaching
 public class EDCConnectorAdapterApplication {
 
     public static void main(String[] args) {

src/main/java/eu/europa/ec/simpl/edcconnectoradapter/service/edcconnector/EDCConnectorServiceImpl.java

@@ -125,7 +125,7 @@ public class EDCConnectorServiceImpl implements EDCConnectorService {
     }
 
     @Override
-    @Cacheable
+    @Cacheable("EDCConnectorService.getParticipant()")
     public Participant getParticipant() throws EDCConnectorException {
         log.debug("getParticipant(): returning configured edcConnectorParticipantId '{}'", edcConnectorParticipantId);
         return Participant.builder()

src/main/resources/application.properties

@@ -3,6 +3,9 @@
 #########################################################################################
 spring.application.name=edc-connector-adapter
 
+spring.cache.type=jcache
+spring.cache.jcache.config=classpath:ehcache.xml
+
 
 #########################################################################################
 # Json object mapper config

src/main/resources/ehcache.xml

+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns="http://www.ehcache.org/v3"
+        xsi:schemaLocation="http://www.ehcache.org/v3 http://www.ehcache.org/schema/ehcache-core-3.0.xsd">
+
+    <cache alias="EDCConnectorService.getParticipant()">
+        <expiry>
+            <ttl unit="minutes">10</ttl>
+        </expiry>
+        <resources>
+            <heap unit="entries">9999</heap>
+        </resources>
+    </cache>
+
+</config>
\ No newline at end of file