vayacondios-server 0.2.4 → 0.2.5

data/lib/vayacondios/client/legacy_switch.rb

@@ -25,8 +25,8 @@ class Vayacondios
   @@legacy_switch = nil
 
   def self.legacy_switch
-    legacy_mode_on = Settings[:vayacondios][:legacy]
     if @@legacy_switch.nil?
+      legacy_mode_on = Settings[:vayacondios][:legacy]
       @@legacy_switch = get_legacy_switch(legacy_mode_on)
       Log.info("using #{legacy_mode_on ? 'legacy' : 'standard'} mode")
     end
@@ -34,6 +34,7 @@ class Vayacondios
   end
 
   def self.force_legacy_mode on
+    Log.info("forcing #{on ? 'legacy' : 'standard'} mode")
     @@legacy_switch = get_legacy_switch on
   end
 

data/lib/vayacondios/legacy_switch.rb

@@ -25,8 +25,8 @@ class Vayacondios
   @@legacy_switch = nil
 
   def self.legacy_switch
-    legacy_mode_on = Settings[:vayacondios][:legacy]
     if @@legacy_switch.nil?
+      legacy_mode_on = Settings[:vayacondios][:legacy]
       @@legacy_switch = get_legacy_switch(legacy_mode_on)
       Log.info("using #{legacy_mode_on ? 'legacy' : 'standard'} mode")
     end
@@ -34,6 +34,7 @@ class Vayacondios
   end
 
   def self.force_legacy_mode on
+    Log.info("forcing #{on ? 'legacy' : 'standard'} mode")
     @@legacy_switch = get_legacy_switch on
   end
 

data/lib/vayacondios/server/legacy_switch.rb

@@ -25,8 +25,8 @@ class Vayacondios
   @@legacy_switch = nil
 
   def self.legacy_switch
-    legacy_mode_on = Settings[:vayacondios][:legacy]
     if @@legacy_switch.nil?
+      legacy_mode_on = Settings[:vayacondios][:legacy]
       @@legacy_switch = get_legacy_switch(legacy_mode_on)
       Log.info("using #{legacy_mode_on ? 'legacy' : 'standard'} mode")
     end
@@ -34,6 +34,7 @@ class Vayacondios
   end
 
   def self.force_legacy_mode on
+    Log.info("forcing #{on ? 'legacy' : 'standard'} mode")
     @@legacy_switch = get_legacy_switch on
   end
 

data/lib/vayacondios/version.rb

@@ -1,3 +1,3 @@
 class Vayacondios
-  VERSION = '0.2.4'
+  VERSION = '0.2.5'
 end

data/pom.xml

@@ -4,7 +4,7 @@
   <groupId>com.infochimps</groupId>
   <artifactId>vayacondios</artifactId>
   <packaging>jar</packaging>
-  <version>1.0.2-SNAPSHOT</version>
+  <version>1.0.3-SNAPSHOT</version>
   <name>java-common</name>
   <url>http://maven.apache.org</url>
 
@@ -62,6 +62,8 @@
 	  <arguments>
 	    <argument>-cp</argument>
 	    <classpath/>
+	    <argument>-Dlog4j.debug</argument>
+	    <argument>-Dlog4j.configuration=file://${project.basedir}/config/log4j.properties</argument>
 	    <argument>-jar</argument>
 	    <argument>target/${project.artifactId}-${project.version}.jar</argument>
 	  </arguments>
@@ -112,13 +114,12 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.7.2</version>
+      <version>1.7.5</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
-      <version>1.7.2</version>
-      <scope>test</scope>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>1.7.5</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

data/src/main/java/com/infochimps/util/HttpHelper.java

