Add adjust account status detection and code detection

Author: laurynas

README.md

@@ -16,7 +16,7 @@ Add this dependency to your `pom.xml`:
 <dependency>
     <groupId>com.detectlanguage</groupId>
     <artifactId>detectlanguage</artifactId>
-    <version>1.1.0</version>
+    <version>2.0.0</version>
 </dependency>
 ```
 
@@ -30,7 +30,7 @@ repositories {
 }
 
 dependencies {
-	compile 'com.detectlanguage:detectlanguage:1.1.0'
+	compile 'com.detectlanguage:detectlanguage:2.0.0'
 }
 ```
 
@@ -59,10 +59,10 @@ System.out.println("Language: " + result.language);
 System.out.println("Score: " + result.score);
 ```
 
-### Simple detection
+### Language code detection
 
 ```java
-String language = DetectLanguage.simpleDetect("Hello world");
+String language = DetectLanguage.detectCode("Hello world");
 ```
 
 ### Batch detection
@@ -76,6 +76,18 @@ String[] texts = {
 List<List<Result>> results = DetectLanguage.detect(texts);
 ```
 
+### Getting your account status
+
+```java
+AccountStatusResponse accountStatus = DetectLanguage.getAccountStatus();
+```
+
+### Getting list supported languages
+
+```java
+LanguageInfo[] languages = DetectLanguage.getLanguages();
+```
+
 ## Requirements
 
 - [gson](http://code.google.com/p/google-gson/)

src/main/java/com/detectlanguage/DetectLanguage.java

@@ -1,7 +1,7 @@
 package com.detectlanguage;
 
 import com.detectlanguage.errors.APIError;
-import com.detectlanguage.responses.StatusResponse;
+import com.detectlanguage.responses.AccountStatusResponse;
 
 import java.util.HashMap;
 import java.util.List;
@@ -15,7 +15,7 @@ public abstract class DetectLanguage {
     public static String apiKey;
     public static int timeout = 3 * 1000;
 
-    public static String simpleDetect(final String text) throws APIError {
+    public static String detectCode(final String text) throws APIError {
         List<Result> results = detect(text);
 
         if (results.isEmpty())
@@ -49,8 +49,8 @@ public static List<List<Result>> detect(final String[] texts)
         return getClient().post("detect-batch", payload, resultType);
     }
 
-    public static StatusResponse getStatus() throws APIError {
-        return getClient().get("account/status", StatusResponse.class);
+    public static AccountStatusResponse getAccountStatus() throws APIError {
+        return getClient().get("account/status", AccountStatusResponse.class);
     }
 
     public static List<LanguageInfo> getLanguages() throws APIError {

…ctlanguage/responses/StatusResponse.java …age/responses/AccountStatusResponse.javasrc/main/java/com/detectlanguage/responses/StatusResponse.java renamed to src/main/java/com/detectlanguage/responses/AccountStatusResponse.java src/main/java/com/detectlanguage/responses/StatusResponse.java renamed to src/main/java/com/detectlanguage/responses/AccountStatusResponse.java

@@ -2,7 +2,7 @@
 
 import java.util.Date;
 
-public class StatusResponse extends Response {
+public class AccountStatusResponse extends Response {
     private Date date;
     private Double requests;
     private Double bytes;

src/test/java/com/detectlanguage/DetectLanguageTest.java

@@ -1,7 +1,7 @@
 package com.detectlanguage;
 
 import com.detectlanguage.errors.APIError;
-import com.detectlanguage.responses.StatusResponse;
+import com.detectlanguage.responses.AccountStatusResponse;
 import org.junit.Test;
 
 import java.util.Date;
@@ -13,8 +13,8 @@
 public class DetectLanguageTest extends BaseTest {
 
     @Test
-    public void testSimpleDetect() throws APIError {
-        String language = DetectLanguage.simpleDetect("Hello world");
+    public void testDetectCode() throws APIError {
+        String language = DetectLanguage.detectCode("Hello world");
 
         assertEquals(language, "en");
     }
@@ -63,8 +63,8 @@ public void testBatchDetectError() throws APIError {
     }
 
     @Test
-    public void testGetStatus() throws APIError {
-        StatusResponse statusResponse = DetectLanguage.getStatus();
+    public void testGetAccountStatus() throws APIError {
+        AccountStatusResponse statusResponse = DetectLanguage.getAccountStatus();
 
         assertThat(statusResponse.getDate(), is(instanceOf(Date.class)));
         assertTrue(statusResponse.getRequests() >= 0);
@@ -80,7 +80,7 @@ public void testGetStatus() throws APIError {
     @Test(expected = APIError.class)
     public void testStatusError() throws APIError {
         DetectLanguage.apiKey = "INVALID";
-        DetectLanguage.getStatus();
+        DetectLanguage.getAccountStatus();
     }
 
     @Test

src/test/java/com/detectlanguage/MultithreadedTest.java

@@ -56,7 +56,7 @@ public void run() {
                 int n = (new Random()).nextInt(SAMPLES.length);
                 expectedLanguage = SAMPLE_CODES[n];
                 sleep((new Random()).nextInt(10000));
-                detectedLanguage = DetectLanguage.simpleDetect(SAMPLES[n]);
+                detectedLanguage = DetectLanguage.detectCode(SAMPLES[n]);
             } catch (InterruptedException e) {
             } catch (APIError apiError) {
                 apiError.printStackTrace();

src/test/java/com/detectlanguage/ServerErrorTest.java

@@ -21,7 +21,7 @@ public void resetHost() {
 
     @Ignore
     @Test(expected = APIError.class)
-    public void testSimpleDetect() throws APIError {
-        DetectLanguage.simpleDetect("Hello world");
+    public void testDetectCode() throws APIError {
+        DetectLanguage.detectCode("Hello world");
     }
 }