Skip to content

Commit 2a27afe

Browse files
natasja-nnatasja-n
authored
Merge pull request #1140 from OSGP/feature/SMHE-1748_SF_JasperW_to_shared
SMHE-1748 SF jasper wireless to shared
2 parents b7d8ec9 + 0cb58a0 commit 2a27afe

File tree

23 files changed

+126
-41
lines changed

23 files changed

+126
-41
lines changed

‎osgp/protocol-adapter-dlms/osgp-jasper-interface/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,10 @@ SPDX-License-Identifier: Apache-2.0
172172
<groupId>org.opensmartgridplatform</groupId>
173173
<artifactId>shared</artifactId>
174174
</dependency>
175+
<dependency>
176+
<groupId>org.opensmartgridplatform</groupId>
177+
<artifactId>osgp-jasper-shared</artifactId>
178+
</dependency>
175179

176180
<dependency>
177181
<groupId>org.postgresql</groupId>

‎osgp/protocol-adapter-dlms/osgp-jasper-interface/src/main/java/org/opensmartgridplatform/adapter/protocol/jasper/client/JasperWirelessSmsClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
package org.opensmartgridplatform.adapter.protocol.jasper.client;
66

7-
import org.opensmartgridplatform.adapter.protocol.jasper.exceptions.OsgpJasperException;
87
import org.opensmartgridplatform.adapter.protocol.jasper.response.SendSMSResponse;
8+
import org.opensmartgridplatform.jasper.exceptions.OsgpJasperException;
99

