Reorganize imports

main/src/com/google/refine/browsing/Engine.java

@@ -43,7 +43,6 @@ import org.json.JSONObject;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonValue;
 
 import com.google.refine.browsing.facets.Facet;
 import com.google.refine.browsing.util.ConjunctiveFilteredRecords;

main/src/com/google/refine/clustering/binning/BinningClusterer.java

@@ -41,13 +41,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Properties;
 import java.util.TreeMap;
 import java.util.stream.Collectors;
 
-import org.json.JSONException;
 import org.json.JSONObject;
-import org.json.JSONWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

main/src/com/google/refine/commands/auth/AuthorizeCommand.java

@@ -42,14 +42,14 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import oauth.signpost.OAuthConsumer;
-import oauth.signpost.OAuthProvider;
-
 import com.google.refine.commands.Command;
 import com.google.refine.oauth.Credentials;
 import com.google.refine.oauth.OAuthUtilities;
 import com.google.refine.oauth.Provider;
 
+import oauth.signpost.OAuthConsumer;
+import oauth.signpost.OAuthProvider;
+
 public class AuthorizeCommand extends Command {
     
     private static final String OAUTH_VERIFIER_PARAM = "oauth_verifier";

main/src/com/google/refine/commands/cell/SplitMultiValueCellsCommand.java

@@ -46,8 +46,8 @@ import com.google.refine.commands.Command;
 import com.google.refine.model.AbstractOperation;
 import com.google.refine.model.Project;
 import com.google.refine.operations.cell.MultiValuedCellSplitOperation;
-import com.google.refine.util.ParsingUtilities;
 import com.google.refine.process.Process;
+import com.google.refine.util.ParsingUtilities;
 
 public class SplitMultiValueCellsCommand extends Command {
     @Override

main/src/com/google/refine/commands/recon/ReconClearOneCellCommand.java

@@ -34,14 +34,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 package com.google.refine.commands.recon;
 
 import java.io.IOException;
-import java.util.Properties;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.json.JSONWriter;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import com.google.refine.commands.Command;

main/src/com/google/refine/commands/recon/ReconJudgeOneCellCommand.java

@@ -34,14 +34,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 package com.google.refine.commands.recon;
 
 import java.io.IOException;
-import java.util.Properties;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.json.JSONWriter;
-
 import com.google.refine.commands.Command;
 import com.google.refine.expr.ExpressionUtils;
 import com.google.refine.history.Change;

main/src/com/google/refine/exporters/CsvExporter.java

@@ -43,13 +43,13 @@ import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import au.com.bytecode.opencsv.CSVWriter;
-
 import com.google.refine.browsing.Engine;
 import com.google.refine.model.Project;
 import com.google.refine.util.JSONUtilities;
 import com.google.refine.util.ParsingUtilities;
 
+import au.com.bytecode.opencsv.CSVWriter;
+
 public class CsvExporter implements WriterExporter{
 
     final static Logger logger = LoggerFactory.getLogger("CsvExporter");

main/src/com/google/refine/exporters/CustomizableTabularExporterUtilities.java

@@ -33,8 +33,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package com.google.refine.exporters;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.time.OffsetDateTime;

main/src/com/google/refine/exporters/sql/SqlInsertBuilder.java

@@ -35,7 +35,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.json.JSONArray;
 import org.json.JSONObject;

main/src/com/google/refine/expr/functions/date/Now.java

@@ -37,9 +37,6 @@ import java.time.OffsetDateTime;
 import java.time.ZoneId;
 import java.util.Properties;
 
-import org.json.JSONException;
-import org.json.JSONWriter;
-
 import com.google.refine.grel.Function;
 
 public class Now implements Function {

main/src/com/google/refine/expr/functions/strings/Trim.java

@@ -36,6 +36,7 @@ package com.google.refine.expr.functions.strings;
 import java.util.Properties;
 
 import com.google.common.base.CharMatcher;
+
 import com.google.refine.expr.EvalError;
 import com.google.refine.grel.Function;
 

main/src/com/google/refine/grel/ast/FieldAccessorExpr.java

@@ -38,7 +38,6 @@ import java.util.Properties;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import com.google.refine.expr.EvalError;
 import com.google.refine.expr.Evaluable;
 import com.google.refine.expr.ExpressionUtils;
 import com.google.refine.expr.HasFields;

main/src/com/google/refine/grel/controls/Filter.java

@@ -40,7 +40,6 @@ import java.util.Properties;
 
 import org.json.JSONArray;
 import org.json.JSONException;
-import org.json.JSONWriter;
 
 import com.google.refine.expr.EvalError;
 import com.google.refine.expr.Evaluable;

main/src/com/google/refine/grel/controls/ForEachIndex.java

@@ -39,7 +39,6 @@ import java.util.Properties;
 
 import org.json.JSONArray;
 import org.json.JSONException;
-import org.json.JSONWriter;
 
 import com.google.refine.expr.EvalError;
 import com.google.refine.expr.Evaluable;

main/src/com/google/refine/grel/controls/ForNonBlank.java

@@ -35,9 +35,6 @@ package com.google.refine.grel.controls;
 
 import java.util.Properties;
 
-import org.json.JSONException;
-import org.json.JSONWriter;
-
 import com.google.refine.expr.Evaluable;
 import com.google.refine.expr.ExpressionUtils;
 import com.google.refine.grel.Control;

main/src/com/google/refine/grel/controls/ForRange.java

@@ -37,9 +37,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 
-import org.json.JSONException;
-import org.json.JSONWriter;
-
 import com.google.refine.expr.EvalError;
 import com.google.refine.expr.Evaluable;
 import com.google.refine.expr.ExpressionUtils;

main/src/com/google/refine/grel/controls/If.java

@@ -35,9 +35,6 @@ package com.google.refine.grel.controls;
 
 import java.util.Properties;
 
-import org.json.JSONException;
-import org.json.JSONWriter;
-
 import com.google.refine.expr.Evaluable;
 import com.google.refine.expr.ExpressionUtils;
 import com.google.refine.grel.Control;

main/src/com/google/refine/importers/ExcelImporter.java

@@ -66,8 +66,8 @@ import com.google.refine.model.Cell;
 import com.google.refine.model.Project;
 import com.google.refine.model.Recon;
 import com.google.refine.model.Recon.Judgment;
-import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.model.ReconCandidate;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.util.JSONUtilities;
 
 public class ExcelImporter extends TabularImportingParserBase {

main/src/com/google/refine/importers/JsonImporter.java

@@ -39,15 +39,16 @@ import java.io.InputStream;
 import java.io.Serializable;
 import java.util.List;
 
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonParser.NumberType;
 import com.fasterxml.jackson.core.JsonToken;
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.google.refine.importers.tree.ImportColumnGroup;
 import com.google.refine.importers.tree.TreeImportingParserBase;

main/src/com/google/refine/importers/MarcImporter.java

@@ -41,7 +41,6 @@ import java.io.InputStream;
 import java.io.OutputStream;
 
 import org.json.JSONObject;
-import org.marc4j.MarcException;
 import org.marc4j.MarcPermissiveStreamReader;
 import org.marc4j.MarcWriter;
 import org.marc4j.MarcXmlWriter;

main/src/com/google/refine/importers/OdsImporter.java

@@ -61,8 +61,8 @@ import com.google.refine.model.Cell;
 import com.google.refine.model.Project;
 import com.google.refine.model.Recon;
 import com.google.refine.model.Recon.Judgment;
-import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.model.ReconCandidate;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.util.JSONUtilities;
 
 

main/src/com/google/refine/importers/SeparatorBasedImporter.java

@@ -50,18 +50,16 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang3.StringEscapeUtils;
-import org.apache.commons.lang3.StringUtils;
-
 import org.json.JSONObject;
 
-import au.com.bytecode.opencsv.CSVParser;
-
 import com.google.refine.importing.ImportingJob;
 import com.google.refine.importing.ImportingUtilities;
 import com.google.refine.model.Project;
 import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.util.JSONUtilities;
 
+import au.com.bytecode.opencsv.CSVParser;
+
 public class SeparatorBasedImporter extends TabularImportingParserBase {
     public SeparatorBasedImporter() {
         super(false);

main/src/com/google/refine/importers/WikitextImporter.java

@@ -10,52 +10,48 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.json.JSONObject;
-import com.google.common.io.CharStreams;
-import de.fau.cs.osr.ptk.common.AstVisitor;
-
 import org.sweble.wikitext.parser.ParserConfig;
-import org.sweble.wikitext.parser.utils.SimpleParserConfig;
+import org.sweble.wikitext.parser.WikitextEncodingValidator;
 import org.sweble.wikitext.parser.WikitextParser;
+import org.sweble.wikitext.parser.WikitextPreprocessor;
+import org.sweble.wikitext.parser.encval.ValidatedWikitext;
+import org.sweble.wikitext.parser.nodes.WtBody;
 import org.sweble.wikitext.parser.nodes.WtBold;
+import org.sweble.wikitext.parser.nodes.WtExternalLink;
+import org.sweble.wikitext.parser.nodes.WtImageLink;
+import org.sweble.wikitext.parser.nodes.WtInternalLink;
 import org.sweble.wikitext.parser.nodes.WtItalics;
+import org.sweble.wikitext.parser.nodes.WtLinkTitle;
+import org.sweble.wikitext.parser.nodes.WtLinkTitle.WtNoLinkTitle;
+import org.sweble.wikitext.parser.nodes.WtName;
 import org.sweble.wikitext.parser.nodes.WtNewline;
 import org.sweble.wikitext.parser.nodes.WtNode;
+import org.sweble.wikitext.parser.nodes.WtParsedWikitextPage;
+import org.sweble.wikitext.parser.nodes.WtPreproWikitextPage;
 import org.sweble.wikitext.parser.nodes.WtSection;
+import org.sweble.wikitext.parser.nodes.WtTable;
+import org.sweble.wikitext.parser.nodes.WtTableCaption;
+import org.sweble.wikitext.parser.nodes.WtTableCell;
+import org.sweble.wikitext.parser.nodes.WtTableHeader;
+import org.sweble.wikitext.parser.nodes.WtTableRow;
 import org.sweble.wikitext.parser.nodes.WtTagExtension;
 import org.sweble.wikitext.parser.nodes.WtTagExtensionBody;
 import org.sweble.wikitext.parser.nodes.WtTemplate;
 import org.sweble.wikitext.parser.nodes.WtTemplateArgument;
 import org.sweble.wikitext.parser.nodes.WtTemplateArguments;
 import org.sweble.wikitext.parser.nodes.WtText;
-import org.sweble.wikitext.parser.nodes.WtInternalLink;
-import org.sweble.wikitext.parser.nodes.WtExternalLink;
-import org.sweble.wikitext.parser.nodes.WtImageLink;
-import org.sweble.wikitext.parser.nodes.WtLinkTitle;
-import org.sweble.wikitext.parser.nodes.WtLinkTitle.WtNoLinkTitle;
 import org.sweble.wikitext.parser.nodes.WtUrl;
-import org.sweble.wikitext.parser.nodes.WtTable;
-import org.sweble.wikitext.parser.nodes.WtTableHeader;
-import org.sweble.wikitext.parser.nodes.WtTableRow;
-import org.sweble.wikitext.parser.nodes.WtTableCell;
-import org.sweble.wikitext.parser.nodes.WtTableCaption;
-import org.sweble.wikitext.parser.nodes.WtXmlAttributes;
-import org.sweble.wikitext.parser.nodes.WtXmlAttribute;
-import org.sweble.wikitext.parser.nodes.WtName;
 import org.sweble.wikitext.parser.nodes.WtValue;
-import org.sweble.wikitext.parser.nodes.WtParsedWikitextPage;
+import org.sweble.wikitext.parser.nodes.WtXmlAttribute;
-import org.sweble.wikitext.parser.nodes.WtBody;
+import org.sweble.wikitext.parser.nodes.WtXmlAttributes;
 import org.sweble.wikitext.parser.nodes.WtXmlEmptyTag;
 import org.sweble.wikitext.parser.nodes.WtXmlEndTag;
 import org.sweble.wikitext.parser.nodes.WtXmlStartTag;
-
-import org.sweble.wikitext.parser.WikitextEncodingValidator;
-import org.sweble.wikitext.parser.WikitextPreprocessor;
-import org.sweble.wikitext.parser.encval.ValidatedWikitext;
-import org.sweble.wikitext.parser.nodes.WtPreproWikitextPage;
 import org.sweble.wikitext.parser.parser.PreprocessorToParserTransformer;
 import org.sweble.wikitext.parser.preprocessor.PreprocessedWikitext;
+import org.sweble.wikitext.parser.utils.SimpleParserConfig;
 
-import xtc.parser.ParseException;
+import com.google.common.io.CharStreams;
 
 import com.google.refine.importing.ImportingJob;
 import com.google.refine.model.Cell;
@@ -64,10 +60,13 @@ import com.google.refine.model.Project;
 import com.google.refine.model.Recon;
 import com.google.refine.model.ReconStats;
 import com.google.refine.model.metadata.ProjectMetadata;
+import com.google.refine.model.recon.ReconJob;
+import com.google.refine.model.recon.StandardReconConfig;
 import com.google.refine.model.recon.StandardReconConfig.ColumnDetail;
 import com.google.refine.util.JSONUtilities;
-import com.google.refine.model.recon.StandardReconConfig;
+
-import com.google.refine.model.recon.ReconJob;
+import de.fau.cs.osr.ptk.common.AstVisitor;
+import xtc.parser.ParseException;
 
 
 public class WikitextImporter extends TabularImportingParserBase {

main/src/com/google/refine/importing/UrlRewriter.java

@@ -37,6 +37,8 @@ import java.io.IOException;
 import java.net.MalformedURLException;
 import java.util.List;
 
+import com.google.refine.model.metadata.DataPackageUrlRewriter;
+
 /**
  * Given a URL rewrittenUrl, the interface will rewrite it into different URLS based on the rewrittenUrl
  * The result will be stored in the Result and can be used for download, parsing etc.

main/src/com/google/refine/model/changes/DataExtensionChange.java

@@ -43,13 +43,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.json.JSONWriter;
-
-import com.google.refine.model.ReconType;
-import com.google.refine.model.recon.DataExtensionReconConfig;
-import com.google.refine.model.recon.ReconciledDataExtensionJob.DataExtension;
 import com.google.refine.history.Change;
 import com.google.refine.model.Cell;
 import com.google.refine.model.Column;
@@ -59,7 +52,10 @@ import com.google.refine.model.Recon;
 import com.google.refine.model.Recon.Judgment;
 import com.google.refine.model.ReconCandidate;
 import com.google.refine.model.ReconStats;
+import com.google.refine.model.ReconType;
 import com.google.refine.model.Row;
+import com.google.refine.model.recon.DataExtensionReconConfig;
+import com.google.refine.model.recon.ReconciledDataExtensionJob.DataExtension;
 import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.Pool;
 

main/src/com/google/refine/model/changes/MassChange.java

@@ -34,14 +34,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 package com.google.refine.model.changes;
 
 import java.io.IOException;
-import com.google.common.collect.Lists;
- 
 import java.io.LineNumberReader;
 import java.io.Writer;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 
+import com.google.common.collect.Lists;
+
 import com.google.refine.history.Change;
 import com.google.refine.history.History;
 import com.google.refine.model.Project;

main/src/com/google/refine/model/changes/MassReconChange.java

@@ -41,9 +41,6 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Properties;
 
-import org.json.JSONException;
-import org.json.JSONWriter;
-
 import com.google.refine.ProjectManager;
 import com.google.refine.history.Change;
 import com.google.refine.model.Cell;

main/src/com/google/refine/model/metadata/ProjectMetadata.java

@@ -34,15 +34,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 package com.google.refine.model.metadata;
 
 import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
 import java.io.Serializable;
-import java.io.StringWriter;
-import java.io.Writer;
 import java.lang.reflect.InvocationTargetException;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -50,7 +45,6 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.io.FileUtils;
@@ -60,17 +54,15 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONTokener;
-import org.json.JSONWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRawValue;
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import com.fasterxml.jackson.annotation.JsonView;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
 
 import com.google.refine.ProjectManager;
 import com.google.refine.preference.PreferenceStore;

main/src/com/google/refine/oauth/Credentials.java

@@ -37,11 +37,11 @@ import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.google.refine.util.CookiesUtilities;
+
 import oauth.signpost.OAuth;
 import oauth.signpost.http.HttpParameters;
 
-import com.google.refine.util.CookiesUtilities;
-
 public class Credentials {
 
     private static final String TOKEN = "oauth_token";