IPROTO-351 TypeId must be parsed before the compatibility check

core/src/main/java/org/infinispan/protostream/descriptors/FileDescriptor.java

@@ -288,7 +288,6 @@ private List<FileDescriptor> resolveImports(List<String> dependencies, Resolutio
    }
 
    private void collectDescriptors(Descriptor descriptor, ResolutionContext resolutionContext) {
-      descriptor.setFileDescriptor(this);
       fileNamespace.put(descriptor.getFullName(), descriptor);
       resolutionContext.addGenericDescriptor(descriptor);
 
@@ -301,7 +300,6 @@ private void collectDescriptors(Descriptor descriptor, ResolutionContext resolut
    }
 
    private void collectEnumDescriptors(EnumDescriptor enumDescriptor, ResolutionContext resolutionContext) {
-      enumDescriptor.setFileDescriptor(this);
       fileNamespace.put(enumDescriptor.getFullName(), enumDescriptor);
       resolutionContext.addGenericDescriptor(enumDescriptor);
    }
@@ -425,6 +423,14 @@ public void checkCompatibility(FileDescriptor that, boolean strict) {
       }
    }
 
+   public void parseAnnotations() {
+      if (configuration == null) {
+         throw new IllegalStateException("FileDescriptor.setConfiguration() must be invoked before parsing the annotations");
+      }
+      messageTypes.forEach(descriptor -> descriptor.setFileDescriptor(this));
+      enumTypes.forEach(enumDescriptor -> enumDescriptor.setFileDescriptor(this));
+   }
+
    @Override
    public String toString() {
       return "FileDescriptor{" +

core/src/main/java/org/infinispan/protostream/descriptors/ProtoLock.java

@@ -127,6 +127,7 @@ public static ProtoLock readLockFile(InputStream is, Configuration configuration
          messageBuilders.values().forEach(fdb::addMessage);
          FileDescriptor fd = fdb.build();
          fd.setConfiguration(configuration);
+         fd.parseAnnotations();
          descriptors.add(fd);
       }
       return new ProtoLock(descriptors);

core/src/main/java/org/infinispan/protostream/impl/parser/ProtostreamProtoParser.java

@@ -45,6 +45,7 @@ public Map<String, FileDescriptor> parse(FileDescriptorSource fileDescriptorSour
          try {
             FileDescriptor fileDescriptor = ProtoParser.parse(fileName, new StringReader(entry.getValue()), configuration);
             fileDescriptor.setConfiguration(configuration);
+            fileDescriptor.parseAnnotations();
             fileDescriptorMap.put(fileName, fileDescriptor);
          } catch (DescriptorParserException e) {
             reportParsingError(fileDescriptorSource, fileDescriptorMap, fileName, e);

integrationtests/src/test/java/org/infinispan/protostream/integrationtests/processor/marshaller/GeneratedMarshallerTest.java

@@ -59,6 +59,16 @@ public void testGenericMessage() {
             .hasMessageContaining("IPROTO000008");
    }
 
+   @Test
+   public void testRegisterTwice() {
+      var ctx = ProtobufUtil.newSerializationContext();
+      MapSchema.INSTANCE.registerSchema(ctx);
+      MapSchema.INSTANCE.registerMarshallers(ctx);
+
+      MapSchema.INSTANCE.registerSchema(ctx);
+      MapSchema.INSTANCE.registerMarshallers(ctx);
+   }
+
    @Test
    public void testMaps() throws IOException {
       var ctx = ProtobufUtil.newSerializationContext();

integrationtests/src/test/java/org/infinispan/protostream/integrationtests/processor/marshaller/model/SimpleEnum.java

@@ -1,7 +1,9 @@
 package org.infinispan.protostream.integrationtests.processor.marshaller.model;
 
 import org.infinispan.protostream.annotations.Proto;
+import org.infinispan.protostream.annotations.ProtoTypeId;
 
+@ProtoTypeId(111111) // large enough so it does not conflict
 @Proto
 public enum SimpleEnum {