From 52adfb6ade353d112025605dd7b9ca8bc3a5a278 Mon Sep 17 00:00:00 2001
From: Greg Gibeling <gdgib@outlook.com>
Date: Wed, 24 Jul 2024 16:33:44 -0700
Subject: [PATCH] G2-1612 Nest record v1 in a subpackage

---
 .../com/g2forge/alexandria/adt/record/{ => v1}/IField.java  | 2 +-
 .../g2forge/alexandria/adt/record/{ => v1}/IFieldType.java  | 2 +-
 .../com/g2forge/alexandria/adt/record/{ => v1}/IRecord.java | 2 +-
 .../g2forge/alexandria/adt/record/{ => v1}/IRecordType.java | 2 +-
 .../record/{map/implementations => v1/map}/MapField.java    | 6 +++---
 .../{map/implementations => v1/map}/MapFieldType.java       | 6 +++---
 .../record/{map/implementations => v1/map}/MapRecord.java   | 2 +-
 .../{map/implementations => v1/map}/MapRecordType.java      | 6 +++---
 .../g2forge/alexandria/adt/record/map/TestMapRecord.java    | 6 +++---
 .../record/v1/reflected/implementations/ReflectedField.java | 4 ++--
 .../v1/reflected/implementations/ReflectedFieldType.java    | 2 +-
 .../reflection/record/v1/typedmap/IJavaTypedFieldType.java  | 2 +-
 .../reflection/record/v1/typedmap/IJavaTypedRecordType.java | 2 +-
 .../v1/typedmap/implementations/JavaTypedMapField.java      | 4 ++--
 .../v1/typedmap/implementations/JavaTypedMapFieldType.java  | 2 +-
 .../v1/typedmap/implementations/JavaTypedMapRecordType.java | 2 +-
 .../reflection/record/v1/reflected/TestReflectedRecord.java | 2 +-
 17 files changed, 27 insertions(+), 27 deletions(-)
 rename ax-adt/src/main/java/com/g2forge/alexandria/adt/record/{ => v1}/IField.java (83%)
 rename ax-adt/src/main/java/com/g2forge/alexandria/adt/record/{ => v1}/IFieldType.java (83%)
 rename ax-adt/src/main/java/com/g2forge/alexandria/adt/record/{ => v1}/IRecord.java (79%)
 rename ax-adt/src/main/java/com/g2forge/alexandria/adt/record/{ => v1}/IRecordType.java (85%)
 rename ax-adt/src/main/java/com/g2forge/alexandria/adt/record/{map/implementations => v1/map}/MapField.java (83%)
 rename ax-adt/src/main/java/com/g2forge/alexandria/adt/record/{map/implementations => v1/map}/MapFieldType.java (82%)
 rename ax-adt/src/main/java/com/g2forge/alexandria/adt/record/{map/implementations => v1/map}/MapRecord.java (70%)
 rename ax-adt/src/main/java/com/g2forge/alexandria/adt/record/{map/implementations => v1/map}/MapRecordType.java (85%)

diff --git a/ax-adt/src/main/java/com/g2forge/alexandria/adt/record/IField.java b/ax-adt/src/main/java/com/g2forge/alexandria/adt/record/v1/IField.java
similarity index 83%
rename from ax-adt/src/main/java/com/g2forge/alexandria/adt/record/IField.java
rename to ax-adt/src/main/java/com/g2forge/alexandria/adt/record/v1/IField.java
index 2687c9a1..c68eba32 100644
--- a/ax-adt/src/main/java/com/g2forge/alexandria/adt/record/IField.java
+++ b/ax-adt/src/main/java/com/g2forge/alexandria/adt/record/v1/IField.java
@@ -1,4 +1,4 @@
-package com.g2forge.alexandria.adt.record;
+package com.g2forge.alexandria.adt.record.v1;
 
 import com.g2forge.alexandria.java.adt.tuple.ITuple1GS;
 import com.g2forge.alexandria.java.type.IGenericTyped;
