METAMODEL-244: Moved to pkg org.apache.metamodel.schema.naming
authorKasper Sørensen <i.am.kasper.sorensen@gmail.com>
Sun, 24 Apr 2016 20:54:40 +0000 (13:54 -0700)
committerKasper Sørensen <i.am.kasper.sorensen@gmail.com>
Sun, 24 Apr 2016 20:54:40 +0000 (13:54 -0700)
13 files changed:
core/src/main/java/org/apache/metamodel/schema/builder/DelegatingIntrinsicSwitchColumnNamingStrategy.java
core/src/main/java/org/apache/metamodel/schema/naming/AlphabeticColumnNamingStrategy.java [moved from core/src/main/java/org/apache/metamodel/schema/builder/AlphabeticColumnNamingStrategy.java with 94% similarity]
core/src/main/java/org/apache/metamodel/schema/naming/ColumnNamingContext.java [moved from core/src/main/java/org/apache/metamodel/schema/builder/ColumnNamingContext.java with 94% similarity]
core/src/main/java/org/apache/metamodel/schema/naming/ColumnNamingContextImpl.java [moved from core/src/main/java/org/apache/metamodel/schema/builder/ColumnNamingContextImpl.java with 94% similarity]
core/src/main/java/org/apache/metamodel/schema/naming/ColumnNamingSession.java [moved from core/src/main/java/org/apache/metamodel/schema/builder/ColumnNamingSession.java with 97% similarity]
core/src/main/java/org/apache/metamodel/schema/naming/ColumnNamingStrategy.java [moved from core/src/main/java/org/apache/metamodel/schema/builder/ColumnNamingStrategy.java with 93% similarity]
core/src/main/java/org/apache/metamodel/schema/naming/DefaultColumnNamingStrategy.java [moved from core/src/main/java/org/apache/metamodel/schema/builder/DefaultColumnNamingStrategy.java with 87% similarity]
core/src/main/java/org/apache/metamodel/schema/naming/UniqueColumnNamingStrategy.java [moved from core/src/main/java/org/apache/metamodel/schema/builder/UniqueColumnNamingStrategy.java with 95% similarity]
core/src/test/java/org/apache/metamodel/schema/naming/DefaultColumnNamingStrategyTest.java [moved from core/src/test/java/org/apache/metamodel/schema/builder/DefaultColumnNamingStrategyTest.java with 89% similarity]
csv/src/main/java/org/apache/metamodel/csv/CsvConfiguration.java
csv/src/main/java/org/apache/metamodel/csv/CsvTable.java
fixedwidth/src/main/java/org/apache/metamodel/fixedwidth/FixedWidthConfiguration.java
fixedwidth/src/main/java/org/apache/metamodel/fixedwidth/FixedWidthDataContext.java

index 612f81d..4fa5d30 100644 (file)
  */\r
 package org.apache.metamodel.schema.builder;\r
 \r
+import org.apache.metamodel.schema.naming.ColumnNamingContext;\r
+import org.apache.metamodel.schema.naming.ColumnNamingSession;\r
+import org.apache.metamodel.schema.naming.ColumnNamingStrategy;\r
+\r
 /**\r
  * A {@link ColumnNamingStrategy} that switches between two other\r
  * {@link ColumnNamingStrategy} delegates depending on the availability of a\r
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations\r
  * under the License.\r
  */\r
-package org.apache.metamodel.schema.builder;\r
+package org.apache.metamodel.schema.naming;\r
 \r
 import org.apache.metamodel.util.AlphabeticSequence;\r
 \r
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the\r
  * specific language governing permissions and limitations\r
  * under the License.\r
- */package org.apache.metamodel.schema.builder;\r
+ */package org.apache.metamodel.schema.naming;\r
 \r
 import org.apache.metamodel.schema.Table;\r
 \r
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations\r
  * under the License.\r
  */\r
-package org.apache.metamodel.schema.builder;\r
+package org.apache.metamodel.schema.naming;\r
 \r
 import org.apache.metamodel.schema.Table;\r
 \r
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.metamodel.schema.builder;
+package org.apache.metamodel.schema.naming;
 
 import java.io.Closeable;
 
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations\r
  * under the License.\r
  */\r
