erik/pinboard-poster
erik/pinboard-poster
1
1
Fork 0
Code Issues Pull requests Releases Activity

Implemented parseMethodResponse.

Browse source
This commit is contained in:
Erik C. Thauvin 2019-04-13 04:48:30 -07:00
parent 6410c5558f
commit 1093ea1625
2 changed files with 54 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/main/kotlin/net/thauvin/erik/pinboard/PinboardPoster.kt
View file

@ -36,6 +36,7 @@ import okhttp3.OkHttpClient
import okhttp3.Request
import org.xml.sax.InputSource
import java.io.File
import java.io.IOException
import java.io.StringReader
import java.net.MalformedURLException
import java.net.URL
@ -152,7 +153,7 @@ open class PinboardPoster() {
if (!validateUrl(url)) {
logger.severe("Please specify a valid URL to pin.")
} else if (description.isBlank()) {
logger.severe("Please specify a valid description.")
logger.severe("Please specify a valid description to pin: `$url`")
} else {
val params = listOf(
Pair("url", url),
@ -192,14 +193,41 @@ open class PinboardPoster() {
return false
}
fun parseMethodResponse(method: String, response: String) {
val factory = DocumentBuilderFactory.newInstance().apply {
isValidating = false
isIgnoringElementContentWhitespace = true
isIgnoringComments = true
isCoalescing = false
isNamespaceAware = false
}
if (response.isEmpty()) {
throw IOException("Response for $method is empty.")
}
try {
val document = factory.newDocumentBuilder().parse(InputSource(StringReader(response)))
val code = document.getElementsByTagName(
"result")?.item(0)?.attributes?.getNamedItem("code")?.nodeValue
if (!code.isNullOrBlank()) {
throw IOException("An error has occurred while executing $method: $code")
} else {
throw IOException("An error has occurred while executing $method.")
}
} catch (e: Exception) {
throw IOException("Could not parse $method response.", e)
}
}
private fun executeMethod(method: String, params: List<Pair<String, String>>): Boolean {
val apiUrl = HttpUrl.parse(cleanEndPoint(method))
if (apiUrl != null) {
val httpUrl = apiUrl.newBuilder().apply {
params.forEach {
if (it.second.isNotBlank()) {
addQueryParameter(it.first, it.second)
}
addQueryParameter(it.first, it.second)
}
addQueryParameter("auth_token", apiToken)
}.build()
@ -216,26 +244,10 @@ open class PinboardPoster() {
if (response.contains("done")) {
return true
} else {
val factory = DocumentBuilderFactory.newInstance().apply {
isValidating = false
isIgnoringElementContentWhitespace = true
isIgnoringComments = true
isCoalescing = false
isNamespaceAware = false
}
try {
val document = factory.newDocumentBuilder().parse(InputSource(StringReader(response)))
val code = document.getElementsByTagName("result")?.item(0)?.attributes?.getNamedItem("code")?.nodeValue
if (code != null && code.isNotBlank()) {
logger.severe("An error has occurred while executing $method: $code")
} else {
logger.severe("An error has occurred while executing $method.")
}
} catch (e: Exception) {
logger.log(Level.SEVERE, "Could not parse $method XML response.", e)
parseMethodResponse(method, response)
} catch (e: IOException) {
logger.log(Level.SEVERE, e.message, e)
}
}
}

28
src/test/kotlin/net/thauvin/erik/pinboard/PinboardPosterTest.kt
View file

@ -31,9 +31,11 @@
*/
package net.thauvin.erik.pinboard
import org.testng.Assert
import org.testng.Assert.assertFalse
import org.testng.Assert.assertTrue
import org.testng.Assert.expectThrows
import org.testng.annotations.Test
import java.io.IOException
import java.nio.file.Files
import java.nio.file.Paths
import java.util.Properties
@ -47,16 +49,16 @@ class PinboardPosterTest {
fun testAddPin() {
var poster = PinboardPoster("")
Assert.assertFalse(poster.addPin(url, desc), "apiToken: <blank>")
assertFalse(poster.addPin(url, desc), "apiToken: <blank>")
poster.apiToken = "foo"
Assert.assertFalse(poster.addPin(url, desc), "apiToken: ${poster.apiToken}")
assertFalse(poster.addPin(url, desc), "apiToken: ${poster.apiToken}")
// poster.apiToken = "foo:TESTING"
// Assert.assertFalse(poster.addPin(url, desc), "apiToken: ${poster.apiToken}")
// assertFalse(poster.addPin(url, desc), "apiToken: ${poster.apiToken}")
poster = PinboardPoster(localProps)
Assert.assertTrue(poster.addPin(url, desc), "apiToken: ${Constants.ENV_API_TOKEN}")
assertTrue(poster.addPin(url, desc), "apiToken: ${Constants.ENV_API_TOKEN}")
}
@Test
@ -74,13 +76,21 @@ class PinboardPosterTest {
var poster = PinboardPoster(props)
poster.apiEndPoint = ""
Assert.assertFalse(poster.deletePin(url), "apiEndPoint: <blank>")
assertFalse(poster.deletePin(url), "apiEndPoint: <blank>")
poster = PinboardPoster(localProps, Constants.ENV_API_TOKEN)
poster.apiEndPoint = Constants.API_ENDPOINT
Assert.assertTrue(poster.deletePin(url), "apiEndPoint: ${Constants.API_ENDPOINT}")
assertTrue(poster.deletePin(url), "apiEndPoint: ${Constants.API_ENDPOINT}")
Assert.assertFalse(poster.deletePin("foo.com"), "url: foo.com")
expectThrows(IOException::class.java) {
poster.parseMethodResponse("post/delete", "<result code=\"item not found\"/>")
}
expectThrows(IOException::class.java) {
poster.parseMethodResponse("post/delete", "")
}
assertFalse(poster.deletePin("foo.com"), "url: foo.com")
}
}