diff --git a/ax-adt/src/main/java/com/g2forge/alexandria/adt/record/IFieldType.java b/ax-adt/src/main/java/com/g2forge/alexandria/adt/record/v1/IFieldType.java
similarity index 83%
rename from ax-adt/src/main/java/com/g2forge/alexandria/adt/record/IFieldType.java
rename to ax-adt/src/main/java/com/g2forge/alexandria/adt/record/v1/IFieldType.java
index 308c6dfd..eb01bb99 100644
--- a/ax-adt/src/main/java/com/g2forge/alexandria/adt/record/IFieldType.java
+++ b/ax-adt/src/main/java/com/g2forge/alexandria/adt/record/v1/IFieldType.java
@@ -1,4 +1,4 @@
-package com.g2forge.alexandria.adt.record;
+package com.g2forge.alexandria.adt.record.v1;
 
 import java.util.function.Function;
 
diff --git a/ax-adt/src/main/java/com/g2forge/alexandria/adt/record/IRecord.java b/ax-adt/src/main/java/com/g2forge/alexandria/adt/record/v1/IRecord.java
similarity index 79%
rename from ax-adt/src/main/java/com/g2forge/alexandria/adt/record/IRecord.java
rename to ax-adt/src/main/java/com/g2forge/alexandria/adt/record/v1/IRecord.java
index d8fb2161..59720794 100644
--- a/ax-adt/src/main/java/com/g2forge/alexandria/adt/record/IRecord.java
+++ b/ax-adt/src/main/java/com/g2forge/alexandria/adt/record/v1/IRecord.java
@@ -1,4 +1,4 @@
-package com.g2forge.alexandria.adt.record;
+package com.g2forge.alexandria.adt.record.v1;
 
 import com.g2forge.alexandria.java.type.ITyped;
 
diff --git a/ax-adt/src/main/java/com/g2forge/alexandria/adt/record/IRecordType.java b/ax-adt/src/main/java/com/g2forge/alexandria/adt/record/v1/IRecordType.java
similarity index 85%
rename from ax-adt/src/main/java/com/g2forge/alexandria/adt/record/IRecordType.java
rename to ax-adt/src/main/java/com/g2forge/alexandria/adt/record/v1/IRecordType.java
index fdeab94f..add9ff41 100644
--- a/ax-adt/src/main/java/com/g2forge/alexandria/adt/record/IRecordType.java
+++ b/ax-adt/src/main/java/com/g2forge/alexandria/adt/record/v1/IRecordType.java
@@ -1,4 +1,4 @@
-package com.g2forge.alexandria.adt.record;
+package com.g2forge.alexandria.adt.record.v1;
 
 import java.util.Collection;
 
diff --git a/ax-adt/src/main/java/com/g2forge/alexandria/adt/record/map/implementations/MapField.java b/ax-adt/src/main/java/com/g2forge/alexandria/adt/record/v1/map/MapField.java
similarity index 83%
rename from ax-adt/src/main/java/com/g2forge/alexandria/adt/record/map/implementations/MapField.java
rename to ax-adt/src/main/java/com/g2forge/alexandria/adt/record/v1/map/MapField.java
index c36da690..644409af 100644
--- a/ax-adt/src/main/java/com/g2forge/alexandria/adt/record/map/implementations/MapField.java
+++ b/ax-adt/src/main/java/com/g2forge/alexandria/adt/record/v1/map/MapField.java
@@ -1,7 +1,7 @@
-package com.g2forge.alexandria.adt.record.map.implementations;
+package com.g2forge.alexandria.adt.record.v1.map;
 
-import com.g2forge.alexandria.adt.record.IField;
-import com.g2forge.alexandria.adt.record.IFieldType;
+import com.g2forge.alexandria.adt.record.v1.IField;
+import com.g2forge.alexandria.adt.record.v1.IFieldType;
 import com.g2forge.alexandria.java.adt.tuple.ITuple1GS;
 
 import lombok.AllArgsConstructor;
diff --git a/ax-adt/src/main/java/com/g2forge/alexandria/adt/record/map/implementations/MapFieldType.java b/ax-adt/src/main/java/com/g2forge/alexandria/adt/record/v1/map/MapFieldType.java
similarity index 82%
rename from ax-adt/src/main/java/com/g2forge/alexandria/adt/record/map/implementations/MapFieldType.java
rename to ax-adt/src/main/java/com/g2forge/alexandria/adt/record/v1/map/MapFieldType.java
index 658b0d68..5798ece8 100644
--- a/ax-adt/src/main/java/com/g2forge/alexandria/adt/record/map/implementations/MapFieldType.java
+++ b/ax-adt/src/main/java/com/g2forge/alexandria/adt/record/v1/map/MapFieldType.java
@@ -1,9 +1,9 @@
-package com.g2forge.alexandria.adt.record.map.implementations;
+package com.g2forge.alexandria.adt.record.v1.map;
 
 import java.util.Objects;
 
