Simplify InputLocation templates

- Remove isMavenModel conditionals from InputLocation/InputLocationTracker templates
- Keep isMavenModel conditional only for modelId field in InputSource

This simplifies the template logic while preserving all Maven-specific functionality.

Author: gnodet

src/mdo/java/InputLocation.java

@@ -22,44 +22,34 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedHashMap;
-import java.util.Map;
-#if ( $isMavenModel )
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-#end
 
 /**
-#if ( $isMavenModel )
  * Represents the location of an element within a model source file.
  * <p>
  * This class tracks the line and column numbers of elements in source files like POM files.
  * It's used for error reporting and debugging to help identify where specific model elements
  * are defined in the source files.
  *
  * @since 4.0.0
-#else
- * Class InputLocation.
-#end
  */
 public class InputLocation implements Serializable, InputLocationTracker {
     private final int lineNumber;
     private final int columnNumber;
     private final InputSource source;
     private final Map<Object, InputLocation> locations;
-#if ( $isMavenModel )
     private final InputLocation importedFrom;
-#end
 
     public InputLocation(InputSource source) {
         this.lineNumber = -1;
         this.columnNumber = -1;
         this.source = source;
         this.locations = Collections.singletonMap(0, this);
-#if ( $isMavenModel )
         this.importedFrom = null;
-#end
     }
 
     public InputLocation(int lineNumber, int columnNumber) {
@@ -76,30 +66,24 @@ public InputLocation(int lineNumber, int columnNumber, InputSource source, Objec
         this.source = source;
         this.locations =
                 selfLocationKey != null ? Collections.singletonMap(selfLocationKey, this) : Collections.emptyMap();
-#if ( $isMavenModel )
         this.importedFrom = null;
-#end
     }
 
     public InputLocation(int lineNumber, int columnNumber, InputSource source, Map<Object, InputLocation> locations) {
         this.lineNumber = lineNumber;
         this.columnNumber = columnNumber;
         this.source = source;
         this.locations = ImmutableCollections.copy(locations);
-#if ( $isMavenModel )
         this.importedFrom = null;
-#end
     }
 
-#if ( $isMavenModel )
     public InputLocation(InputLocation original) {
         this.lineNumber = original.lineNumber;
         this.columnNumber = original.columnNumber;
         this.source = original.source;
         this.locations = original.locations;
         this.importedFrom = original.importedFrom;
     }
-#end
 
     public int getLineNumber() {
         return lineNumber;
@@ -122,7 +106,6 @@ public Map<Object, InputLocation> getLocations() {
         return locations;
     }
 
-#if ( $isMavenModel )
     /**
      * Gets the parent InputLocation where this InputLocation may have been imported from.
      * Can return {@code null}.
@@ -134,7 +117,6 @@ public Map<Object, InputLocation> getLocations() {
     public InputLocation getImportedFrom() {
         return importedFrom;
     }
-#end
 
     /**
      * Merges the {@code source} location into the {@code target} location.
@@ -223,15 +205,8 @@ public interface StringFormatter {
         String toString(InputLocation location);
     }
 
-#if ( $isMavenModel )
     @Override
     public String toString() {
         return String.format("%s @ %d:%d", source != null ? source.getLocation() : "n/a", lineNumber, columnNumber);
     }
-#else
-    @Override
-    public String toString() {
-        return getLineNumber() + " : " + getColumnNumber() + ", " + getSource();
-    }
-#end
 }

src/mdo/java/InputLocationTracker.java

@@ -21,7 +21,6 @@
 public interface InputLocationTracker {
     InputLocation getLocation(Object field);
 
-#if ( $isMavenModel )
     /**
      * Gets the parent InputLocation where this InputLocation may have been imported from.
      * Can return {@code null}.
@@ -30,5 +29,4 @@ public interface InputLocationTracker {
      * @since 4.0.0
      */
     InputLocation getImportedFrom();
-#end
 }

src/mdo/java/InputSource.java

@@ -19,37 +19,31 @@
 package ${package};
 
 import java.io.Serializable;
-#if ( $isMavenModel )
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-#end
 
 /**
-#if ( $isMavenModel )
  * Represents the source of a model input, such as a POM file.
  * <p>
  * This class tracks the origin of model elements, including their location in source files
  * and relationships between imported models. It's used for error reporting and debugging
  * to help identify where specific model elements came from.
  *
  * @since 4.0.0
-#else
- * Class InputSource.
-#end
  */
 public class InputSource implements Serializable {
 
 #if ( $isMavenModel )
     private final String modelId;
 #end
     private final String location;
-#if ( $isMavenModel )
     private final List<InputSource> inputs;
     private final InputLocation importedFrom;
 
+#if ( $isMavenModel )
     public InputSource(String modelId, String location) {
         this(modelId, location, null);
     }
@@ -60,26 +54,28 @@ public InputSource(String modelId, String location, InputLocation importedFrom)
         this.inputs = null;
         this.importedFrom = importedFrom;
     }
+#end
+
+    public InputSource(String location) {
+#if ( $isMavenModel )
+        this.modelId = null;
+#end
+        this.location = location;
+        this.inputs = null;
+        this.importedFrom = null;
+    }
 
     public InputSource(Collection<InputSource> inputs) {
+#if ( $isMavenModel )
         this.modelId = null;
+#end
         this.location = null;
         this.inputs = ImmutableCollections.copy(inputs);
         this.importedFrom = null;
     }
-#else
-
-    public InputSource(String location) {
-        this.location = location;
-    }
-#end
 
     /**
-#if ( $isMavenModel )
      * Get the path/URL of the POM or {@code null} if unknown.
-#else
-     * Get the path/URL of the settings definition or {@code null} if unknown.
-#end
      *
      * @return the location
      */
@@ -96,6 +92,7 @@ public String getLocation() {
     public String getModelId() {
         return this.modelId;
     }
+#end
 
     /**
      * Gets the parent InputLocation where this InputLocation may have been imported from.
@@ -117,14 +114,23 @@ public boolean equals(Object o) {
             return false;
         }
         InputSource that = (InputSource) o;
+#if ( $isMavenModel )
         return Objects.equals(modelId, that.modelId)
                 && Objects.equals(location, that.location)
                 && Objects.equals(inputs, that.inputs);
+#else
+        return Objects.equals(location, that.location)
+                && Objects.equals(inputs, that.inputs);
+#end
     }
 
     @Override
     public int hashCode() {
+#if ( $isMavenModel )
         return Objects.hash(modelId, location, inputs);
+#else
+        return Objects.hash(location, inputs);
+#end
     }
 
     Stream<InputSource> sources() {
@@ -136,16 +142,14 @@ public String toString() {
         if (inputs != null) {
             return inputs.stream().map(InputSource::toString).collect(Collectors.joining(", ", "merged[", "]"));
         }
-        return getModelId() + " " + getLocation();
+#if ( $isMavenModel )
+        return getModelId() != null ? getModelId() + " " + getLocation() : getLocation();
+#else
+        return getLocation();
+#end
     }
 
     public static InputSource merge(InputSource src1, InputSource src2) {
         return new InputSource(Stream.concat(src1.sources(), src2.sources()).collect(Collectors.toSet()));
     }
-#else
-    @Override
-    public String toString() {
-        return getLocation();
-    }
-#end
 }