Skip to content

Commit da50ae3

Browse files
author
Tomáš Kraus
committed
Renamed test modules and packages.
Signed-off-by: Tomáš Kraus <[email protected]>
1 parent f8db101 commit da50ae3

File tree

97 files changed

+1104
-1105
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+1104
-1105
lines changed

data/codegen/parser/etc/spotbugs/exclude.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@
2121
xsi:schemaLocation="https://github.com/spotbugs/filter/3.0.0 https://raw.githubusercontent.com/spotbugs/spotbugs/3.1.0/spotbugs/etc/findbugsfilter.xsd">
2222

2323
<Match>
24-
<!-- Doesn't construct SQL string. It converts string to statement -->
25-
<Class name="io.helidon.data.codegen.parser.MethodNameParserImpl"/>
26-
<Method name="dataQuery"/>
27-
<Bug pattern="SF_SWITCH_FALLTHROUGH"/>
24+
<!-- ANTLR generated code, can't fix. -->
25+
<Class name="io.helidon.data.codegen.parser.MethodName"/>
26+
<Bug pattern="SF_SWITCH_NO_DEFAULT"/>
2827
</Match>
2928
</FindBugsFilter>

data/codegen/parser/src/main/java/io/helidon/data/codegen/parser/MethodNameParserImpl.java

Lines changed: 328 additions & 330 deletions
Large diffs are not rendered by default.

data/jakarta-persistence/jakarta-persistence/src/main/java/io/helidon/data/jakarta/persistence/JpaRepositoryExecutorImpl.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -178,18 +178,18 @@ public <E extends Throwable> void run(EntityManager em, Functions.CheckedConsume
178178
// PersistenceException mapping
179179
private static void handlePersistenceException(PersistenceException pe) throws DataException {
180180
switch (pe) {
181-
case jakarta.persistence.EntityExistsException ignore:
182-
throw new EntityExistsException("Entity already exists.", pe);
183-
case jakarta.persistence.EntityNotFoundException ignore:
184-
throw new EntityNotFoundException("Entity was not found.", pe);
185-
case jakarta.persistence.NoResultException ignore:
186-
throw new NoResultException("Query returned no result.", pe);
187-
case jakarta.persistence.NonUniqueResultException ignore:
188-
throw new NonUniqueResultException("Query returned multiple result.", pe);
189-
case jakarta.persistence.OptimisticLockException ignore:
190-
throw new OptimisticLockException("Optimistic locking conflict.", pe);
191-
default:
192-
throw new DataException("Persistence session task failed.", pe);
181+
case jakarta.persistence.EntityExistsException ex:
182+
throw new EntityExistsException("Entity already exists.", ex);
183+
case jakarta.persistence.EntityNotFoundException ex:
184+
throw new EntityNotFoundException("Entity was not found.", ex);
185+
case jakarta.persistence.NoResultException ex:
186+
throw new NoResultException("Query returned no result.", ex);
187+
case jakarta.persistence.NonUniqueResultException ex:
188+
throw new NonUniqueResultException("Query returned multiple result.", ex);
189+
case jakarta.persistence.OptimisticLockException ex:
190+
throw new OptimisticLockException("Optimistic locking conflict.", ex);
191+
default:
192+
throw new DataException("Persistence session task failed.", pe);
193193
}
194194
}
195195
}

data/sql/datasource/hikari/pom.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,16 +211,15 @@
211211

212212
<profiles>
213213
<profile>
214-
<id>testcontainers</id>
214+
<id>tests</id>
215215
<build>
216216
<plugins>
217217
<plugin>
218218
<groupId>org.apache.maven.plugins</groupId>
219219
<artifactId>maven-surefire-plugin</artifactId>
220220
<configuration>
221221
<systemPropertyVariables>
222-
<junit.jupiter.extensions.autodetection.enabled>true
223-
</junit.jupiter.extensions.autodetection.enabled>
222+
<junit.jupiter.extensions.autodetection.enabled>true</junit.jupiter.extensions.autodetection.enabled>
224223
</systemPropertyVariables>
225224
<skip>false</skip>
226225
</configuration>

data/sql/datasource/ucp/pom.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,16 +217,15 @@
217217

218218
<profiles>
219219
<profile>
220-
<id>testcontainers</id>
220+
<id>tests</id>
221221
<build>
222222
<plugins>
223223
<plugin>
224224
<groupId>org.apache.maven.plugins</groupId>
225225
<artifactId>maven-surefire-plugin</artifactId>
226226
<configuration>
227227
<systemPropertyVariables>
228-
<junit.jupiter.extensions.autodetection.enabled>true
229-
</junit.jupiter.extensions.autodetection.enabled>
228+
<junit.jupiter.extensions.autodetection.enabled>true</junit.jupiter.extensions.autodetection.enabled>
230229
</systemPropertyVariables>
231230
<skip>false</skip>
232231
</configuration>

data/sql/testing/src/main/java/io/helidon/data/sql/testing/TestConfigFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ private Config config() {
5151
return config;
5252
}
5353

54-
private void config(Config config) {
54+
private static void config(Config config) {
5555
TestConfigFactory.config = config;
5656
}
5757

data/tests/codegen/application/pom.xml renamed to data/tests/application/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
<modelVersion>4.0.0</modelVersion>
2222

2323
<parent>
24-
<groupId>io.helidon.data.tests.codegen</groupId>
25-
<artifactId>helidon-data-tests-codegen-project</artifactId>
24+
<groupId>io.helidon.data.tests</groupId>
25+
<artifactId>helidon-data-tests-project</artifactId>
2626
<version>4.2.0-SNAPSHOT</version>
2727
</parent>
2828

29-
<artifactId>helidon-data-tests-codegen-application</artifactId>
29+
<artifactId>helidon-data-tests-application</artifactId>
3030
<name>Helidon Data Codegen Tests Application</name>
3131

3232
<dependencies>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.helidon.data.tests.codegen.application;
16+
package io.helidon.data.tests.application;
1717

1818
import io.helidon.data.DataConfig;
1919
import io.helidon.data.DataRegistry;

data/tests/codegen/application/src/main/java/module-info.java renamed to data/tests/application/src/main/java/module-info.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
* limitations under the License.
1515
*/
1616
/**
17-
* Helidon Data Codegen Tests Application.
17+
* Helidon Data Tests Application.
1818
*/
19-
module io.helidon.data.tests.codegen.application {
19+
module io.helidon.data.tests.application {
2020

2121
requires io.helidon.data;
2222
requires io.helidon.common.config;
2323

24-
exports io.helidon.data.tests.codegen.application;
24+
exports io.helidon.data.tests.application;
2525

2626
}

data/tests/codegen/pom.xml

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)