Refactor fields rename package name

src/main/java/com/speedment/db/crud/Selector.java

@@ -17,7 +17,7 @@
 package com.speedment.db.crud;
 
 import com.speedment.annotation.Api;
-import com.speedment.field2.predicate.PredicateType;
+import com.speedment.field.predicate.PredicateType;
 
 import java.util.Optional;
 

src/main/java/com/speedment/encoder/Encoder.java

@@ -17,9 +17,9 @@
 package com.speedment.encoder;
 
 import com.speedment.annotation.Api;
-import com.speedment.field2.trait.FieldTrait;
-import com.speedment.field2.trait.ReferenceFieldTrait;
-import com.speedment.field2.trait.ReferenceForeignKeyFieldTrait;
+import com.speedment.field.trait.FieldTrait;
+import com.speedment.field.trait.ReferenceFieldTrait;
+import com.speedment.field.trait.ReferenceForeignKeyFieldTrait;
 import java.util.function.Function;
 import java.util.stream.Stream;
 

src/main/java/com/speedment/encoder/JsonEncoder.java

@@ -19,9 +19,9 @@
 import com.speedment.config.Column;
 import com.speedment.config.Table;
 import com.speedment.Manager;
-import com.speedment.field2.trait.FieldTrait;
-import com.speedment.field2.trait.ReferenceFieldTrait;
-import com.speedment.field2.trait.ReferenceForeignKeyFieldTrait;
+import com.speedment.field.trait.FieldTrait;
+import com.speedment.field.trait.ReferenceFieldTrait;
+import com.speedment.field.trait.ReferenceForeignKeyFieldTrait;
 import static com.speedment.internal.util.NullUtil.requireNonNulls;
 import static com.speedment.internal.util.JavaLanguage.javaVariableName;
 import java.util.LinkedHashMap;

src/main/java/com/speedment/field2/ComparableField.java → src/main/java/com/speedment/field/ComparableField.java

@@ -14,12 +14,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.field2;
+package com.speedment.field;
 
 import com.speedment.annotation.Api;
