Skip to content

Commit 9227130

Browse files
skyforce77skyforce77
committed
App/json
1 parent ff751c4 commit 9227130

File tree

5 files changed

+41
-41
lines changed

5 files changed

+41
-41
lines changed

‎src/main/java/com/authlete/jaxrs/server/api/vci/AbstractCredentialEndpoint.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,25 +67,25 @@ protected IntrospectionResponse introspect(final AuthleteApi api,
6767
.setToken(accessToken);
6868

6969
final IntrospectionResponse response = api.introspection(introspectionRequest);
70-
final String resultMessage = response.getResultMessage();
70+
final String content = response.getResponseContent();
7171

7272
switch (response.getAction())
7373
{
7474
case BAD_REQUEST:
75-
throw ExceptionUtil.badRequestException(resultMessage);
75+
throw ExceptionUtil.badRequestException(content);
7676

7777
case UNAUTHORIZED:
78-
throw ExceptionUtil.unauthorizedException(accessToken, resultMessage);
78+
throw ExceptionUtil.unauthorizedException(accessToken, content);
7979

8080
case FORBIDDEN:
81-
throw ExceptionUtil.forbiddenException(resultMessage);
81+
throw ExceptionUtil.forbiddenException(content);
8282

8383
case OK:
8484
return response;
8585

8686
case INTERNAL_SERVER_ERROR:
8787
default:
88-
throw ExceptionUtil.internalServerErrorException(resultMessage);
88+
throw ExceptionUtil.internalServerErrorException(content);
8989
}
9090
}
9191
}

‎src/main/java/com/authlete/jaxrs/server/api/vci/BatchCredentialEndpoint.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,25 +111,25 @@ private Response credentialIssue(final AuthleteApi api,
111111
.setOrders(orders);
112112

113113
final CredentialBatchIssueResponse response = api.credentialBatchIssue(credentialBatchIssueRequest);
114-
final String resultMessage = response.getResultMessage();
114+
final String content = response.getResponseContent();
115115

116116
switch (response.getAction())
117117
{
118118
case CALLER_ERROR:
119-
return ResponseUtil.badRequest(resultMessage);
119+
return ResponseUtil.badRequest(content);
120120

121121
case UNAUTHORIZED:
122-
return ResponseUtil.unauthorized(accessToken, resultMessage);
122+
return ResponseUtil.unauthorized(accessToken, content);
123123

124124
case FORBIDDEN:
125-
return ResponseUtil.forbidden(resultMessage);
125+
return ResponseUtil.forbidden(content);
126126

127127
case OK:
128-
return ResponseUtil.ok(response.getResponseContent());
128+
return ResponseUtil.ok(content);
129129

130130
case INTERNAL_SERVER_ERROR:
131131
default:
132-
throw ExceptionUtil.internalServerErrorException(resultMessage);
132+
throw ExceptionUtil.internalServerErrorException(content);
133133
}
134134
}
135135
}

‎src/main/java/com/authlete/jaxrs/server/api/vci/CredentialEndpoint.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -111,28 +111,28 @@ private Response credentialIssue(final AuthleteApi api,
111111

112112
final CredentialSingleIssueResponse response =
113113
api.credentialSingleIssue(credentialSingleIssueRequest);
114-
final String resultMessage = response.getResultMessage();
114+
final String content = response.getResponseContent();
115115

116116
switch (response.getAction())
117117
{
118118
case CALLER_ERROR:
119-
return ResponseUtil.badRequest(resultMessage);
119+
return ResponseUtil.badRequest(content);
120120

121121
case UNAUTHORIZED:
122-
return ResponseUtil.unauthorized(accessToken, resultMessage);
122+
return ResponseUtil.unauthorized(accessToken, content);
123123

124124
case FORBIDDEN:
125-
return ResponseUtil.forbidden(resultMessage);
125+
return ResponseUtil.forbidden(content);
126126

127127
case OK:
128-
return ResponseUtil.ok(response.getResponseContent());
128+
return ResponseUtil.ok(content);
129129

130130
case ACCEPTED:
131-
return ResponseUtil.accepted(response.getResponseContent());
131+
return ResponseUtil.accepted(content);
132132

133133
case INTERNAL_SERVER_ERROR:
134134
default:
135-
throw ExceptionUtil.internalServerErrorException(resultMessage);
135+
throw ExceptionUtil.internalServerErrorException(content);
136136
}
137137
}
138138
}

