Fix tools module so it compiles and builds properly.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/d4c408f8 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/d4c408f8 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/d4c408f8 Branch: refs/heads/master Commit: d4c408f8a21551194dcb809f256345392e96bb21 Parents: b9f39ee Author: Dave Johnson <snoopd...@gmail.com> Authored: Thu Dec 8 11:40:15 2016 -0500 Committer: Dave Johnson <snoopd...@gmail.com> Committed: Thu Dec 8 11:40:15 2016 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/usergrid/tools/Export.java | 14 ++++++++------ .../java/org/apache/usergrid/tools/ExportAdmins.java | 2 +- .../java/org/apache/usergrid/tools/ExportApp.java | 6 +++--- .../org/apache/usergrid/tools/ExportingToolBase.java | 10 +++++----- .../main/java/org/apache/usergrid/tools/Metrics.java | 2 +- 5 files changed, 18 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/d4c408f8/stack/tools/src/main/java/org/apache/usergrid/tools/Export.java ---------------------------------------------------------------------- diff --git a/stack/tools/src/main/java/org/apache/usergrid/tools/Export.java b/stack/tools/src/main/java/org/apache/usergrid/tools/Export.java index bc83921..821d011 100644 --- a/stack/tools/src/main/java/org/apache/usergrid/tools/Export.java +++ b/stack/tools/src/main/java/org/apache/usergrid/tools/Export.java @@ -26,10 +26,10 @@ import java.util.Map.Entry; import java.util.Set; import java.util.UUID; +import com.fasterxml.jackson.core.JsonEncoding; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonGenerator; import org.apache.usergrid.persistence.*; -import org.codehaus.jackson.JsonEncoding; -import org.codehaus.jackson.JsonFactory; -import org.codehaus.jackson.JsonGenerator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.usergrid.management.OrganizationInfo; @@ -116,7 +116,8 @@ public class Export extends ExportingToolBase { logger.info( application.getValue() + " : " + application.getKey() ); // Get the JSon serializer. - JsonGenerator jg = getJsonGenerator( createOutputFile( "application", application.getValue() ) ); + com.fasterxml.jackson.core.JsonGenerator jg = + getJsonGenerator( createOutputFile( "application", application.getValue() ) ); // load the dictionary EntityManager rootEm = emf.getEntityManager( emf.getManagementAppId() ); @@ -157,7 +158,8 @@ public class Export extends ExportingToolBase { jg.writeObject( nsEntity ); // Create a GENERATOR for the application collections. - JsonGenerator collectionsJg = getJsonGenerator( createOutputFile( "collections", application.getValue() ) ); + JsonGenerator collectionsJg = + getJsonGenerator( createOutputFile( "collections", application.getValue() ) ); collectionsJg.writeStartObject(); Map<String, Object> metadata = em.getApplicationCollectionMetadata(); @@ -387,7 +389,7 @@ public class Export extends ExportingToolBase { try { File outFile = createOutputFile( "organization", acc.getName() ); - JsonGenerator jg = getJsonGenerator( outFile ); + com.fasterxml.jackson.core.JsonGenerator jg = getJsonGenerator( outFile ); jg.writeObject( acc ); jg.close(); } http://git-wip-us.apache.org/repos/asf/usergrid/blob/d4c408f8/stack/tools/src/main/java/org/apache/usergrid/tools/ExportAdmins.java ---------------------------------------------------------------------- diff --git a/stack/tools/src/main/java/org/apache/usergrid/tools/ExportAdmins.java b/stack/tools/src/main/java/org/apache/usergrid/tools/ExportAdmins.java index 479d740..229e372 100644 --- a/stack/tools/src/main/java/org/apache/usergrid/tools/ExportAdmins.java +++ b/stack/tools/src/main/java/org/apache/usergrid/tools/ExportAdmins.java @@ -16,6 +16,7 @@ */ package org.apache.usergrid.tools; +import com.fasterxml.jackson.core.JsonGenerator; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import org.apache.commons.cli.CommandLine; @@ -29,7 +30,6 @@ import org.apache.usergrid.persistence.EntityManager; import org.apache.usergrid.persistence.Query; import org.apache.usergrid.persistence.Results; import org.apache.usergrid.utils.StringUtils; -import org.codehaus.jackson.JsonGenerator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/usergrid/blob/d4c408f8/stack/tools/src/main/java/org/apache/usergrid/tools/ExportApp.java ---------------------------------------------------------------------- diff --git a/stack/tools/src/main/java/org/apache/usergrid/tools/ExportApp.java b/stack/tools/src/main/java/org/apache/usergrid/tools/ExportApp.java index db59521..c46f4b7 100644 --- a/stack/tools/src/main/java/org/apache/usergrid/tools/ExportApp.java +++ b/stack/tools/src/main/java/org/apache/usergrid/tools/ExportApp.java @@ -16,6 +16,9 @@ */ package org.apache.usergrid.tools; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.util.MinimalPrettyPrinter; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; import org.apache.commons.cli.OptionBuilder; @@ -27,9 +30,6 @@ import org.apache.usergrid.persistence.Results; import org.apache.usergrid.tools.export.ExportConnection; import org.apache.usergrid.tools.export.ExportEntity; import org.apache.usergrid.utils.StringUtils; -import org.codehaus.jackson.JsonGenerator; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.util.MinimalPrettyPrinter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import rx.Observable; http://git-wip-us.apache.org/repos/asf/usergrid/blob/d4c408f8/stack/tools/src/main/java/org/apache/usergrid/tools/ExportingToolBase.java ---------------------------------------------------------------------- diff --git a/stack/tools/src/main/java/org/apache/usergrid/tools/ExportingToolBase.java b/stack/tools/src/main/java/org/apache/usergrid/tools/ExportingToolBase.java index a7c3905..6fb0911 100644 --- a/stack/tools/src/main/java/org/apache/usergrid/tools/ExportingToolBase.java +++ b/stack/tools/src/main/java/org/apache/usergrid/tools/ExportingToolBase.java @@ -22,10 +22,10 @@ import java.io.IOException; import java.io.PrintWriter; import java.util.UUID; -import org.codehaus.jackson.JsonFactory; -import org.codehaus.jackson.JsonGenerator; -import org.codehaus.jackson.impl.DefaultPrettyPrinter; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.util.DefaultPrettyPrinter; +import com.fasterxml.jackson.databind.ObjectMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.usergrid.utils.ConversionUtils; @@ -171,7 +171,7 @@ public abstract class ExportingToolBase extends ToolBase { } - protected JsonGenerator getJsonGenerator( String outFile ) throws IOException { + protected JsonGenerator getJsonGenerator(String outFile ) throws IOException { return getJsonGenerator( new File( outputDir, outFile ) ); } http://git-wip-us.apache.org/repos/asf/usergrid/blob/d4c408f8/stack/tools/src/main/java/org/apache/usergrid/tools/Metrics.java ---------------------------------------------------------------------- diff --git a/stack/tools/src/main/java/org/apache/usergrid/tools/Metrics.java b/stack/tools/src/main/java/org/apache/usergrid/tools/Metrics.java index a056f77..e413d78 100644 --- a/stack/tools/src/main/java/org/apache/usergrid/tools/Metrics.java +++ b/stack/tools/src/main/java/org/apache/usergrid/tools/Metrics.java @@ -26,8 +26,8 @@ import java.util.Map; import java.util.Set; import java.util.UUID; +import com.fasterxml.jackson.core.JsonGenerator; import org.apache.usergrid.persistence.index.query.CounterResolution; -import org.codehaus.jackson.JsonGenerator; import org.apache.usergrid.management.ApplicationInfo; import org.apache.usergrid.management.OrganizationInfo; import org.apache.usergrid.management.UserInfo;
