From 14a771ca9c7185eec8b920f4ec1948c3149b6c05 Mon Sep 17 00:00:00 2001 From: Albert Shift Date: Thu, 23 Apr 2015 00:12:39 -0700 Subject: [PATCH] group converter packages by type --- .../EntityToTupleValueConverter.java | 3 ++- .../MapToTupleKeyMapConverter.java | 3 ++- .../{ => tuple}/MapToTupleMapConverter.java | 3 ++- .../MapToTupleValueMapConverter.java | 3 ++- .../{ => tuple}/SetToTupleSetConverter.java | 3 ++- .../TupleKeyMapToMapConverter.java | 3 ++- .../{ => tuple}/TupleListToListConverter.java | 3 ++- .../{ => tuple}/TupleMapToMapConverter.java | 3 ++- .../{ => tuple}/TupleSetToSetConverter.java | 3 ++- .../TupleValueMapToMapConverter.java | 3 ++- .../TupleValueToEntityConverter.java | 3 ++- .../{ => udt}/EntityToUDTValueConverter.java | 3 ++- .../{ => udt}/ListToUDTListConverter.java | 3 ++- .../{ => udt}/MapToUDTKeyMapConverter.java | 3 ++- .../{ => udt}/MapToUDTMapConverter.java | 3 ++- .../{ => udt}/MapToUDTValueMapConverter.java | 3 ++- .../{ => udt}/SetToUDTSetConverter.java | 3 ++- .../{ => udt}/UDTKeyMapToMapConverter.java | 3 ++- .../{ => udt}/UDTListToListConverter.java | 3 ++- .../{ => udt}/UDTMapToMapConverter.java | 3 ++- .../{ => udt}/UDTSetToSetConverter.java | 3 ++- .../{ => udt}/UDTValueMapToMapConverter.java | 3 ++- .../{ => udt}/UDTValueToEntityConverter.java | 3 ++- .../casser/mapping/javatype/ListJavaType.java | 8 +++---- .../casser/mapping/javatype/MapJavaType.java | 24 +++++++++---------- .../casser/mapping/javatype/SetJavaType.java | 8 +++---- .../mapping/javatype/TupleValueJavaType.java | 4 ++-- .../mapping/javatype/UDTValueJavaType.java | 4 ++-- .../ListToTupleListConverter.java | 3 ++- 29 files changed, 72 insertions(+), 48 deletions(-) rename src/main/java/com/noorq/casser/mapping/convert/{ => tuple}/EntityToTupleValueConverter.java (90%) rename src/main/java/com/noorq/casser/mapping/convert/{ => tuple}/MapToTupleKeyMapConverter.java (92%) rename src/main/java/com/noorq/casser/mapping/convert/{ => tuple}/MapToTupleMapConverter.java (92%) rename src/main/java/com/noorq/casser/mapping/convert/{ => tuple}/MapToTupleValueMapConverter.java (92%) rename src/main/java/com/noorq/casser/mapping/convert/{ => tuple}/SetToTupleSetConverter.java (92%) rename src/main/java/com/noorq/casser/mapping/convert/{ => tuple}/TupleKeyMapToMapConverter.java (92%) rename src/main/java/com/noorq/casser/mapping/convert/{ => tuple}/TupleListToListConverter.java (92%) rename src/main/java/com/noorq/casser/mapping/convert/{ => tuple}/TupleMapToMapConverter.java (93%) rename src/main/java/com/noorq/casser/mapping/convert/{ => tuple}/TupleSetToSetConverter.java (92%) rename src/main/java/com/noorq/casser/mapping/convert/{ => tuple}/TupleValueMapToMapConverter.java (92%) rename src/main/java/com/noorq/casser/mapping/convert/{ => tuple}/TupleValueToEntityConverter.java (91%) rename src/main/java/com/noorq/casser/mapping/convert/{ => udt}/EntityToUDTValueConverter.java (90%) rename src/main/java/com/noorq/casser/mapping/convert/{ => udt}/ListToUDTListConverter.java (92%) rename src/main/java/com/noorq/casser/mapping/convert/{ => udt}/MapToUDTKeyMapConverter.java (92%) rename src/main/java/com/noorq/casser/mapping/convert/{ => udt}/MapToUDTMapConverter.java (93%) rename src/main/java/com/noorq/casser/mapping/convert/{ => udt}/MapToUDTValueMapConverter.java (92%) rename src/main/java/com/noorq/casser/mapping/convert/{ => udt}/SetToUDTSetConverter.java (92%) rename src/main/java/com/noorq/casser/mapping/convert/{ => udt}/UDTKeyMapToMapConverter.java (92%) rename src/main/java/com/noorq/casser/mapping/convert/{ => udt}/UDTListToListConverter.java (92%) rename src/main/java/com/noorq/casser/mapping/convert/{ => udt}/UDTMapToMapConverter.java (93%) rename src/main/java/com/noorq/casser/mapping/convert/{ => udt}/UDTSetToSetConverter.java (92%) rename src/main/java/com/noorq/casser/mapping/convert/{ => udt}/UDTValueMapToMapConverter.java (92%) rename src/main/java/com/noorq/casser/mapping/convert/{ => udt}/UDTValueToEntityConverter.java (91%) rename src/main/java/com/noorq/casser/mapping/{convert => type}/ListToTupleListConverter.java (92%) diff --git a/src/main/java/com/noorq/casser/mapping/convert/EntityToTupleValueConverter.java b/src/main/java/com/noorq/casser/mapping/convert/tuple/EntityToTupleValueConverter.java similarity index 90% rename from src/main/java/com/noorq/casser/mapping/convert/EntityToTupleValueConverter.java rename to src/main/java/com/noorq/casser/mapping/convert/tuple/EntityToTupleValueConverter.java index 7a9aa1b..accd19f 100644 --- a/src/main/java/com/noorq/casser/mapping/convert/EntityToTupleValueConverter.java +++ b/src/main/java/com/noorq/casser/mapping/convert/tuple/EntityToTupleValueConverter.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.noorq.casser.mapping.convert; +package com.noorq.casser.mapping.convert.tuple; import java.util.function.Function; import com.datastax.driver.core.TupleType; import com.datastax.driver.core.TupleValue; import com.noorq.casser.core.SessionRepository; +import com.noorq.casser.mapping.convert.TupleValueWriter; public final class EntityToTupleValueConverter extends TupleValueWriter implements Function { diff --git a/src/main/java/com/noorq/casser/mapping/convert/MapToTupleKeyMapConverter.java b/src/main/java/com/noorq/casser/mapping/convert/tuple/MapToTupleKeyMapConverter.java similarity index 92% rename from src/main/java/com/noorq/casser/mapping/convert/MapToTupleKeyMapConverter.java rename to src/main/java/com/noorq/casser/mapping/convert/tuple/MapToTupleKeyMapConverter.java index 5e3a815..f8602b7 100644 --- a/src/main/java/com/noorq/casser/mapping/convert/MapToTupleKeyMapConverter.java +++ b/src/main/java/com/noorq/casser/mapping/convert/tuple/MapToTupleKeyMapConverter.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.noorq.casser.mapping.convert; +package com.noorq.casser.mapping.convert.tuple; import java.util.Map; import java.util.function.Function; import com.datastax.driver.core.TupleType; import com.noorq.casser.core.SessionRepository; +import com.noorq.casser.mapping.convert.TupleValueWriter; import com.noorq.casser.support.Transformers; public final class MapToTupleKeyMapConverter implements Function { diff --git a/src/main/java/com/noorq/casser/mapping/convert/MapToTupleMapConverter.java b/src/main/java/com/noorq/casser/mapping/convert/tuple/MapToTupleMapConverter.java similarity index 92% rename from src/main/java/com/noorq/casser/mapping/convert/MapToTupleMapConverter.java rename to src/main/java/com/noorq/casser/mapping/convert/tuple/MapToTupleMapConverter.java index ff56db1..ae8dfad 100644 --- a/src/main/java/com/noorq/casser/mapping/convert/MapToTupleMapConverter.java +++ b/src/main/java/com/noorq/casser/mapping/convert/tuple/MapToTupleMapConverter.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.noorq.casser.mapping.convert; +package com.noorq.casser.mapping.convert.tuple; import java.util.Map; import java.util.function.Function; import com.datastax.driver.core.TupleType; import com.noorq.casser.core.SessionRepository; +import com.noorq.casser.mapping.convert.TupleValueWriter; import com.noorq.casser.support.Transformers; public final class MapToTupleMapConverter implements Function { diff --git a/src/main/java/com/noorq/casser/mapping/convert/MapToTupleValueMapConverter.java b/src/main/java/com/noorq/casser/mapping/convert/tuple/MapToTupleValueMapConverter.java similarity index 92% rename from src/main/java/com/noorq/casser/mapping/convert/MapToTupleValueMapConverter.java rename to src/main/java/com/noorq/casser/mapping/convert/tuple/MapToTupleValueMapConverter.java index e2f41a5..e63257a 100644 --- a/src/main/java/com/noorq/casser/mapping/convert/MapToTupleValueMapConverter.java +++ b/src/main/java/com/noorq/casser/mapping/convert/tuple/MapToTupleValueMapConverter.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.noorq.casser.mapping.convert; +package com.noorq.casser.mapping.convert.tuple; import java.util.Map; import java.util.function.Function; import com.datastax.driver.core.TupleType; import com.noorq.casser.core.SessionRepository; +import com.noorq.casser.mapping.convert.TupleValueWriter; import com.noorq.casser.support.Transformers; public final class MapToTupleValueMapConverter implements Function { diff --git a/src/main/java/com/noorq/casser/mapping/convert/SetToTupleSetConverter.java b/src/main/java/com/noorq/casser/mapping/convert/tuple/SetToTupleSetConverter.java similarity index 92% rename from src/main/java/com/noorq/casser/mapping/convert/SetToTupleSetConverter.java rename to src/main/java/com/noorq/casser/mapping/convert/tuple/SetToTupleSetConverter.java index 2c31bf1..678e4eb 100644 --- a/src/main/java/com/noorq/casser/mapping/convert/SetToTupleSetConverter.java +++ b/src/main/java/com/noorq/casser/mapping/convert/tuple/SetToTupleSetConverter.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.noorq.casser.mapping.convert; +package com.noorq.casser.mapping.convert.tuple; import java.util.Set; import java.util.function.Function; import com.datastax.driver.core.TupleType; import com.noorq.casser.core.SessionRepository; +import com.noorq.casser.mapping.convert.TupleValueWriter; import com.noorq.casser.support.Transformers; public final class SetToTupleSetConverter implements Function { diff --git a/src/main/java/com/noorq/casser/mapping/convert/TupleKeyMapToMapConverter.java b/src/main/java/com/noorq/casser/mapping/convert/tuple/TupleKeyMapToMapConverter.java similarity index 92% rename from src/main/java/com/noorq/casser/mapping/convert/TupleKeyMapToMapConverter.java rename to src/main/java/com/noorq/casser/mapping/convert/tuple/TupleKeyMapToMapConverter.java index 79deb65..a6e8a47 100644 --- a/src/main/java/com/noorq/casser/mapping/convert/TupleKeyMapToMapConverter.java +++ b/src/main/java/com/noorq/casser/mapping/convert/tuple/TupleKeyMapToMapConverter.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.noorq.casser.mapping.convert; +package com.noorq.casser.mapping.convert.tuple; import java.util.Map; import java.util.function.Function; import com.datastax.driver.core.TupleValue; import com.noorq.casser.core.SessionRepository; +import com.noorq.casser.mapping.convert.ProxyValueReader; import com.noorq.casser.mapping.value.TupleColumnValueProvider; import com.noorq.casser.support.Transformers; diff --git a/src/main/java/com/noorq/casser/mapping/convert/TupleListToListConverter.java b/src/main/java/com/noorq/casser/mapping/convert/tuple/TupleListToListConverter.java similarity index 92% rename from src/main/java/com/noorq/casser/mapping/convert/TupleListToListConverter.java rename to src/main/java/com/noorq/casser/mapping/convert/tuple/TupleListToListConverter.java index bda172a..bed15d0 100644 --- a/src/main/java/com/noorq/casser/mapping/convert/TupleListToListConverter.java +++ b/src/main/java/com/noorq/casser/mapping/convert/tuple/TupleListToListConverter.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.noorq.casser.mapping.convert; +package com.noorq.casser.mapping.convert.tuple; import java.util.List; import java.util.function.Function; import com.datastax.driver.core.TupleValue; import com.noorq.casser.core.SessionRepository; +import com.noorq.casser.mapping.convert.ProxyValueReader; import com.noorq.casser.mapping.value.TupleColumnValueProvider; import com.noorq.casser.support.Transformers; diff --git a/src/main/java/com/noorq/casser/mapping/convert/TupleMapToMapConverter.java b/src/main/java/com/noorq/casser/mapping/convert/tuple/TupleMapToMapConverter.java similarity index 93% rename from src/main/java/com/noorq/casser/mapping/convert/TupleMapToMapConverter.java rename to src/main/java/com/noorq/casser/mapping/convert/tuple/TupleMapToMapConverter.java index df87a4d..e8db13f 100644 --- a/src/main/java/com/noorq/casser/mapping/convert/TupleMapToMapConverter.java +++ b/src/main/java/com/noorq/casser/mapping/convert/tuple/TupleMapToMapConverter.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.noorq.casser.mapping.convert; +package com.noorq.casser.mapping.convert.tuple; import java.util.Map; import java.util.function.Function; import com.datastax.driver.core.TupleValue; import com.noorq.casser.core.SessionRepository; +import com.noorq.casser.mapping.convert.ProxyValueReader; import com.noorq.casser.mapping.value.TupleColumnValueProvider; import com.noorq.casser.support.Transformers; diff --git a/src/main/java/com/noorq/casser/mapping/convert/TupleSetToSetConverter.java b/src/main/java/com/noorq/casser/mapping/convert/tuple/TupleSetToSetConverter.java similarity index 92% rename from src/main/java/com/noorq/casser/mapping/convert/TupleSetToSetConverter.java rename to src/main/java/com/noorq/casser/mapping/convert/tuple/TupleSetToSetConverter.java index e42628d..5811ee1 100644 --- a/src/main/java/com/noorq/casser/mapping/convert/TupleSetToSetConverter.java +++ b/src/main/java/com/noorq/casser/mapping/convert/tuple/TupleSetToSetConverter.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.noorq.casser.mapping.convert; +package com.noorq.casser.mapping.convert.tuple; import java.util.Set; import java.util.function.Function; import com.datastax.driver.core.TupleValue; import com.noorq.casser.core.SessionRepository; +import com.noorq.casser.mapping.convert.ProxyValueReader; import com.noorq.casser.mapping.value.TupleColumnValueProvider; import com.noorq.casser.support.Transformers; diff --git a/src/main/java/com/noorq/casser/mapping/convert/TupleValueMapToMapConverter.java b/src/main/java/com/noorq/casser/mapping/convert/tuple/TupleValueMapToMapConverter.java similarity index 92% rename from src/main/java/com/noorq/casser/mapping/convert/TupleValueMapToMapConverter.java rename to src/main/java/com/noorq/casser/mapping/convert/tuple/TupleValueMapToMapConverter.java index ce63b23..806861e 100644 --- a/src/main/java/com/noorq/casser/mapping/convert/TupleValueMapToMapConverter.java +++ b/src/main/java/com/noorq/casser/mapping/convert/tuple/TupleValueMapToMapConverter.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.noorq.casser.mapping.convert; +package com.noorq.casser.mapping.convert.tuple; import java.util.Map; import java.util.function.Function; import com.datastax.driver.core.TupleValue; import com.noorq.casser.core.SessionRepository; +import com.noorq.casser.mapping.convert.ProxyValueReader; import com.noorq.casser.mapping.value.TupleColumnValueProvider; import com.noorq.casser.support.Transformers; diff --git a/src/main/java/com/noorq/casser/mapping/convert/TupleValueToEntityConverter.java b/src/main/java/com/noorq/casser/mapping/convert/tuple/TupleValueToEntityConverter.java similarity index 91% rename from src/main/java/com/noorq/casser/mapping/convert/TupleValueToEntityConverter.java rename to src/main/java/com/noorq/casser/mapping/convert/tuple/TupleValueToEntityConverter.java index 066b663..30cbc0e 100644 --- a/src/main/java/com/noorq/casser/mapping/convert/TupleValueToEntityConverter.java +++ b/src/main/java/com/noorq/casser/mapping/convert/tuple/TupleValueToEntityConverter.java @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.noorq.casser.mapping.convert; +package com.noorq.casser.mapping.convert.tuple; import java.util.function.Function; import com.datastax.driver.core.TupleValue; import com.noorq.casser.core.SessionRepository; +import com.noorq.casser.mapping.convert.ProxyValueReader; import com.noorq.casser.mapping.value.TupleColumnValueProvider; public final class TupleValueToEntityConverter extends ProxyValueReader implements Function { diff --git a/src/main/java/com/noorq/casser/mapping/convert/EntityToUDTValueConverter.java b/src/main/java/com/noorq/casser/mapping/convert/udt/EntityToUDTValueConverter.java similarity index 90% rename from src/main/java/com/noorq/casser/mapping/convert/EntityToUDTValueConverter.java rename to src/main/java/com/noorq/casser/mapping/convert/udt/EntityToUDTValueConverter.java index 35449fe..701441c 100644 --- a/src/main/java/com/noorq/casser/mapping/convert/EntityToUDTValueConverter.java +++ b/src/main/java/com/noorq/casser/mapping/convert/udt/EntityToUDTValueConverter.java @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.noorq.casser.mapping.convert; +package com.noorq.casser.mapping.convert.udt; import com.datastax.driver.core.UserType; import com.noorq.casser.core.SessionRepository; +import com.noorq.casser.mapping.convert.UDTValueWriter; public final class EntityToUDTValueConverter extends UDTValueWriter { diff --git a/src/main/java/com/noorq/casser/mapping/convert/ListToUDTListConverter.java b/src/main/java/com/noorq/casser/mapping/convert/udt/ListToUDTListConverter.java similarity index 92% rename from src/main/java/com/noorq/casser/mapping/convert/ListToUDTListConverter.java rename to src/main/java/com/noorq/casser/mapping/convert/udt/ListToUDTListConverter.java index 4e56952..2edf3bb 100644 --- a/src/main/java/com/noorq/casser/mapping/convert/ListToUDTListConverter.java +++ b/src/main/java/com/noorq/casser/mapping/convert/udt/ListToUDTListConverter.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.noorq.casser.mapping.convert; +package com.noorq.casser.mapping.convert.udt; import java.util.List; import java.util.function.Function; import com.datastax.driver.core.UserType; import com.noorq.casser.core.SessionRepository; +import com.noorq.casser.mapping.convert.UDTValueWriter; import com.noorq.casser.support.Transformers; public final class ListToUDTListConverter implements Function { diff --git a/src/main/java/com/noorq/casser/mapping/convert/MapToUDTKeyMapConverter.java b/src/main/java/com/noorq/casser/mapping/convert/udt/MapToUDTKeyMapConverter.java similarity index 92% rename from src/main/java/com/noorq/casser/mapping/convert/MapToUDTKeyMapConverter.java rename to src/main/java/com/noorq/casser/mapping/convert/udt/MapToUDTKeyMapConverter.java index 51f97aa..95740d5 100644 --- a/src/main/java/com/noorq/casser/mapping/convert/MapToUDTKeyMapConverter.java +++ b/src/main/java/com/noorq/casser/mapping/convert/udt/MapToUDTKeyMapConverter.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.noorq.casser.mapping.convert; +package com.noorq.casser.mapping.convert.udt; import java.util.Map; import java.util.function.Function; import com.datastax.driver.core.UserType; import com.noorq.casser.core.SessionRepository; +import com.noorq.casser.mapping.convert.UDTValueWriter; import com.noorq.casser.support.Transformers; public final class MapToUDTKeyMapConverter implements Function { diff --git a/src/main/java/com/noorq/casser/mapping/convert/MapToUDTMapConverter.java b/src/main/java/com/noorq/casser/mapping/convert/udt/MapToUDTMapConverter.java similarity index 93% rename from src/main/java/com/noorq/casser/mapping/convert/MapToUDTMapConverter.java rename to src/main/java/com/noorq/casser/mapping/convert/udt/MapToUDTMapConverter.java index e2a4c93..c22f156 100644 --- a/src/main/java/com/noorq/casser/mapping/convert/MapToUDTMapConverter.java +++ b/src/main/java/com/noorq/casser/mapping/convert/udt/MapToUDTMapConverter.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.noorq.casser.mapping.convert; +package com.noorq.casser.mapping.convert.udt; import java.util.Map; import java.util.function.Function; import com.datastax.driver.core.UserType; import com.noorq.casser.core.SessionRepository; +import com.noorq.casser.mapping.convert.UDTValueWriter; import com.noorq.casser.support.Transformers; public final class MapToUDTMapConverter implements Function { diff --git a/src/main/java/com/noorq/casser/mapping/convert/MapToUDTValueMapConverter.java b/src/main/java/com/noorq/casser/mapping/convert/udt/MapToUDTValueMapConverter.java similarity index 92% rename from src/main/java/com/noorq/casser/mapping/convert/MapToUDTValueMapConverter.java rename to src/main/java/com/noorq/casser/mapping/convert/udt/MapToUDTValueMapConverter.java index c798f42..3863d0f 100644 --- a/src/main/java/com/noorq/casser/mapping/convert/MapToUDTValueMapConverter.java +++ b/src/main/java/com/noorq/casser/mapping/convert/udt/MapToUDTValueMapConverter.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.noorq.casser.mapping.convert; +package com.noorq.casser.mapping.convert.udt; import java.util.Map; import java.util.function.Function; import com.datastax.driver.core.UserType; import com.noorq.casser.core.SessionRepository; +import com.noorq.casser.mapping.convert.UDTValueWriter; import com.noorq.casser.support.Transformers; public final class MapToUDTValueMapConverter implements Function { diff --git a/src/main/java/com/noorq/casser/mapping/convert/SetToUDTSetConverter.java b/src/main/java/com/noorq/casser/mapping/convert/udt/SetToUDTSetConverter.java similarity index 92% rename from src/main/java/com/noorq/casser/mapping/convert/SetToUDTSetConverter.java rename to src/main/java/com/noorq/casser/mapping/convert/udt/SetToUDTSetConverter.java index 78aab5c..2ae97cf 100644 --- a/src/main/java/com/noorq/casser/mapping/convert/SetToUDTSetConverter.java +++ b/src/main/java/com/noorq/casser/mapping/convert/udt/SetToUDTSetConverter.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.noorq.casser.mapping.convert; +package com.noorq.casser.mapping.convert.udt; import java.util.Set; import java.util.function.Function; import com.datastax.driver.core.UserType; import com.noorq.casser.core.SessionRepository; +import com.noorq.casser.mapping.convert.UDTValueWriter; import com.noorq.casser.support.Transformers; public final class SetToUDTSetConverter implements Function { diff --git a/src/main/java/com/noorq/casser/mapping/convert/UDTKeyMapToMapConverter.java b/src/main/java/com/noorq/casser/mapping/convert/udt/UDTKeyMapToMapConverter.java similarity index 92% rename from src/main/java/com/noorq/casser/mapping/convert/UDTKeyMapToMapConverter.java rename to src/main/java/com/noorq/casser/mapping/convert/udt/UDTKeyMapToMapConverter.java index 886a6f4..7fdd13a 100644 --- a/src/main/java/com/noorq/casser/mapping/convert/UDTKeyMapToMapConverter.java +++ b/src/main/java/com/noorq/casser/mapping/convert/udt/UDTKeyMapToMapConverter.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.noorq.casser.mapping.convert; +package com.noorq.casser.mapping.convert.udt; import java.util.Map; import java.util.function.Function; import com.datastax.driver.core.UDTValue; import com.noorq.casser.core.SessionRepository; +import com.noorq.casser.mapping.convert.ProxyValueReader; import com.noorq.casser.mapping.value.UDTColumnValueProvider; import com.noorq.casser.support.Transformers; diff --git a/src/main/java/com/noorq/casser/mapping/convert/UDTListToListConverter.java b/src/main/java/com/noorq/casser/mapping/convert/udt/UDTListToListConverter.java similarity index 92% rename from src/main/java/com/noorq/casser/mapping/convert/UDTListToListConverter.java rename to src/main/java/com/noorq/casser/mapping/convert/udt/UDTListToListConverter.java index 28ebf0b..0b620ff 100644 --- a/src/main/java/com/noorq/casser/mapping/convert/UDTListToListConverter.java +++ b/src/main/java/com/noorq/casser/mapping/convert/udt/UDTListToListConverter.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.noorq.casser.mapping.convert; +package com.noorq.casser.mapping.convert.udt; import java.util.List; import java.util.function.Function; import com.datastax.driver.core.UDTValue; import com.noorq.casser.core.SessionRepository; +import com.noorq.casser.mapping.convert.ProxyValueReader; import com.noorq.casser.mapping.value.UDTColumnValueProvider; import com.noorq.casser.support.Transformers; diff --git a/src/main/java/com/noorq/casser/mapping/convert/UDTMapToMapConverter.java b/src/main/java/com/noorq/casser/mapping/convert/udt/UDTMapToMapConverter.java similarity index 93% rename from src/main/java/com/noorq/casser/mapping/convert/UDTMapToMapConverter.java rename to src/main/java/com/noorq/casser/mapping/convert/udt/UDTMapToMapConverter.java index c7ace11..535bda7 100644 --- a/src/main/java/com/noorq/casser/mapping/convert/UDTMapToMapConverter.java +++ b/src/main/java/com/noorq/casser/mapping/convert/udt/UDTMapToMapConverter.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.noorq.casser.mapping.convert; +package com.noorq.casser.mapping.convert.udt; import java.util.Map; import java.util.function.Function; import com.datastax.driver.core.UDTValue; import com.noorq.casser.core.SessionRepository; +import com.noorq.casser.mapping.convert.ProxyValueReader; import com.noorq.casser.mapping.value.UDTColumnValueProvider; import com.noorq.casser.support.Transformers; diff --git a/src/main/java/com/noorq/casser/mapping/convert/UDTSetToSetConverter.java b/src/main/java/com/noorq/casser/mapping/convert/udt/UDTSetToSetConverter.java similarity index 92% rename from src/main/java/com/noorq/casser/mapping/convert/UDTSetToSetConverter.java rename to src/main/java/com/noorq/casser/mapping/convert/udt/UDTSetToSetConverter.java index da840bd..387a769 100644 --- a/src/main/java/com/noorq/casser/mapping/convert/UDTSetToSetConverter.java +++ b/src/main/java/com/noorq/casser/mapping/convert/udt/UDTSetToSetConverter.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.noorq.casser.mapping.convert; +package com.noorq.casser.mapping.convert.udt; import java.util.Set; import java.util.function.Function; import com.datastax.driver.core.UDTValue; import com.noorq.casser.core.SessionRepository; +import com.noorq.casser.mapping.convert.ProxyValueReader; import com.noorq.casser.mapping.value.UDTColumnValueProvider; import com.noorq.casser.support.Transformers; diff --git a/src/main/java/com/noorq/casser/mapping/convert/UDTValueMapToMapConverter.java b/src/main/java/com/noorq/casser/mapping/convert/udt/UDTValueMapToMapConverter.java similarity index 92% rename from src/main/java/com/noorq/casser/mapping/convert/UDTValueMapToMapConverter.java rename to src/main/java/com/noorq/casser/mapping/convert/udt/UDTValueMapToMapConverter.java index 7c8cf43..f65f0bf 100644 --- a/src/main/java/com/noorq/casser/mapping/convert/UDTValueMapToMapConverter.java +++ b/src/main/java/com/noorq/casser/mapping/convert/udt/UDTValueMapToMapConverter.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.noorq.casser.mapping.convert; +package com.noorq.casser.mapping.convert.udt; import java.util.Map; import java.util.function.Function; import com.datastax.driver.core.UDTValue; import com.noorq.casser.core.SessionRepository; +import com.noorq.casser.mapping.convert.ProxyValueReader; import com.noorq.casser.mapping.value.UDTColumnValueProvider; import com.noorq.casser.support.Transformers; diff --git a/src/main/java/com/noorq/casser/mapping/convert/UDTValueToEntityConverter.java b/src/main/java/com/noorq/casser/mapping/convert/udt/UDTValueToEntityConverter.java similarity index 91% rename from src/main/java/com/noorq/casser/mapping/convert/UDTValueToEntityConverter.java rename to src/main/java/com/noorq/casser/mapping/convert/udt/UDTValueToEntityConverter.java index 1e61be7..9ee26d6 100644 --- a/src/main/java/com/noorq/casser/mapping/convert/UDTValueToEntityConverter.java +++ b/src/main/java/com/noorq/casser/mapping/convert/udt/UDTValueToEntityConverter.java @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.noorq.casser.mapping.convert; +package com.noorq.casser.mapping.convert.udt; import java.util.function.Function; import com.datastax.driver.core.UDTValue; import com.noorq.casser.core.SessionRepository; +import com.noorq.casser.mapping.convert.ProxyValueReader; import com.noorq.casser.mapping.value.UDTColumnValueProvider; public final class UDTValueToEntityConverter extends ProxyValueReader implements Function { diff --git a/src/main/java/com/noorq/casser/mapping/javatype/ListJavaType.java b/src/main/java/com/noorq/casser/mapping/javatype/ListJavaType.java index 788ceee..5fe2223 100644 --- a/src/main/java/com/noorq/casser/mapping/javatype/ListJavaType.java +++ b/src/main/java/com/noorq/casser/mapping/javatype/ListJavaType.java @@ -30,12 +30,12 @@ import com.noorq.casser.core.SessionRepository; import com.noorq.casser.mapping.ColumnType; import com.noorq.casser.mapping.IdentityName; import com.noorq.casser.mapping.annotation.Types; -import com.noorq.casser.mapping.convert.ListToTupleListConverter; -import com.noorq.casser.mapping.convert.ListToUDTListConverter; -import com.noorq.casser.mapping.convert.TupleListToListConverter; -import com.noorq.casser.mapping.convert.UDTListToListConverter; +import com.noorq.casser.mapping.convert.tuple.TupleListToListConverter; +import com.noorq.casser.mapping.convert.udt.ListToUDTListConverter; +import com.noorq.casser.mapping.convert.udt.UDTListToListConverter; import com.noorq.casser.mapping.type.AbstractDataType; import com.noorq.casser.mapping.type.DTDataType; +import com.noorq.casser.mapping.type.ListToTupleListConverter; import com.noorq.casser.mapping.type.UDTListDataType; import com.noorq.casser.support.CasserMappingException; import com.noorq.casser.support.Either; diff --git a/src/main/java/com/noorq/casser/mapping/javatype/MapJavaType.java b/src/main/java/com/noorq/casser/mapping/javatype/MapJavaType.java index 3a718c0..e46aa7d 100644 --- a/src/main/java/com/noorq/casser/mapping/javatype/MapJavaType.java +++ b/src/main/java/com/noorq/casser/mapping/javatype/MapJavaType.java @@ -30,18 +30,18 @@ import com.noorq.casser.core.SessionRepository; import com.noorq.casser.mapping.ColumnType; import com.noorq.casser.mapping.IdentityName; import com.noorq.casser.mapping.annotation.Types; -import com.noorq.casser.mapping.convert.MapToTupleKeyMapConverter; -import com.noorq.casser.mapping.convert.MapToTupleMapConverter; -import com.noorq.casser.mapping.convert.MapToTupleValueMapConverter; -import com.noorq.casser.mapping.convert.MapToUDTKeyMapConverter; -import com.noorq.casser.mapping.convert.MapToUDTMapConverter; -import com.noorq.casser.mapping.convert.MapToUDTValueMapConverter; -import com.noorq.casser.mapping.convert.TupleKeyMapToMapConverter; -import com.noorq.casser.mapping.convert.TupleMapToMapConverter; -import com.noorq.casser.mapping.convert.TupleValueMapToMapConverter; -import com.noorq.casser.mapping.convert.UDTKeyMapToMapConverter; -import com.noorq.casser.mapping.convert.UDTMapToMapConverter; -import com.noorq.casser.mapping.convert.UDTValueMapToMapConverter; +import com.noorq.casser.mapping.convert.tuple.MapToTupleKeyMapConverter; +import com.noorq.casser.mapping.convert.tuple.MapToTupleMapConverter; +import com.noorq.casser.mapping.convert.tuple.MapToTupleValueMapConverter; +import com.noorq.casser.mapping.convert.tuple.TupleKeyMapToMapConverter; +import com.noorq.casser.mapping.convert.tuple.TupleMapToMapConverter; +import com.noorq.casser.mapping.convert.tuple.TupleValueMapToMapConverter; +import com.noorq.casser.mapping.convert.udt.MapToUDTKeyMapConverter; +import com.noorq.casser.mapping.convert.udt.MapToUDTMapConverter; +import com.noorq.casser.mapping.convert.udt.MapToUDTValueMapConverter; +import com.noorq.casser.mapping.convert.udt.UDTKeyMapToMapConverter; +import com.noorq.casser.mapping.convert.udt.UDTMapToMapConverter; +import com.noorq.casser.mapping.convert.udt.UDTValueMapToMapConverter; import com.noorq.casser.mapping.type.AbstractDataType; import com.noorq.casser.mapping.type.DTDataType; import com.noorq.casser.mapping.type.UDTKeyMapDataType; diff --git a/src/main/java/com/noorq/casser/mapping/javatype/SetJavaType.java b/src/main/java/com/noorq/casser/mapping/javatype/SetJavaType.java index c76a642..30e52dc 100644 --- a/src/main/java/com/noorq/casser/mapping/javatype/SetJavaType.java +++ b/src/main/java/com/noorq/casser/mapping/javatype/SetJavaType.java @@ -30,10 +30,10 @@ import com.noorq.casser.core.SessionRepository; import com.noorq.casser.mapping.ColumnType; import com.noorq.casser.mapping.IdentityName; import com.noorq.casser.mapping.annotation.Types; -import com.noorq.casser.mapping.convert.SetToTupleSetConverter; -import com.noorq.casser.mapping.convert.SetToUDTSetConverter; -import com.noorq.casser.mapping.convert.TupleSetToSetConverter; -import com.noorq.casser.mapping.convert.UDTSetToSetConverter; +import com.noorq.casser.mapping.convert.tuple.SetToTupleSetConverter; +import com.noorq.casser.mapping.convert.tuple.TupleSetToSetConverter; +import com.noorq.casser.mapping.convert.udt.SetToUDTSetConverter; +import com.noorq.casser.mapping.convert.udt.UDTSetToSetConverter; import com.noorq.casser.mapping.type.AbstractDataType; import com.noorq.casser.mapping.type.DTDataType; import com.noorq.casser.mapping.type.UDTSetDataType; diff --git a/src/main/java/com/noorq/casser/mapping/javatype/TupleValueJavaType.java b/src/main/java/com/noorq/casser/mapping/javatype/TupleValueJavaType.java index 23aaa06..9577f87 100644 --- a/src/main/java/com/noorq/casser/mapping/javatype/TupleValueJavaType.java +++ b/src/main/java/com/noorq/casser/mapping/javatype/TupleValueJavaType.java @@ -32,9 +32,9 @@ import com.noorq.casser.mapping.ColumnType; import com.noorq.casser.mapping.IdentityName; import com.noorq.casser.mapping.MappingUtil; import com.noorq.casser.mapping.annotation.Types; -import com.noorq.casser.mapping.convert.EntityToTupleValueConverter; -import com.noorq.casser.mapping.convert.TupleValueToEntityConverter; import com.noorq.casser.mapping.convert.TypedConverter; +import com.noorq.casser.mapping.convert.tuple.EntityToTupleValueConverter; +import com.noorq.casser.mapping.convert.tuple.TupleValueToEntityConverter; import com.noorq.casser.mapping.type.AbstractDataType; import com.noorq.casser.mapping.type.DTDataType; import com.noorq.casser.support.CasserMappingException; diff --git a/src/main/java/com/noorq/casser/mapping/javatype/UDTValueJavaType.java b/src/main/java/com/noorq/casser/mapping/javatype/UDTValueJavaType.java index dd001c1..f3f0f0d 100644 --- a/src/main/java/com/noorq/casser/mapping/javatype/UDTValueJavaType.java +++ b/src/main/java/com/noorq/casser/mapping/javatype/UDTValueJavaType.java @@ -27,9 +27,9 @@ import com.noorq.casser.mapping.ColumnType; import com.noorq.casser.mapping.IdentityName; import com.noorq.casser.mapping.MappingUtil; import com.noorq.casser.mapping.annotation.Types; -import com.noorq.casser.mapping.convert.EntityToUDTValueConverter; import com.noorq.casser.mapping.convert.TypedConverter; -import com.noorq.casser.mapping.convert.UDTValueToEntityConverter; +import com.noorq.casser.mapping.convert.udt.EntityToUDTValueConverter; +import com.noorq.casser.mapping.convert.udt.UDTValueToEntityConverter; import com.noorq.casser.mapping.type.AbstractDataType; import com.noorq.casser.mapping.type.UDTDataType; import com.noorq.casser.support.CasserMappingException; diff --git a/src/main/java/com/noorq/casser/mapping/convert/ListToTupleListConverter.java b/src/main/java/com/noorq/casser/mapping/type/ListToTupleListConverter.java similarity index 92% rename from src/main/java/com/noorq/casser/mapping/convert/ListToTupleListConverter.java rename to src/main/java/com/noorq/casser/mapping/type/ListToTupleListConverter.java index f4ae737..18344ad 100644 --- a/src/main/java/com/noorq/casser/mapping/convert/ListToTupleListConverter.java +++ b/src/main/java/com/noorq/casser/mapping/type/ListToTupleListConverter.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.noorq.casser.mapping.convert; +package com.noorq.casser.mapping.type; import java.util.List; import java.util.function.Function; import com.datastax.driver.core.TupleType; import com.noorq.casser.core.SessionRepository; +import com.noorq.casser.mapping.convert.TupleValueWriter; import com.noorq.casser.support.Transformers; public final class ListToTupleListConverter implements Function {