Skip to content

Commit 31f5182

Browse files
author
Dennis Labordus
authored
Merge pull request #185 from com-pas/develop
New release
2 parents aaf4305 + da700cd commit 31f5182

File tree

8 files changed

+54
-39
lines changed

8 files changed

+54
-39
lines changed

pom.xml

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,38 @@ SPDX-License-Identifier: Apache-2.0
163163
<artifactId>maven-jar-plugin</artifactId>
164164
<version>3.3.0</version>
165165
</plugin>
166+
167+
<plugin>
168+
<groupId>org.apache.maven.plugins</groupId>
169+
<artifactId>maven-source-plugin</artifactId>
170+
<version>3.2.1</version>
171+
<executions>
172+
<execution>
173+
<id>attach-sources</id>
174+
<goals>
175+
<goal>jar</goal>
176+
</goals>
177+
</execution>
178+
</executions>
179+
</plugin>
180+
181+
<plugin>
182+
<groupId>org.apache.maven.plugins</groupId>
183+
<artifactId>maven-javadoc-plugin</artifactId>
184+
<version>3.4.1</version>
185+
<executions>
186+
<execution>
187+
<id>attach-javadocs</id>
188+
<goals>
189+
<goal>jar</goal>
190+
</goals>
191+
</execution>
192+
</executions>
193+
<configuration>
194+
<doclint>none</doclint>
195+
<failOnError>false</failOnError>
196+
</configuration>
197+
</plugin>
166198
</plugins>
167199
</pluginManagement>
168200
</build>
@@ -218,38 +250,6 @@ SPDX-License-Identifier: Apache-2.0
218250
<id>release</id>
219251

220252
<build>
221-
<pluginManagement>
222-
<plugins>
223-
<plugin>
224-
<groupId>org.apache.maven.plugins</groupId>
225-
<artifactId>maven-source-plugin</artifactId>
226-
<version>3.2.1</version>
227-
<executions>
228-
<execution>
229-
<id>attach-sources</id>
230-
<goals>
231-
<goal>jar</goal>
232-
</goals>
233-
</execution>
234-
</executions>
235-
</plugin>
236-
237-
<plugin>
238-
<groupId>org.apache.maven.plugins</groupId>
239-
<artifactId>maven-javadoc-plugin</artifactId>
240-
<version>3.4.1</version>
241-
<executions>
242-
<execution>
243-
<id>attach-javadocs</id>
244-
<goals>
245-
<goal>jar</goal>
246-
</goals>
247-
</execution>
248-
</executions>
249-
</plugin>
250-
</plugins>
251-
</pluginManagement>
252-
253253
<plugins>
254254
<plugin>
255255
<groupId>org.apache.maven.plugins</groupId>

rest-commons/src/main/java/org/lfenergy/compas/core/jaxrs/exception/CompasExceptionHandler.java renamed to rest-commons/src/main/java/org/lfenergy/compas/core/rest/exception/CompasExceptionHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-FileCopyrightText: 2021 Alliander N.V.
22
//
33
// SPDX-License-Identifier: Apache-2.0
4-
package org.lfenergy.compas.core.jaxrs.exception;
4+
package org.lfenergy.compas.core.rest.exception;
55

66
import org.lfenergy.compas.core.commons.exception.CompasException;
77
import org.lfenergy.compas.core.commons.model.ErrorResponse;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-FileCopyrightText: 2021 Alliander N.V.
22
//
33
// SPDX-License-Identifier: Apache-2.0
4-
package org.lfenergy.compas.core.jaxrs.exception;
4+
package org.lfenergy.compas.core.rest.exception;
55

66
import org.lfenergy.compas.core.commons.model.ErrorResponse;
77
import org.slf4j.Logger;

rest-commons/src/main/java/org/lfenergy/compas/core/jaxrs/exception/GenericExceptionHandler.java renamed to rest-commons/src/main/java/org/lfenergy/compas/core/rest/exception/GenericExceptionHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-FileCopyrightText: 2021 Alliander N.V.
22
//
33
// SPDX-License-Identifier: Apache-2.0
4-
package org.lfenergy.compas.core.jaxrs.exception;
4+
package org.lfenergy.compas.core.rest.exception;
55

66
import org.lfenergy.compas.core.commons.model.ErrorResponse;
77
import org.slf4j.Logger;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-FileCopyrightText: 2021 Alliander N.V.
22
//
33
// SPDX-License-Identifier: Apache-2.0
4-
package org.lfenergy.compas.core.jaxrs.exception;
4+
package org.lfenergy.compas.core.rest.exception;
55

66
import org.junit.jupiter.api.Test;
77
import org.lfenergy.compas.core.commons.exception.CompasException;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-FileCopyrightText: 2021 Alliander N.V.
22
//
33
// SPDX-License-Identifier: Apache-2.0
4-
package org.lfenergy.compas.core.jaxrs.exception;
4+
package org.lfenergy.compas.core.rest.exception;
55

66
import org.junit.jupiter.api.Test;
77
import org.junit.jupiter.api.extension.ExtendWith;
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-FileCopyrightText: 2021 Alliander N.V.
22
//
33
// SPDX-License-Identifier: Apache-2.0
4-
package org.lfenergy.compas.core.jaxrs.exception;
4+
package org.lfenergy.compas.core.rest.exception;
55

66
import org.junit.jupiter.api.Test;
77
import org.lfenergy.compas.core.commons.model.ErrorResponse;
@@ -10,7 +10,7 @@
1010
import static org.junit.jupiter.api.Assertions.assertEquals;
1111
import static org.junit.jupiter.api.Assertions.assertNull;
1212
import static org.lfenergy.compas.core.commons.exception.CompasErrorCode.UNKNOWN_EXCEPTION_ERROR;
13-
import static org.lfenergy.compas.core.jaxrs.exception.GenericExceptionHandler.ERROR_MESSAGE;
13+
import static org.lfenergy.compas.core.rest.exception.GenericExceptionHandler.ERROR_MESSAGE;
1414

1515
class GenericExceptionHandlerTest {
1616
@Test
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// SPDX-FileCopyrightText: 2022 Alliander N.V.
2+
//
3+
// SPDX-License-Identifier: Apache-2.0
4+
package org.lfenergy.compas.core.websocket;
5+
6+
import org.junit.jupiter.api.Test;
7+
8+
import static org.junit.jupiter.api.Assertions.assertThrows;
9+
10+
class WebsocketSupportTest {
11+
@Test
12+
void constructor_WhenConstructorCalled_ThenShouldThrowExceptionCauseForbidden() {
13+
assertThrows(UnsupportedOperationException.class, WebsocketSupport::new);
14+
}
15+
}

0 commit comments

Comments
 (0)