Skip to content

Commit 3d7bf53

Browse files
AB-xdevAB-xdev
authored
Merge pull request #209 from xdev-software/develop
Release
2 parents c72c7d8 + 97dd984 commit 3d7bf53

File tree

50 files changed

+285
-307
lines changed

Some content is hidden

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

50 files changed

+285
-307
lines changed

‎.config/checkstyle/checkstyle.xml‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
<module name="TreeWalker">
5353
<!-- Checks - sorted alphabetically -->
5454
<module name="ArrayTypeStyle"/>
55+
<module name="AvoidDoubleBraceInitialization"/>
5556
<module name="AvoidStarImport"/>
5657
<module name="ConstantName"/>
5758
<module name="DefaultComesLast"/>
@@ -68,6 +69,11 @@
6869
<module name="FinalParameters"/>
6970
<module name="GenericWhitespace"/>
7071
<module name="HideUtilityClassConstructor"/>
72+
<module name="IllegalCatch">
73+
<!-- https://docs.pmd-code.org/pmd-doc-7.11.0/pmd_rules_java_errorprone.html#avoidcatchingnpe -->
74+
<!-- https://docs.pmd-code.org/pmd-doc-7.11.0/pmd_rules_java_errorprone.html#avoidcatchingthrowable -->
75+
<property name="illegalClassNames" value="Error,Throwable,NullPointerException,java.lang.Error,java.lang.Throwable,java.lang.NullPointerException"/>
76+
</module>
7177
<module name="IllegalImport"/>
7278
<module name="InterfaceIsType"/>
7379
<module name="JavadocStyle">
@@ -93,7 +99,6 @@
9399
<module name="MethodParamPad"/>
94100
<module name="MissingDeprecated"/>
95101
<module name="MissingOverride"/>
96-
<module name="MissingSwitchDefault"/>
97102
<module name="ModifierOrder"/>
98103
<module name="NeedBraces"/>
99104
<module name="NoClone"/>
@@ -122,7 +127,13 @@
122127
</module>
123128
<module name="TypecastParenPad"/>
124129
<module name="TypeName"/>
130+
<module name="UnnecessaryParentheses"/>
131+
<module name="UnnecessarySemicolonAfterOuterTypeDeclaration"/>
132+
<module name="UnnecessarySemicolonAfterTypeMemberDeclaration"/>
133+
<module name="UnnecessarySemicolonInEnumeration"/>
134+
<module name="UnnecessarySemicolonInTryWithResources"/>
125135
<module name="UnusedImports"/>
136+
<module name="UnusedLocalVariable"/>
126137
<module name="UpperEll"/>
127138
<module name="VisibilityModifier">
128139
<property name="packageAllowed" value="true"/>

‎.config/pmd/ruleset.xml‎

Lines changed: 39 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,38 @@
1010

1111
<!-- Only rules that don't overlap with CheckStyle! -->
1212

13+
<rule ref="category/java/bestpractices.xml/AvoidPrintStackTrace"/>
14+
<rule ref="category/java/bestpractices.xml/AvoidStringBufferField"/>
1315
<rule ref="category/java/bestpractices.xml/AvoidUsingHardCodedIP"/>
16+
<rule ref="category/java/bestpractices.xml/ConstantsInInterface"/>
17+
<rule ref="category/java/bestpractices.xml/ExhaustiveSwitchHasDefault"/>
18+
<rule ref="category/java/bestpractices.xml/LiteralsFirstInComparisons"/>
19+
<!-- CheckStyle can't handle this switch behavior -> delegated to PMD -->
20+
<rule ref="category/java/bestpractices.xml/NonExhaustiveSwitch"/>
21+
<rule ref="category/java/bestpractices.xml/OneDeclarationPerLine">
22+
<properties>
23+
<property name="strictMode" value="true"/>
24+
</properties>
25+
</rule>
1426
<rule ref="category/java/bestpractices.xml/PreserveStackTrace"/>
27+
<rule ref="category/java/bestpractices.xml/SimplifiableTestAssertion"/>
28+
<rule ref="category/java/bestpractices.xml/SystemPrintln"/>
29+
<rule ref="category/java/bestpractices.xml/UnusedAssignment"/>
30+
<rule ref="category/java/bestpractices.xml/UnusedFormalParameter"/>
31+
<rule ref="category/java/bestpractices.xml/UnusedPrivateField"/>
32+
<rule ref="category/java/bestpractices.xml/UnusedPrivateMethod"/>
1533
<rule ref="category/java/bestpractices.xml/UseCollectionIsEmpty"/>
34+
<rule ref="category/java/bestpractices.xml/UseEnumCollections"/>
1635
<rule ref="category/java/bestpractices.xml/UseStandardCharsets"/>
36+
<rule ref="category/java/bestpractices.xml/UseTryWithResources"/>
1737

