Merge pull request #1140 from OSGP/feature/SMHE-1748_SF_JasperW_to_shared

natasja-n · web-flow · commit 2a27afed5b8c · 2023-12-11T13:36:26.000+01:00
SMHE-1748 SF jasper wireless to shared
diff --git a/osgp/protocol-adapter-dlms/osgp-jasper-interface/pom.xml b/osgp/protocol-adapter-dlms/osgp-jasper-interface/pom.xml
@@ -172,6 +172,10 @@ SPDX-License-Identifier: Apache-2.0
       <groupId>org.opensmartgridplatform</groupId>
       <artifactId>shared</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opensmartgridplatform</groupId>
+      <artifactId>osgp-jasper-shared</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>org.postgresql</groupId>
diff --git a/osgp/protocol-adapter-dlms/osgp-jasper-interface/src/main/java/org/opensmartgridplatform/adapter/protocol/jasper/client/JasperWirelessSmsClient.java b/osgp/protocol-adapter-dlms/osgp-jasper-interface/src/main/java/org/opensmartgridplatform/adapter/protocol/jasper/client/JasperWirelessSmsClient.java
@@ -4,8 +4,8 @@
 
 package org.opensmartgridplatform.adapter.protocol.jasper.client;
 
-import org.opensmartgridplatform.adapter.protocol.jasper.exceptions.OsgpJasperException;
 import org.opensmartgridplatform.adapter.protocol.jasper.response.SendSMSResponse;
