leviathonbeast/restcountries
1
0
Fork 0
mirror of https://gitlab.com/restcountries/restcountries.git synced 2026-03-31 15:07:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Closes #138: Searching for an unknown country won't return an exception

Browse Source
This commit is contained in:
Alejandro Matos
2022-07-07 21:58:18 -05:00
parent 1ec9a0c785
commit 5681387d9c
2 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
-2
View File
@@ -131,8 +131,6 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<!-- Uncomment to enable incremental compilation -->
<!-- <useIncrementalCompilation>false</useIncrementalCompilation> -->
<annotationProcessorPaths>
<path>
<groupId>io.micronaut</groupId>
src/main/java/dev/amatos/restcountries/controller/ControllerHelper.java
+20 -20
View File
@@ -6,12 +6,12 @@ import dev.amatos.restcountries.domain.ICountryRestSymbols;
import dev.amatos.restcountries.domain.ResponseEntity;
import dev.amatos.restcountries.domain.base.BaseCountry;
import io.micronaut.http.HttpResponse;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.Response.Status;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Set;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
public class ControllerHelper {
@@ -92,30 +92,30 @@ public class ControllerHelper {
}
protected static HttpResponse<Object> notFound() {
var gson = new Gson();
var notFound = Response
.status(Status.NOT_FOUND)
.entity(gson.toJson(new ResponseEntity(Response.Status.NOT_FOUND.getStatusCode(),
Response.Status.NOT_FOUND.getReasonPhrase()))).build().getEntity();
return HttpResponse.notFound(notFound);
return HttpResponse.notFound().body(
new ResponseEntity(
Response.Status.NOT_FOUND.getStatusCode(),
Response.Status.NOT_FOUND.getReasonPhrase()
)
);
}
protected static HttpResponse<Object> internalError() {
var gson = new Gson();
var notFound = Response
.status(Status.INTERNAL_SERVER_ERROR)
.entity(gson.toJson(new ResponseEntity(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(),
Response.Status.INTERNAL_SERVER_ERROR.getReasonPhrase()))).build().getEntity();
return HttpResponse.serverError(notFound);
return HttpResponse.serverError().body(
new ResponseEntity(
Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(),
Response.Status.INTERNAL_SERVER_ERROR.getReasonPhrase()
)
);
}
protected static HttpResponse<Object> badRequest() {
var gson = new Gson();
var notFound = Response
.status(Status.BAD_REQUEST)
.entity(gson.toJson(new ResponseEntity(Response.Status.BAD_REQUEST.getStatusCode(),
Response.Status.BAD_REQUEST.getReasonPhrase()))).build().getEntity();
return HttpResponse.badRequest(notFound);
return HttpResponse.badRequest().body(
new ResponseEntity(
Response.Status.BAD_REQUEST.getStatusCode(),
Response.Status.BAD_REQUEST.getReasonPhrase()
)
);
}
protected static Object parsedCountry(Set<? extends BaseCountry> countries, String fields) {