1010
public interface JasperWirelessSmsClient {
1111

‎osgp/protocol-adapter-dlms/osgp-jasper-interface/src/main/java/org/opensmartgridplatform/adapter/protocol/jasper/client/JasperWirelessTerminalClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
package org.opensmartgridplatform.adapter.protocol.jasper.client;
66

7-
import org.opensmartgridplatform.adapter.protocol.jasper.exceptions.OsgpJasperException;
87
import org.opensmartgridplatform.adapter.protocol.jasper.response.GetSessionInfoResponse;
8+
import org.opensmartgridplatform.jasper.exceptions.OsgpJasperException;
99

1010
public interface JasperWirelessTerminalClient {
1111

‎osgp/protocol-adapter-dlms/osgp-jasper-interface/src/main/java/org/opensmartgridplatform/adapter/protocol/jasper/config/JasperWirelessConfig.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import javax.xml.soap.SOAPException;
1313
import org.opensmartgridplatform.adapter.protocol.jasper.client.JasperWirelessSmsClient;
1414
import org.opensmartgridplatform.adapter.protocol.jasper.client.JasperWirelessTerminalClient;
15-
import org.opensmartgridplatform.adapter.protocol.jasper.exceptions.OsgpJasperException;
1615
import org.opensmartgridplatform.adapter.protocol.jasper.infra.ws.CorrelationIdProviderService;
1716
import org.opensmartgridplatform.adapter.protocol.jasper.infra.ws.JasperWirelessSmsSoapClient;
1817
import org.opensmartgridplatform.adapter.protocol.jasper.infra.ws.JasperWirelessTerminalSoapClient;
@@ -23,6 +22,8 @@
2322
import org.opensmartgridplatform.adapter.protocol.jasper.sessionproviders.SessionProviderKpnPollJasper;
2423
import org.opensmartgridplatform.adapter.protocol.jasper.sessionproviders.SessionProviderKpnPushAlarm;
2524
import org.opensmartgridplatform.adapter.protocol.jasper.sessionproviders.SessionProviderMap;
25+
import org.opensmartgridplatform.jasper.config.JasperWirelessAccess;
26+
import org.opensmartgridplatform.jasper.exceptions.OsgpJasperException;
2627
import org.opensmartgridplatform.shared.application.config.AbstractConfig;
2728
import org.slf4j.Logger;
2829
import org.slf4j.LoggerFactory;

‎osgp/protocol-adapter-dlms/osgp-jasper-interface/src/main/java/org/opensmartgridplatform/adapter/protocol/jasper/infra/ws/JasperWirelessSmsSoapClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import java.util.List;
1313
import org.apache.ws.security.WSConstants;
1414
import org.opensmartgridplatform.adapter.protocol.jasper.client.JasperWirelessSmsClient;
15-
import org.opensmartgridplatform.adapter.protocol.jasper.config.JasperWirelessAccess;
15+
import org.opensmartgridplatform.jasper.config.JasperWirelessAccess;
1616
import org.springframework.beans.factory.annotation.Autowired;
1717
import org.springframework.ws.client.core.WebServiceTemplate;
1818
import org.springframework.ws.client.support.interceptor.ClientInterceptor;

‎osgp/protocol-adapter-dlms/osgp-jasper-interface/src/main/java/org/opensmartgridplatform/adapter/protocol/jasper/infra/ws/JasperWirelessTerminalSoapClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import lombok.extern.slf4j.Slf4j;
1212
import org.apache.ws.security.WSConstants;
1313
import org.opensmartgridplatform.adapter.protocol.jasper.client.JasperWirelessTerminalClient;
14-
import org.opensmartgridplatform.adapter.protocol.jasper.config.JasperWirelessAccess;
15-
import org.opensmartgridplatform.adapter.protocol.jasper.exceptions.OsgpJasperException;
14+
import org.opensmartgridplatform.jasper.config.JasperWirelessAccess;
15+
import org.opensmartgridplatform.jasper.exceptions.OsgpJasperException;
1616
import org.springframework.beans.factory.annotation.Autowired;
1717
import org.springframework.ws.client.core.WebServiceTemplate;
1818
import org.springframework.ws.client.support.interceptor.ClientInterceptor;

‎osgp/protocol-adapter-dlms/osgp-jasper-interface/src/main/java/org/opensmartgridplatform/adapter/protocol/jasper/rest/client/JasperWirelessSmsRestClient.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
package org.opensmartgridplatform.adapter.protocol.jasper.rest.client;
66

77
import org.opensmartgridplatform.adapter.protocol.jasper.client.JasperWirelessSmsClient;
8-
import org.opensmartgridplatform.adapter.protocol.jasper.config.JasperWirelessAccess;
9-
import org.opensmartgridplatform.adapter.protocol.jasper.exceptions.OsgpJasperException;
108
import org.opensmartgridplatform.adapter.protocol.jasper.rest.json.SendSMSRequest;
119
import org.opensmartgridplatform.adapter.protocol.jasper.rest.json.SendSMSResponse;
10+
import org.opensmartgridplatform.jasper.client.JasperWirelessRestClient;
11+
import org.opensmartgridplatform.jasper.config.JasperWirelessAccess;
12+
import org.opensmartgridplatform.jasper.exceptions.OsgpJasperException;
1213
import org.springframework.beans.factory.annotation.Autowired;
1314
import org.springframework.http.HttpEntity;
1415
import org.springframework.http.HttpHeaders;

‎osgp/protocol-adapter-dlms/osgp-jasper-interface/src/main/java/org/opensmartgridplatform/adapter/protocol/jasper/rest/client/JasperWirelessTerminalRestClient.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
package org.opensmartgridplatform.adapter.protocol.jasper.rest.client;
66

77
import org.opensmartgridplatform.adapter.protocol.jasper.client.JasperWirelessTerminalClient;
8-
import org.opensmartgridplatform.adapter.protocol.jasper.config.JasperWirelessAccess;
9-
import org.opensmartgridplatform.adapter.protocol.jasper.exceptions.OsgpJasperException;
108
import org.opensmartgridplatform.adapter.protocol.jasper.response.GetSessionInfoResponse;
9+
import org.opensmartgridplatform.jasper.client.JasperWirelessRestClient;
10+
import org.opensmartgridplatform.jasper.config.JasperWirelessAccess;
11+
import org.opensmartgridplatform.jasper.exceptions.OsgpJasperException;
1112
import org.springframework.beans.factory.annotation.Autowired;
1213
import org.springframework.http.HttpEntity;
1314
import org.springframework.http.HttpHeaders;
@@ -54,7 +55,10 @@ public GetSessionInfoResponse getSession(final String iccId) throws OsgpJasperEx
5455
this.jasperwirelessRestTemplate.exchange(
5556
url, HttpMethod.GET, entity, GetSessionInfoResponse.class);
5657

57-
getSessionInfoResponse = this.checkOnSessionValidity(getSessionInfoResponseEntity);
58+
if (getSessionInfoResponseEntity.getBody() != null) {
59+
getSessionInfoResponse =
60+
this.checkOnSessionValidity(getSessionInfoResponseEntity.getBody());
61+
}
5862

5963
} catch (final HttpClientErrorException | HttpServerErrorException e) {
6064
this.handleException(e);
@@ -65,15 +69,14 @@ public GetSessionInfoResponse getSession(final String iccId) throws OsgpJasperEx
6569
}
6670

6771
private GetSessionInfoResponse checkOnSessionValidity(
68-
final ResponseEntity<GetSessionInfoResponse> getSessionInfoResponseEntity) {
72+
final GetSessionInfoResponse getSessionInfoResponse) {
6973
// To simulated to same behaviour as the SOAP interface. Session info of an expired session is
7074
// removed form the response.
7175
// REST-interface returns information about the current or most recent data session for a given
7276
// device.
7377
// SOAP-interface returns the current session information (IP address and session start time)
7478
// for one or more devices. If the specified device is not in session, no information is
7579
// returned.
76-
final GetSessionInfoResponse getSessionInfoResponse = getSessionInfoResponseEntity.getBody();
7780
if (this.hasCurrentSession(getSessionInfoResponse)) {
7881
return getSessionInfoResponse;
7982
} else {

‎osgp/protocol-adapter-dlms/osgp-jasper-interface/src/main/java/org/opensmartgridplatform/adapter/protocol/jasper/sessionproviders/SessionProviderKpnPollJasper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
import javax.annotation.PostConstruct;
99
import org.opensmartgridplatform.adapter.protocol.jasper.client.JasperWirelessSmsClient;
1010
import org.opensmartgridplatform.adapter.protocol.jasper.client.JasperWirelessTerminalClient;
11-
import org.opensmartgridplatform.adapter.protocol.jasper.exceptions.OsgpJasperException;
1211
import org.opensmartgridplatform.adapter.protocol.jasper.response.GetSessionInfoResponse;
1312
import org.opensmartgridplatform.adapter.protocol.jasper.sessionproviders.exceptions.SessionProviderException;
13+
import org.opensmartgridplatform.jasper.exceptions.OsgpJasperException;
1414
import org.opensmartgridplatform.shared.exceptionhandling.ComponentType;
1515
import org.opensmartgridplatform.shared.exceptionhandling.FunctionalException;
1616
import org.opensmartgridplatform.shared.exceptionhandling.FunctionalExceptionType;

‎osgp/protocol-adapter-dlms/osgp-jasper-interface/src/main/java/org/opensmartgridplatform/adapter/protocol/jasper/sessionproviders/SessionProviderKpnPushAlarm.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
import javax.annotation.PostConstruct;
99
import org.opensmartgridplatform.adapter.protocol.jasper.client.JasperWirelessSmsClient;
1010
import org.opensmartgridplatform.adapter.protocol.jasper.client.JasperWirelessTerminalClient;
11-
import org.opensmartgridplatform.adapter.protocol.jasper.exceptions.OsgpJasperException;
1211
import org.opensmartgridplatform.adapter.protocol.jasper.response.GetSessionInfoResponse;
1312
import org.opensmartgridplatform.adapter.protocol.jasper.service.DeviceSessionService;
13+
import org.opensmartgridplatform.jasper.exceptions.OsgpJasperException;
1414
import org.opensmartgridplatform.shared.exceptionhandling.ComponentType;
1515
import org.opensmartgridplatform.shared.exceptionhandling.FunctionalException;
1616
import org.opensmartgridplatform.shared.exceptionhandling.FunctionalExceptionType;

‎osgp/protocol-adapter-dlms/osgp-jasper-interface/src/test/java/org/opensmartgridplatform/adapter/protocol/jasper/infra/ws/JasperWirelessTestConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package org.opensmartgridplatform.adapter.protocol.jasper.infra.ws;
66

77
import javax.annotation.Resource;
8-
import org.opensmartgridplatform.adapter.protocol.jasper.config.JasperWirelessAccess;
8+
import org.opensmartgridplatform.jasper.config.JasperWirelessAccess;
99
import org.springframework.context.annotation.Bean;
1010
import org.springframework.context.annotation.Configuration;
1111
import org.springframework.core.env.Environment;

‎osgp/protocol-adapter-dlms/osgp-jasper-interface/src/test/java/org/opensmartgridplatform/adapter/protocol/jasper/rest/client/JasperWirelessSmsRestClientTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
import org.mockito.InjectMocks;
2020
import org.mockito.Mock;
2121
import org.mockito.junit.jupiter.MockitoExtension;
22-
import org.opensmartgridplatform.adapter.protocol.jasper.config.JasperWirelessAccess;
23-
import org.opensmartgridplatform.adapter.protocol.jasper.exceptions.OsgpJasperException;
2422
import org.opensmartgridplatform.adapter.protocol.jasper.rest.json.SendSMSResponse;
23+
import org.opensmartgridplatform.jasper.config.JasperWirelessAccess;
24+
import org.opensmartgridplatform.jasper.exceptions.OsgpJasperException;
2525
import org.springframework.http.HttpEntity;
2626
import org.springframework.http.HttpMethod;
2727
import org.springframework.http.HttpStatus;

‎osgp/protocol-adapter-dlms/osgp-jasper-interface/src/test/java/org/opensmartgridplatform/adapter/protocol/jasper/rest/client/JasperWirelessTerminalRestClientTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
import org.mockito.InjectMocks;
2323
import org.mockito.Mock;
2424
import org.mockito.junit.jupiter.MockitoExtension;
25-
import org.opensmartgridplatform.adapter.protocol.jasper.config.JasperWirelessAccess;
26-
import org.opensmartgridplatform.adapter.protocol.jasper.exceptions.OsgpJasperException;
2725
import org.opensmartgridplatform.adapter.protocol.jasper.response.GetSessionInfoResponse;
26+
import org.opensmartgridplatform.jasper.config.JasperWirelessAccess;
27+
import org.opensmartgridplatform.jasper.exceptions.OsgpJasperException;
2828
import org.springframework.http.HttpEntity;
2929
import org.springframework.http.HttpMethod;
3030
import org.springframework.http.HttpStatus;
@@ -52,7 +52,7 @@ private enum SessionType {
5252
NEVER_HAD_SESSION,
5353
CURRENT_SESSION,
5454
EXPIRED_SESSION
55-
};
55+
}
5656

5757
@Mock private RestTemplate jasperwirelessRestTemplate;
5858

‎osgp/protocol-adapter-dlms/osgp-jasper-interface/src/test/java/org/opensmartgridplatform/adapter/protocol/jasper/sessionproviders/SessionProviderKpnPollJasperTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
import org.mockito.junit.jupiter.MockitoExtension;
2121
import org.opensmartgridplatform.adapter.protocol.jasper.client.JasperWirelessSmsClient;
2222
import org.opensmartgridplatform.adapter.protocol.jasper.client.JasperWirelessTerminalClient;
23-
import org.opensmartgridplatform.adapter.protocol.jasper.exceptions.OsgpJasperException;
2423
import org.opensmartgridplatform.adapter.protocol.jasper.response.GetSessionInfoResponse;
24+
import org.opensmartgridplatform.jasper.exceptions.OsgpJasperException;
2525
import org.opensmartgridplatform.shared.exceptionhandling.FunctionalException;
2626
import org.opensmartgridplatform.shared.exceptionhandling.OsgpException;
2727

‎osgp/protocol-adapter-dlms/osgp-jasper-interface/src/test/java/org/opensmartgridplatform/adapter/protocol/jasper/sessionproviders/SessionProviderKpnPushAlarmTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
import org.mockito.junit.jupiter.MockitoExtension;
2020
import org.opensmartgridplatform.adapter.protocol.jasper.client.JasperWirelessSmsClient;
2121
import org.opensmartgridplatform.adapter.protocol.jasper.client.JasperWirelessTerminalClient;
22-
import org.opensmartgridplatform.adapter.protocol.jasper.exceptions.OsgpJasperException;
2322
import org.opensmartgridplatform.adapter.protocol.jasper.response.GetSessionInfoResponse;
24-
import org.opensmartgridplatform.adapter.protocol.jasper.rest.JasperError;
2523
import org.opensmartgridplatform.adapter.protocol.jasper.service.DeviceSessionService;
24+
import org.opensmartgridplatform.jasper.exceptions.OsgpJasperException;
25+
import org.opensmartgridplatform.jasper.rest.JasperError;
2626
import org.opensmartgridplatform.shared.exceptionhandling.ComponentType;
2727
import org.opensmartgridplatform.shared.exceptionhandling.FunctionalException;
2828
import org.opensmartgridplatform.shared.exceptionhandling.FunctionalExceptionType;

‎osgp/shared/osgp-jasper-shared/pom.xml

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
<parent>
7+
<groupId>org.opensmartgridplatform</groupId>
8+
<artifactId>parent-shared</artifactId>
9+
<version>5.49.0-SNAPSHOT</version>
10+
<relativePath>../parent-shared/pom.xml</relativePath>
11+
</parent>
12+
13+
<groupId>org.opensmartgridplatform</groupId>
14+
<artifactId>osgp-jasper-shared</artifactId>
15+
<packaging>jar</packaging>
16+
17+
<dependencies>
18+
<!-- Spring Framework -->
19+
<dependency>
20+
<groupId>org.springframework</groupId>
21+
<artifactId>spring-core</artifactId>
22+
</dependency>
23+
<dependency>
24+
<groupId>org.springframework</groupId>
25+
<artifactId>spring-web</artifactId>
26+
</dependency>
27+
<!-- Utils -->
28+
<dependency>
29+
<groupId>org.projectlombok</groupId>
30+
<artifactId>lombok</artifactId>
31+
<scope>provided</scope>
32+
</dependency>
33+
34+
<dependency>
35+
<groupId>com.fasterxml.jackson.core</groupId>
36+
<artifactId>jackson-annotations</artifactId>
37+
</dependency>
38+
<dependency>
39+
<groupId>com.fasterxml.jackson.core</groupId>
40+
<artifactId>jackson-core</artifactId>
41+
</dependency>
42+
<dependency>
43+
<groupId>com.fasterxml.jackson.core</groupId>
44+
<artifactId>jackson-databind</artifactId>
45+
</dependency>
46+
</dependencies>
47+
48+
<build>
49+
<plugins>
50+
<plugin>
51+
<groupId>org.apache.maven.plugins</groupId>
52+
<artifactId>maven-jar-plugin</artifactId>
53+
<version>${maven.jar.plugin.version}</version>
54+
</plugin>
55+
<plugin>
56+
<artifactId>maven-surefire-plugin</artifactId>
57+
<version>${maven.surefire.plugin.version}</version>
58+
<dependencies>
59+
<dependency>
60+
<groupId>org.junit.jupiter</groupId>
61+
<artifactId>junit-jupiter-engine</artifactId>
62+
<version>${junit.version}</version>
63+
</dependency>
64+
</dependencies>
65+
</plugin>
66+
</plugins>
67+
</build>
68+
69+
</project>

‎osgp/protocol-adapter-dlms/osgp-jasper-interface/src/main/java/org/opensmartgridplatform/adapter/protocol/jasper/rest/client/JasperWirelessRestClient.java renamed to ‎osgp/shared/osgp-jasper-shared/src/main/java/org/opensmartgridplatform/jasper/client/JasperWirelessRestClient.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
//
33
// SPDX-License-Identifier: Apache-2.0
44

5-
package org.opensmartgridplatform.adapter.protocol.jasper.rest.client;
5+
package org.opensmartgridplatform.jasper.client;
66

77
import com.fasterxml.jackson.core.JsonProcessingException;
88
import com.fasterxml.jackson.databind.ObjectMapper;
99
import java.util.Base64;
10-
import org.opensmartgridplatform.adapter.protocol.jasper.config.JasperWirelessAccess;
11-
import org.opensmartgridplatform.adapter.protocol.jasper.exceptions.OsgpJasperException;
12-
import org.opensmartgridplatform.adapter.protocol.jasper.response.JasperErrorResponse;
13-
import org.opensmartgridplatform.adapter.protocol.jasper.rest.JasperError;
10+
import org.opensmartgridplatform.jasper.config.JasperWirelessAccess;
11+
import org.opensmartgridplatform.jasper.exceptions.OsgpJasperException;
12+
import org.opensmartgridplatform.jasper.response.JasperErrorResponse;
13+
import org.opensmartgridplatform.jasper.rest.JasperError;
1414
import org.springframework.web.client.HttpStatusCodeException;
1515

1616
public class JasperWirelessRestClient {

‎osgp/protocol-adapter-dlms/osgp-jasper-interface/src/main/java/org/opensmartgridplatform/adapter/protocol/jasper/config/JasperWirelessAccess.java renamed to ‎osgp/shared/osgp-jasper-shared/src/main/java/org/opensmartgridplatform/jasper/config/JasperWirelessAccess.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22
//
33
// SPDX-License-Identifier: Apache-2.0
44

5-
package org.opensmartgridplatform.adapter.protocol.jasper.config;
5+
package org.opensmartgridplatform.jasper.config;
66

77
import lombok.Getter;
88

99
@Getter
1010
public class JasperWirelessAccess {
1111

12-
private String uri;
13-
private String licenseKey;
14-
private String apiKey;
15-
private String username;
16-
private String password;
17-
private String apiVersion;
18-
private String apiType;
12+
private final String uri;
13+
private final String licenseKey;
14+
private final String apiKey;
15+
private final String username;
16+
private final String password;
17+
private final String apiVersion;
18+
private final String apiType;
1919

2020
public JasperWirelessAccess(
2121
final String uri,

‎osgp/protocol-adapter-dlms/osgp-jasper-interface/src/main/java/org/opensmartgridplatform/adapter/protocol/jasper/exceptions/OsgpJasperException.java renamed to ‎osgp/shared/osgp-jasper-shared/src/main/java/org/opensmartgridplatform/jasper/exceptions/OsgpJasperException.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
//
33
// SPDX-License-Identifier: Apache-2.0
44

5-
package org.opensmartgridplatform.adapter.protocol.jasper.exceptions;
5+
package org.opensmartgridplatform.jasper.exceptions;
66

7-
import org.opensmartgridplatform.adapter.protocol.jasper.rest.JasperError;
7+
import org.opensmartgridplatform.jasper.rest.JasperError;
88

99
public class OsgpJasperException extends Exception {
1010

‎osgp/protocol-adapter-dlms/osgp-jasper-interface/src/main/java/org/opensmartgridplatform/adapter/protocol/jasper/response/JasperErrorResponse.java renamed to ‎osgp/shared/osgp-jasper-shared/src/main/java/org/opensmartgridplatform/jasper/response/JasperErrorResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// SPDX-License-Identifier: Apache-2.0
44

5-
package org.opensmartgridplatform.adapter.protocol.jasper.response;
5+
package org.opensmartgridplatform.jasper.response;
66

77
import lombok.Getter;
88

‎osgp/protocol-adapter-dlms/osgp-jasper-interface/src/main/java/org/opensmartgridplatform/adapter/protocol/jasper/rest/JasperError.java renamed to ‎osgp/shared/osgp-jasper-shared/src/main/java/org/opensmartgridplatform/jasper/rest/JasperError.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// SPDX-License-Identifier: Apache-2.0
44

5-
package org.opensmartgridplatform.adapter.protocol.jasper.rest;
5+
package org.opensmartgridplatform.jasper.rest;
66

77
import java.util.Arrays;
88
import lombok.Getter;

‎osgp/shared/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ SPDX-License-Identifier: Apache-2.0
1212
<groupId>org.opensmartgridplatform</groupId>
1313
<artifactId>shared-components</artifactId>
1414
<version>5.49.0-SNAPSHOT</version>
15+
1516
<packaging>pom</packaging>
1617
<name>shared</name>
1718
<properties>
@@ -95,6 +96,7 @@ SPDX-License-Identifier: Apache-2.0
9596
<module>osgp-ws-admin</module>
9697
<module>osgp-throttling-api</module>
9798
<module>osgp-throttling-client</module>
99+
<module>osgp-jasper-shared</module>
98100
</modules>
99101

100102
<profiles>

‎super/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,11 @@ SPDX-License-Identifier: Apache-2.0
348348
<artifactId>osgp-core-db-api-iec61850</artifactId>
349349
<version>${osgp.version}</version>
350350
</dependency>
351+
<dependency>
352+
<groupId>org.opensmartgridplatform</groupId>
353+
<artifactId>osgp-jasper-shared</artifactId>
354+
<version>${osgp.version}</version>
355+
</dependency>
351356
<dependency>
352357
<groupId>org.opensmartgridplatform</groupId>
353358
<artifactId>cucumber-tests-core</artifactId>

0 commit comments

Comments
 (0)