Upgrading Jackson to v. 2.4.1

pom.xml

@@ -44,18 +44,6 @@
       <version>3.0.9.Final</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-core-asl</artifactId>
-      <version>1.9.12</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-mapper-asl</artifactId>
-      <version>1.9.12</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
@@ -116,6 +104,17 @@
       <version>2.4.1</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+      <version>2.4.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.4.1</version>
+    </dependency>
     <dependency>
       <groupId>javax</groupId>
       <artifactId>javaee-web-api</artifactId>

src/main/java/no/bioforsk/vips/logic/controller/session/ForecastBean.java

@@ -19,6 +19,7 @@
 
 package no.bioforsk.vips.logic.controller.session;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.ibm.icu.util.Calendar;
 import de.micromata.opengis.kml.v_2_2_0.Coordinate;
 import de.micromata.opengis.kml.v_2_2_0.Document;
@@ -63,7 +64,6 @@ import no.bioforsk.vips.logic.util.SessionControllerGetter;
 import no.bioforsk.vips.logic.util.SystemTime;
 import no.bioforsk.web.forms.FormField;
 import org.apache.commons.lang.StringUtils;
-import org.codehaus.jackson.JsonNode;
 import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;
 
 /**
@@ -265,7 +265,7 @@ public class ForecastBean {
             Response resp = this.getManagerResource().printModelListJSON();
             for(JsonNode modelIdItem: resp.readEntity(JsonNode.class).findValues("modelId"))
             {
-                String modelId = modelIdItem.getValueAsText();
+                String modelId = modelIdItem.asText();
                 
                 // We get the corresponding modelInformation entry 
                 ModelInformation modelInformation = em.find(ModelInformation.class, modelId);
@@ -416,9 +416,10 @@ public class ForecastBean {
                 request.setVipsCoreUserId(forecastConfiguration.getVipsLogicUserId().getVipsCoreUserIdWithFallback());
                 //System.out.println("RunModel for wsId" + forecastConfiguration.getWeatherStationPointOfInterestId());
                 Response resp = this.getManagerResource().runModel(config.getModelId(), request);
+                
                 if(resp.getStatus() == Response.Status.OK.getStatusCode())
                 {
-                    List<Result> results = resp.readEntity(new GenericType<List<Result>>(){});
+                    List<Result> results = (List<Result>) resp.readEntity(new GenericType<List<Result>>(){});
                     // We delete all former results before we store the new ones
                     SessionControllerGetter.getForecastBean().storeResults(forecastConfiguration,results);
                 }

src/main/java/no/bioforsk/vips/logic/entity/ForecastResult.java

@@ -43,11 +43,12 @@ import javax.xml.bind.annotation.XmlRootElement;
 import no.bioforsk.vips.entity.Result;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 
 /**
- * @copyright 2013 <a href="http://www.bioforsk.no/">Bioforsk</a>
+ * @copyright 2013-2014 <a href="http://www.bioforsk.no/">Bioforsk</a>
  * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
  */
 @Entity

src/main/java/no/bioforsk/vips/logic/scheduling/model/ModelRunPreprocessor.java

@@ -19,6 +19,8 @@
 
 package no.bioforsk.vips.logic.scheduling.model;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
@@ -32,12 +34,11 @@ import no.bioforsk.vips.entity.ModelConfiguration;
 import no.bioforsk.vips.entity.WeatherObservation;
 import no.bioforsk.vips.logic.entity.ForecastConfiguration;
 import org.apache.commons.io.IOUtils;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
