Skip to content

Commit 71b9aef

Browse files
Invalid Parameterが見つからなかった場合の処理を追加。
1 parent 83b183a commit 71b9aef

7 files changed

Lines changed: 11 additions & 7 deletions

File tree

dConnectDevicePlugin/dConnectDevicePluginSDK/dconnect-device-plugin-sdk/src/main/java/org/deviceconnect/android/profile/DConnectProfile.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ private String getInvalidParameter(final Intent request) {
263263
if (swagger != null) {
264264
Bundle extras = request.getExtras();
265265
if (extras == null) {
266-
return builder.toString();
266+
return "";
267267
}
268268
List<Parameter> parameters = OpenAPIValidator.findParameters(swagger, request);
269269
for (Parameter parameter : parameters) {
@@ -294,7 +294,11 @@ public boolean onRequest(final Intent request, final Intent response) {
294294
if (api != null) {
295295
if (!validateRequest(request)) {
296296
String invalidDetails = getInvalidParameter(request);
297-
invalidDetails = invalidDetails.substring(0, invalidDetails.length() - 1);
297+
if (invalidDetails.length() != 0) {
298+
invalidDetails = invalidDetails.substring(0, invalidDetails.length() - 1);
299+
} else {
300+
invalidDetails = "Unknown";
301+
}
298302
// API 定義ファイルでパラメータエラーとなった
299303
MessageUtils.setInvalidRequestParameterError(response, "Request parameters are invalid: " + invalidDetails);
300304
return true;
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
43049bdb12241666dbb769c8ddfa6e47
1+
3035b63432ef86546145abbf2249e2ec
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
98fc6f3802be34c44454d2c9adcf96dcab1458aa
1+
96175eee0df65ec2f513f6425092bae45ebfa084

dConnectDevicePlugin/dConnectDevicePluginSDK/repository/org/deviceconnect/dconnect-device-plugin-sdk/maven-metadata.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@
3333
<version>2.8.3</version>
3434
<version>2.8.4</version>
3535
</versions>
36-
<lastUpdated>20200319023902</lastUpdated>
36+
<lastUpdated>20200323074002</lastUpdated>
3737
</versioning>
3838
</metadata>
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
03db08542af8f2c7725ca9a5672051c4
1+
6129c9eb26dfcf2c5ebc36277d6081fd
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
f38f6beee3471babb02a3356053dc21d21bb51e8
1+
902c94e2354b1975837e99bce9ee7779ee005095

0 commit comments

Comments
 (0)