Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-jams
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-jams
Commits
6ec5d1a1
Commit
6ec5d1a1
authored
4 years ago
by
William Enright
Committed by
Larbi Gharib
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
jams-server/src/main/java/net/jami/jams/server/servlets/api/jaminameserver/AddressServlet.java
+4
-4
4 additions, 4 deletions
...ms/server/servlets/api/jaminameserver/AddressServlet.java
with
4 additions
and
4 deletions
jams-server/src/main/java/net/jami/jams/server/servlets/api/jaminameserver/AddressServlet.java
+
4
−
4
View file @
6ec5d1a1
...
...
@@ -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
,
"
a
ddress not found"
);
else
resp
.
get
OutputStream
().
write
(
JsonStream
.
serialize
(
new
AddrLookupResponse
(
username
)).
getBytes
()
);
if
(
username
==
null
)
TomcatCustomErrorHandler
.
sendCustomError
(
resp
,
404
,
"
A
ddress not found
!
"
);
else
resp
.
get
Writer
().
write
(
username
);
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment