Renamed JSON packages

paul-rogers · Apr 26, 2020 · 360a7a3 · 360a7a3
1 parent d69abed
commit 360a7a3
Show file tree

Hide file tree

Showing 26 changed files with 51 additions and 51 deletions.
diff --git a/...der/extended/BaseExtendedValueParser.java → ...son/extended/BaseExtendedValueParser.java b/...der/extended/BaseExtendedValueParser.java → ...son/extended/BaseExtendedValueParser.java
@@ -15,12 +15,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.drill.exec.store.easy.json.loader.extended;
+package org.apache.drill.exec.store.easy.json.extended;
 
-import org.apache.drill.exec.store.easy.json.loader.values.ScalarListener;
 import org.apache.drill.exec.store.easy.json.parser.JsonStructureParser;
 import org.apache.drill.exec.store.easy.json.parser.TokenIterator;
 import org.apache.drill.exec.store.easy.json.parser.ValueParser;
+import org.apache.drill.exec.store.easy.json.values.ScalarListener;
 
 import com.fasterxml.jackson.core.JsonToken;
 

diff --git a/...er/extended/ExtendedTypeFieldFactory.java → ...on/extended/ExtendedTypeFieldFactory.java b/...er/extended/ExtendedTypeFieldFactory.java → ...on/extended/ExtendedTypeFieldFactory.java
@@ -15,27 +15,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.drill.exec.store.easy.json.loader.extended;
+package org.apache.drill.exec.store.easy.json.extended;
 
 import org.apache.drill.common.types.TypeProtos.MinorType;
 import org.apache.drill.exec.record.metadata.MetadataUtils;
 import org.apache.drill.exec.store.easy.json.loader.BaseFieldFactory;
 import org.apache.drill.exec.store.easy.json.loader.FieldDefn;
 import org.apache.drill.exec.store.easy.json.loader.FieldFactory;
 import org.apache.drill.exec.store.easy.json.loader.JsonLoaderImpl;
-import org.apache.drill.exec.store.easy.json.loader.values.BinaryValueListener;
-import org.apache.drill.exec.store.easy.json.loader.values.DateValueListener;
-import org.apache.drill.exec.store.easy.json.loader.values.DecimalValueListener;
-import org.apache.drill.exec.store.easy.json.loader.values.IntervalValueListener;
-import org.apache.drill.exec.store.easy.json.loader.values.StrictBigIntValueListener;
-import org.apache.drill.exec.store.easy.json.loader.values.StrictDoubleValueListener;
-import org.apache.drill.exec.store.easy.json.loader.values.StrictIntValueListener;
-import org.apache.drill.exec.store.easy.json.loader.values.StrictStringValueListener;
-import org.apache.drill.exec.store.easy.json.loader.values.TimeValueListener;
-import org.apache.drill.exec.store.easy.json.loader.values.TimestampValueListener;
 import org.apache.drill.exec.store.easy.json.parser.ElementParser;
 import org.apache.drill.exec.store.easy.json.parser.TokenIterator;
 import org.apache.drill.exec.store.easy.json.parser.ValueParser;
+import org.apache.drill.exec.store.easy.json.values.BinaryValueListener;
+import org.apache.drill.exec.store.easy.json.values.DateValueListener;
+import org.apache.drill.exec.store.easy.json.values.DecimalValueListener;
+import org.apache.drill.exec.store.easy.json.values.IntervalValueListener;
+import org.apache.drill.exec.store.easy.json.values.StrictBigIntValueListener;
+import org.apache.drill.exec.store.easy.json.values.StrictDoubleValueListener;
+import org.apache.drill.exec.store.easy.json.values.StrictIntValueListener;
+import org.apache.drill.exec.store.easy.json.values.StrictStringValueListener;
+import org.apache.drill.exec.store.easy.json.values.TimeValueListener;
+import org.apache.drill.exec.store.easy.json.values.TimestampValueListener;
 
 import com.fasterxml.jackson.core.JsonToken;
 

diff --git a/...on/loader/extended/ExtendedTypeNames.java → ...easy/json/extended/ExtendedTypeNames.java b/...on/loader/extended/ExtendedTypeNames.java → ...easy/json/extended/ExtendedTypeNames.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.drill.exec.store.easy.json.loader.extended;
+package org.apache.drill.exec.store.easy.json.extended;
 
 import org.apache.drill.exec.vector.complex.fn.ExtendedTypeName;
 

diff --git a/...ader/extended/MongoBinaryValueParser.java → ...json/extended/MongoBinaryValueParser.java b/...ader/extended/MongoBinaryValueParser.java → ...json/extended/MongoBinaryValueParser.java
@@ -15,11 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.drill.exec.store.easy.json.loader.extended;
+package org.apache.drill.exec.store.easy.json.extended;
 
-import org.apache.drill.exec.store.easy.json.loader.values.ScalarListener;
 import org.apache.drill.exec.store.easy.json.parser.JsonStructureParser;
 import org.apache.drill.exec.store.easy.json.parser.TokenIterator;
+import org.apache.drill.exec.store.easy.json.values.ScalarListener;
 
 import com.fasterxml.jackson.core.JsonToken;
 

diff --git a/...loader/extended/MongoDateValueParser.java → ...y/json/extended/MongoDateValueParser.java b/...loader/extended/MongoDateValueParser.java → ...y/json/extended/MongoDateValueParser.java
@@ -15,11 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.drill.exec.store.easy.json.loader.extended;
+package org.apache.drill.exec.store.easy.json.extended;
 
-import org.apache.drill.exec.store.easy.json.loader.values.ScalarListener;
 import org.apache.drill.exec.store.easy.json.parser.JsonStructureParser;
 import org.apache.drill.exec.store.easy.json.parser.TokenIterator;
+import org.apache.drill.exec.store.easy.json.values.ScalarListener;
 
 import com.fasterxml.jackson.core.JsonToken;
 

diff --git a/...r/extended/SimpleExtendedValueParser.java → ...n/extended/SimpleExtendedValueParser.java b/...r/extended/SimpleExtendedValueParser.java → ...n/extended/SimpleExtendedValueParser.java
@@ -15,11 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.drill.exec.store.easy.json.loader.extended;
+package org.apache.drill.exec.store.easy.json.extended;
 
-import org.apache.drill.exec.store.easy.json.loader.values.ScalarListener;
 import org.apache.drill.exec.store.easy.json.parser.JsonStructureParser;
 import org.apache.drill.exec.store.easy.json.parser.TokenIterator;
+import org.apache.drill.exec.store.easy.json.values.ScalarListener;
 
 /**
  * Parsers a Mongo extended type of the form:<pre><code>

diff --git a/...sy/json/loader/extended/package-info.java → ...tore/easy/json/extended/package-info.java b/...sy/json/loader/extended/package-info.java → ...tore/easy/json/extended/package-info.java
@@ -139,4 +139,4 @@
  * @see org.apache.drill.exec.vector.complex.fn.VectorOutput.MapVectorOutput MapVectorOutput
  * for an older implementation
 */
-package org.apache.drill.exec.store.easy.json.loader.extended;
+package org.apache.drill.exec.store.easy.json.extended;
diff --git a/...ava-exec/src/main/java/org/apache/drill/exec/store/easy/json/loader/BaseFieldFactory.java b/...ava-exec/src/main/java/org/apache/drill/exec/store/easy/json/loader/BaseFieldFactory.java
@@ -25,21 +25,21 @@
 import org.apache.drill.exec.record.metadata.TupleMetadata;
 import org.apache.drill.exec.store.easy.json.loader.SimpleArrayListener.ListArrayListener;
 import org.apache.drill.exec.store.easy.json.loader.SimpleArrayListener.StructureArrayListener;
