redoes packaging. fixes #12

aoberoi · aoberoi · commit bf5b37c2e058 · 2014-04-15T02:36:34.000-04:00
*  all user facing classes are directly under com.opentok.*
*  all actual constants are under com.opentok.contants, but Version is the only one
*  all exceptions are under com.opentok.exception, they don't need OpenTok in the name
*  com.opentok.util has been consolidated
diff --git a/README.md b/README.md
@@ -121,7 +121,7 @@ a connection metadata string:
 
 <pre>
 import com.opentok.api.OpenTokSDK;
-import com.opentok.api.constants.Role;
+import com.opentok.Role;
 
 class Test {
     public static void main(String argv[]) throws OpenTokException {
diff --git a/sample/ArchivingSample.java b/sample/ArchivingSample.java
@@ -1,6 +1,6 @@
 import java.util.List;
-import com.opentok.api.Archive;
-import com.opentok.api.OpenTok;
+import com.opentok.Archive;
+import com.opentok.OpenTok;
 import com.opentok.exception.OpenTokException;
 
 class ArchivingSample {
diff --git a/sample/Sample.java b/sample/Sample.java
@@ -1,6 +1,6 @@
-import com.opentok.api.OpenTok;
-import com.opentok.api.Session;
-import com.opentok.api.constants.Role;
+import com.opentok.OpenTok;
+import com.opentok.Session;
+import com.opentok.Role;
 import com.opentok.SessionProperties;
 import com.opentok.exception.OpenTokException;
 
diff --git a/src/main/java/com/opentok/Archive.java b/src/main/java/com/opentok/Archive.java
@@ -1,13 +1,9 @@
-package com.opentok.api;
+package com.opentok;
 
-import java.util.HashMap;
 import java.util.UUID;
 
 import org.codehaus.jackson.map.ObjectMapper;
 
-import com.opentok.exception.OpenTokException;
-import com.opentok.exception.OpenTokRequestException;
-
 /**
 * Represents an archive of an OpenTok session. 
 */
@@ -166,7 +162,7 @@ public void setStatus(ArchiveState status) {
      * The download URL of the available MP4 file. This is only set for an archive with the status set to "available";
      * for other archives, (including archives wit the status "uploaded") this method returns null. The download URL is
      * obfuscated, and the file is only available from the URL for 10 minutes. To generate a new URL, call
-     * the {@link OpenTok#listArchives()} or {@link OpenTok#getArchive(String)} method.
+     * the {@link com.opentok.OpenTok#listArchives()} or {@link com.opentok.OpenTok#getArchive(String)} method.
      */
     public String getUrl() {
         return url;
@@ -187,7 +183,7 @@ public void setUrl(String url) {
 //            this.status = updatedArchive.status;
 //            return this;
 //        } catch (Exception e) {
-//            throw new OpenTokRequestException(500, "Exception mapping json: " + e.getMessage());
+//            throw new RequestException(500, "Exception mapping json: " + e.getMessage());
 //        }
 //    }
     
diff --git a/src/main/java/com/opentok/OpenTok.java b/src/main/java/com/opentok/OpenTok.java
@@ -8,7 +8,7 @@
  * Last modified: @opentok.sdk.java.mod_time@
  */
 
-package com.opentok.api;
+package com.opentok;
 
 import java.io.StringReader;
 import java.util.Collection;
@@ -18,11 +18,8 @@
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
 
-import com.opentok.api.constants.TokenOptions;
-
-import com.opentok.SessionProperties;
 import com.opentok.exception.OpenTokException;
-import com.opentok.exception.OpenTokInvalidArgumentException;
+import com.opentok.exception.InvalidArgumentException;
 import com.opentok.util.HttpClient;
 import org.xml.sax.InputSource;
 
@@ -89,7 +86,7 @@ public OpenTok(int apiKey, String apiSecret, String apiUrl) {
      * a connection metadata string:
      * <p>
      * <pre>
-     * import com.opentok.api.constants.Role;
+     * import com.opentok.Role;
      *
      * class Test {
      *     public static void main(String argv[]) throws OpenTokException {
@@ -143,7 +140,7 @@ public OpenTok(int apiKey, String apiSecret, String apiUrl) {
     public String generateToken(String sessionId, TokenOptions tokenOptions) throws OpenTokException {
 
         if(sessionId == null || sessionId == "") {
-            throw new OpenTokInvalidArgumentException("Session not valid");
+            throw new InvalidArgumentException("Session not valid");
         }
 
         // TODO: use more succinct codec routines
@@ -159,11 +156,11 @@ public String generateToken(String sessionId, TokenOptions tokenOptions) throws
 //                }
 //            }
 //        } catch (UnsupportedEncodingException e) {
-//            throw new OpenTokSessionNotFoundException("Session not found");
+//            throw new SessionNotFoundException("Session not found");
 //        }
 //
 //        if(!decodedSessionId.split("~")[1].equals(String.valueOf(apiKey))) {
-//            throw new OpenTokSessionNotFoundException("Session not found");
+//            throw new SessionNotFoundException("Session not found");
 //        }
         
         Session session = new Session(sessionId, apiKey, apiSecret);
@@ -325,7 +322,7 @@ private static String readXml(String xpathQuery, String xml) throws XPathExpress
 //        try {
 //            return mapper.readValue(archive, Archive.class);
 //        } catch (Exception e) {
-//            throw new OpenTokRequestException(500, "Exception mapping json: " + e.getMessage());
+//            throw new RequestException(500, "Exception mapping json: " + e.getMessage());
 //        }
 //
 //    }
@@ -360,7 +357,7 @@ private static String readXml(String xpathQuery, String xml) throws XPathExpress
 //            return mapper.readValue(node.get("items"), new TypeReference<List<Archive>>() {
 //            });
 //        } catch (Exception e) {
-//            throw new OpenTokRequestException(500, "Exception mapping json: " + e.getMessage());
+//            throw new RequestException(500, "Exception mapping json: " + e.getMessage());
 //        }
 //    }
     
@@ -381,7 +378,7 @@ private static String readXml(String xpathQuery, String xml) throws XPathExpress
      */
 //    public Archive startArchive(String sessionId, String name) throws OpenTokException {
 //        if (sessionId == null || sessionId == "") {
-//            throw new OpenTokInvalidArgumentException("Session not valid");
+//            throw new InvalidArgumentException("Session not valid");
 //        }
 //        HashMap<String, String> headers = new HashMap<String, String>();
 //        headers.put("content-type", "application/json");
@@ -391,7 +388,7 @@ private static String readXml(String xpathQuery, String xml) throws XPathExpress
 //        try {
 //            return mapper.readValue(archive, Archive.class);
 //        } catch (Exception e) {
-//            throw new OpenTokRequestException(500, "Exception mapping json: " + e.getMessage());
+//            throw new RequestException(500, "Exception mapping json: " + e.getMessage());
 //        }
 //    }
 
@@ -413,7 +410,7 @@ private static String readXml(String xpathQuery, String xml) throws XPathExpress
 //        try {
 //            return mapper.readValue(archive, Archive.class);
 //        } catch (Exception e) {
-//            throw new OpenTokRequestException(500, "Exception mapping json: " + e.getMessage());
+//            throw new RequestException(500, "Exception mapping json: " + e.getMessage());
 //        }
 //    }
     
diff --git a/src/main/java/com/opentok/Role.java b/src/main/java/com/opentok/Role.java
@@ -5,7 +5,7 @@
  * Copyright 2010, TokBox, Inc.
  */
 
-package com.opentok.api.constants;
+package com.opentok;
 /**
  * Defines values for the role parameter of the <code>OpenTokSDK.generateToken()</code> method.
  *
diff --git a/src/main/java/com/opentok/Session.java b/src/main/java/com/opentok/Session.java
@@ -1,4 +1,4 @@
-package com.opentok.api;
+package com.opentok;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
@@ -7,14 +7,11 @@
 import java.security.SignatureException;
 import java.util.Random;
 
-import com.opentok.api.constants.Role;
+import com.opentok.exception.InvalidArgumentException;
 import com.opentok.util.Crypto;
 import org.apache.commons.codec.binary.Base64;
 
-import com.opentok.SessionProperties;
-import com.opentok.api.constants.TokenOptions;
 import com.opentok.exception.OpenTokException;
-import com.opentok.exception.OpenTokInvalidArgumentException;
 
 public class Session {
 
@@ -97,7 +94,7 @@ public String generateToken(TokenOptions tokenOptions) throws OpenTokException {
         //                       | "partner_id={apiKey}&sig={sig}:| -- dataStringBuilder -- |
 
         if (tokenOptions == null) {
-            throw new OpenTokInvalidArgumentException("Token options cannot be null");
+            throw new InvalidArgumentException("Token options cannot be null");
         }
 
         Role role = tokenOptions.getRole();
@@ -121,25 +118,25 @@ public String generateToken(TokenOptions tokenOptions) throws OpenTokException {
         if (expireTime == 0) {
             expireTime = now + (60*60*24); // 1 day
         } else if(expireTime < now-1) {
-            throw new OpenTokInvalidArgumentException(
+            throw new InvalidArgumentException(
                     "Expire time must be in the future. relative time: "+ (expireTime - now));
         } else if(expireTime > (now + (60*60*24*30) /* 30 days */)) {
-            throw new OpenTokInvalidArgumentException(
+            throw new InvalidArgumentException(
                     "Expire time must be in the next 30 days. too large by "+ (expireTime - (now + (60*60*24*30))));
         }
         dataStringBuilder.append("&expire_time=");
         dataStringBuilder.append(expireTime);
 
         if (data != null) {
             if(data.length() > 1000) {
-                throw new OpenTokInvalidArgumentException(
+                throw new InvalidArgumentException(
                         "Connection data must be less than 1000 characters. length: " + data.length());
             }
             dataStringBuilder.append("&connection_data=");
             try {
                 dataStringBuilder.append(URLEncoder.encode(data, "UTF-8"));
             } catch (UnsupportedEncodingException e) {
-                throw new OpenTokInvalidArgumentException(
+                throw new InvalidArgumentException(
                         "Error during URL encode of your connection data: " +  e.getMessage());
             }
         }
diff --git a/src/main/java/com/opentok/SessionProperties.java b/src/main/java/com/opentok/SessionProperties.java
@@ -1,6 +1,6 @@
 package com.opentok;
 
-import com.opentok.exception.OpenTokInvalidArgumentException;
+import com.opentok.exception.InvalidArgumentException;
 import org.apache.commons.validator.routines.InetAddressValidator;
 
 import java.util.ArrayList;
@@ -10,7 +10,7 @@
 
 
 /**
- * Defines values for the <code>properties</code> parameter of the {@link com.opentok.api.OpenTok#createSession(SessionProperties)} method.
+ * Defines values for the <code>properties</code> parameter of the {@link OpenTok#createSession(SessionProperties)} method.
  *
  * @see <a href="../OpenTokSDK.html#createSession(com.opentok.SessionProperties)">OpenTokSDK.createSession(SessionProperties)</a>
  */
@@ -30,9 +30,9 @@ public static class Builder {
         private boolean p2p = false;
         
 
-        public Builder location(String location) throws OpenTokInvalidArgumentException {
+        public Builder location(String location) throws InvalidArgumentException {
             if (!InetAddressValidator.getInstance().isValidInet4Address(location)) {
-                throw new OpenTokInvalidArgumentException("Location must be a valid IPv4 address. location="+location);
+                throw new InvalidArgumentException("Location must be a valid IPv4 address. location="+location);
             }
             this.location = location;
             return this;
diff --git a/src/main/java/com/opentok/TokenOptions.java b/src/main/java/com/opentok/TokenOptions.java
@@ -1,6 +1,6 @@
-package com.opentok.api.constants;
+package com.opentok;
 
-import com.opentok.exception.OpenTokInvalidArgumentException;
+import com.opentok.exception.InvalidArgumentException;
 
 /**
  * Created by ankur on 4/14/14.
@@ -49,11 +49,11 @@ public Builder expireTime(double expireTime) {
             return this;
         }
 
-        public Builder data(String data) throws OpenTokInvalidArgumentException {
+        public Builder data(String data) throws InvalidArgumentException {
             if (data.length() <= 1000) {
                 this.data = data;
             } else {
-                throw new OpenTokInvalidArgumentException(
+                throw new InvalidArgumentException(
                         "The given connection data is too long, limit is 1000 characters: "+data.length());
             }
             return this;
diff --git a/src/main/java/com/opentok/api/package-info.java b/src/main/java/com/opentok/api/package-info.java
diff --git a/src/main/java/com/opentok/constants/Version.java b/src/main/java/com/opentok/constants/Version.java
@@ -1,4 +1,4 @@
-package com.opentok.api.constants;
+package com.opentok.constants;
 
 /**
  * Created by ankur on 4/11/14.
diff --git a/src/main/java/com/opentok/constants/package-info.java b/src/main/java/com/opentok/constants/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Defines values for token roles and peer-to-peer settings.
  */
-package com.opentok.api.constants;
+package com.opentok.constants;
diff --git a/src/main/java/com/opentok/exception/InvalidArgumentException.java b/src/main/java/com/opentok/exception/InvalidArgumentException.java
@@ -1,10 +1,10 @@
 package com.opentok.exception;
 
-public class OpenTokInvalidArgumentException extends OpenTokException {
+public class InvalidArgumentException extends OpenTokException {
 
     private static final long serialVersionUID = 6315168083117996091L;
 
-    public OpenTokInvalidArgumentException(String message) {
+    public InvalidArgumentException(String message) {
         super(message);
     }
 
diff --git a/src/main/java/com/opentok/exception/RequestException.java b/src/main/java/com/opentok/exception/RequestException.java
@@ -1,10 +1,10 @@
 package com.opentok.exception;
 
-public class OpenTokRequestException extends OpenTokException {
+public class RequestException extends OpenTokException {
 
     private static final long serialVersionUID = -3852834447530956514L;
 
-    public OpenTokRequestException(String message) {
+    public RequestException(String message) {
         super(message);
     }
 
diff --git a/src/main/java/com/opentok/exception/SessionNotFoundException.java b/src/main/java/com/opentok/exception/SessionNotFoundException.java
@@ -1,10 +1,10 @@
 package com.opentok.exception;
 
-public class OpenTokSessionNotFoundException extends OpenTokException {
+public class SessionNotFoundException extends OpenTokException {
 
     private static final long serialVersionUID = 1946440047275860231L;
 
-    public OpenTokSessionNotFoundException(String message) {
+    public SessionNotFoundException(String message) {
         super(message);
     }
 }
diff --git a/src/main/java/com/opentok/util/HttpClient.java b/src/main/java/com/opentok/util/HttpClient.java
@@ -11,7 +11,7 @@
 import com.ning.http.client.filter.FilterException;
 import com.ning.http.client.filter.RequestFilter;
 
-import com.opentok.api.constants.Version;
+import com.opentok.constants.Version;
 
 public class HttpClient extends AsyncHttpClient {
     
@@ -66,12 +66,12 @@ public String createSession(Map<String, Collection<String>> params) {
 //        try {
 //            Response result = get.execute().get();
 //            if (result.getStatusCode() < 200 || result.getStatusCode() > 299) {
-//                throw new OpenTokRequestException(result.getStatusCode(), "Error response: message: "
+//                throw new RequestException(result.getStatusCode(), "Error response: message: "
 //                        + result.getStatusText());
 //            }
 //            return result.getResponseBody();
 //        } catch (Exception e) {
-//            throw new OpenTokRequestException(500, e.getMessage());
+//            throw new RequestException(500, e.getMessage());
 //        }
 //    }
 //
@@ -82,12 +82,12 @@ public String createSession(Map<String, Collection<String>> params) {
 //        try {
 //            Response result = get.execute().get();
 //            if (result.getStatusCode() < 200 || result.getStatusCode() > 299) {
-//                throw new OpenTokRequestException(result.getStatusCode(), "Error response: message: "
+//                throw new RequestException(result.getStatusCode(), "Error response: message: "
 //                        + result.getStatusText());
 //            }
 //            return result.getResponseBody();
 //        } catch (Exception e) {
-//            throw new OpenTokRequestException(500, e.getMessage());
+//            throw new RequestException(500, e.getMessage());
 //        }
 //    }
 //
@@ -116,12 +116,12 @@ public String createSession(Map<String, Collection<String>> params) {
 //            Response result = post.execute().get();
 //
 //            if (result.getStatusCode() < 200 || result.getStatusCode() > 299) {
-//                throw new OpenTokRequestException(result.getStatusCode(), "Error response: message: " + result.getStatusText());
+//                throw new RequestException(result.getStatusCode(), "Error response: message: " + result.getStatusText());
 //            }
 //
 //            return result.getResponseBody();
 //        } catch (Exception e) {
-//            throw new OpenTokRequestException(500, e.getMessage());
+//            throw new RequestException(500, e.getMessage());
 //        }
 //    }
 //
diff --git a/src/test/java/com/opentok/test/OpenTokTest.java b/src/test/java/com/opentok/test/OpenTokTest.java

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`* Copyright 2010, TokBox, Inc.`
`6`	`6`	`*/`
`7`	`7`
`8`		`-package com.opentok.api.constants;`
	`8`	`+package com.opentok;`
`9`	`9`	`/**`
`10`	`10`	`* Defines values for the role parameter of the <code>OpenTokSDK.generateToken()</code> method.`
`11`	`11`	`*`