Skip to content

Commit 94b9fa1

Browse files
AB-xdevAB-xdev
authored
Merge pull request #445 from xdev-software/develop
Release
2 parents ec8d966 + 877c315 commit 94b9fa1

9 files changed

Lines changed: 62 additions & 17 deletions

File tree

‎.config/pmd/java/ruleset.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ A `Set` also prevents duplicates when the ORM reads multiple identical rows from
440440
<value>
441441
<![CDATA[
442442
//ClassDeclaration[pmd-java:hasAnnotation('jakarta.persistence.Entity')]
443-
//FieldDeclaration[pmd-java:hasAnnotation('jakarta.persistence.ManyToMany') or pmd-java:hasAnnotation('jakarta.persistence.OneToMany')]
443+
//FieldDeclaration[pmd-java:hasAnnotation('jakarta.persistence.ManyToMany') or pmd-java:hasAnnotation('jakarta.persistence.OneToMany') or pmd-java:hasAnnotation('jakarta.persistence.ElementCollection')]
444444
/ClassType[pmd-java:typeIs('java.util.List')]
445445
]]>
446446
</value>

‎.github/.lycheeignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
localhost
33
mvnrepository.com
44
testcontainers.com
5+
web.archive.org

‎.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
wrapperVersion=3.3.4
22
distributionType=only-script
3-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.15/apache-maven-3.9.15-bin.zip
3+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip

‎CHANGELOG.md‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 2.50.9
2+
* Updated dependencies
3+
* Add shorthand methods for `HttpRequest`
4+
15
# 2.50.8
26
* Updated dependencies
37