-import com.g2forge.alexandria.adt.record.IField;
-import com.g2forge.alexandria.adt.record.IFieldType;
+import com.g2forge.alexandria.adt.record.v1.IField;
+import com.g2forge.alexandria.adt.record.v1.IFieldType;
 
 public class MapFieldType<T> implements IFieldType<MapRecord, T> {
 	protected final String name;
diff --git a/ax-adt/src/main/java/com/g2forge/alexandria/adt/record/map/implementations/MapRecord.java b/ax-adt/src/main/java/com/g2forge/alexandria/adt/record/v1/map/MapRecord.java
similarity index 70%
rename from ax-adt/src/main/java/com/g2forge/alexandria/adt/record/map/implementations/MapRecord.java
rename to ax-adt/src/main/java/com/g2forge/alexandria/adt/record/v1/map/MapRecord.java
index a2328a92..7231c515 100644
--- a/ax-adt/src/main/java/com/g2forge/alexandria/adt/record/map/implementations/MapRecord.java
+++ b/ax-adt/src/main/java/com/g2forge/alexandria/adt/record/v1/map/MapRecord.java
@@ -1,4 +1,4 @@
-package com.g2forge.alexandria.adt.record.map.implementations;
+package com.g2forge.alexandria.adt.record.v1.map;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/ax-adt/src/main/java/com/g2forge/alexandria/adt/record/map/implementations/MapRecordType.java b/ax-adt/src/main/java/com/g2forge/alexandria/adt/record/v1/map/MapRecordType.java
similarity index 85%
rename from ax-adt/src/main/java/com/g2forge/alexandria/adt/record/map/implementations/MapRecordType.java
rename to ax-adt/src/main/java/com/g2forge/alexandria/adt/record/v1/map/MapRecordType.java
index 7e1e1172..d125c67d 100644
--- a/ax-adt/src/main/java/com/g2forge/alexandria/adt/record/map/implementations/MapRecordType.java
+++ b/ax-adt/src/main/java/com/g2forge/alexandria/adt/record/v1/map/MapRecordType.java
@@ -1,11 +1,11 @@
-package com.g2forge.alexandria.adt.record.map.implementations;
+package com.g2forge.alexandria.adt.record.v1.map;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 
-import com.g2forge.alexandria.adt.record.IFieldType;
-import com.g2forge.alexandria.adt.record.IRecordType;
+import com.g2forge.alexandria.adt.record.v1.IFieldType;
+import com.g2forge.alexandria.adt.record.v1.IRecordType;
 import com.g2forge.alexandria.java.core.helpers.HCollection;
 
 public class MapRecordType implements IRecordType<MapRecord> {
diff --git a/ax-adt/src/test/java/com/g2forge/alexandria/adt/record/map/TestMapRecord.java b/ax-adt/src/test/java/com/g2forge/alexandria/adt/record/map/TestMapRecord.java
index faba3a06..4ae71abc 100644
--- a/ax-adt/src/test/java/com/g2forge/alexandria/adt/record/map/TestMapRecord.java
+++ b/ax-adt/src/test/java/com/g2forge/alexandria/adt/record/map/TestMapRecord.java
@@ -3,9 +3,9 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.g2forge.alexandria.adt.record.map.implementations.MapFieldType;
-import com.g2forge.alexandria.adt.record.map.implementations.MapRecord;
-import com.g2forge.alexandria.adt.record.map.implementations.MapRecordType;
+import com.g2forge.alexandria.adt.record.v1.map.MapFieldType;
+import com.g2forge.alexandria.adt.record.v1.map.MapRecord;
+import com.g2forge.alexandria.adt.record.v1.map.MapRecordType;
 import com.g2forge.alexandria.java.adt.tuple.ITuple1GS;
 
 public class TestMapRecord {
diff --git a/ax-reflection/src/main/java/com/g2forge/alexandria/reflection/record/v1/reflected/implementations/ReflectedField.java b/ax-reflection/src/main/java/com/g2forge/alexandria/reflection/record/v1/reflected/implementations/ReflectedField.java
index 0daf9b06..644179ad 100644
--- a/ax-reflection/src/main/java/com/g2forge/alexandria/reflection/record/v1/reflected/implementations/ReflectedField.java
+++ b/ax-reflection/src/main/java/com/g2forge/alexandria/reflection/record/v1/reflected/implementations/ReflectedField.java
@@ -1,7 +1,7 @@
 package com.g2forge.alexandria.reflection.record.v1.reflected.implementations;
 
-import com.g2forge.alexandria.adt.record.IField;
-import com.g2forge.alexandria.adt.record.IFieldType;
+import com.g2forge.alexandria.adt.record.v1.IField;
+import com.g2forge.alexandria.adt.record.v1.IFieldType;
 import com.g2forge.alexandria.java.adt.tuple.ITuple1GS;
 
 import lombok.Getter;
diff --git a/ax-reflection/src/main/java/com/g2forge/alexandria/reflection/record/v1/reflected/implementations/ReflectedFieldType.java b/ax-reflection/src/main/java/com/g2forge/alexandria/reflection/record/v1/reflected/implementations/ReflectedFieldType.java
index d9b8438b..05a5df2a 100644
--- a/ax-reflection/src/main/java/com/g2forge/alexandria/reflection/record/v1/reflected/implementations/ReflectedFieldType.java
+++ b/ax-reflection/src/main/java/com/g2forge/alexandria/reflection/record/v1/reflected/implementations/ReflectedFieldType.java
@@ -1,6 +1,6 @@
 package com.g2forge.alexandria.reflection.record.v1.reflected.implementations;
 
-import com.g2forge.alexandria.adt.record.IField;
+import com.g2forge.alexandria.adt.record.v1.IField;
 import com.g2forge.alexandria.generic.type.java.IJavaUntype;
 import com.g2forge.alexandria.java.reflect.annotations.IJavaAnnotations;
 import com.g2forge.alexandria.reflection.object.IJavaFieldReflection;
diff --git a/ax-reflection/src/main/java/com/g2forge/alexandria/reflection/record/v1/typedmap/IJavaTypedFieldType.java b/ax-reflection/src/main/java/com/g2forge/alexandria/reflection/record/v1/typedmap/IJavaTypedFieldType.java
index 90f73ffd..c8179b5a 100644
--- a/ax-reflection/src/main/java/com/g2forge/alexandria/reflection/record/v1/typedmap/IJavaTypedFieldType.java
+++ b/ax-reflection/src/main/java/com/g2forge/alexandria/reflection/record/v1/typedmap/IJavaTypedFieldType.java
@@ -1,6 +1,6 @@
 package com.g2forge.alexandria.reflection.record.v1.typedmap;
 
-import com.g2forge.alexandria.adt.record.IFieldType;
+import com.g2forge.alexandria.adt.record.v1.IFieldType;
 import com.g2forge.alexandria.generic.type.java.typed.IJavaGenericTyped;
 
 public interface IJavaTypedFieldType<R, F> extends IFieldType<R, F>, IJavaGenericTyped<F> {}
diff --git a/ax-reflection/src/main/java/com/g2forge/alexandria/reflection/record/v1/typedmap/IJavaTypedRecordType.java b/ax-reflection/src/main/java/com/g2forge/alexandria/reflection/record/v1/typedmap/IJavaTypedRecordType.java
index 379e9031..56f50dba 100644
--- a/ax-reflection/src/main/java/com/g2forge/alexandria/reflection/record/v1/typedmap/IJavaTypedRecordType.java
+++ b/ax-reflection/src/main/java/com/g2forge/alexandria/reflection/record/v1/typedmap/IJavaTypedRecordType.java
@@ -1,6 +1,6 @@
 package com.g2forge.alexandria.reflection.record.v1.typedmap;
 
-import com.g2forge.alexandria.adt.record.IRecordType;
+import com.g2forge.alexandria.adt.record.v1.IRecordType;
 import com.g2forge.alexandria.generic.type.java.typed.IJavaGenericTyped;
 
 public interface IJavaTypedRecordType<R> extends IRecordType<R>, IJavaGenericTyped<R> {}
diff --git a/ax-reflection/src/main/java/com/g2forge/alexandria/reflection/record/v1/typedmap/implementations/JavaTypedMapField.java b/ax-reflection/src/main/java/com/g2forge/alexandria/reflection/record/v1/typedmap/implementations/JavaTypedMapField.java
index d1270163..22ce13be 100644
--- a/ax-reflection/src/main/java/com/g2forge/alexandria/reflection/record/v1/typedmap/implementations/JavaTypedMapField.java
+++ b/ax-reflection/src/main/java/com/g2forge/alexandria/reflection/record/v1/typedmap/implementations/JavaTypedMapField.java
@@ -1,7 +1,7 @@
 package com.g2forge.alexandria.reflection.record.v1.typedmap.implementations;
 
-import com.g2forge.alexandria.adt.record.IField;
-import com.g2forge.alexandria.adt.record.IFieldType;
+import com.g2forge.alexandria.adt.record.v1.IField;
+import com.g2forge.alexandria.adt.record.v1.IFieldType;
 import com.g2forge.alexandria.java.adt.tuple.ITuple1GS;
 
 import lombok.AllArgsConstructor;
diff --git a/ax-reflection/src/main/java/com/g2forge/alexandria/reflection/record/v1/typedmap/implementations/JavaTypedMapFieldType.java b/ax-reflection/src/main/java/com/g2forge/alexandria/reflection/record/v1/typedmap/implementations/JavaTypedMapFieldType.java
index 68d7b4f2..7f3b51fb 100644
--- a/ax-reflection/src/main/java/com/g2forge/alexandria/reflection/record/v1/typedmap/implementations/JavaTypedMapFieldType.java
+++ b/ax-reflection/src/main/java/com/g2forge/alexandria/reflection/record/v1/typedmap/implementations/JavaTypedMapFieldType.java
@@ -3,7 +3,7 @@
 import java.lang.reflect.Type;
 import java.util.Objects;
 
-import com.g2forge.alexandria.adt.record.IField;
+import com.g2forge.alexandria.adt.record.v1.IField;
 import com.g2forge.alexandria.generic.type.environment.implementations.EmptyTypeEnvironment;
 import com.g2forge.alexandria.generic.type.java.HJavaType;
 import com.g2forge.alexandria.generic.type.java.IJavaUntype;
diff --git a/ax-reflection/src/main/java/com/g2forge/alexandria/reflection/record/v1/typedmap/implementations/JavaTypedMapRecordType.java b/ax-reflection/src/main/java/com/g2forge/alexandria/reflection/record/v1/typedmap/implementations/JavaTypedMapRecordType.java
index cf90f153..15234b83 100644
--- a/ax-reflection/src/main/java/com/g2forge/alexandria/reflection/record/v1/typedmap/implementations/JavaTypedMapRecordType.java
+++ b/ax-reflection/src/main/java/com/g2forge/alexandria/reflection/record/v1/typedmap/implementations/JavaTypedMapRecordType.java
@@ -4,7 +4,7 @@
 import java.util.Collection;
 import java.util.Collections;
 
-import com.g2forge.alexandria.adt.record.IFieldType;
+import com.g2forge.alexandria.adt.record.v1.IFieldType;
 import com.g2forge.alexandria.generic.type.environment.implementations.EmptyTypeEnvironment;
 import com.g2forge.alexandria.generic.type.java.IJavaUntype;
 import com.g2forge.alexandria.generic.type.java.type.implementations.JavaClassType;
diff --git a/ax-reflection/src/test/java/com/g2forge/alexandria/reflection/record/v1/reflected/TestReflectedRecord.java b/ax-reflection/src/test/java/com/g2forge/alexandria/reflection/record/v1/reflected/TestReflectedRecord.java
index 23d9ec04..2e480430 100644
--- a/ax-reflection/src/test/java/com/g2forge/alexandria/reflection/record/v1/reflected/TestReflectedRecord.java
+++ b/ax-reflection/src/test/java/com/g2forge/alexandria/reflection/record/v1/reflected/TestReflectedRecord.java
@@ -5,7 +5,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.g2forge.alexandria.adt.record.IField;
+import com.g2forge.alexandria.adt.record.v1.IField;
 import com.g2forge.alexandria.java.core.helpers.HCollection;
 import com.g2forge.alexandria.reflection.record.v1.reflected.implementations.ReflectedRecordType;