-import org.apache.drill.exec.store.easy.json.loader.values.BigIntListener;
-import org.apache.drill.exec.store.easy.json.loader.values.BinaryValueListener;
-import org.apache.drill.exec.store.easy.json.loader.values.BooleanListener;
-import org.apache.drill.exec.store.easy.json.loader.values.DateValueListener;
-import org.apache.drill.exec.store.easy.json.loader.values.DecimalValueListener;
-import org.apache.drill.exec.store.easy.json.loader.values.DoubleListener;
-import org.apache.drill.exec.store.easy.json.loader.values.IntervalValueListener;
-import org.apache.drill.exec.store.easy.json.loader.values.ScalarListener;
-import org.apache.drill.exec.store.easy.json.loader.values.StrictIntValueListener;
-import org.apache.drill.exec.store.easy.json.loader.values.TimeValueListener;
-import org.apache.drill.exec.store.easy.json.loader.values.TimestampValueListener;
-import org.apache.drill.exec.store.easy.json.loader.values.VarCharListener;
 import org.apache.drill.exec.store.easy.json.parser.ElementParser;
 import org.apache.drill.exec.store.easy.json.parser.FieldParserFactory;
 import org.apache.drill.exec.store.easy.json.parser.ValueParser;
+import org.apache.drill.exec.store.easy.json.values.BigIntListener;
+import org.apache.drill.exec.store.easy.json.values.BinaryValueListener;
+import org.apache.drill.exec.store.easy.json.values.BooleanListener;
+import org.apache.drill.exec.store.easy.json.values.DateValueListener;
+import org.apache.drill.exec.store.easy.json.values.DecimalValueListener;
+import org.apache.drill.exec.store.easy.json.values.DoubleListener;
+import org.apache.drill.exec.store.easy.json.values.IntervalValueListener;
+import org.apache.drill.exec.store.easy.json.values.ScalarListener;
+import org.apache.drill.exec.store.easy.json.values.StrictIntValueListener;
+import org.apache.drill.exec.store.easy.json.values.TimeValueListener;
+import org.apache.drill.exec.store.easy.json.values.TimestampValueListener;
+import org.apache.drill.exec.store.easy.json.values.VarCharListener;
 import org.apache.drill.exec.vector.accessor.ArrayWriter;
 import org.apache.drill.exec.vector.accessor.ObjectWriter;
 import org.apache.drill.exec.vector.accessor.ScalarWriter;

diff --git a/...exec/src/main/java/org/apache/drill/exec/store/easy/json/loader/InferredFieldFactory.java b/...exec/src/main/java/org/apache/drill/exec/store/easy/json/loader/InferredFieldFactory.java
@@ -21,10 +21,10 @@
 import org.apache.drill.common.types.TypeProtos.MinorType;
 import org.apache.drill.exec.record.metadata.ColumnMetadata;
 import org.apache.drill.exec.record.metadata.MetadataUtils;
-import org.apache.drill.exec.store.easy.json.loader.values.VarCharListener;
 import org.apache.drill.exec.store.easy.json.parser.ElementParser;
 import org.apache.drill.exec.store.easy.json.parser.ValueDef;
 import org.apache.drill.exec.store.easy.json.parser.ValueDef.JsonType;
+import org.apache.drill.exec.store.easy.json.values.VarCharListener;
 import org.apache.drill.exec.store.easy.json.parser.ValueParser;
 import org.apache.drill.exec.vector.accessor.ScalarWriter;
 import org.apache.drill.shaded.guava.com.google.common.base.Preconditions;

diff --git a/.../java-exec/src/main/java/org/apache/drill/exec/store/easy/json/loader/JsonLoaderImpl.java b/.../java-exec/src/main/java/org/apache/drill/exec/store/easy/json/loader/JsonLoaderImpl.java
@@ -31,7 +31,7 @@
 import org.apache.drill.exec.record.metadata.ColumnMetadata;
 import org.apache.drill.exec.record.metadata.TupleMetadata;
 import org.apache.drill.exec.server.options.OptionSet;
-import org.apache.drill.exec.store.easy.json.loader.extended.ExtendedTypeFieldFactory;
+import org.apache.drill.exec.store.easy.json.extended.ExtendedTypeFieldFactory;
 import org.apache.drill.exec.store.easy.json.parser.ErrorFactory;
 import org.apache.drill.exec.store.easy.json.parser.JsonStructureParser;
 import org.apache.drill.exec.store.easy.json.parser.JsonStructureParser.JsonStructureParserBuilder;