@@ -24,44 +24,97 @@ public class HttpHelper {
   private static final boolean USE_CHARLES = false;
 
   // opens or returns a null reader
-    public static BufferedReader openOrNull(Logger log, String urlString, Charset inputCharset) {
-    try { return open(log, urlString, inputCharset); }
+  public static BufferedReader openOrNull(Logger log,
+                                          String urlString,
+                                          Charset inputCharset) {
+    return openOrNull(log, urlString, inputCharset, 0);
+  }
+
+  // opens or returns a null reader
+  public static BufferedReader openOrNull(Logger log,
+                                          String urlString,
+                                          Charset inputCharset,
+                                          int timeout) {
+    try { return open(log, urlString, inputCharset, timeout); }
     catch (IOException e) {
       log.warn("Got an exception trying to open {}: {}", urlString, e);
       return null;
     }
   }
 
+  //----------------------------------------------------------------------------
+
   public static BufferedReader open(Logger log,
                                     String urlString,
                                     Charset inputCharset) throws IOException {
-    return getReader(openStream(log, urlString), inputCharset);
+    return open(log, urlString, inputCharset, 0);
   }
 
   public static BufferedReader open(Logger log,
                                     String urlString,
                                     HashMap<String,String> extraHeaders,
                                     Charset inputCharset) throws IOException {
-    return getReader(openStream(log, urlString, extraHeaders), inputCharset);
+    return open(log, urlString, extraHeaders, inputCharset, 0);
+  }
+  
+  public static BufferedReader open(Logger log,
+                                    String urlString,
+                                    Charset inputCharset,
+                                    int timeout) throws IOException {
+    HttpURLConnection con = getConnection(urlString, log, timeout);
+    return getReader(con, log, inputCharset);
+  }
 
+  public static BufferedReader open(Logger log,
+                                    String urlString,
+                                    HashMap<String,String> extraHeaders,
+                                    Charset inputCharset,
+                                    int timeout) throws IOException {
+
+    HttpURLConnection con = getConnection(urlString, log, timeout);
+    for (Entry<String,String> header : extraHeaders.entrySet())
+      con.setRequestProperty(header.getKey(), header.getValue());
+    return getReader(con, log, inputCharset);
   }
 
+  //----------------------------------------------------------------------------
+
   public static InputStream openStream(Logger log,
                                        String urlString) throws IOException {
-    HttpURLConnection con = getConnection(urlString, log);
+    return openStream(log, urlString, 0);
+  }
+
+  public static InputStream openStream(Logger log,
+                                       String urlString,
+                                       HashMap<String,String> extraHeaders)
+    throws IOException {
+    return openStream(log, urlString, extraHeaders, 0);
+  }
+  
+  public static InputStream openStream(Logger log,
+                                       String urlString,
+                                       int timeout) throws IOException {
+    HttpURLConnection con = getConnection(urlString, log, timeout);
     return getStream(con, log);
   }
 
   public static InputStream openStream(Logger log,
                                        String urlString,
-                                       HashMap<String,String> extraHeaders) throws IOException {
-    HttpURLConnection con = getConnection(urlString, log);
+                                       HashMap<String,String> extraHeaders,
+                                       int timeout) throws IOException {
+
+    HttpURLConnection con = getConnection(urlString, log, timeout);
     for (Entry<String,String> header : extraHeaders.entrySet())
       con.setRequestProperty(header.getKey(), header.getValue());
     return getStream(con, log);
   }
 
-  private static HttpURLConnection getConnection(String urlString, Logger log) throws IOException {
+  //----------------------------------------------------------------------------
+
+  private static HttpURLConnection getConnection(String urlString,
+                                                 Logger log,
+                                                 int timeout)
+    throws IOException {
     URL url = null;
     try { url = new URL(urlString); }
     catch (MalformedURLException e) {
@@ -79,13 +132,27 @@ public class HttpHelper {
       con.setRequestProperty("Authorization", "Basic " + new String(BASE64.encodeBase64(userInfo.getBytes())));
     }
     con.setRequestProperty("Accept-Encoding", "gzip,deflate");
+    if (timeout != 0) con.setReadTimeout(timeout);
     return con;
   }
 
+  private static BufferedReader getReader(HttpURLConnection con,
+                                          Logger log,
+                                          Charset inputCharset) throws IOException {
+    BufferedReader reader =
+      new BufferedReader(
+        new InputStreamReader(getStream(con, log), inputCharset));
+
+    log.info("successfully opened connection to {} with character encoding {}",
+             con.getURL().toString(),
+             inputCharset);
+
+    return reader;
+  }
+
   private static InputStream getStream(HttpURLConnection con,
                                        Logger log) throws IOException {
-    InputStream in = null;
-
+    InputStream in;
     try { in = con.getInputStream(); }
     catch (IOException e) {
       // Some HTTP responses will raise an exception, but the
@@ -96,7 +163,7 @@ public class HttpHelper {
       InputStream errorStream = con.getErrorStream();
       if (errorStream != null) {
         BufferedReader r = new BufferedReader(new InputStreamReader(errorStream));
-        try { for (String line; (line = r.readLine()) != null; log.warn(line)); }
+        try { for (String line; (line = r.readLine()) != null; log.error(line)); }
         catch (IOException nested_exc) {
           log.error("Got an exception in the exception handler: {}", nested_exc);
           throw e;
@@ -105,17 +172,10 @@ public class HttpHelper {
       throw e;
     }
 
-    log.debug("successfully opened connection to " + con.getURL().toString());
     String encoding = con.getContentEncoding();
     log.debug("Got HTTP stream with content encoding type '" + encoding + "'");
 
-    return (encoding != null && encoding.equals("gzip")) ? new GZIPInputStream(in) : in;
-  }
-
-  private static BufferedReader getReader(InputStream in, Charset inputCharset) {
-    InputStreamReader istream_reader = new InputStreamReader(in, inputCharset);
-    BufferedReader reader = new BufferedReader(istream_reader);
-
-    return reader;
+    return (encoding != null && encoding.equals("gzip")) ?
+      new GZIPInputStream(in) : in;
   }
 }

data/src/main/java/com/infochimps/vayacondios/ItemSets.java

@@ -301,7 +301,7 @@ public class ItemSets<LinkType extends LinkToVCD> extends Organization {
    * A Vayacondios item can be a boolean, a number, or a string.
    */
   public static class Item {
-    static class Serializer implements JsonSerializer {
+    public static class Serializer implements JsonSerializer {
       public JsonElement serialize(Object item,
                                    Type typeOfId,
                                    JsonSerializationContext context) {

data/src/main/java/com/infochimps/vayacondios/StandardVCDLink.java

@@ -1,7 +1,7 @@
 package com.infochimps.vayacondios;
-
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonIOException;
 import com.google.gson.JsonObject;
@@ -23,6 +23,7 @@ import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import java.net.URL;
 
@@ -50,8 +51,7 @@ public class StandardVCDLink extends LinkToVCD {
 
     // assume Vayacondios response comes in a single line
     if (line != null &&
-        (response = PARSER.parse(line)).isJsonObject() &&
-        (itemSet = (response.getAsJsonObject().get("contents"))).isJsonArray()) {
+        (itemSet = VCD_HANDLER.extractContents(PARSER.parse(line))) != null) {
       for (JsonElement elem : itemSet.getAsJsonArray()) {
         if (!elem.isJsonPrimitive()) {
           LOG.warn("ignoring non-primitive in itemset: " + elem);
@@ -81,9 +81,7 @@ public class StandardVCDLink extends LinkToVCD {
                      List<Item> items) throws IOException {
     
     // serialize the items
-    HashMap content = new HashMap();
-    content.put("contents", items);
-    String body = GSON.toJson(content);
+    String body = VCD_HANDLER.wrapContents(items);
     // connect to our standard path
     URL url = new URL(getParent().urlString(PATH_COMPONENT, topic, id));
     HttpURLConnection connection = (HttpURLConnection)
@@ -137,6 +135,17 @@ public class StandardVCDLink extends LinkToVCD {
     connection.disconnect();
   }
 
+  //----------------------------------------------------------------------------
+
+  public static void forceLegacy(boolean vcdLegacy) {
+    LOG.info("forcing vayacondios {} mode", vcdLegacy ? "legacy" : "standard");
+
+    VCD_HANDLER = vcdLegacy ?
+      new LegacyContentsHandler() : new StandardContentsHandler();
+  }
+
+  //----------------------------------------------------------------------------
+
   private BufferedReader openUrl(String urlString) throws IOException {
     HashMap headers = new HashMap();
     headers.put("Accept", "*/*");
@@ -149,4 +158,61 @@ public class StandardVCDLink extends LinkToVCD {
   private static final JsonParser PARSER        = new JsonParser();
   private static final Logger LOG               = getLogger();
   private static final String PATH_COMPONENT    = "itemset";
+
+  private static LegacySwitch VCD_HANDLER = new StandardContentsHandler();
+
+  //----------------------------------------------------------------------------
+
+  private static interface LegacySwitch {
+    String wrapContents(List<Item> items);
+    JsonArray extractContents(JsonElement response);
+  } 
+
+  private static class LegacyContentsHandler implements LegacySwitch {
+    @Override
+    public String wrapContents(List<Item> items) {
+      String json = GSON.toJson(items);
+      LOG.trace("results of wrapping with legacy handler: {}", json);
+      return json;
+    }
+    @Override
+    public JsonArray extractContents(JsonElement response) {
+      if (response.isJsonArray()) {
+        return response.getAsJsonArray();
+      } else { return null; }
+    }
+  }
+
+  private static class StandardContentsHandler implements LegacySwitch {
+    @Override
+    public String wrapContents(final List<Item> items) {
+      // not at all sure why GSON is returning null given a
+      // Map<String,List<Item>> all of the sudden, but it seems to
+      // work on a Map<String,List<String>>, so here we go.
+      Map<String,List<String>> contents =
+        new HashMap<String,List<String>>();
+      List<String> strItems = new ArrayList<String>();
+      for (Item item : items) {
+        strItems.add(item.getObject().toString());
+      }
+      contents.put("contents", strItems);
+      LOG.trace("contents: {}", contents);
+      String json = GSON.toJson(contents);
+      LOG.trace("results of wrapping with standard handler: {}", json);
+      return json;
+    }
+    @Override
+    public JsonArray extractContents(JsonElement response) {
+      JsonElement itemSet;
+      
+      if (response.isJsonObject()) {
+        if ((itemSet = response.getAsJsonObject().get("contents"))
+            .isJsonArray()) {
+          return itemSet.getAsJsonArray();
+        }
+      }
+
+      return null;
+    }
+  }
 }

data/src/main/java/com/infochimps/vayacondios/VCDIntegrationTest.java

@@ -1,6 +1,7 @@
 package com.infochimps.vayacondios;
 
 import com.infochimps.vayacondios.VayacondiosClient;
+import com.infochimps.vayacondios.StandardVCDLink;
 
 import static com.infochimps.util.CurrentClass.getLogger;
 
@@ -20,6 +21,10 @@ public class VCDIntegrationTest {
   private static final int VCD_PORT = 8000;
   private static final Logger LOG = getLogger();
 
+  public static void setUp() {
+    StandardVCDLink.forceLegacy(false);
+  }
+
   private static ItemSets itemSets() {
     return new VayacondiosClient("localhost", VCD_PORT).
       organization("org").
@@ -79,6 +84,8 @@ public class VCDIntegrationTest {
                        "this will fail. ***");
     System.out.println("Running Vayacondios integration test...");
 
+    setUp();
+
     try {
       create("foo", "baz", "bar", "bing");
       assertEquals("foo", "baz", "bar", "bing");

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vayacondios-server
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-03 00:00:00.000000000 Z
+date: 2013-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configliere
@@ -279,7 +279,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3470064849041831815
+      hash: 530761123720877382
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -288,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3470064849041831815
+      hash: 530761123720877382
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25