Fix unfolded map elements bug

SuduIDE · Oct 11, 2023 · 3d60803 · 3d60803
1 parent af8be6d
commit 3d60803
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/...tor/src/main/java/org/sudu/protogen/generator/field/processors/MapFieldTypeProcessor.java b/...tor/src/main/java/org/sudu/protogen/generator/field/processors/MapFieldTypeProcessor.java
@@ -23,6 +23,9 @@ public MapFieldTypeProcessor(@NotNull GenerationContext context) {
                 .filter(f -> f.getName().equals("key")).findFirst().orElseThrow();
         Field value = entryDescriptor.getFields().stream()
                 .filter(f -> f.getName().equals("value")).findFirst().orElseThrow();
-        return new MapType(next(key), next(value));
+        return new MapType(
+                getContext().typeManager().processType(key),
+                getContext().typeManager().processType(value)
+        );
     }
 }
diff --git a/tests/src/test/proto/general.proto b/tests/src/test/proto/general.proto
@@ -40,6 +40,10 @@ message GrpcTask {
   optional string context = 4;
 }
 
+message GrpcTaskMapped {
+  map<string, GrpcTask> taskMap = 1;
+}
+
 message GrpcTasksBatch {
   GrpcBatchId id = 1;
   repeated GrpcTask tasks = 2 [(.protogen.repeated_container) = SET];

diff --git a/tests/src/test/proto/unfolding.proto b/tests/src/test/proto/unfolding.proto
@@ -37,6 +37,10 @@ message GrpcGeneratedIdConsumer {
   GrpcGeneratedId genId = 1;
 }
 
+message GrpcUnfoldedMap {
+  map<int64, GrpcId> idMap = 1;
+}
+
 message GrpcDomain {
   GrpcId id = 1;
   GrpcOptionalId optionalId = 2;