Merge pull request #371 from gdgib/G2-1612-NestRecordv1

G2-1612 Nest record v1 in a subpackage
g2forge · Jul 24, 2024 · acd8232 · acd8232
2 parents f3aa7d5 + 52adfb6
commit acd8232
Show file tree

Hide file tree

Showing 17 changed files with 27 additions and 27 deletions.
diff --git a/...g2forge/alexandria/adt/record/IField.java → ...orge/alexandria/adt/record/v1/IField.java b/...g2forge/alexandria/adt/record/IField.java → ...orge/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/...rge/alexandria/adt/record/IFieldType.java → .../alexandria/adt/record/v1/IFieldType.java b/...rge/alexandria/adt/record/IFieldType.java → .../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/...2forge/alexandria/adt/record/IRecord.java → ...rge/alexandria/adt/record/v1/IRecord.java b/...2forge/alexandria/adt/record/IRecord.java → ...rge/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/...ge/alexandria/adt/record/IRecordType.java → ...alexandria/adt/record/v1/IRecordType.java b/...ge/alexandria/adt/record/IRecordType.java → ...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/.../record/map/implementations/MapField.java → ...lexandria/adt/record/v1/map/MapField.java b/.../record/map/implementations/MapField.java → ...lexandria/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/...ord/map/implementations/MapFieldType.java → ...ndria/adt/record/v1/map/MapFieldType.java b/...ord/map/implementations/MapFieldType.java → ...ndria/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/...record/map/implementations/MapRecord.java → ...exandria/adt/record/v1/map/MapRecord.java b/...record/map/implementations/MapRecord.java → ...exandria/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/...rd/map/implementations/MapRecordType.java → ...dria/adt/record/v1/map/MapRecordType.java b/...rd/map/implementations/MapRecordType.java → ...dria/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
@@ -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/...com/g2forge/alexandria/reflection/record/v1/reflected/implementations/ReflectedField.java b/...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/...g2forge/alexandria/reflection/record/v1/reflected/implementations/ReflectedFieldType.java b/...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/...c/main/java/com/g2forge/alexandria/reflection/record/v1/typedmap/IJavaTypedFieldType.java b/...c/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/.../main/java/com/g2forge/alexandria/reflection/record/v1/typedmap/IJavaTypedRecordType.java b/.../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/...m/g2forge/alexandria/reflection/record/v1/typedmap/implementations/JavaTypedMapField.java b/...m/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/...forge/alexandria/reflection/record/v1/typedmap/implementations/JavaTypedMapFieldType.java b/...forge/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/...orge/alexandria/reflection/record/v1/typedmap/implementations/JavaTypedMapRecordType.java b/...orge/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/.../test/java/com/g2forge/alexandria/reflection/record/v1/reflected/TestReflectedRecord.java b/.../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;