Introduce org.jboss.forge.roaster.model.source.JavaRecordSource#getRe…

…cordComponents
forge · Oct 18, 2022 · 2a09106 · 2a09106
1 parent 59ee7a7
commit 2a09106
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/api/src/main/java/org/jboss/forge/roaster/model/JavaRecord.java b/api/src/main/java/org/jboss/forge/roaster/model/JavaRecord.java
@@ -16,5 +16,5 @@ public interface JavaRecord<O extends JavaRecord<O>> extends
    /**
     * @return the list of {@link JavaRecordComponent} for this record
     */
-   List<JavaRecordComponent> getRecordComponents();
+   List<? extends JavaRecordComponent> getRecordComponents();
 }
diff --git a/api/src/main/java/org/jboss/forge/roaster/model/source/JavaRecordSource.java b/api/src/main/java/org/jboss/forge/roaster/model/source/JavaRecordSource.java
@@ -3,6 +3,8 @@
 import org.jboss.forge.roaster.model.JavaRecord;
 import org.jboss.forge.roaster.model.JavaRecordComponent;
 
+import java.util.List;
+
 public interface JavaRecordSource extends
          JavaSource<JavaRecordSource>,
          JavaRecord<JavaRecordSource>,
@@ -12,6 +14,9 @@ public interface JavaRecordSource extends
    JavaRecordComponentSource addRecordComponent(String type, String name);
    JavaRecordComponentSource addRecordComponent(Class<?> type, String name);
 
+   @Override
+   List<JavaRecordComponentSource> getRecordComponents();
+
    JavaRecordSource removeRecordComponent(String name);
    JavaRecordSource removeRecordComponent(JavaRecordComponent recordComponent);
 

diff --git a/impl/src/main/java/org/jboss/forge/roaster/model/impl/JavaRecordImpl.java b/impl/src/main/java/org/jboss/forge/roaster/model/impl/JavaRecordImpl.java
@@ -112,9 +112,9 @@ public JavaRecordSource removeMethod(Method<JavaRecordSource, ?> method)
    }
 
    @Override
-   public List<JavaRecordComponent> getRecordComponents()
+   public List<JavaRecordComponentSource> getRecordComponents()
    {
-      var list = new ArrayList<JavaRecordComponent>();
+      var list = new ArrayList<JavaRecordComponentSource>();
       for (Object internal : getDeclaration().recordComponents()) {
          list.add(new JavaRecordComponentImpl(this, internal));
       }

diff --git a/tests/src/test/java/org/jboss/forge/test/roaster/model/JavaRecordTest.java b/tests/src/test/java/org/jboss/forge/test/roaster/model/JavaRecordTest.java
@@ -6,6 +6,7 @@
 import org.jboss.forge.roaster.model.JavaRecordComponent;
 import org.jboss.forge.roaster.model.Visibility;
 import org.jboss.forge.roaster.model.source.JavaInterfaceSource;
+import org.jboss.forge.roaster.model.source.JavaRecordComponentSource;
 import org.jboss.forge.roaster.model.source.JavaRecordSource;
 import org.junit.jupiter.api.Test;
 
@@ -33,7 +34,7 @@ void testCreateRecord() {
                .setPackage("org.example.foo");
       javaRecord.addRecordComponent(BigInteger.class, "number");
       javaRecord.addMethod().setName("dial").setReturnType(boolean.class).setBody("return true;");
-      List<JavaRecordComponent> recordComponents = javaRecord.getRecordComponents();
+      List<JavaRecordComponentSource> recordComponents = javaRecord.getRecordComponents();
       assertThat(recordComponents).hasSize(1);
       assertThat(recordComponents.get(0).getName()).isEqualTo("number");
       assertThat(recordComponents.get(0).getType().getQualifiedName()).isEqualTo("java.math.BigInteger");