-import com.speedment.field2.trait.ComparableFieldTrait;
-import com.speedment.field2.trait.FieldTrait;
-import com.speedment.field2.trait.ReferenceFieldTrait;
+import com.speedment.field.trait.ComparableFieldTrait;
+import com.speedment.field.trait.FieldTrait;
+import com.speedment.field.trait.ReferenceFieldTrait;
 
 /**
  * A representation of an Entity field that is a reference type (eg Integer and

src/main/java/com/speedment/field2/ComparableForeignKeyField.java → src/main/java/com/speedment/field/ComparableForeignKeyField.java

@@ -14,13 +14,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.field2;
+package com.speedment.field;
 
 import com.speedment.annotation.Api;
-import com.speedment.field2.trait.ComparableFieldTrait;
-import com.speedment.field2.trait.FieldTrait;
-import com.speedment.field2.trait.ReferenceFieldTrait;
-import com.speedment.field2.trait.ReferenceForeignKeyFieldTrait;
+import com.speedment.field.trait.ComparableFieldTrait;
+import com.speedment.field.trait.FieldTrait;
+import com.speedment.field.trait.ReferenceFieldTrait;
+import com.speedment.field.trait.ReferenceForeignKeyFieldTrait;
 
 /**
  *

src/main/java/com/speedment/field2/Inclusion.java → src/main/java/com/speedment/field/Inclusion.java

@@ -19,7 +19,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package com.speedment.field2;
+package com.speedment.field;
 
 /**
  *

src/main/java/com/speedment/field2/ReferenceField.java → src/main/java/com/speedment/field/ReferenceField.java

@@ -14,11 +14,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.field2;
+package com.speedment.field;
 
 import com.speedment.annotation.Api;
-import com.speedment.field2.trait.FieldTrait;
-import com.speedment.field2.trait.ReferenceFieldTrait;
+import com.speedment.field.trait.FieldTrait;
+import com.speedment.field.trait.ReferenceFieldTrait;
 
 /**
  *

src/main/java/com/speedment/field2/ReferenceForeignKeyField.java → src/main/java/com/speedment/field/ReferenceForeignKeyField.java

@@ -14,12 +14,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.field2;
+package com.speedment.field;
 
 import com.speedment.annotation.Api;
-import com.speedment.field2.trait.FieldTrait;
-import com.speedment.field2.trait.ReferenceFieldTrait;
-import com.speedment.field2.trait.ReferenceForeignKeyFieldTrait;
+import com.speedment.field.trait.FieldTrait;
+import com.speedment.field.trait.ReferenceFieldTrait;
+import com.speedment.field.trait.ReferenceForeignKeyFieldTrait;
 
 /**
  *

src/main/java/com/speedment/field2/StringField.java → src/main/java/com/speedment/field/StringField.java

@@ -14,13 +14,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.field2;
+package com.speedment.field;
 
 import com.speedment.annotation.Api;
-import com.speedment.field2.trait.ComparableFieldTrait;
-import com.speedment.field2.trait.FieldTrait;
-import com.speedment.field2.trait.ReferenceFieldTrait;
-import com.speedment.field2.trait.StringFieldTrait;
+import com.speedment.field.trait.ComparableFieldTrait;
+import com.speedment.field.trait.FieldTrait;
+import com.speedment.field.trait.ReferenceFieldTrait;
+import com.speedment.field.trait.StringFieldTrait;
 
 /**
  *

src/main/java/com/speedment/field2/StringForeignKeyField.java → src/main/java/com/speedment/field/StringForeignKeyField.java

@@ -14,14 +14,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.field2;
+package com.speedment.field;
 
 import com.speedment.annotation.Api;
-import com.speedment.field2.trait.ComparableFieldTrait;
-import com.speedment.field2.trait.FieldTrait;
-import com.speedment.field2.trait.ReferenceFieldTrait;
-import com.speedment.field2.trait.ReferenceForeignKeyFieldTrait;
-import com.speedment.field2.trait.StringFieldTrait;
+import com.speedment.field.trait.ComparableFieldTrait;
+import com.speedment.field.trait.FieldTrait;
+import com.speedment.field.trait.ReferenceFieldTrait;
+import com.speedment.field.trait.ReferenceForeignKeyFieldTrait;
+import com.speedment.field.trait.StringFieldTrait;
 
 /**
  *

src/main/java/com/speedment/field2/methods/FieldSetter.java → src/main/java/com/speedment/field/methods/FieldSetter.java

@@ -19,9 +19,9 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package com.speedment.field2.methods;
+package com.speedment.field.methods;
 
-import com.speedment.field2.trait.FieldTrait;
+import com.speedment.field.trait.FieldTrait;
 import java.util.function.UnaryOperator;
 
 /**

src/main/java/com/speedment/field2/methods/Finder.java → src/main/java/com/speedment/field/methods/Finder.java

@@ -14,7 +14,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.field2.methods;
+package com.speedment.field.methods;
 
 import com.speedment.annotation.Api;
 import java.util.function.Function;

src/main/java/com/speedment/field2/methods/Getter.java → src/main/java/com/speedment/field/methods/Getter.java

@@ -14,7 +14,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.field2.methods;
+package com.speedment.field.methods;
 
 import com.speedment.annotation.Api;
 import java.util.function.Function;

src/main/java/com/speedment/field2/methods/Referencer.java → src/main/java/com/speedment/field/methods/Referencer.java

@@ -14,7 +14,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.field2.methods;
+package com.speedment.field.methods;
 
 import com.speedment.annotation.Api;
 import java.util.function.Function;

src/main/java/com/speedment/field2/methods/Setter.java → src/main/java/com/speedment/field/methods/Setter.java

@@ -14,7 +14,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.field2.methods;
+package com.speedment.field.methods;
 
 import com.speedment.annotation.Api;
 import java.util.function.BiFunction;

src/main/java/com/speedment/field2/predicate/ComparableSpeedmentPredicate.java → src/main/java/com/speedment/field/predicate/ComparableSpeedmentPredicate.java

@@ -14,7 +14,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.field2.predicate;
+package com.speedment.field.predicate;
 
 /**
  *

src/main/java/com/speedment/field2/predicate/HasFieldTrait.java → src/main/java/com/speedment/field/predicate/HasFieldTrait.java

@@ -14,9 +14,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.field2.predicate;
+package com.speedment.field.predicate;
 
-import com.speedment.field2.trait.FieldTrait;
+import com.speedment.field.trait.FieldTrait;
 
 /**
  *

src/main/java/com/speedment/field2/predicate/HasGetter.java → src/main/java/com/speedment/field/predicate/HasGetter.java

@@ -14,9 +14,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.field2.predicate;
+package com.speedment.field.predicate;
 
-import com.speedment.field2.methods.Getter;
+import com.speedment.field.methods.Getter;
 
 /**
  *

src/main/java/com/speedment/field2/predicate/HasNegated.java → src/main/java/com/speedment/field/predicate/HasNegated.java

@@ -14,7 +14,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.field2.predicate;
+package com.speedment.field.predicate;
 
 /**
  *

src/main/java/com/speedment/field2/predicate/HasPredicateType.java → src/main/java/com/speedment/field/predicate/HasPredicateType.java

@@ -14,7 +14,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.field2.predicate;
+package com.speedment.field.predicate;
 
 /**
  *

src/main/java/com/speedment/field2/predicate/PredicateType.java → src/main/java/com/speedment/field/predicate/PredicateType.java

@@ -14,7 +14,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.field2.predicate;
+package com.speedment.field.predicate;
 
 /**
  *

src/main/java/com/speedment/field2/predicate/SpeedmentPredicate.java → src/main/java/com/speedment/field/predicate/SpeedmentPredicate.java

@@ -14,7 +14,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.field2.predicate;
+package com.speedment.field.predicate;
 
 import java.util.function.Predicate;
 

src/main/java/com/speedment/field2/predicate/StringSpeedmentPredicate.java → src/main/java/com/speedment/field/predicate/StringSpeedmentPredicate.java

@@ -14,7 +14,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.field2.predicate;
+package com.speedment.field.predicate;
 
 /**
  *

src/main/java/com/speedment/field2/trait/ComparableFieldTrait.java → src/main/java/com/speedment/field/trait/ComparableFieldTrait.java

@@ -14,11 +14,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.field2.trait;
+package com.speedment.field.trait;
 
 import com.speedment.annotation.Api;
-import com.speedment.field2.Inclusion;
-import com.speedment.field2.predicate.ComparableSpeedmentPredicate;
+import com.speedment.field.Inclusion;
+import com.speedment.field.predicate.ComparableSpeedmentPredicate;
 import java.util.Comparator;
 import java.util.Set;
 

src/main/java/com/speedment/field2/trait/FieldTrait.java → src/main/java/com/speedment/field/trait/FieldTrait.java

@@ -14,7 +14,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.field2.trait;
+package com.speedment.field.trait;
 
 /**
  *

src/main/java/com/speedment/field2/trait/ReferenceFieldTrait.java → src/main/java/com/speedment/field/trait/ReferenceFieldTrait.java

@@ -19,12 +19,12 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package com.speedment.field2.trait;
+package com.speedment.field.trait;
 
-import com.speedment.field2.methods.FieldSetter;
-import com.speedment.field2.methods.Getter;
-import com.speedment.field2.methods.Setter;
-import com.speedment.field2.predicate.SpeedmentPredicate;
+import com.speedment.field.methods.FieldSetter;
+import com.speedment.field.methods.Getter;
+import com.speedment.field.methods.Setter;
+import com.speedment.field.predicate.SpeedmentPredicate;
 import java.util.function.Predicate;
 
 /**

src/main/java/com/speedment/field2/trait/ReferenceForeignKeyFieldTrait.java → src/main/java/com/speedment/field/trait/ReferenceForeignKeyFieldTrait.java

@@ -14,10 +14,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.field2.trait;
+package com.speedment.field.trait;
 
 import com.speedment.annotation.Api;
-import com.speedment.field2.methods.Finder;
+import com.speedment.field.methods.Finder;
 
 /**
  *

src/main/java/com/speedment/field2/trait/StringFieldTrait.java → src/main/java/com/speedment/field/trait/StringFieldTrait.java

@@ -14,10 +14,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.field2.trait;
+package com.speedment.field.trait;
 
 import com.speedment.annotation.Api;
-import com.speedment.field2.predicate.StringSpeedmentPredicate;
+import com.speedment.field.predicate.StringSpeedmentPredicate;
 
 /**
  *

src/main/java/com/speedment/internal/comparator/SpeedmentComparator.java

@@ -16,7 +16,7 @@
  */
 package com.speedment.internal.comparator;
 