1838
<!-- Native code is platform dependent; Loading external native libs might pose a security threat -->
1939
<rule ref="category/java/codestyle.xml/AvoidUsingNativeCode"/>
2040
<rule ref="category/java/codestyle.xml/IdenticalCatchBranches"/>
41+
<rule ref="category/java/codestyle.xml/LambdaCanBeMethodReference"/>
2142
<rule ref="category/java/codestyle.xml/NoPackage"/>
2243
<rule ref="category/java/codestyle.xml/PrematureDeclaration"/>
44+
<rule ref="category/java/codestyle.xml/UnnecessarySemicolon"/>
2345

2446
<rule ref="category/java/design.xml">
2547
<!-- Sometimes abstract classes have just fields -->
@@ -76,9 +98,6 @@
7698

7799
<!-- Limit too low -->
78100
<exclude name="UseObjectForClearerAPI"/>
79-
80-
<!-- Handled by checkstyle -->
81-
<exclude name="UseUtilityClass"/>
82101
</rule>
83102

84103
<rule ref="category/java/design.xml/AvoidDeeplyNestedIfStmts">
@@ -114,17 +133,33 @@
114133
</properties>
115134
</rule>
116135

136+
<rule ref="category/java/errorprone.xml/AssignmentToNonFinalStatic"/>
137+
<rule ref="category/java/errorprone.xml/AvoidDecimalLiteralsInBigDecimalConstructor"/>
138+
<rule ref="category/java/errorprone.xml/AvoidMultipleUnaryOperators"/>
117139
<rule ref="category/java/errorprone.xml/AvoidUsingOctalValues"/>
118140
<rule ref="category/java/errorprone.xml/BrokenNullCheck"/>
119141
<rule ref="category/java/errorprone.xml/ComparisonWithNaN"/>
120142
<rule ref="category/java/errorprone.xml/DoNotCallGarbageCollectionExplicitly"/>
121143
<rule ref="category/java/errorprone.xml/DontImportSun"/>
144+
<rule ref="category/java/errorprone.xml/DontUseFloatTypeForLoopIndices"/>
145+
<rule ref="category/java/errorprone.xml/EqualsNull"/>
146+
<rule ref="category/java/errorprone.xml/IdempotentOperations"/>
147+
<rule ref="category/java/errorprone.xml/ImplicitSwitchFallThrough"/>
148+
<rule ref="category/java/errorprone.xml/InstantiationToGetClass"/>
149+
<rule ref="category/java/errorprone.xml/InvalidLogMessageFormat"/>
150+
<rule ref="category/java/errorprone.xml/JumbledIncrementer"/>
122151
<rule ref="category/java/errorprone.xml/MisplacedNullCheck"/>
152+
<rule ref="category/java/errorprone.xml/MoreThanOneLogger"/>
153+
<rule ref="category/java/errorprone.xml/NonStaticInitializer"/>
154+
<rule ref="category/java/errorprone.xml/ReturnFromFinallyBlock"/>
155+
<rule ref="category/java/errorprone.xml/SingletonClassReturningNewInstance"/>
156+
<rule ref="category/java/errorprone.xml/UnconditionalIfStatement"/>
123157
<rule ref="category/java/errorprone.xml/UnnecessaryCaseChange"/>
158+
<rule ref="category/java/errorprone.xml/UselessOperationOnImmutable"/>
124159

