Rename serialization methods for consistency

1 files changed, 16 insertions, 12 deletions

diff --git a/src/main/java/org/shedlang/compiler/patio/protobuf/PatioToProtobuf.java b/src/main/java/org/shedlang/compiler/patio/protobuf/PatioToProtobuf.java
index 8ceb9019..07b652d8 100644
--- a/src/main/java/org/shedlang/compiler/patio/protobuf/PatioToProtobuf.java
+++ b/src/main/java/org/shedlang/compiler/patio/protobuf/PatioToProtobuf.java
@@ -9,7 +9,9 @@ import java.util.Optional;
 import static org.shedlang.compiler.sources.protobuf.SourceToProtobuf.serializeSource;
 
 public class PatioToProtobuf {
-    public PatioProtobuf.PatioCompilationUnit compilationUnitToProtobuf(
+    // == Compilation unit ==
+
+    public static PatioProtobuf.PatioCompilationUnit serializeCompilationUnit(
         PatioCompilationUnit compilationUnit
     ) {
         var builder = PatioProtobuf.PatioCompilationUnit.newBuilder();
@@ -17,13 +19,15 @@ public class PatioToProtobuf {
         builder.setSource(serializeSource(compilationUnit.source(), Optional.empty()));
 
         for (var element : compilationUnit.elements()) {
-            builder.addElements(compilationUnitElementToProtobuf(element, compilationUnit.source()));
+            builder.addElements(serializeCompilationUnitElement(element, compilationUnit.source()));
         }
 
         return builder.build();
     }
 
-    private PatioProtobuf.PatioCompilationUnitElement compilationUnitElementToProtobuf(
+    // == Compilation unit elements ==
+
+    private static PatioProtobuf.PatioCompilationUnitElement serializeCompilationUnitElement(
         PatioCompilationUnitElement element,
         Source parentSource
     ) {
@@ -32,17 +36,17 @@ public class PatioToProtobuf {
         switch (element) {
             case PatioDataElementImmutableDefinition dataElementImmutableDefinition -> {
                 builder.setDataElementImmutableDefinition(
-                    dataElementImmutableDefinitionToProtobuf(dataElementImmutableDefinition, parentSource)
+                    serializeDataElementImmutableDefinition(dataElementImmutableDefinition, parentSource)
                 );
             }
             case PatioDataElementMutableDeclaration dataElementMutableDeclaration -> {
                 builder.setDataElementMutableDeclaration(
-                    dataElementMutableDeclarationToProtobuf(dataElementMutableDeclaration, parentSource)
+                    serializeDataElementMutableDeclaration(dataElementMutableDeclaration, parentSource)
                 );
             }
             case PatioDataElementMutableDefinition dataElementMutableDefinition -> {
                 builder.setDataElementMutableDefinition(
-                    dataElementMutableDefinitionToProtobuf(dataElementMutableDefinition, parentSource)
+                    serializeDataElementMutableDefinition(dataElementMutableDefinition, parentSource)
                 );
             }
             case PatioExceptionTypeDefinition exceptionTypeDefinition -> {
@@ -59,18 +63,18 @@ public class PatioToProtobuf {
         return builder.build();
     }
 
-    private PatioProtobuf.PatioDataElementImmutableDefinition dataElementImmutableDefinitionToProtobuf(
+    private static PatioProtobuf.PatioDataElementImmutableDefinition serializeDataElementImmutableDefinition(
         PatioDataElementImmutableDefinition element,
         Source parentSource
     ) {
         var builder = PatioProtobuf.PatioDataElementImmutableDefinition.newBuilder();
         builder.setSource(SourceToProtobuf.serializeSource(element.source(), parentSource));
         builder.setName(element.name());
-        builder.setVisibility(visibilityToProtobuf(element.visibility()));
+        builder.setVisibility(serializeVisibility(element.visibility()));
         return builder.build();
     }
 
-    private PatioProtobuf.PatioDataElementMutableDeclaration dataElementMutableDeclarationToProtobuf(
+    private static PatioProtobuf.PatioDataElementMutableDeclaration serializeDataElementMutableDeclaration(
         PatioDataElementMutableDeclaration element,
         Source parentSource
     ) {
@@ -80,18 +84,18 @@ public class PatioToProtobuf {
         return builder.build();
     }
 
-    private PatioProtobuf.PatioDataElementMutableDefinition dataElementMutableDefinitionToProtobuf(
+    private static PatioProtobuf.PatioDataElementMutableDefinition serializeDataElementMutableDefinition(
         PatioDataElementMutableDefinition element,
         Source parentSource
     ) {
         var builder = PatioProtobuf.PatioDataElementMutableDefinition.newBuilder();
         builder.setSource(SourceToProtobuf.serializeSource(element.source(), parentSource));
         builder.setName(element.name());
-        builder.setVisibility(visibilityToProtobuf(element.visibility()));
+        builder.setVisibility(serializeVisibility(element.visibility()));
         return builder.build();
     }
 
-    private PatioProtobuf.PatioVisibility visibilityToProtobuf(PatioVisibility visibility) {
+    private static PatioProtobuf.PatioVisibility serializeVisibility(PatioVisibility visibility) {
         return switch (visibility) {
             case PRIVATE -> PatioProtobuf.PatioVisibility.PRIVATE;
             case PUBLIC -> PatioProtobuf.PatioVisibility.PUBLIC;