-import com.speedment.field2.trait.FieldTrait;
+import com.speedment.field.trait.FieldTrait;
 import java.util.Comparator;
 
 /**

src/main/java/com/speedment/internal/comparator/impl/SpeedmentComparatorImpl.java

@@ -16,8 +16,8 @@
  */
 package com.speedment.internal.comparator.impl;
 
-import com.speedment.field2.methods.Getter;
-import com.speedment.field2.trait.FieldTrait;
+import com.speedment.field.methods.Getter;
+import com.speedment.field.trait.FieldTrait;
 import com.speedment.internal.comparator.SpeedmentComparator;
 import java.util.Comparator;
 import static java.util.Objects.requireNonNull;

src/main/java/com/speedment/internal/core/code/entity/EntityTranslatorSupport.java

@@ -33,20 +33,20 @@
 import com.speedment.config.ForeignKeyColumn;
 import com.speedment.config.Project;
 import com.speedment.config.Table;
-import com.speedment.field2.ComparableField;
-import com.speedment.field2.ComparableForeignKeyField;
-import com.speedment.field2.StringForeignKeyField;
-import com.speedment.field2.StringField;
-import com.speedment.field2.ReferenceField;
-import com.speedment.field2.ReferenceForeignKeyField;
+import com.speedment.field.ComparableField;
+import com.speedment.field.ComparableForeignKeyField;
+import com.speedment.field.StringForeignKeyField;
+import com.speedment.field.StringField;
+import com.speedment.field.ReferenceField;
+import com.speedment.field.ReferenceForeignKeyField;
 import com.speedment.exception.SpeedmentException;
 
-import com.speedment.internal.core.field2.ComparableFieldImpl;
-import com.speedment.internal.core.field2.ComparableForeignKeyFieldImpl;
-import com.speedment.internal.core.field2.StringForeignKeyFieldImpl;
-import com.speedment.internal.core.field2.StringFieldImpl;
-import com.speedment.internal.core.field2.ReferenceFieldImpl;
-import com.speedment.internal.core.field2.ReferenceForeignKeyFieldImpl;
+import com.speedment.internal.core.field.ComparableFieldImpl;
+import com.speedment.internal.core.field.ComparableForeignKeyFieldImpl;
+import com.speedment.internal.core.field.StringForeignKeyFieldImpl;
+import com.speedment.internal.core.field.StringFieldImpl;
+import com.speedment.internal.core.field.ReferenceFieldImpl;
+import com.speedment.internal.core.field.ReferenceForeignKeyFieldImpl;
 
 import com.speedment.db.MetaResult;
 import com.speedment.encoder.JsonEncoder;