‎src/main/java/com/authlete/jaxrs/server/api/vci/DeferredCredentialEndpoint.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,22 +114,22 @@ private Response credentialIssue(final AuthleteApi api,
114114
.setOrder(order);
115115

116116
final CredentialDeferredIssueResponse response = api.credentialDeferredIssue(credentialSingleIssueRequest);
117-
final String resultMessage = response.getResultMessage();
117+
final String content = response.getResponseContent();
118118

119119
switch (response.getAction())
120120
{
121121
case CALLER_ERROR:
122-
return ResponseUtil.badRequest(resultMessage);
122+
return ResponseUtil.badRequest(content);
123123

124124
case FORBIDDEN:
125-
return ResponseUtil.forbidden(resultMessage);
125+
return ResponseUtil.forbidden(content);
126126

127127
case OK:
128-
return ResponseUtil.ok(response.getResponseContent());
128+
return ResponseUtil.ok(content);
129129

130130
case INTERNAL_SERVER_ERROR:
131131
default:
132-
throw ExceptionUtil.internalServerErrorException(resultMessage);
132+
throw ExceptionUtil.internalServerErrorException(content);
133133
}
134134
}
135135
}

‎src/main/java/com/authlete/jaxrs/server/util/ResponseUtil.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package com.authlete.jaxrs.server.util;
1818

1919

20+
import javax.ws.rs.core.CacheControl;
2021
import javax.ws.rs.core.HttpHeaders;
2122
import javax.ws.rs.core.MediaType;
2223
import javax.ws.rs.core.Response;
@@ -45,6 +46,15 @@ public class ResponseUtil
4546
private static final MediaType MEDIA_TYPE_PLAIN =
4647
MediaType.TEXT_PLAIN_TYPE.withCharset("UTF-8");
4748

49+
/**
50+
* {@code "application/json;charset=UTF-8"}
51+
*/
52+
private static final MediaType MEDIA_TYPE_JSON =
53+
MediaType.APPLICATION_JSON_TYPE.withCharset("UTF-8");
54+
55+
56+
private static final CacheControl NO_STORE_CACHE_CONTROL = new CacheControl();
57+
4858

4959
/**
5060
* Build a "text/plain" response of "200 OK".
@@ -87,22 +97,7 @@ public static Response ok(Viewable entity)
8797
*/
8898
public static Response accepted(String entity)
8999
{
90-
return builderForTextPlain(Status.ACCEPTED, entity).build();
91-
}
92-
93-
94-
/**
95-
* Build a "text/html" response of "202 ACCEPTED".
96-
*
97-
* @param entity
98-
* A {@link Viewable} entity to contain in the response.
99-
*
100-
* @return
101-
* A "text/html" response of "202 ACCEPTED".
102-
*/
103-
public static Response accepted(Viewable entity)
104-
{
105-
return builderForTextHtml(Status.ACCEPTED, entity).build();
100+
return builderForJson(Status.ACCEPTED, entity).build();
106101
}
107102

108103

@@ -199,8 +194,7 @@ public static Response unauthorized(Viewable entity, String challenge)
199194
*/
200195
public static Response forbidden(final String entity)
201196
{
202-
return builderForTextPlain(Status.FORBIDDEN, entity)
203-
.build();
197+
return builderForJson(Status.FORBIDDEN, entity).build();
204198
}
205199

206200

@@ -276,6 +270,12 @@ private static ResponseBuilder builderForTextHtml(Status status, Viewable entity
276270
}
277271

278272

273+
private static ResponseBuilder builderForJson(Status status, String entity)
274+
{
275+
return builder(status, entity, MEDIA_TYPE_JSON);
276+
}
277+
278+
279279
private static ResponseBuilder builder(Status status, Object entity, MediaType type)
280280
{
281281
return Response

0 commit comments

Comments
 (0)