125160

126161
<rule ref="category/java/multithreading.xml">
127-
<!-- Just bloats code -->
162+
<!-- Just bloats code; improved in JEP-491/Java 24+ -->
128163
<exclude name="AvoidSynchronizedAtMethodLevel"/>
129164

130165
<!-- NOPE -->

‎.github/workflows/broken-links.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
- name: Link Checker
2121
id: lychee
22-
uses: lycheeverse/lychee-action@v2
22+
uses: lycheeverse/lychee-action@1d97d84f0bc547f7b25f4c2170d87d810dc2fb2c # v2
2323
with:
2424
fail: false # Don't fail on broken links, create an issue instead
2525

@@ -38,7 +38,7 @@ jobs:
3838

3939
- name: Create Issue From File
4040
if: env.lychee_exit_code != 0
41-
uses: peter-evans/create-issue-from-file@v5
41+
uses: peter-evans/create-issue-from-file@e8ef132d6df98ed982188e460ebb3b5d4ef3a9cd # v5
4242
with:
4343
issue-number: ${{ steps.find-issue.outputs.number }}
4444
title: Link Checker Report

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
8787
- name: Create Release
8888
id: create-release
89-
uses: shogo82148/actions-create-release@v1
89+
uses: shogo82148/actions-create-release@e5f206451d4ace2da9916d01f1aef279997f8659 # v1
9090
with:
9191
tag_name: v${{ steps.version.outputs.release }}
9292
release_name: v${{ steps.version.outputs.release }}
@@ -277,7 +277,7 @@ jobs:
277277
done
278278
279279
- name: Deploy to Github pages
280-
uses: peaceiris/actions-gh-pages@v4
280+
uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4
281281
with:
282282
github_token: ${{ secrets.GITHUB_TOKEN }}
283283
publish_dir: ./target/site

‎.github/workflows/sync-labels.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ jobs:
2020
with:
2121
sparse-checkout: .github/labels.yml
2222

23-
- uses: EndBug/label-sync@v2
23+
- uses: EndBug/label-sync@52074158190acb45f3077f9099fea818aa43f97a # v2
2424
with:
2525
config-file: .github/labels.yml

‎.idea/externalDependencies.xml‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# 1.0.15
2+
* Updated dependencies
3+
14
# 1.0.14
25
* Remove not needed alpine packages from (Docker) image
36
* This get's rid of CVE-2024-8176

‎client/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@
255255
<dependency>
256256
<groupId>com.puppycrawl.tools</groupId>
257257
<artifactId>checkstyle</artifactId>
258-
<version>10.21.4</version>
258+
<version>10.23.1</version>
259259
</dependency>
260260
</dependencies>
261261
<configuration>
@@ -292,12 +292,12 @@
292292
<dependency>
293293
<groupId>net.sourceforge.pmd</groupId>
294294
<artifactId>pmd-core</artifactId>
295-
<version>7.11.0</version>
295+
<version>7.13.0</version>
296296
</dependency>
297297
<dependency>
298298
<groupId>net.sourceforge.pmd</groupId>
299299
<artifactId>pmd-java</artifactId>
300-
<version>7.11.0</version>
300+
<version>7.13.0</version>
301301
</dependency>
302302
</dependencies>
303303
</plugin>