+
 
 /**
  * All model preprocessors must implement this
- * @copyright 2013 <a href="http://www.bioforsk.no/">Bioforsk</a>
+ * @copyright 2013-2014 <a href="http://www.bioforsk.no/">Bioforsk</a>
  * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
  */
 public abstract class ModelRunPreprocessor {

src/main/java/no/bioforsk/web/forms/FormField.java

@@ -19,6 +19,7 @@
 
 package no.bioforsk.web.forms;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.vividsolutions.jts.geom.Coordinate;
 import com.vividsolutions.jts.geom.GeometryFactory;
 import com.vividsolutions.jts.geom.Point;
@@ -27,7 +28,7 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
-import org.codehaus.jackson.annotate.JsonIgnore;
+
 
 /**
  * Represents a (web) form field

src/main/java/no/bioforsk/web/forms/FormValidator.java

@@ -19,6 +19,11 @@
 
 package no.bioforsk.web.forms;
 
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ibm.icu.util.ULocale;
 import java.io.IOException;
 import java.io.InputStream;
@@ -38,11 +43,6 @@ import no.bioforsk.vips.logic.authenticate.PasswordValidationException;
 import no.bioforsk.vips.logic.i18n.SessionLocaleUtil;
 import no.bioforsk.vips.logic.util.SessionControllerGetter;
 import org.apache.commons.validator.EmailValidator;
-import org.codehaus.jackson.JsonFactory;
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
 
 /**
  * Uses form configuration set in JSON files in [WARFILE]/formdefinitions/, or 
@@ -351,9 +351,9 @@ public class FormValidator {
         {
             for(JsonNode item: relations)
             {
-                String relationType = item.findValue("relationType").getTextValue();
-                String primaryFieldName = item.findValue("primaryField").getTextValue();
-                String secondaryFieldName = item.findValue("secondaryField").getTextValue();
+                String relationType = item.findValue("relationType").asText();
+                String primaryFieldName = item.findValue("primaryField").asText();
+                String secondaryFieldName = item.findValue("secondaryField").asText();
                 FormField primaryField = retVal.getFormField(primaryFieldName);
                 FormField secondaryField = retVal.getFormField(secondaryFieldName);
                 if(primaryField == null || secondaryField == null)
@@ -405,10 +405,10 @@ public class FormValidator {
     public static JsonNode getFormDefinition(String formName, ServletContext servletContext) throws IOException
     {
         ObjectMapper mapper = new ObjectMapper();
-        JsonFactory factory = mapper.getJsonFactory();
+        JsonFactory factory = mapper.getFactory();
         InputStream in = servletContext.getResourceAsStream("/formdefinitions/" + formName + ".json");
 
-        JsonParser parser = factory.createJsonParser(in);
+        JsonParser parser = factory.createParser(in);
         JsonNode formDefinition = mapper.readTree(parser);
         return formDefinition;
     }

src/main/java/no/bioforsk/web/forms/HTMLFormGenerator.java

@@ -19,18 +19,18 @@
 
 package no.bioforsk.web.forms;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.IOException;
 import java.text.MessageFormat;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import no.bioforsk.vips.i18n.I18nImpl;
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
 
 /**
- * @copyright 2013 <a href="http://www.bioforsk.no/">Bioforsk</a>
+ * @copyright 2013-2014 <a href="http://www.bioforsk.no/">Bioforsk</a>
  * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
  */
 public class HTMLFormGenerator {

src/test/java/no/bioforsk/vips/logic/forms/FormValidatorTest.java

@@ -19,17 +19,15 @@
 
 package no.bioforsk.vips.logic.forms;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 import java.util.ResourceBundle;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import no.bioforsk.web.forms.FormValidation;
 import no.bioforsk.web.forms.FormValidationException;
 import no.bioforsk.web.forms.FormValidator;
-import org.codehaus.jackson.JsonNode;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -39,7 +37,7 @@ import static org.junit.Assert.*;
 
 /**
  *
- * @author treinar
+ * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
  */
 public class FormValidatorTest {
     

src/test/java/no/bioforsk/vips/logic/forms/HTMLFormGeneratorTest.java

@@ -19,14 +19,14 @@
 
 package no.bioforsk.vips.logic.forms;
 
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import no.bioforsk.web.forms.HTMLFormGenerator;
-import org.codehaus.jackson.JsonFactory;
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.map.ObjectMapper;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -36,7 +36,7 @@ import static org.junit.Assert.*;
 
 /**
  *
- * @author treinar
+ * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
  */
 public class HTMLFormGeneratorTest {
     
@@ -68,8 +68,8 @@ public class HTMLFormGeneratorTest {
             InputStream in = this.getClass().getResourceAsStream("/HTMLFormGeneratorTest/forecastConfigurationForm.json");
             InputStreamReader reader = new InputStreamReader(in,"UTF-8");
             ObjectMapper mapper = new ObjectMapper();
-            JsonFactory factory = mapper.getJsonFactory();
-            JsonParser parser = factory.createJsonParser(reader);
+            JsonFactory factory = mapper.getFactory();
+            JsonParser parser = factory.createParser(reader);
             JsonNode formDefinition = mapper.readTree(parser);
             InputStream in2 = this.getClass().getResourceAsStream("/HTMLFormGeneratorTest/forecastConfigurationForm_result.html");
             InputStreamReader reader2 = new InputStreamReader(in2, "UTF-8");