Skip to content
Snippets Groups Projects
Commit 6ec5d1a1 authored by William Enright's avatar William Enright Committed by Larbi Gharib
Browse files

Fixed nameserver address endpoint returning a JSON object inside a JSON

Change-Id: I34a4e087f617e1d7e141d375a1476ca13b094423
parent 9da6f54d
No related branches found
No related tags found
No related merge requests found
......@@ -22,13 +22,12 @@
*/
package net.jami.jams.server.servlets.api.jaminameserver;
import com.jsoniter.output.JsonStream;
import jakarta.servlet.ServletException;
import jakarta.servlet.annotation.WebServlet;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import net.jami.jams.common.jami.AddrLookupResponse;
import net.jami.jams.common.annotations.JsonContent;
import net.jami.jams.common.serialization.tomcat.TomcatCustomErrorHandler;
import java.io.IOException;
......@@ -54,10 +53,11 @@ public class AddressServlet extends HttpServlet {
* @apiError (500) {null} null could not fetch user information
*/
@Override
@JsonContent
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
String[] path = req.getPathInfo().split("/");
String username = nameServer.getNameFromAddress(path[path.length - 1]);
if (username == null) TomcatCustomErrorHandler.sendCustomError(resp,404,"address not found");
else resp.getOutputStream().write(JsonStream.serialize(new AddrLookupResponse(username)).getBytes());
if (username == null) TomcatCustomErrorHandler.sendCustomError(resp,404,"Address not found!");
else resp.getWriter().write(username);
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment