Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-26 08:12:05 +01:00
Code Issues Releases Wiki Activity

Improve HTTP File Upload SlotProvider

Browse source
This commit is contained in:
Florian Schmaus 2017-12-10 15:29:57 +01:00
parent 3a7c20ce54
commit 63dd9953fc
1 changed files with 59 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/provider/SlotProvider.java
View file

@ -1,6 +1,6 @@
/** /**
* *
* Copyright © 2017 Grigory Fedorov * Copyright © 2017 Grigory Fedorov, Florian Schmaus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -50,7 +50,7 @@ public class SlotProvider extends IQProvider<Slot> {
URL putUrl = null; URL putUrl = null;
URL getUrl = null; URL getUrl = null;
Map<String, String> headers = null; PutElement_V0_4_Content putElementV04Content = null;
outerloop: while (true) { outerloop: while (true) {
int event = parser.next(); int event = parser.next();
@ -60,18 +60,17 @@ public class SlotProvider extends IQProvider<Slot> {
String name = parser.getName(); String name = parser.getName();
switch (name) { switch (name) {
case "put": { case "put": {
String putUrlString;
switch (version) { switch (version) {
case v0_2: case v0_2:
putUrlString = parser.nextText(); String putUrlString = parser.nextText();
putUrl = new URL(putUrlString);
break; break;
case v0_3: case v0_3:
putUrlString = parser.getAttributeValue(null, "url"); putElementV04Content = parsePutElement_V0_4(parser);
break; break;
default: default:
throw new AssertionError(); throw new AssertionError();
} }
putUrl = new URL(putUrlString);
break; break;
} }
case "get": case "get":
@ -88,14 +87,6 @@ public class SlotProvider extends IQProvider<Slot> {
} }
getUrl = new URL(getUrlString); getUrl = new URL(getUrlString);
break; break;
case "header":
String headerName = ParserUtils.getRequiredAttribute(parser, "name");
String headerValue = ParserUtils.getRequiredNextText(parser);
if (headers == null) {
headers = new HashMap<>();
}
headers.put(headerName, headerValue);
break;
} }
break; break;
case XmlPullParser.END_TAG: case XmlPullParser.END_TAG:
@ -108,7 +99,7 @@ public class SlotProvider extends IQProvider<Slot> {
switch (version) { switch (version) {
case v0_3: case v0_3:
return new Slot(putUrl, getUrl, headers); return new Slot(putElementV04Content.putUrl, getUrl, putElementV04Content.headers);
case v0_2: case v0_2:
return new Slot_V0_2(putUrl, getUrl); return new Slot_V0_2(putUrl, getUrl);
default: default:
@ -116,4 +107,57 @@ public class SlotProvider extends IQProvider<Slot> {
} }
} }
public static PutElement_V0_4_Content parsePutElement_V0_4(XmlPullParser parser) throws XmlPullParserException, IOException {
final int initialDepth = parser.getDepth();
String putUrlString = parser.getAttributeValue(null, "url");
URL putUrl = new URL(putUrlString);
Map<String, String> headers = null;
outerloop: while (true) {
int next = parser.next();
switch (next) {
case XmlPullParser.START_TAG:
String name = parser.getName();
switch (name) {
case "header":
String headerName = ParserUtils.getRequiredAttribute(parser, "name");
String headerValue = ParserUtils.getRequiredNextText(parser);
if (headers == null) {
headers = new HashMap<>();
}
headers.put(headerName, headerValue);
break;
default:
break;
}
break;
case XmlPullParser.END_TAG:
if (parser.getDepth() == initialDepth) {
break outerloop;
}
break;
}
}
return new PutElement_V0_4_Content(putUrl, headers);
}
public static final class PutElement_V0_4_Content {
private final URL putUrl;
private final Map<String, String> headers;
private PutElement_V0_4_Content(URL putUrl, Map<String, String> headers) {
this.putUrl = putUrl;
this.headers = headers;
}
public URL getPutUrl() {
return putUrl;
}
public Map<String, String> getHeaders() {
return headers;
}
}
} }