diff --git a/...exec/src/main/java/org/apache/drill/exec/store/easy/json/loader/ProvidedFieldFactory.java b/...exec/src/main/java/org/apache/drill/exec/store/easy/json/loader/ProvidedFieldFactory.java
@@ -21,10 +21,10 @@
 import org.apache.drill.exec.record.metadata.ColumnMetadata;
 import org.apache.drill.exec.record.metadata.MetadataUtils;
 import org.apache.drill.exec.record.metadata.TupleMetadata;
-import org.apache.drill.exec.store.easy.json.loader.values.VarCharListener;
 import org.apache.drill.exec.store.easy.json.parser.ElementParser;
 import org.apache.drill.exec.store.easy.json.parser.FieldParserFactory;
 import org.apache.drill.exec.store.easy.json.parser.ValueParser;
+import org.apache.drill.exec.store.easy.json.values.VarCharListener;
 import org.apache.drill.exec.vector.accessor.ObjectWriter;
 import org.apache.drill.shaded.guava.com.google.common.base.Preconditions;
 

diff --git a/...sy/json/loader/values/BigIntListener.java → ...tore/easy/json/values/BigIntListener.java b/...sy/json/loader/values/BigIntListener.java → ...tore/easy/json/values/BigIntListener.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.drill.exec.store.easy.json.loader.values;
+package org.apache.drill.exec.store.easy.json.values;
 
 import org.apache.drill.exec.store.easy.json.loader.JsonLoaderImpl;
 import org.apache.drill.exec.store.easy.json.parser.TokenIterator;

diff --git a/...on/loader/values/BinaryValueListener.java → ...easy/json/values/BinaryValueListener.java b/...on/loader/values/BinaryValueListener.java → ...easy/json/values/BinaryValueListener.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.drill.exec.store.easy.json.loader.values;
+package org.apache.drill.exec.store.easy.json.values;
 
 import org.apache.drill.exec.store.easy.json.loader.JsonLoaderImpl;
 import org.apache.drill.exec.store.easy.json.parser.TokenIterator;

diff --git a/...y/json/loader/values/BooleanListener.java → ...ore/easy/json/values/BooleanListener.java b/...y/json/loader/values/BooleanListener.java → ...ore/easy/json/values/BooleanListener.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.drill.exec.store.easy.json.loader.values;
+package org.apache.drill.exec.store.easy.json.values;
 
 import org.apache.drill.exec.store.easy.json.loader.JsonLoaderImpl;
 import org.apache.drill.exec.store.easy.json.parser.TokenIterator;

diff --git a/...json/loader/values/DateValueListener.java → ...e/easy/json/values/DateValueListener.java b/...json/loader/values/DateValueListener.java → ...e/easy/json/values/DateValueListener.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.drill.exec.store.easy.json.loader.values;
+package org.apache.drill.exec.store.easy.json.values;
 
 import java.time.LocalDate;
 import java.time.ZoneOffset;

diff --git a/...n/loader/values/DecimalValueListener.java → ...asy/json/values/DecimalValueListener.java b/...n/loader/values/DecimalValueListener.java → ...asy/json/values/DecimalValueListener.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.drill.exec.store.easy.json.loader.values;
+package org.apache.drill.exec.store.easy.json.values;
 
 import java.math.BigDecimal;
 

diff --git a/...sy/json/loader/values/DoubleListener.java → ...tore/easy/json/values/DoubleListener.java b/...sy/json/loader/values/DoubleListener.java → ...tore/easy/json/values/DoubleListener.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.drill.exec.store.easy.json.loader.values;
+package org.apache.drill.exec.store.easy.json.values;
 
 import org.apache.drill.exec.store.easy.json.loader.JsonLoaderImpl;
 import org.apache.drill.exec.store.easy.json.parser.TokenIterator;

