Merge pull request #56 from remear/inception

Inception

Author: remear

.gitignore

@@ -26,4 +26,6 @@ target
 
 # idea
 .idea
-*.iml
+*.iml
+
+jangod

.travis.yml

@@ -4,3 +4,5 @@ jdk:
   - openjdk7
   - openjdk6
   - oraclejdk7
+
+script: "mvn install -DskipTests=true -B && mvn cobertura:check"

README.md

@@ -41,7 +41,7 @@ key.save();
 System.out.printf("Our secret is %s\n", key.secret);
 
 System.out.printf("Configure with our secret\n");
-Settings.configure(key.secret);
+Balanced.configure(key.secret);
 
 System.out.printf("Create marketplace\n");
 Marketplace mp = new Marketplace();

pom.xml

@@ -66,6 +66,25 @@
             <version>4.10</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>cobertura-maven-plugin</artifactId>
+            <version>2.6</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.2.3</version>
+        </dependency>
+        <!--
+        <dependency>
+            <groupId>net.asfun.jangod</groupId>
+            <artifactId>jangod</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/lib/jangod.jar</systemPath>
+        </dependency>
+        -->
     </dependencies>
     <profiles>
         <profile>
@@ -156,7 +175,52 @@
                     <useFile>false</useFile>
                     <trimStackTrace>false</trimStackTrace>
                 </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>cobertura-maven-plugin</artifactId>