‎client/src/main/java/software/xdev/mockserver/client/MockServerClient.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1151,7 +1151,7 @@ public HttpRequest[] retrieveRecordedRequests(final RequestDefinition requestDef
11511151
{
11521152
RequestDefinition[] requestDefinitions = new RequestDefinition[0];
11531153
final String recordedRequests = this.retrieveRecordedRequests(requestDefinition, Format.JSON);
1154-
if(isNotBlank(recordedRequests) && !recordedRequests.equals("[]"))
1154+
if(isNotBlank(recordedRequests) && !"[]".equals(recordedRequests))
11551155
{
11561156
requestDefinitions = this.requestDefinitionSerializer.deserializeArray(recordedRequests);
11571157
}
@@ -1198,7 +1198,7 @@ public String retrieveRecordedRequests(final RequestDefinition requestDefinition
11981198
public LogEventRequestAndResponse[] retrieveRecordedRequestsAndResponses(final RequestDefinition requestDefinition)
11991199
{
12001200
final String recordedRequests = this.retrieveRecordedRequestsAndResponses(requestDefinition, Format.JSON);
1201-
if(isNotBlank(recordedRequests) && !recordedRequests.equals("[]"))
1201+
if(isNotBlank(recordedRequests) && !"[]".equals(recordedRequests))
12021202
{
12031203
return this.httpRequestResponseSerializer.deserializeArray(recordedRequests);
12041204
}
@@ -1247,7 +1247,7 @@ public String retrieveRecordedRequestsAndResponses(final RequestDefinition reque
12471247
public Expectation[] retrieveRecordedExpectations(final RequestDefinition requestDefinition)
12481248
{
12491249
final String recordedExpectations = this.retrieveRecordedExpectations(requestDefinition, Format.JSON);
1250-
if(isNotBlank(recordedExpectations) && !recordedExpectations.equals("[]"))
1250+
if(isNotBlank(recordedExpectations) && !"[]".equals(recordedExpectations))
12511251
{
12521252
return this.expectationSerializer.deserializeArray(recordedExpectations, true);
12531253
}
@@ -1518,7 +1518,7 @@ else if(expectations.length > 1)
15181518
public Expectation[] retrieveActiveExpectations(final RequestDefinition requestDefinition)
15191519
{
15201520
final String activeExpectations = this.retrieveActiveExpectations(requestDefinition, Format.JSON);
1521-
if(isNotBlank(activeExpectations) && !activeExpectations.equals("[]"))
1521+
if(isNotBlank(activeExpectations) && !"[]".equals(activeExpectations))
15221522
{
15231523
return this.expectationSerializer.deserializeArray(activeExpectations, true);
15241524
}

‎core/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,14 @@
8989
<dependency>
9090
<groupId>com.fasterxml.jackson</groupId>
9191
<artifactId>jackson-bom</artifactId>
92-
<version>2.18.3</version>
92+
<version>2.19.0</version>
9393
<type>pom</type>
9494
<scope>import</scope>
9595
</dependency>
9696
<dependency>
9797
<groupId>io.netty</groupId>
9898
<artifactId>netty-bom</artifactId>
99-
<version>4.1.119.Final</version>
99+
<version>4.2.1.Final</version>
100100
<type>pom</type>
101101
<scope>import</scope>
102102
</dependency>
@@ -313,7 +313,7 @@
313313
<dependency>
314314
<groupId>com.puppycrawl.tools</groupId>
315315
<artifactId>checkstyle</artifactId>
316-
<version>10.21.4</version>
316+
<version>10.23.1</version>
317317
</dependency>
318318
</dependencies>
319319
<configuration>
@@ -350,12 +350,12 @@
350350
<dependency>
351351
<groupId>net.sourceforge.pmd</groupId>
352352
<artifactId>pmd-core</artifactId>
353-
<version>7.11.0</version>
353+
<version>7.13.0</version>
354354
</dependency>
355355
<dependency>
356356
<groupId>net.sourceforge.pmd</groupId>
357357
<artifactId>pmd-java</artifactId>
358-
<version>7.11.0</version>
358+
<version>7.13.0</version>
359359
</dependency>
360360
</dependencies>
361361
</plugin>

0 commit comments

Comments
 (0)