+import org.opensmartgridplatform.jasper.exceptions.OsgpJasperException;
 
 public interface JasperWirelessSmsClient {
 
diff --git a/osgp/protocol-adapter-dlms/osgp-jasper-interface/src/main/java/org/opensmartgridplatform/adapter/protocol/jasper/client/JasperWirelessTerminalClient.java b/osgp/protocol-adapter-dlms/osgp-jasper-interface/src/main/java/org/opensmartgridplatform/adapter/protocol/jasper/client/JasperWirelessTerminalClient.java
@@ -4,8 +4,8 @@
 
 package org.opensmartgridplatform.adapter.protocol.jasper.client;
 
-import org.opensmartgridplatform.adapter.protocol.jasper.exceptions.OsgpJasperException;
 import org.opensmartgridplatform.adapter.protocol.jasper.response.GetSessionInfoResponse;
+import org.opensmartgridplatform.jasper.exceptions.OsgpJasperException;
 
 public interface JasperWirelessTerminalClient {
 
diff --git a/osgp/protocol-adapter-dlms/osgp-jasper-interface/src/main/java/org/opensmartgridplatform/adapter/protocol/jasper/config/JasperWirelessConfig.java b/osgp/protocol-adapter-dlms/osgp-jasper-interface/src/main/java/org/opensmartgridplatform/adapter/protocol/jasper/config/JasperWirelessConfig.java
@@ -12,7 +12,6 @@
 import javax.xml.soap.SOAPException;
 import org.opensmartgridplatform.adapter.protocol.jasper.client.JasperWirelessSmsClient;
 import org.opensmartgridplatform.adapter.protocol.jasper.client.JasperWirelessTerminalClient;
-import org.opensmartgridplatform.adapter.protocol.jasper.exceptions.OsgpJasperException;
 import org.opensmartgridplatform.adapter.protocol.jasper.infra.ws.CorrelationIdProviderService;
 import org.opensmartgridplatform.adapter.protocol.jasper.infra.ws.JasperWirelessSmsSoapClient;
 import org.opensmartgridplatform.adapter.protocol.jasper.infra.ws.JasperWirelessTerminalSoapClient;
@@ -23,6 +22,8 @@
 import org.opensmartgridplatform.adapter.protocol.jasper.sessionproviders.SessionProviderKpnPollJasper;
 import org.opensmartgridplatform.adapter.protocol.jasper.sessionproviders.SessionProviderKpnPushAlarm;
 import org.opensmartgridplatform.adapter.protocol.jasper.sessionproviders.SessionProviderMap;
+import org.opensmartgridplatform.jasper.config.JasperWirelessAccess;
+import org.opensmartgridplatform.jasper.exceptions.OsgpJasperException;
 import org.opensmartgridplatform.shared.application.config.AbstractConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/osgp/protocol-adapter-dlms/osgp-jasper-interface/src/main/java/org/opensmartgridplatform/adapter/protocol/jasper/infra/ws/JasperWirelessSmsSoapClient.java b/osgp/protocol-adapter-dlms/osgp-jasper-interface/src/main/java/org/opensmartgridplatform/adapter/protocol/jasper/infra/ws/JasperWirelessSmsSoapClient.java
@@ -12,7 +12,7 @@
 import java.util.List;
 import org.apache.ws.security.WSConstants;
 import org.opensmartgridplatform.adapter.protocol.jasper.client.JasperWirelessSmsClient;
-import org.opensmartgridplatform.adapter.protocol.jasper.config.JasperWirelessAccess;
+import org.opensmartgridplatform.jasper.config.JasperWirelessAccess;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ws.client.core.WebServiceTemplate;
 import org.springframework.ws.client.support.interceptor.ClientInterceptor;
diff --git a/osgp/protocol-adapter-dlms/osgp-jasper-interface/src/main/java/org/opensmartgridplatform/adapter/protocol/jasper/infra/ws/JasperWirelessTerminalSoapClient.java b/osgp/protocol-adapter-dlms/osgp-jasper-interface/src/main/java/org/opensmartgridplatform/adapter/protocol/jasper/infra/ws/JasperWirelessTerminalSoapClient.java
@@ -11,8 +11,8 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ws.security.WSConstants;
 import org.opensmartgridplatform.adapter.protocol.jasper.client.JasperWirelessTerminalClient;
-import org.opensmartgridplatform.adapter.protocol.jasper.config.JasperWirelessAccess;
-import org.opensmartgridplatform.adapter.protocol.jasper.exceptions.OsgpJasperException;
+import org.opensmartgridplatform.jasper.config.JasperWirelessAccess;
+import org.opensmartgridplatform.jasper.exceptions.OsgpJasperException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ws.client.core.WebServiceTemplate;
 import org.springframework.ws.client.support.interceptor.ClientInterceptor;
diff --git a/osgp/protocol-adapter-dlms/osgp-jasper-interface/src/main/java/org/opensmartgridplatform/adapter/protocol/jasper/rest/client/JasperWirelessSmsRestClient.java b/osgp/protocol-adapter-dlms/osgp-jasper-interface/src/main/java/org/opensmartgridplatform/adapter/protocol/jasper/rest/client/JasperWirelessSmsRestClient.java
@@ -5,10 +5,11 @@
 package org.opensmartgridplatform.adapter.protocol.jasper.rest.client;
 
 import org.opensmartgridplatform.adapter.protocol.jasper.client.JasperWirelessSmsClient;
-import org.opensmartgridplatform.adapter.protocol.jasper.config.JasperWirelessAccess;
-import org.opensmartgridplatform.adapter.protocol.jasper.exceptions.OsgpJasperException;
 import org.opensmartgridplatform.adapter.protocol.jasper.rest.json.SendSMSRequest;
 import org.opensmartgridplatform.adapter.protocol.jasper.rest.json.SendSMSResponse;
+import org.opensmartgridplatform.jasper.client.JasperWirelessRestClient;
+import org.opensmartgridplatform.jasper.config.JasperWirelessAccess;
+import org.opensmartgridplatform.jasper.exceptions.OsgpJasperException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
diff --git a/osgp/protocol-adapter-dlms/osgp-jasper-interface/src/main/java/org/opensmartgridplatform/adapter/protocol/jasper/rest/client/JasperWirelessTerminalRestClient.java b/osgp/protocol-adapter-dlms/osgp-jasper-interface/src/main/java/org/opensmartgridplatform/adapter/protocol/jasper/rest/client/JasperWirelessTerminalRestClient.java
@@ -5,9 +5,10 @@
 package org.opensmartgridplatform.adapter.protocol.jasper.rest.client;
 
 import org.opensmartgridplatform.adapter.protocol.jasper.client.JasperWirelessTerminalClient;
-import org.opensmartgridplatform.adapter.protocol.jasper.config.JasperWirelessAccess;
-import org.opensmartgridplatform.adapter.protocol.jasper.exceptions.OsgpJasperException;
 import org.opensmartgridplatform.adapter.protocol.jasper.response.GetSessionInfoResponse;
+import org.opensmartgridplatform.jasper.client.JasperWirelessRestClient;
+import org.opensmartgridplatform.jasper.config.JasperWirelessAccess;
+import org.opensmartgridplatform.jasper.exceptions.OsgpJasperException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -54,7 +55,10 @@ public GetSessionInfoResponse getSession(final String iccId) throws OsgpJasperEx
           this.jasperwirelessRestTemplate.exchange(
               url, HttpMethod.GET, entity, GetSessionInfoResponse.class);
 
-      getSessionInfoResponse = this.checkOnSessionValidity(getSessionInfoResponseEntity);
+      if (getSessionInfoResponseEntity.getBody() != null) {
+        getSessionInfoResponse =
+            this.checkOnSessionValidity(getSessionInfoResponseEntity.getBody());
+      }
 
     } catch (final HttpClientErrorException | HttpServerErrorException e) {
       this.handleException(e);
@@ -65,15 +69,14 @@ public GetSessionInfoResponse getSession(final String iccId) throws OsgpJasperEx
   }
 
   private GetSessionInfoResponse checkOnSessionValidity(
-      final ResponseEntity<GetSessionInfoResponse> getSessionInfoResponseEntity) {
+      final GetSessionInfoResponse getSessionInfoResponse) {
     // To simulated to same behaviour as the SOAP interface. Session info of an expired session is
     // removed form the response.
     // REST-interface returns information about the current or most recent data session for a given
     // device.
     // SOAP-interface returns the current session information (IP address and session start time)
     // for one or more devices. If the specified device is not in session, no information is
     // returned.
-    final GetSessionInfoResponse getSessionInfoResponse = getSessionInfoResponseEntity.getBody();
     if (this.hasCurrentSession(getSessionInfoResponse)) {
       return getSessionInfoResponse;
     } else {
diff --git a/osgp/protocol-adapter-dlms/osgp-jasper-interface/src/main/java/org/opensmartgridplatform/adapter/protocol/jasper/sessionproviders/SessionProviderKpnPollJasper.java b/osgp/protocol-adapter-dlms/osgp-jasper-interface/src/main/java/org/opensmartgridplatform/adapter/protocol/jasper/sessionproviders/SessionProviderKpnPollJasper.java
@@ -8,9 +8,9 @@
 import javax.annotation.PostConstruct;
 import org.opensmartgridplatform.adapter.protocol.jasper.client.JasperWirelessSmsClient;
 import org.opensmartgridplatform.adapter.protocol.jasper.client.JasperWirelessTerminalClient;
-import org.opensmartgridplatform.adapter.protocol.jasper.exceptions.OsgpJasperException;
 import org.opensmartgridplatform.adapter.protocol.jasper.response.GetSessionInfoResponse;
 import org.opensmartgridplatform.adapter.protocol.jasper.sessionproviders.exceptions.SessionProviderException;
+import org.opensmartgridplatform.jasper.exceptions.OsgpJasperException;
 import org.opensmartgridplatform.shared.exceptionhandling.ComponentType;
 import org.opensmartgridplatform.shared.exceptionhandling.FunctionalException;
 import org.opensmartgridplatform.shared.exceptionhandling.FunctionalExceptionType;
diff --git a/osgp/protocol-adapter-dlms/osgp-jasper-interface/src/main/java/org/opensmartgridplatform/adapter/protocol/jasper/sessionproviders/SessionProviderKpnPushAlarm.java b/osgp/protocol-adapter-dlms/osgp-jasper-interface/src/main/java/org/opensmartgridplatform/adapter/protocol/jasper/sessionproviders/SessionProviderKpnPushAlarm.java
@@ -8,9 +8,9 @@
 import javax.annotation.PostConstruct;
 import org.opensmartgridplatform.adapter.protocol.jasper.client.JasperWirelessSmsClient;
 import org.opensmartgridplatform.adapter.protocol.jasper.client.JasperWirelessTerminalClient;
-import org.opensmartgridplatform.adapter.protocol.jasper.exceptions.OsgpJasperException;
 import org.opensmartgridplatform.adapter.protocol.jasper.response.GetSessionInfoResponse;
 import org.opensmartgridplatform.adapter.protocol.jasper.service.DeviceSessionService;
+import org.opensmartgridplatform.jasper.exceptions.OsgpJasperException;
 import org.opensmartgridplatform.shared.exceptionhandling.ComponentType;
 import org.opensmartgridplatform.shared.exceptionhandling.FunctionalException;
 import org.opensmartgridplatform.shared.exceptionhandling.FunctionalExceptionType;
diff --git a/osgp/protocol-adapter-dlms/osgp-jasper-interface/src/test/java/org/opensmartgridplatform/adapter/protocol/jasper/infra/ws/JasperWirelessTestConfig.java b/osgp/protocol-adapter-dlms/osgp-jasper-interface/src/test/java/org/opensmartgridplatform/adapter/protocol/jasper/infra/ws/JasperWirelessTestConfig.java
@@ -5,7 +5,7 @@
 package org.opensmartgridplatform.adapter.protocol.jasper.infra.ws;
 
 import javax.annotation.Resource;
-import org.opensmartgridplatform.adapter.protocol.jasper.config.JasperWirelessAccess;
+import org.opensmartgridplatform.jasper.config.JasperWirelessAccess;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
diff --git a/osgp/protocol-adapter-dlms/osgp-jasper-interface/src/test/java/org/opensmartgridplatform/adapter/protocol/jasper/rest/client/JasperWirelessSmsRestClientTest.java b/osgp/protocol-adapter-dlms/osgp-jasper-interface/src/test/java/org/opensmartgridplatform/adapter/protocol/jasper/rest/client/JasperWirelessSmsRestClientTest.java
@@ -19,9 +19,9 @@
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.opensmartgridplatform.adapter.protocol.jasper.config.JasperWirelessAccess;
-import org.opensmartgridplatform.adapter.protocol.jasper.exceptions.OsgpJasperException;
 import org.opensmartgridplatform.adapter.protocol.jasper.rest.json.SendSMSResponse;
+import org.opensmartgridplatform.jasper.config.JasperWirelessAccess;
+import org.opensmartgridplatform.jasper.exceptions.OsgpJasperException;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
diff --git a/osgp/protocol-adapter-dlms/osgp-jasper-interface/src/test/java/org/opensmartgridplatform/adapter/protocol/jasper/rest/client/JasperWirelessTerminalRestClientTest.java b/osgp/protocol-adapter-dlms/osgp-jasper-interface/src/test/java/org/opensmartgridplatform/adapter/protocol/jasper/rest/client/JasperWirelessTerminalRestClientTest.java
@@ -22,9 +22,9 @@
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.opensmartgridplatform.adapter.protocol.jasper.config.JasperWirelessAccess;
-import org.opensmartgridplatform.adapter.protocol.jasper.exceptions.OsgpJasperException;
 import org.opensmartgridplatform.adapter.protocol.jasper.response.GetSessionInfoResponse;
+import org.opensmartgridplatform.jasper.config.JasperWirelessAccess;
+import org.opensmartgridplatform.jasper.exceptions.OsgpJasperException;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
@@ -52,7 +52,7 @@ private enum SessionType {
     NEVER_HAD_SESSION,
     CURRENT_SESSION,
     EXPIRED_SESSION
-  };
+  }
 
   @Mock private RestTemplate jasperwirelessRestTemplate;
 
diff --git a/osgp/protocol-adapter-dlms/osgp-jasper-interface/src/test/java/org/opensmartgridplatform/adapter/protocol/jasper/sessionproviders/SessionProviderKpnPollJasperTest.java b/osgp/protocol-adapter-dlms/osgp-jasper-interface/src/test/java/org/opensmartgridplatform/adapter/protocol/jasper/sessionproviders/SessionProviderKpnPollJasperTest.java
@@ -20,8 +20,8 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.opensmartgridplatform.adapter.protocol.jasper.client.JasperWirelessSmsClient;
 import org.opensmartgridplatform.adapter.protocol.jasper.client.JasperWirelessTerminalClient;
-import org.opensmartgridplatform.adapter.protocol.jasper.exceptions.OsgpJasperException;
 import org.opensmartgridplatform.adapter.protocol.jasper.response.GetSessionInfoResponse;
+import org.opensmartgridplatform.jasper.exceptions.OsgpJasperException;
 import org.opensmartgridplatform.shared.exceptionhandling.FunctionalException;
 import org.opensmartgridplatform.shared.exceptionhandling.OsgpException;
 
diff --git a/osgp/protocol-adapter-dlms/osgp-jasper-interface/src/test/java/org/opensmartgridplatform/adapter/protocol/jasper/sessionproviders/SessionProviderKpnPushAlarmTest.java b/osgp/protocol-adapter-dlms/osgp-jasper-interface/src/test/java/org/opensmartgridplatform/adapter/protocol/jasper/sessionproviders/SessionProviderKpnPushAlarmTest.java
@@ -19,10 +19,10 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.opensmartgridplatform.adapter.protocol.jasper.client.JasperWirelessSmsClient;
 import org.opensmartgridplatform.adapter.protocol.jasper.client.JasperWirelessTerminalClient;
-import org.opensmartgridplatform.adapter.protocol.jasper.exceptions.OsgpJasperException;
 import org.opensmartgridplatform.adapter.protocol.jasper.response.GetSessionInfoResponse;
-import org.opensmartgridplatform.adapter.protocol.jasper.rest.JasperError;
 import org.opensmartgridplatform.adapter.protocol.jasper.service.DeviceSessionService;
+import org.opensmartgridplatform.jasper.exceptions.OsgpJasperException;
+import org.opensmartgridplatform.jasper.rest.JasperError;
 import org.opensmartgridplatform.shared.exceptionhandling.ComponentType;
 import org.opensmartgridplatform.shared.exceptionhandling.FunctionalException;
 import org.opensmartgridplatform.shared.exceptionhandling.FunctionalExceptionType;
diff --git a/osgp/shared/osgp-jasper-shared/pom.xml b/osgp/shared/osgp-jasper-shared/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+      <groupId>org.opensmartgridplatform</groupId>
+      <artifactId>parent-shared</artifactId>
+      <version>5.49.0-SNAPSHOT</version>
+      <relativePath>../parent-shared/pom.xml</relativePath>
+  </parent>
+
+  <groupId>org.opensmartgridplatform</groupId>
+  <artifactId>osgp-jasper-shared</artifactId>
+  <packaging>jar</packaging>
+
+  <dependencies>
+    <!-- Spring Framework -->
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+    </dependency>
+    <!-- Utils -->
+    <dependency>
+      <groupId>org.projectlombok</groupId>
+      <artifactId>lombok</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>${maven.jar.plugin.version}</version>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>${maven.surefire.plugin.version}</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit.version}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/osgp/shared/osgp-jasper-shared/src/main/java/org/opensmartgridplatform/jasper/client/JasperWirelessRestClient.java b/osgp/shared/osgp-jasper-shared/src/main/java/org/opensmartgridplatform/jasper/client/JasperWirelessRestClient.java
@@ -2,15 +2,15 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package org.opensmartgridplatform.adapter.protocol.jasper.rest.client;
+package org.opensmartgridplatform.jasper.client;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.util.Base64;
-import org.opensmartgridplatform.adapter.protocol.jasper.config.JasperWirelessAccess;
-import org.opensmartgridplatform.adapter.protocol.jasper.exceptions.OsgpJasperException;
-import org.opensmartgridplatform.adapter.protocol.jasper.response.JasperErrorResponse;
-import org.opensmartgridplatform.adapter.protocol.jasper.rest.JasperError;
+import org.opensmartgridplatform.jasper.config.JasperWirelessAccess;
+import org.opensmartgridplatform.jasper.exceptions.OsgpJasperException;
+import org.opensmartgridplatform.jasper.response.JasperErrorResponse;
+import org.opensmartgridplatform.jasper.rest.JasperError;
 import org.springframework.web.client.HttpStatusCodeException;
 
 public class JasperWirelessRestClient {
diff --git a/osgp/shared/osgp-jasper-shared/src/main/java/org/opensmartgridplatform/jasper/config/JasperWirelessAccess.java b/osgp/shared/osgp-jasper-shared/src/main/java/org/opensmartgridplatform/jasper/config/JasperWirelessAccess.java
@@ -2,20 +2,20 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package org.opensmartgridplatform.adapter.protocol.jasper.config;
+package org.opensmartgridplatform.jasper.config;
 
 import lombok.Getter;
 
 @Getter
 public class JasperWirelessAccess {
 
-  private String uri;
-  private String licenseKey;
-  private String apiKey;
-  private String username;
-  private String password;
-  private String apiVersion;
-  private String apiType;
+  private final String uri;
+  private final String licenseKey;
+  private final String apiKey;
+  private final String username;
+  private final String password;
+  private final String apiVersion;
+  private final String apiType;
 
   public JasperWirelessAccess(
       final String uri,
diff --git a/osgp/shared/osgp-jasper-shared/src/main/java/org/opensmartgridplatform/jasper/exceptions/OsgpJasperException.java b/osgp/shared/osgp-jasper-shared/src/main/java/org/opensmartgridplatform/jasper/exceptions/OsgpJasperException.java
@@ -2,9 +2,9 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package org.opensmartgridplatform.adapter.protocol.jasper.exceptions;
+package org.opensmartgridplatform.jasper.exceptions;
 
-import org.opensmartgridplatform.adapter.protocol.jasper.rest.JasperError;
+import org.opensmartgridplatform.jasper.rest.JasperError;
 
 public class OsgpJasperException extends Exception {
 
diff --git a/osgp/shared/osgp-jasper-shared/src/main/java/org/opensmartgridplatform/jasper/response/JasperErrorResponse.java b/osgp/shared/osgp-jasper-shared/src/main/java/org/opensmartgridplatform/jasper/response/JasperErrorResponse.java
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package org.opensmartgridplatform.adapter.protocol.jasper.response;
+package org.opensmartgridplatform.jasper.response;
 
 import lombok.Getter;
 
diff --git a/osgp/shared/osgp-jasper-shared/src/main/java/org/opensmartgridplatform/jasper/rest/JasperError.java b/osgp/shared/osgp-jasper-shared/src/main/java/org/opensmartgridplatform/jasper/rest/JasperError.java
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package org.opensmartgridplatform.adapter.protocol.jasper.rest;
+package org.opensmartgridplatform.jasper.rest;
 
 import java.util.Arrays;
 import lombok.Getter;
diff --git a/osgp/shared/pom.xml b/osgp/shared/pom.xml
@@ -12,6 +12,7 @@ SPDX-License-Identifier: Apache-2.0
   <groupId>org.opensmartgridplatform</groupId>
   <artifactId>shared-components</artifactId>
   <version>5.49.0-SNAPSHOT</version>
+
   <packaging>pom</packaging>
   <name>shared</name>
   <properties>
@@ -95,6 +96,7 @@ SPDX-License-Identifier: Apache-2.0
     <module>osgp-ws-admin</module>
     <module>osgp-throttling-api</module>
     <module>osgp-throttling-client</module>
+    <module>osgp-jasper-shared</module>
   </modules>
 
   <profiles>
diff --git a/super/pom.xml b/super/pom.xml
@@ -348,6 +348,11 @@ SPDX-License-Identifier: Apache-2.0
         <artifactId>osgp-core-db-api-iec61850</artifactId>
         <version>${osgp.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.opensmartgridplatform</groupId>
+        <artifactId>osgp-jasper-shared</artifactId>
+        <version>${osgp.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.opensmartgridplatform</groupId>
         <artifactId>cucumber-tests-core</artifactId>