+                <version>2.6</version>
+                <configuration>
+                    <instrumentation>
+                        <excludes>
+                            <exclude>${project.basedir}/src/scenarios/**</exclude>
+                        </excludes>
+                    </instrumentation>
+                    <check>
+                        <branchRate>0</branchRate>
+                        <lineRate>0</lineRate>
+                        <haltOnFailure>true</haltOnFailure>
+                        <totalBranchRate>30</totalBranchRate>
+                        <totalLineRate>30</totalLineRate>
+                        <packageLineRate>30</packageLineRate>
+                        <packageBranchRate>30</packageBranchRate>
+                    </check>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>cobertura</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>cobertura-maven-plugin</artifactId>
+                <version>2.6</version>
+            </plugin>
+        </plugins>
+    </reporting>
 </project>

src/examples/com/balancedpayments/QuickStart.java

@@ -16,7 +16,7 @@ public static void main(String [] args) throws HTTPError, NoResultsFound, Multip
         System.out.printf("Our secret is %s\n", key.secret);
 
         System.out.printf("Configure with our secret\n");
-        Settings.configure(key.secret);
+        Balanced.configure(key.secret);
 
         System.out.printf("Create marketplace\n");
         Marketplace mp = new Marketplace();

src/main/java/com/balancedpayments/APIKey.java

@@ -10,7 +10,7 @@
 
 public class APIKey extends Resource
 {
-    private static final String root_uri = String.format("/v%s/%s", Settings.VERSION, "api_keys");
+    private static final String root_uri = String.format("/v%s/%s", Balanced.getInstance().getAPIVersion(), "api_keys");
 
     @ResourceField()
     public Date created_at;
@@ -25,10 +25,17 @@ public static ResourceCollection<APIKey> query() {
         return new ResourceCollection<APIKey>(APIKey.class, root_uri);
     }
 
+    public void saveToExistingMarketplace() throws HTTPError {
+        if (id == null && uri == null)
+            uri = APIKey.root_uri;
+        super.save();
+    }
+
     @Override
     public void save() throws HTTPError {
         if (id == null && uri == null)
             uri = APIKey.root_uri;
+        Balanced.configure(null);
         super.save();
     }
 }

src/main/java/com/balancedpayments/Account.java

@@ -4,7 +4,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import com.balancedpayments.core.Client;
 import com.balancedpayments.core.Resource;
 import com.balancedpayments.core.ResourceCollection;
 import com.balancedpayments.core.ResourceField;
@@ -55,7 +54,7 @@ public Collection(String uri) {
     };
 
     public static Account get(String uri) throws HTTPError {
-        return new Account((new Client()).get(uri));
+        return new Account((Balanced.getInstance().getClient()).get(uri));
     }
 
     public Account() {
@@ -108,7 +107,7 @@ public Debit debit(
         if (description != null)
             payload.put("description", description);
         if (source_uri != null)
-            payload.put("source", source_uri);
+            payload.put("source_uri", source_uri);
         if (appears_on_statement_as != null)
             payload.put("appears_on_statement_as", appears_on_statement_as);
         if (meta != null)
@@ -134,7 +133,7 @@ public Hold hold(
         if (description != null)
             payload.put("description", description);
         if (source_uri != null)
-            payload.put("source", source_uri);
+            payload.put("source_uri", source_uri);
         if (meta != null)
             payload.put("meta", meta);
         return holds.create(payload);
@@ -147,14 +146,14 @@ public Hold hold(int amount) throws HTTPError {
     public void associateBankAccount(String bank_account_uri) throws HTTPError {
         Map<String, Object> payload = new HashMap<String, Object>();
         payload.put("bank_account_uri", bank_account_uri);
-        Map<String, Object> response = client.put(uri, payload);
+        Map<String, Object> response = Balanced.getInstance().getClient().put(uri, payload);
         deserialize(response);
     }
 
     public void promoteToMerchant(Map<String, Object> merchant_map) throws HTTPError {
         Map<String, Object> payload = new HashMap<String, Object>();
         payload.put("merchant", merchant_map);
-        Map<String, Object> response = client.put(uri, payload);
+        Map<String, Object> response = Balanced.getInstance().getClient().put(uri, payload);
         deserialize(response);
     }
 
@@ -171,14 +170,14 @@ You should use the promoteToMerchant(Map<String, Object> merchant_map) method
     public void promoteToMerchant(String merchant_uri) throws HTTPError {
         Map<String, Object> payload = new HashMap<String, Object>();
         payload.put("merchant_uri", merchant_uri);
-        Map<String, Object> response = client.put(uri, payload);
+        Map<String, Object> response = Balanced.getInstance().getClient().put(uri, payload);
         deserialize(response);
     }
 
     public void associateCard(String card_uri) throws HTTPError {
         Map<String, Object> payload = new HashMap<String, Object>();
         payload.put("card_uri", card_uri);
-        Map<String, Object> response = client.put(uri, payload);
+        Map<String, Object> response = Balanced.getInstance().getClient().put(uri, payload);
         deserialize(response);
     }
 }

src/main/java/com/balancedpayments/Balanced.java

@@ -0,0 +1,39 @@
+package com.balancedpayments;
+
+import com.balancedpayments.core.Client;
+
+public class Balanced {
+
+    private static final Balanced _instance = new Balanced();
+
+    private static final String API_VERSION = "1";
+    private static final String API_URL = "https://api.balancedpayments.com";
+    private String KEY;
+    private Client client = new Client(API_URL, null);
+
+    private Balanced() {}
+
+    public static synchronized Balanced getInstance() {
+        return _instance;
+    }
+
+    public void configureClient(String key) {
+        KEY=key;
+        client = new Client(API_URL, key);
+    }
+    public static void configure(String key) {
+        getInstance().configureClient(key);
+    }
+
+    public Client getClient() {
+        return client;
+    }
+
+    public String getAPIVersion() {
+        return API_VERSION;
+    }
+
+    public String getAPIURL() {
+        return API_URL;
+    }
+}

src/main/java/com/balancedpayments/BankAccount.java

@@ -3,7 +3,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import com.balancedpayments.core.Client;
 import com.balancedpayments.core.ResourceCollection;
 import com.balancedpayments.core.ResourceField;
 import com.balancedpayments.core.ResourceQuery;
@@ -13,8 +12,8 @@
 
 public class BankAccount extends FundingInstrument {
 
-    public final static String Checking = "checking";
-    public final static String Savings = "savings";
+    public final static String CHECKING = "checking";
+    public final static String SAVINGS = "savings";
 
     @ResourceField()
     public String fingerprint;
@@ -34,7 +33,7 @@ public class BankAccount extends FundingInstrument {
     @ResourceField()
     public String bank_name;
 
-    @ResourceField()
+    @ResourceField(mutable=true)
     public Map<String, String> meta;
 
     @ResourceField(field="verifications_uri")
@@ -55,7 +54,7 @@ public class BankAccount extends FundingInstrument {
     @ResourceField(field="holds_uri")
     public Hold.Collection holds;
 
-    protected static final String root_uri = "/v" + Settings.VERSION + "/bank_accounts";
+    protected static final String root_uri = "/v" + Balanced.getInstance().getAPIVersion() + "/bank_accounts";
 
     public static class Collection extends ResourceCollection<BankAccount> {
         public Collection(String uri) {
@@ -64,7 +63,7 @@ public Collection(String uri) {
     }
 
     public static BankAccount get(String uri) throws HTTPError {
-        return new BankAccount((new Client()).get(uri));
+        return new BankAccount((Balanced.getInstance().getClient()).get(uri));
     }
 
     public BankAccount() {
@@ -102,30 +101,11 @@ public BankAccountVerification getVerification() throws HTTPError {
         return new BankAccountVerification(verification_uri);
     }
 
-    public Credit credit(
-            int amount,
-            String description,
-            String destination_uri,
-            String appears_on_statement_as,
-            Map<String, String> meta) throws HTTPError {
-        Map<String, Object> payload = new HashMap<String, Object>();
-        payload.put("amount", amount);
-        if (description != null)
-            payload.put("description", description);
-        if (destination_uri != null)
-            payload.put("destination", destination_uri);
-        if (appears_on_statement_as != null)
-            payload.put("appears_on_statement_as", appears_on_statement_as);
-        if (meta != null)
-            payload.put("meta", meta);
+    public Credit credit(Map<String, Object> payload) throws HTTPError {
         return credits.create(payload);
     }
 
-    public Credit credit(int amount) throws HTTPError {
-        return credit(amount, null, null, null, null);
-    }
-
-    public void unstore() throws HTTPError, NotCreated {
-        super.delete();
+    public Debit debit(Map<String, Object> payload) throws HTTPError {
+        return debits.create(payload);
     }
 }

src/main/java/com/balancedpayments/BankAccountVerification.java

@@ -33,15 +33,11 @@ public BankAccountVerification(String uri) throws HTTPError {
         super(uri);
     }
 
-    public BankAccountVerification(Map<String, Object> payload) {
-        super(payload);
-    }
-
     public void confirm(int amount_1, int amount_2) throws HTTPError {
         Map<String, Object> request = new HashMap<String, Object>();
         request.put("amount_1", amount_1);
         request.put("amount_2", amount_2);
-        Map<String, Object> response = client.put(uri, request);
+        Map<String, Object> response = Balanced.getInstance().getClient().put(uri, request);
         deserialize(response);
     }
 }