@@ -167,11 +171,11 @@ Minimalistic fork of [mock-server/mockserver](https://github.com/mock-server/moc
167171
* Change all occurrences of ``org.mockserver`` to ``software.xdev.mockserver``
168172

169173
### Fixes the following issues from the [original project](https://github.com/mock-server/mockserver)
170-
* Removed useless/Minimize dependencies of ``mockserver-client-java`` [#1494](https://github.com/mock-server/mockserver/issues/1494)
171-
* ARM image doesn't include ARM binaries [#1568](https://github.com/mock-server/mockserver/issues/1568)
172-
* Add any Shell to Docker Container [#1593](https://github.com/mock-server/mockserver/issues/1593)
173-
* io.netty 4.1.89.Final is using unsupported JDK internal APIs [#1812](https://github.com/mock-server/mockserver/issues/1812)
174-
* MockServerClient.verify(RequestDefinition requestDefinition, VerificationTimes times) not works correctly after update to 5.14.0 [#1524](https://github.com/mock-server/mockserver/issues/1524) (Ported fix from @szada92)
174+
* Removed useless/Minimize dependencies of ``mockserver-client-java`` [#1494](https://web.archive.org/web/20260513070329/https://github.com/mock-server/mockserver-monorepo/issues/1494)
175+
* ARM image doesn't include ARM binaries [#1568](https://web.archive.org/web/20260513070357/https://github.com/mock-server/mockserver-monorepo/issues/1568)
176+
* Add any Shell to Docker Container [#1593](https://web.archive.org/web/20260513070323/https://github.com/mock-server/mockserver-monorepo/issues/1593)
177+
* io.netty 4.1.89.Final is using unsupported JDK internal APIs [#1812](https://web.archive.org/web/20260513070253/https://github.com/mock-server/mockserver-monorepo/issues/1812)
178+
* MockServerClient.verify(RequestDefinition requestDefinition, VerificationTimes times) not works correctly after update to 5.14.0 [#1524](https://web.archive.org/web/20260513070405/https://github.com/mock-server/mockserver-monorepo/issues/1524) (Ported fix from @szada92)
175179
* ... and probably many more
176180

177181
## Testcontainers

‎COMPARISON.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Sources:
5252
✔ Provides a Java client that is used to create responses for certain requests <sup><a href="https://www.mock-server.com/">Docs</a> <a href="https://java.testcontainers.org/modules/mockserver/">Testcontainer-Docs</a></sup>
5353
</td>
5454
<td>
55-
⚠ Split into a <a href="https://github.com/mock-server/mockserver/issues/1494">un-optimized</a> client and server module
55+
⚠ Split into a <a href="https://web.archive.org/web/20260513070329/https://github.com/mock-server/mockserver-monorepo/issues/1494">un-optimized</a> client and server module
5656
</td>
5757
<td>
5858
✔ <a href="https://java.testcontainers.org/modules/mockserver/">Yes</a>
@@ -106,7 +106,7 @@ Sources:
106106
</a>
107107
</td>
108108
<td>
109-
Custom programming language/syntax files <sup><a href="https://github.com/karatelabs/karate/tree/master/examples">Docs</a></sup>
109+
Custom programming language/syntax files <sup><a href="https://github.com/karatelabs/karate/tree/c07caae8b5fadaf535d0074db948911b62bae6f9/examples">Docs</a></sup>
110110
</td>
111111
<td>
112112
❌ Monolithic - nearly all code in "core" module

‎core/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<dependency>
5555
<groupId>io.netty</groupId>
5656
<artifactId>netty-bom</artifactId>
57-
<version>4.2.13.Final</version>
57+
<version>4.2.14.Final</version>
5858
<type>pom</type>
5959
<scope>import</scope>
6060
</dependency>
@@ -71,7 +71,7 @@
7171
<dependency>
7272
<groupId>org.slf4j</groupId>
7373
<artifactId>slf4j-api</artifactId>
74-
<version>2.0.17</version>
74+
<version>2.0.18</version>
7575
</dependency>
7676

7777
<dependency>

‎core/src/main/java/software/xdev/mockserver/model/HttpRequest.java‎

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import com.fasterxml.jackson.annotation.JsonIgnore;
3636

3737

38-
@SuppressWarnings({"rawtypes", "UnusedReturnValue", "PMD.CyclomaticComplexity"})
38+
@SuppressWarnings({"rawtypes", "UnusedReturnValue", "PMD.CyclomaticComplexity", "PMD.GodClass"})
3939
public class HttpRequest extends RequestDefinition implements HttpMessage<HttpRequest, Body>
4040
{
4141
private int hashCode;
@@ -63,6 +63,46 @@ public static HttpRequest request(final String path)
6363
return new HttpRequest().withPath(path);
6464
}
6565

66+
public static HttpRequest request(final String method, final String path)
67+
{
68+
return new HttpRequest().withMethod(method).withPath(path);
69+
}
70+
71+
public static HttpRequest get(final String path)
72+
{
73+
return request("GET", path);
74+
}
75+
76+
public static HttpRequest head(final String path)
77+
{
78+
return request("HEAD", path);
79+
}
80+
81+
public static HttpRequest post(final String path)
82+
{
83+
return request("POST", path);
84+
}
85+
86+
public static HttpRequest put(final String path)
87+
{
88+
return request("PUT", path);
89+
}
90+
91+
public static HttpRequest delete(final String path)
92+
{
93+
return request("DELETE", path);
94+
}
95+
96+
public static HttpRequest options(final String path)
97+
{
98+
return request("OPTIONS", path);
99+
}
100+
101+
public static HttpRequest patch(final String path)
102+
{
103+
return request("PATCH", path);
104+
}
105+
66106
public Boolean isKeepAlive()
67107
{
68108
return this.keepAlive;

‎server/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<dependency>
5757
<groupId>io.netty</groupId>
5858
<artifactId>netty-bom</artifactId>
59-
<version>4.2.13.Final</version>
59+
<version>4.2.14.Final</version>
6060
<type>pom</type>
6161
<scope>import</scope>
6262
</dependency>
@@ -78,7 +78,7 @@
7878
<dependency>
7979
<groupId>org.slf4j</groupId>
8080
<artifactId>slf4j-jdk14</artifactId>
81-
<version>2.0.17</version>
81+
<version>2.0.18</version>
8282
</dependency>
8383

8484
<dependency>

‎testcontainers/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<dependency>
6464
<groupId>org.slf4j</groupId>
6565
<artifactId>slf4j-api</artifactId>
66-
<version>2.0.17</version>
66+
<version>2.0.18</version>
6767
</dependency>
6868

6969
<!-- Tests -->
@@ -84,13 +84,13 @@
8484
<dependency>
8585
<groupId>org.junit.jupiter</groupId>
8686
<artifactId>junit-jupiter</artifactId>
87-
<version>6.0.3</version>
87+
<version>6.1.0</version>
8888
<scope>test</scope>
8989
</dependency>
9090
<dependency>
9191
<groupId>org.slf4j</groupId>
9292
<artifactId>slf4j-simple</artifactId>
93-
<version>2.0.17</version>
93+
<version>2.0.18</version>
9494
<scope>test</scope>
9595
</dependency>
9696
<dependency>

0 commit comments

Comments
 (0)