svn commit: r785346 - in /lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix: JsonMatrixAdapter.java JsonVectorAdapter.java

[gsingers]

Author: gsingers
Date: Tue Jun 16 19:17:08 2009
New Revision: 785346

URL: http://svn.apache.org/viewvc?rev=785346&view=rev
Log:
replace magic strings with constants

Modified:
    
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/JsonMatrixAdapter.java
    
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/JsonVectorAdapter.java

Modified: 
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/JsonMatrixAdapter.java
URL: 
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/JsonMatrixAdapter.java?rev=785346&r1=785345&r2=785346&view=diff
==============================================================================
--- 
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/JsonMatrixAdapter.java
 (original)
+++ 
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/JsonMatrixAdapter.java
 Tue Jun 16 19:17:08 2009
@@ -36,6 +36,8 @@
     JsonDeserializer<Matrix> {
 
   private static final Logger log = Logger.getLogger(JsonMatrixAdapter.class);
+  public static final String CLASS = "class";
+  public static final String MATRIX = "matrix";
 
   @Override
   public JsonElement serialize(Matrix src, Type typeOfSrc,
@@ -49,8 +51,8 @@
     builder.registerTypeAdapter(matrixType, new JsonMatrixAdapter());
     Gson gson = builder.create();
     JsonObject obj = new JsonObject();
-    obj.add("class", new JsonPrimitive(src.getClass().getName()));
-    obj.add("matrix", new JsonPrimitive(gson.toJson(src)));
+    obj.add(CLASS, new JsonPrimitive(src.getClass().getName()));
+    obj.add(MATRIX, new JsonPrimitive(gson.toJson(src)));
     return obj;
   }
 
@@ -66,8 +68,8 @@
     builder.registerTypeAdapter(matrixType, new JsonMatrixAdapter());
     Gson gson = builder.create();
     JsonObject obj = json.getAsJsonObject();
-    String klass = obj.get("class").getAsString();
-    String matrix = obj.get("matrix").getAsString();
+    String klass = obj.get(CLASS).getAsString();
+    String matrix = obj.get(MATRIX).getAsString();
     ClassLoader ccl = Thread.currentThread().getContextClassLoader();
     Class<?> cl = null;
     try {

Modified: 
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/JsonVectorAdapter.java
URL: 
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/JsonVectorAdapter.java?rev=785346&r1=785345&r2=785346&view=diff
==============================================================================
--- 
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/JsonVectorAdapter.java
 (original)
+++ 
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/JsonVectorAdapter.java
 Tue Jun 16 19:17:08 2009
@@ -35,6 +35,7 @@
     JsonDeserializer<Vector> {
 
   private static final Logger log = Logger.getLogger(JsonVectorAdapter.class);
+  public static final String VECTOR = "vector";
 
   @Override
   public JsonElement serialize(Vector src, Type typeOfSrc,
@@ -43,8 +44,8 @@
     builder.registerTypeAdapter(Vector.class, new JsonVectorAdapter());
     Gson gson = builder.create();
     JsonObject obj = new JsonObject();
-    obj.add("class", new JsonPrimitive(src.getClass().getName()));
-    obj.add("vector", new JsonPrimitive(gson.toJson(src)));
+    obj.add(JsonMatrixAdapter.CLASS, new 
JsonPrimitive(src.getClass().getName()));
+    obj.add(VECTOR, new JsonPrimitive(gson.toJson(src)));
     return obj;
   }
 
@@ -55,8 +56,8 @@
     builder.registerTypeAdapter(Vector.class, new JsonVectorAdapter());
     Gson gson = builder.create();
     JsonObject obj = json.getAsJsonObject();
-    String klass = obj.get("class").getAsString();
-    String vector = obj.get("vector").getAsString();
+    String klass = obj.get(JsonMatrixAdapter.CLASS).getAsString();
+    String vector = obj.get(VECTOR).getAsString();
     ClassLoader ccl = Thread.currentThread().getContextClassLoader();
     Class<?> cl = null;
     try {