diff --git a/.../loader/values/IntervalValueListener.java → ...sy/json/values/IntervalValueListener.java b/.../loader/values/IntervalValueListener.java → ...sy/json/values/IntervalValueListener.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.drill.exec.store.easy.json.loader.values;
+package org.apache.drill.exec.store.easy.json.values;
 
 import org.apache.drill.exec.store.easy.json.loader.JsonLoaderImpl;
 import org.apache.drill.exec.store.easy.json.parser.TokenIterator;

diff --git a/...sy/json/loader/values/ScalarListener.java → ...tore/easy/json/values/ScalarListener.java b/...sy/json/loader/values/ScalarListener.java → ...tore/easy/json/values/ScalarListener.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.drill.exec.store.easy.json.loader.values;
+package org.apache.drill.exec.store.easy.json.values;
 
 import org.apache.drill.common.exceptions.UserException;
 import org.apache.drill.exec.record.metadata.ColumnMetadata;

diff --git a/...der/values/StrictBigIntValueListener.java → ...son/values/StrictBigIntValueListener.java b/...der/values/StrictBigIntValueListener.java → ...son/values/StrictBigIntValueListener.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.drill.exec.store.easy.json.loader.values;
+package org.apache.drill.exec.store.easy.json.values;
 
 import org.apache.drill.exec.store.easy.json.loader.JsonLoaderImpl;
 import org.apache.drill.exec.store.easy.json.parser.TokenIterator;

diff --git a/...der/values/StrictDoubleValueListener.java → ...son/values/StrictDoubleValueListener.java b/...der/values/StrictDoubleValueListener.java → ...son/values/StrictDoubleValueListener.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.drill.exec.store.easy.json.loader.values;
+package org.apache.drill.exec.store.easy.json.values;
 
 import org.apache.drill.exec.store.easy.json.loader.JsonLoaderImpl;
 import org.apache.drill.exec.store.easy.json.parser.TokenIterator;

diff --git a/...loader/values/StrictIntValueListener.java → ...y/json/values/StrictIntValueListener.java b/...loader/values/StrictIntValueListener.java → ...y/json/values/StrictIntValueListener.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.drill.exec.store.easy.json.loader.values;
+package org.apache.drill.exec.store.easy.json.values;
 
 import org.apache.drill.exec.store.easy.json.loader.JsonLoaderImpl;
 import org.apache.drill.exec.store.easy.json.parser.TokenIterator;

diff --git a/...der/values/StrictStringValueListener.java → ...son/values/StrictStringValueListener.java b/...der/values/StrictStringValueListener.java → ...son/values/StrictStringValueListener.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.drill.exec.store.easy.json.loader.values;
+package org.apache.drill.exec.store.easy.json.values;
 
 import org.apache.drill.exec.store.easy.json.loader.JsonLoaderImpl;
 import org.apache.drill.exec.store.easy.json.parser.TokenIterator;

diff --git a/...json/loader/values/TimeValueListener.java → ...e/easy/json/values/TimeValueListener.java b/...json/loader/values/TimeValueListener.java → ...e/easy/json/values/TimeValueListener.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.drill.exec.store.easy.json.loader.values;
+package org.apache.drill.exec.store.easy.json.values;
 
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;

diff --git a/...loader/values/TimestampValueListener.java → ...y/json/values/TimestampValueListener.java b/...loader/values/TimestampValueListener.java → ...y/json/values/TimestampValueListener.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.drill.exec.store.easy.json.loader.values;
+package org.apache.drill.exec.store.easy.json.values;
 
 import java.time.Instant;
 import java.time.ZoneId;

diff --git a/...y/json/loader/values/VarCharListener.java → ...ore/easy/json/values/VarCharListener.java b/...y/json/loader/values/VarCharListener.java → ...ore/easy/json/values/VarCharListener.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.drill.exec.store.easy.json.loader.values;
+package org.apache.drill.exec.store.easy.json.values;
 
 import org.apache.drill.exec.store.easy.json.loader.JsonLoaderImpl;
 import org.apache.drill.exec.store.easy.json.parser.TokenIterator;