address merge conflicts

Author: Andriy Onyshchuk

dataenum-processor/src/test/resources/MethodsAndValues.java

@@ -70,11 +70,23 @@ public final Val2 asVal2() {
 
   public abstract <R_> R_ map(@Nonnull Function<Val1, R_> val1, @Nonnull Function<Val2, R_> val2);
 
-  public String x(MethodsAndValues z) {
-    return z.map((v1)->v1.x(), (v2)->v2.x());}
+  public String classMethodNoExtraArgs(MethodsAndValues x) {
+    return x.map((v1)->v1.x(), (v2)->v2.x());}
 
-  public static int y(MethodsAndValues z) {
-    return z.map((v1)->0, (v2)->1);}
+  public String classMethodSomeExtraArgs(MethodsAndValues x, String suffix) {
+    return x.map((v1)->v1.x() + suffix, (v2)->v2.x() + suffix);}
+
+  public <T> String classMethodTypeParams(MethodsAndValues x, T suffix) {
+    return x.map((v1)->v1.x() + suffix.toString(), (v2)->v2.x() + suffix.toString());}
+
+  public static String staticMethodNoExtraArgs(MethodsAndValues x) {
+    return x.map((v1)->v1.x(), (v2)->v2.x());}
+
+  public static String staticMethodSomeExtraArgs(MethodsAndValues x, String suffix) {
+    return x.map((v1)->v1.x() + suffix, (v2)->v2.x() + suffix);}
+
+  public static <T> String staticMethodTypeParams(MethodsAndValues x, T suffix) {
+    return x.map((v1)->v1.x() + suffix.toString(), (v2)->v2.x() + suffix.toString());}
 
   public static final class Val1 extends MethodsAndValues {
     private final String x;

dataenum-processor/src/test/resources/MethodsAndValues_dataenum.java

@@ -17,27 +17,62 @@
  * limitations under the License.
  * -/-/-
  */
+
 import com.spotify.dataenum.DataEnum;
 import com.spotify.dataenum.Static;
 import com.spotify.dataenum.dataenum_case;
+
 import java.util.Set;
 
 @DataEnum
 interface MethodsAndValues_dataenum {
-  dataenum_case Val1(String x);
-  dataenum_case Val2(String x);
-
-  default String x(MethodsAndValues z) {
-    return z.map(
-      v1 -> v1.x(),
-      v2 -> v2.x()
-    );
-  }
-
-  @Static default int y(MethodsAndValues z) {
-    return z.map(
-      v1 -> 0,
-      v2 -> 1
-    );
-  }
+    dataenum_case Val1(String x);
+
+    dataenum_case Val2(String x);
+
+    default String classMethodNoExtraArgs(MethodsAndValues x) {
+        return x.map(
+                v1 -> v1.x(),
+                v2 -> v2.x()
+        );
+    }
+
+    default String classMethodSomeExtraArgs(MethodsAndValues x, String suffix) {
+        return x.map(
+                v1 -> v1.x() + suffix,
+                v2 -> v2.x() + suffix
+        );
+    }
+
+    default <T> String classMethodTypeParams(MethodsAndValues x, T suffix) {
+        return x.map(
+                v1 -> v1.x() + suffix.toString(),
+                v2 -> v2.x() + suffix.toString()
+        );
+    }
+
+    @Static
+    default String staticMethodNoExtraArgs(MethodsAndValues x) {
+        return x.map(
+                v1 -> v1.x(),
+                v2 -> v2.x()
+        );
+    }
+
+    @Static
+    default String staticMethodSomeExtraArgs(MethodsAndValues x, String suffix) {
+        return x.map(
+                v1 -> v1.x() + suffix,
+                v2 -> v2.x() + suffix
+        );
+    }
+
+    @Static
+    default <T> String staticMethodTypeParams(MethodsAndValues x, T suffix) {
+        return x.map(
+                v1 -> v1.x() + suffix.toString(),
+                v2 -> v2.x() + suffix.toString()
+        );
+    }
+
 }