- remove method-ref from Projection, just keep string projection

- ref #3853

Author: jknack

jooby/src/main/java/io/jooby/Projected.java

@@ -6,7 +6,6 @@
 package io.jooby;
 
 import java.util.*;
-import java.util.function.Consumer;
 
 /**
  * A wrapper for a value and its associated {@link Projection}.
@@ -56,17 +55,6 @@ public Projected<T> include(String... paths) {
     return this;
   }
 
-  @SafeVarargs
-  public final Projected<T> include(Projection.Property<T, ?>... props) {
-    projection.include(props);
-    return this;
-  }
-
-  public <R> Projected<T> include(Projection.Property<T, R> prop, Consumer<Projection<R>> child) {
-    projection.include(prop, child);
-    return this;
-  }
-
   @Override
   public String toString() {
     return projection.toString();

jooby/src/main/java/io/jooby/Projection.java

@@ -5,15 +5,12 @@
  */
 package io.jooby;
 
-import java.io.Serializable;
-import java.lang.invoke.SerializedLambda;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Consumer;
 
 import io.jooby.value.ValueFactory;
 
@@ -90,23 +87,6 @@
  */
 public class Projection<T> {
 
-  /**
-   * Functional interface for capturing method references.
-   *
-   * @param <T> The type containing the property.
-   * @param <R> The return type of the property.
-   */
-  @FunctionalInterface
-  public interface Property<T, R> extends Serializable {
-    /**
-     * Captures the property method reference.
-     *
-     * @param instance The instance to apply the method to.
-     * @return The property value.
-     */
-    R apply(T instance);
-  }
-
   private static final Map<Class<?>, String> PROP_CACHE = new ConcurrentHashMap<>();
 
   private final Class<T> type;
@@ -152,44 +132,6 @@ public Projection<T> include(String... paths) {
     return this;
   }
 
-  /**
-   * Includes fields via type-safe method references.
-   *
-   * @param props Method references.
-   * @return This projection instance.
-   */
-  @SafeVarargs
-  public final Projection<T> include(Property<T, ?>... props) {
-    for (Property<T, ?> prop : props) {
-      String name = getFieldName(prop);
-      children.computeIfAbsent(
-          name, k -> new Projection<>(resolveFieldType(this.type, name), false, validate));
-    }
-    rebuild();
-    return this;
-  }
-
-  /**
-   * Includes a nested field and configures its sub-projection using a lambda. This provides full
-   * type-safety for nested objects.
-   *
-   * @param <R> The type of the nested field.
-   * @param prop The method reference to the nested field.
-   * @param childSpec A consumer that configures the nested projection.
-   * @return This projection instance.
-   */
-  public <R> Projection<T> include(Property<T, R> prop, Consumer<Projection<R>> childSpec) {
-    String name = getFieldName(prop);
-    Class<R> childType = (Class<R>) resolveFieldType(this.type, name);
-    Projection<R> child =
-        (Projection<R>)
-            children.computeIfAbsent(name, k -> new Projection<>(childType, false, validate));
-    childSpec.accept(child);
-    child.rebuild();
-    rebuild();
-    return this;
-  }
-
   public Map<String, Projection<?>> getChildren() {
     return Collections.unmodifiableMap(children);
   }
@@ -552,23 +494,6 @@ private Class<?> resolveFieldType(Class<?> currentType, String fieldName) {
     return rawType;
   }
 
-  private static String getFieldName(Property<?, ?> property) {
-    return PROP_CACHE.computeIfAbsent(
-        property.getClass(),
-        clz -> {
-          try {
-            Method m = clz.getDeclaredMethod("writeReplace");
-            m.setAccessible(true);
-            SerializedLambda l = (SerializedLambda) m.invoke(property);
-            String n = l.getImplMethodName();
-            int s = n.startsWith("get") ? 3 : (n.startsWith("is") ? 2 : 0);
-            return Character.toLowerCase(n.charAt(s)) + n.substring(s + 1);
-          } catch (Exception x) {
-            throw new IllegalArgumentException("Could not resolve field from method reference.", x);
-          }
-        });
-  }
-
   @Override
   public boolean equals(Object o) {
     if (this == o) return true;

jooby/src/test/java/io/jooby/ProjectionTest.java

@@ -131,14 +131,6 @@ public void testMixedNotationRecursive() {
     assertEquals("(address(loc(lat,lon)),roles(name))", p.toView());
   }
 
-  @Test
-  public void testTypeSafeInclude() {
-    // Type-safe references also follow the defined order
-    Projection<User> p = Projection.of(User.class).include(User::getName, User::getId);
-    assertEquals("(name,id)", p.toView());
-    assertEquals("User(name,id)", p.toString());
-  }
-
   @Test
   public void testCollectionGenericUnwrapping() {
     Projection<User> p = Projection.of(User.class).include("roles.name");

tests/src/test/java/io/jooby/i3853/Issue3853.java

@@ -102,13 +102,6 @@ public void shouldProjectData(ServerTestRunner runner, Extension extension) {
                   ctx -> {
                     return Projected.wrap(createUser()).include("(id, name, address(loc(lat)))");
                   });
-              app.get(
-                  "/stub/address-stub-ref",
-                  ctx -> {
-                    return Projected.wrap(createUser())
-                        .include(U3853::getId, U3853::getName)
-                        .include(U3853::getAddress, addr -> addr.include(A3853::getCity));
-                  });
             })
         .ready(
             http -> {
@@ -189,15 +182,6 @@ public void shouldProjectData(ServerTestRunner runner, Extension extension) {
                             {"id":"cobb-001","name":"Dom Cobb","address":{"city":"Snow Fortress (Level 3)"}}
                             """);
                   });
-              http.get(
-                  "/stub/address-stub-ref",
-                  rsp -> {
-                    assertThat(rsp.body().string())
-                        .isEqualToIgnoringNewLines(
-                            """
-                            {"id":"cobb-001","name":"Dom Cobb","address":{"city":"Snow Fortress (Level 3)"}}
-                            """);
-                  });
               http.get(
                   "/stub/address-loc-lat",
                   rsp -> {