Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.5.7</version>
<version>4.0.0</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

Expand All @@ -23,7 +24,7 @@
<dependency>
<groupId>it.aboutbits</groupId>
<artifactId>spring-boot-toolbox</artifactId>
<version>1.7.0</version>
<version>2.0.0</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down Expand Up @@ -117,12 +118,12 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>11.1.0</version>
<version>12.3.0</version>
</dependency>
<dependency>
<groupId>it.aboutbits</groupId>
<artifactId>java-checkstyle-config</artifactId>
<version>1.0.1</version>
<version>1.1.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package it.aboutbits.springboot.testing.web.request;

import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.NonNull;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
import tools.jackson.databind.json.JsonMapper;

import static org.springframework.http.MediaType.APPLICATION_JSON;

public class Delete extends Request<MockHttpServletRequestBuilder> {
Delete(
@NonNull MockMvc mockMvc,
@NonNull ObjectMapper objectMapper,
@NonNull JsonMapper objectMapper,
@NonNull String url,
@NonNull Object... pathVariables
) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package it.aboutbits.springboot.testing.web.request;

import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.NonNull;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
import tools.jackson.databind.json.JsonMapper;

import static org.springframework.http.MediaType.APPLICATION_JSON;

public class Get extends Request<MockHttpServletRequestBuilder> {
Get(
@NonNull MockMvc mockMvc,
@NonNull ObjectMapper objectMapper,
@NonNull JsonMapper objectMapper,
@NonNull String url,
@NonNull Object... pathVariables
) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
package it.aboutbits.springboot.testing.web.request;

import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
import tools.jackson.databind.json.JsonMapper;

@RequiredArgsConstructor
public class HttpTestClient {
private final MockMvc mockMvc;
private final ObjectMapper objectMapper;
private final JsonMapper jsonMapper;

public Request<MockHttpServletRequestBuilder> get(@NonNull String url, Object... pathVariables) {
return new Get(mockMvc, objectMapper, url, pathVariables);
return new Get(mockMvc, jsonMapper, url, pathVariables);
}

public Request<MockHttpServletRequestBuilder> put(@NonNull String url, Object... pathVariables) {
return new Put(mockMvc, objectMapper, url, pathVariables);
return new Put(mockMvc, jsonMapper, url, pathVariables);
}

public MultipartRequest putMultipart(@NonNull String url, Object... pathVariables) {
return new PutMultipart(mockMvc, objectMapper, url, pathVariables);
return new PutMultipart(mockMvc, jsonMapper, url, pathVariables);
}

public Request<MockHttpServletRequestBuilder> post(@NonNull String url, Object... pathVariables) {
return new Post(mockMvc, objectMapper, url, pathVariables);
return new Post(mockMvc, jsonMapper, url, pathVariables);
}

public MultipartRequest postMultipart(@NonNull String url, Object... pathVariables) {
return new PostMultipart(mockMvc, objectMapper, url, pathVariables);
return new PostMultipart(mockMvc, jsonMapper, url, pathVariables);
}

public Request<MockHttpServletRequestBuilder> patch(@NonNull String url, Object... pathVariables) {
return new Patch(mockMvc, objectMapper, url, pathVariables);
return new Patch(mockMvc, jsonMapper, url, pathVariables);
}

public MultipartRequest patchMultipart(@NonNull String url, Object... pathVariables) {
return new PatchMultipart(mockMvc, objectMapper, url, pathVariables);
return new PatchMultipart(mockMvc, jsonMapper, url, pathVariables);
}

public Request<MockHttpServletRequestBuilder> delete(@NonNull String url, Object... pathVariables) {
return new Delete(mockMvc, objectMapper, url, pathVariables);
return new Delete(mockMvc, jsonMapper, url, pathVariables);
}
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package it.aboutbits.springboot.testing.web.request;

import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.NonNull;
import org.springframework.mock.web.MockMultipartFile;
import org.springframework.mock.web.MockPart;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.request.MockMultipartHttpServletRequestBuilder;
import tools.jackson.databind.json.JsonMapper;

import java.util.ArrayList;
import java.util.List;
Expand All @@ -18,7 +18,7 @@ public abstract class MultipartRequest extends Request<MockMultipartHttpServletR

MultipartRequest(
@NonNull MockMvc mockMvc,
@NonNull ObjectMapper objectMapper,
@NonNull JsonMapper objectMapper,
@NonNull String url,
@NonNull Object... pathVariables
) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package it.aboutbits.springboot.testing.web.request;

import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.NonNull;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
import tools.jackson.databind.json.JsonMapper;

import static org.springframework.http.MediaType.APPLICATION_JSON;

public class Patch extends Request<MockHttpServletRequestBuilder> {
Patch(
@NonNull MockMvc mockMvc,
@NonNull ObjectMapper objectMapper,
@NonNull JsonMapper objectMapper,
@NonNull String url,
@NonNull Object... pathVariables
) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package it.aboutbits.springboot.testing.web.request;

import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.NonNull;
import org.springframework.http.HttpMethod;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.request.MockMultipartHttpServletRequestBuilder;
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
import tools.jackson.databind.json.JsonMapper;

public class PatchMultipart extends MultipartRequest {
PatchMultipart(
@NonNull MockMvc mockMvc,
@NonNull ObjectMapper objectMapper,
@NonNull JsonMapper objectMapper,
@NonNull String url,
@NonNull Object... pathVariables
) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package it.aboutbits.springboot.testing.web.request;

import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.NonNull;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
import tools.jackson.databind.json.JsonMapper;

import static org.springframework.http.MediaType.APPLICATION_JSON;

public class Post extends Request<MockHttpServletRequestBuilder> {
Post(
@NonNull MockMvc mockMvc,
@NonNull ObjectMapper objectMapper,
@NonNull JsonMapper objectMapper,
@NonNull String url,
@NonNull Object... pathVariables
) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package it.aboutbits.springboot.testing.web.request;

import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.NonNull;
import org.springframework.http.HttpMethod;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.request.MockMultipartHttpServletRequestBuilder;
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
import tools.jackson.databind.json.JsonMapper;

public class PostMultipart extends MultipartRequest {
PostMultipart(
@NonNull MockMvc mockMvc,
@NonNull ObjectMapper objectMapper,
@NonNull JsonMapper objectMapper,
@NonNull String url,
@NonNull Object... pathVariables
) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package it.aboutbits.springboot.testing.web.request;

import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.NonNull;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
import tools.jackson.databind.json.JsonMapper;

import static org.springframework.http.MediaType.APPLICATION_JSON;

public class Put extends Request<MockHttpServletRequestBuilder> {
Put(
@NonNull MockMvc mockMvc,
@NonNull ObjectMapper objectMapper,
@NonNull JsonMapper objectMapper,
@NonNull String url,
@NonNull Object... pathVariables
) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package it.aboutbits.springboot.testing.web.request;

import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.NonNull;
import org.springframework.http.HttpMethod;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.request.MockMultipartHttpServletRequestBuilder;
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
import tools.jackson.databind.json.JsonMapper;

public class PutMultipart extends MultipartRequest {
PutMultipart(
@NonNull MockMvc mockMvc,
@NonNull ObjectMapper objectMapper,
@NonNull JsonMapper objectMapper,
@NonNull String url,
@NonNull Object... pathVariables
) {
Expand Down
Loading