Rogiel/httpchannel
1
0
Fork 0
mirror of https://github.com/Rogiel/httpchannel synced 2025-12-06 07:32:50 +00:00
Code Releases Activity

Adds -SNAPSHOT to Maven version parameter and few modifications to API

Browse Source
This commit is contained in:
Rogiel Sulzbach
2012-01-17 17:07:48 -02:00
parent 08d22a12fe
commit 673bfc6639
56 changed files with 536 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
httpchannel-captcha/httpchannel-captcha-captchatrader/src/main/java/com/captchatrader/CaptchaTrader.java
View File

@@ -5,9 +5,7 @@ package com.captchatrader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URL;
import java.util.List;
import org.apache.http.HttpResponse;
@@ -50,7 +48,7 @@ public class CaptchaTrader {
private final HttpClient client = new DefaultHttpClient();
private final JSONParser json = new JSONParser();
private final URI apiURL;
private final URI apiURI;
private final String applicationKey;
private final String username;
private final String password;
@@ -61,9 +59,9 @@ public class CaptchaTrader {
* @param applicationKey
* the key
*/
public CaptchaTrader(URI apiURL, String applicationKey, String username,
public CaptchaTrader(URI apiURI, String applicationKey, String username,
String password) {
this.apiURL = apiURL;
this.apiURI = apiURI;
this.applicationKey = applicationKey;
this.username = username;
this.password = password;
@@ -74,7 +72,7 @@ public class CaptchaTrader {
*
* @param applicationKey
* the key
* @throws MalformedURLException
* @throws MalformedURIException
*/
public CaptchaTrader(String applicationKey, String username, String password) {
this(URI.create("http://api.captchatrader.com/"), applicationKey,
@@ -84,27 +82,27 @@ public class CaptchaTrader {
/**
* Submit a CAPTCHA already hosted on an existing website.
*
* @param url
* The URL of the CAPTCHA image.
* @param uri
* The URI of the CAPTCHA image.
* @return The decoded CAPTCHA.
* @throws Any
* exceptions sent by the server.
*/
public ResolvedCaptcha submit(URL url) throws CaptchaTraderException,
public ResolvedCaptcha submit(URI uri) throws CaptchaTraderException,
IOException {
final URI requestUri = apiURL.resolve("submit");
final URI requestUri = apiURI.resolve("submit");
final HttpPost request = new HttpPost(requestUri);
final MultipartEntity entity = new MultipartEntity();
entity.addPart("api_key", new StringBody(applicationKey));
entity.addPart("username", new StringBody(username));
entity.addPart("password", new StringBody(password));
entity.addPart("value", new StringBody(url.toString()));
entity.addPart("value", new StringBody(uri.toString()));
request.setEntity(entity);
final List<Object> response = validate(execute(request));
return new ResolvedCaptcha(this, ((Long) response.get(0)).intValue(),
return new ResolvedCaptcha(this, ((Long) response.get(0)).toString(),
(String) response.get(1));
}
@@ -118,17 +116,16 @@ public class CaptchaTrader {
* @throws CaptchaTraderException
* any of the possible errors
*/
public void response(ResolvedCaptcha captcha, boolean state)
public void respond(ResolvedCaptcha captcha, boolean state)
throws CaptchaTraderException, IOException {
final URI requestUri = apiURL.resolve("respond");
final URI requestUri = apiURI.resolve("respond");
final HttpPost request = new HttpPost(requestUri);
final MultipartEntity entity = new MultipartEntity();
entity.addPart("is_correct", new StringBody(state ? "1" : "0"));
entity.addPart("username", new StringBody(username));
entity.addPart("password", new StringBody(password));
entity.addPart("ticket",
new StringBody(Integer.toString(captcha.getID())));
entity.addPart("ticket", new StringBody(captcha.getID()));
entity.addPart("username", new StringBody(username));
request.setEntity(entity);
validate(execute(request));
@@ -143,7 +140,7 @@ public class CaptchaTrader {
*/
public int getCredits() throws CaptchaTraderException, IOException {
return ((Number) validate(
execute(new HttpGet(apiURL.resolve("get_credits/username:"
execute(new HttpGet(apiURI.resolve("get_credits/username:"
+ username + "/password:" + password + "/")))).get(1))
.intValue();
}
@@ -185,7 +182,7 @@ public class CaptchaTrader {
return new InvalidApplicationKeyException();
case "INVALID PARAMETERS":
return new InvalidParametersException();
case "INVALID URL":
case "INVALID URI":
return new InvalidURLException();
case "INVALID USER":
return new InvalidUserException();

10
httpchannel-captcha/httpchannel-captcha-captchatrader/src/main/java/com/captchatrader/ResolvedCaptcha.java
View File

@@ -13,16 +13,16 @@ import com.captchatrader.exception.CaptchaTraderException;
*/
public class ResolvedCaptcha {
private final CaptchaTrader api;
private final int id;
private final String id;
private final String answer;
public ResolvedCaptcha(CaptchaTrader api, int id, String answer) {
public ResolvedCaptcha(CaptchaTrader api, String id, String answer) {
this.api = api;
this.id = id;
this.answer = answer;
}
public int getID() {
public String getID() {
return id;
}
@@ -31,10 +31,10 @@ public class ResolvedCaptcha {
}
public void valid() throws CaptchaTraderException, IOException {
api.response(this, true);
api.respond(this, true);
}
public void invalid() throws CaptchaTraderException, IOException {
api.response(this, true);
api.respond(this, true);
}
}

6
httpchannel-captcha/httpchannel-captcha-captchatrader/src/main/java/com/rogiel/httpchannel/captcha/impl/CaptchaTraderService.java
View File

@@ -32,7 +32,7 @@ public class CaptchaTraderService implements ImageCaptchaService {
/**
* The current application key to be used
*/
private String currentApplicationKey = APP_KEY;
private String currentApplicationKey = CaptchaTraderService.APP_KEY;
/**
* The CaptchaTrader.com API object
@@ -56,8 +56,8 @@ public class CaptchaTraderService implements ImageCaptchaService {
public void solve(ImageCaptcha captcha)
throws UnsolvableCaptchaServiceException {
try {
logger.debug("Resolving CAPTCHA {}", captcha.getImageURL());
final ResolvedCaptcha resolved = api.submit(captcha.getImageURL());
logger.debug("Resolving CAPTCHA {}", captcha.getImageURI());
final ResolvedCaptcha resolved = api.submit(captcha.getImageURI());
captcha.setAnswer(resolved.getAnswer());
captcha.setAttachment(resolved);
logger.debug("CAPTCHA solved, answer is \"{}\"",