-package org.apache.metamodel.schema.builder;\r
+package org.apache.metamodel.schema.naming;\r
 \r
 import java.io.Serializable;\r
 \r
@@ -16,7 +16,9 @@
  * specific language governing permissions and limitations\r
  * under the License.\r
  */\r
-package org.apache.metamodel.schema.builder;\r
+package org.apache.metamodel.schema.naming;\r
+\r
+import org.apache.metamodel.schema.builder.DelegatingIntrinsicSwitchColumnNamingStrategy;\r
 \r
 /**\r
  * The default (in most cases) {@link ColumnNamingStrategy} to use when no other\r
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations\r
  * under the License.\r
  */\r
-package org.apache.metamodel.schema.builder;\r
+package org.apache.metamodel.schema.naming;\r
 \r
 import java.util.HashSet;\r
 import java.util.Set;\r
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.metamodel.schema.builder;
+package org.apache.metamodel.schema.naming;
 
 import static org.junit.Assert.*;
 
+import org.apache.metamodel.schema.naming.ColumnNamingContextImpl;
+import org.apache.metamodel.schema.naming.ColumnNamingSession;
+import org.apache.metamodel.schema.naming.DefaultColumnNamingStrategy;
 import org.junit.Test;
 
 public class DefaultColumnNamingStrategyTest {
index 4d1874c..dd1c8ac 100644 (file)
@@ -21,8 +21,8 @@ package org.apache.metamodel.csv;
 import java.io.Serializable;
 import java.util.List;
 
-import org.apache.metamodel.schema.builder.ColumnNamingStrategy;
-import org.apache.metamodel.schema.builder.DefaultColumnNamingStrategy;
+import org.apache.metamodel.schema.naming.ColumnNamingStrategy;
+import org.apache.metamodel.schema.naming.DefaultColumnNamingStrategy;
 import org.apache.metamodel.util.BaseObject;
 import org.apache.metamodel.util.FileHelper;
 
index e2a665d..334af7e 100644 (file)
@@ -27,9 +27,9 @@ import org.apache.metamodel.schema.MutableColumn;
 import org.apache.metamodel.schema.Relationship;
 import org.apache.metamodel.schema.Schema;
 import org.apache.metamodel.schema.TableType;
-import org.apache.metamodel.schema.builder.ColumnNamingContextImpl;
-import org.apache.metamodel.schema.builder.ColumnNamingSession;
-import org.apache.metamodel.schema.builder.ColumnNamingStrategy;
+import org.apache.metamodel.schema.naming.ColumnNamingContextImpl;
+import org.apache.metamodel.schema.naming.ColumnNamingSession;
+import org.apache.metamodel.schema.naming.ColumnNamingStrategy;
 import org.apache.metamodel.util.FileHelper;
 
 import au.com.bytecode.opencsv.CSVReader;
index 9c0dd46..bbdd0ad 100644 (file)
@@ -23,8 +23,8 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.apache.metamodel.data.DataSet;
-import org.apache.metamodel.schema.builder.ColumnNamingStrategy;
-import org.apache.metamodel.schema.builder.DefaultColumnNamingStrategy;
+import org.apache.metamodel.schema.naming.ColumnNamingStrategy;
+import org.apache.metamodel.schema.naming.DefaultColumnNamingStrategy;
 import org.apache.metamodel.util.BaseObject;
 import org.apache.metamodel.util.FileHelper;
 
index 25a8457..d28a0b2 100644 (file)
@@ -33,9 +33,9 @@ import org.apache.metamodel.schema.MutableTable;
 import org.apache.metamodel.schema.Schema;
 import org.apache.metamodel.schema.Table;
 import org.apache.metamodel.schema.TableType;
-import org.apache.metamodel.schema.builder.ColumnNamingContextImpl;
-import org.apache.metamodel.schema.builder.ColumnNamingSession;
-import org.apache.metamodel.schema.builder.ColumnNamingStrategy;
+import org.apache.metamodel.schema.naming.ColumnNamingContextImpl;
+import org.apache.metamodel.schema.naming.ColumnNamingSession;
+import org.apache.metamodel.schema.naming.ColumnNamingStrategy;
 import org.apache.metamodel.util.FileHelper;
 import org.apache.metamodel.util.FileResource;
 import org.apache.metamodel.util.Resource;