Skip to content

Commit c679b23

Browse files
raboofraboof
committed
Exclude AbstractFunction1 static forwarders as well
1 parent 787ce48 commit c679b23

File tree

15 files changed

+410
-1
lines changed

15 files changed

+410
-1
lines changed

‎plugin/src/main/scala/com/typesafe/genjavadoc/Output.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ trait Output { this: TransformCake ⇒
184184
// implements `AbstractFunctionN`, but static forwarders are not created
185185
// on the class for the methods on the companion object inherited from
186186
// that:
187-
Seq("curried", "tupled")
187+
Seq("curried", "tupled", "compose", "andThen")
188188

189189
private def inheritedMethods(sym: global.Symbol, exclude: Set[String]): Seq[MethodInfo] = {
190190
import global._

‎plugin/src/test/resources/expected_output/basic/akka/actor/Identify$.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package akka.actor;
2+
public class Identify$ extends scala.runtime.AbstractFunction1<java.lang.Object, akka.actor.Identify> implements scala.Serializable {
3+
/**
4+
* Static reference to the singleton instance of this Scala object.
5+
*/
6+
public static final Identify$ MODULE$ = null;
7+
public Identify$ () { throw new RuntimeException(); }
8+
public final java.lang.String toString () { throw new RuntimeException(); }
9+
public akka.actor.Identify apply (Object messageId) { throw new RuntimeException(); }
10+
public scala.Option<java.lang.Object> unapply (akka.actor.Identify x$0) { throw new RuntimeException(); }
11+
private java.lang.Object readResolve () { throw new RuntimeException(); }
12+
}

‎plugin/src/test/resources/expected_output/basic/akka/actor/Identify.java‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package akka.actor;
2+
public final class Identify implements scala.Product, scala.Serializable {
3+
static public akka.actor.Identify apply (Object messageId) { throw new RuntimeException(); }
4+
static public scala.Option<java.lang.Object> unapply (akka.actor.Identify x$0) { throw new RuntimeException(); }
5+
static private java.lang.Object readResolve () { throw new RuntimeException(); }
6+
public Object messageId () { throw new RuntimeException(); }
7+
// not preceding
8+
public Identify (Object messageId) { throw new RuntimeException(); }
9+
public akka.actor.Identify copy (Object messageId) { throw new RuntimeException(); }
10+
public Object copy$default$1 () { throw new RuntimeException(); }
11+
// not preceding
12+
public java.lang.String productPrefix () { throw new RuntimeException(); }
13+
public int productArity () { throw new RuntimeException(); }
14+
public Object productElement (int x$1) { throw new RuntimeException(); }
15+
public scala.collection.Iterator<java.lang.Object> productIterator () { throw new RuntimeException(); }
16+
public boolean canEqual (Object x$1) { throw new RuntimeException(); }
17+
public int hashCode () { throw new RuntimeException(); }
18+
public java.lang.String toString () { throw new RuntimeException(); }
19+
public boolean equals (Object x$1) { throw new RuntimeException(); }
20+
}

‎plugin/src/test/resources/input/basic/akka/actor/Actor.scala‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package akka.actor
2+
3+
@SerialVersionUID(1L)
4+
final case class Identify(messageId: Any) // extends AutoReceivedMessage with NotInfluenceReceiveTimeout
5+

‎plugin/src/test/resources/patches/2.12.0.patch‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,36 @@
5151
- */
5252
- public akka.rk.buh.is.it.A.D$ D () { throw new RuntimeException(); }
5353
}
54+
--- target/expected_output/basic/akka/actor/Identify.java
55+
+++ target/expected_output/basic/akka/actor/Identify.java
56+
@@ -3,6 +3,30 @@
57+
static public akka.actor.Identify apply (Object messageId) { throw new RuntimeException(); }
58+
static public scala.Option<java.lang.Object> unapply (akka.actor.Identify x$0) { throw new RuntimeException(); }
59+
static private java.lang.Object readResolve () { throw new RuntimeException(); }
60+
+ static public boolean apply$mcZD$sp (double v1) { throw new RuntimeException(); }
61+
+ static public double apply$mcDD$sp (double v1) { throw new RuntimeException(); }
62+
+ static public float apply$mcFD$sp (double v1) { throw new RuntimeException(); }
63+
+ static public int apply$mcID$sp (double v1) { throw new RuntimeException(); }
64+
+ static public long apply$mcJD$sp (double v1) { throw new RuntimeException(); }
65+
+ static public void apply$mcVD$sp (double v1) { throw new RuntimeException(); }
66+
+ static public boolean apply$mcZF$sp (float v1) { throw new RuntimeException(); }
67+
+ static public double apply$mcDF$sp (float v1) { throw new RuntimeException(); }
68+
+ static public float apply$mcFF$sp (float v1) { throw new RuntimeException(); }
69+
+ static public int apply$mcIF$sp (float v1) { throw new RuntimeException(); }
70+
+ static public long apply$mcJF$sp (float v1) { throw new RuntimeException(); }
71+
+ static public void apply$mcVF$sp (float v1) { throw new RuntimeException(); }
72+
+ static public boolean apply$mcZI$sp (int v1) { throw new RuntimeException(); }
73+
+ static public double apply$mcDI$sp (int v1) { throw new RuntimeException(); }
74+
+ static public float apply$mcFI$sp (int v1) { throw new RuntimeException(); }
75+
+ static public int apply$mcII$sp (int v1) { throw new RuntimeException(); }
76+
+ static public long apply$mcJI$sp (int v1) { throw new RuntimeException(); }
77+
+ static public void apply$mcVI$sp (int v1) { throw new RuntimeException(); }
78+
+ static public boolean apply$mcZJ$sp (long v1) { throw new RuntimeException(); }
79+
+ static public double apply$mcDJ$sp (long v1) { throw new RuntimeException(); }
80+
+ static public float apply$mcFJ$sp (long v1) { throw new RuntimeException(); }
81+
+ static public int apply$mcIJ$sp (long v1) { throw new RuntimeException(); }
82+
+ static public long apply$mcJJ$sp (long v1) { throw new RuntimeException(); }
83+
+ static public void apply$mcVJ$sp (long v1) { throw new RuntimeException(); }
84+
public Object messageId () { throw new RuntimeException(); }
85+
// not preceding
86+
public Identify (Object messageId) { throw new RuntimeException(); }

‎plugin/src/test/resources/patches/2.12.1.patch‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,36 @@
5151
- */
5252
- public akka.rk.buh.is.it.A.D$ D () { throw new RuntimeException(); }
5353
}
54+
--- target/expected_output/basic/akka/actor/Identify.java
55+
+++ target/expected_output/basic/akka/actor/Identify.java
56+
@@ -3,6 +3,30 @@
57+
static public akka.actor.Identify apply (Object messageId) { throw new RuntimeException(); }
58+
static public scala.Option<java.lang.Object> unapply (akka.actor.Identify x$0) { throw new RuntimeException(); }
59+
static private java.lang.Object readResolve () { throw new RuntimeException(); }
60+
+ static public boolean apply$mcZD$sp (double v1) { throw new RuntimeException(); }
61+
+ static public double apply$mcDD$sp (double v1) { throw new RuntimeException(); }
62+
+ static public float apply$mcFD$sp (double v1) { throw new RuntimeException(); }
63+
+ static public int apply$mcID$sp (double v1) { throw new RuntimeException(); }
64+
+ static public long apply$mcJD$sp (double v1) { throw new RuntimeException(); }
65+
+ static public void apply$mcVD$sp (double v1) { throw new RuntimeException(); }
66+
+ static public boolean apply$mcZF$sp (float v1) { throw new RuntimeException(); }
67+
+ static public double apply$mcDF$sp (float v1) { throw new RuntimeException(); }
68+
+ static public float apply$mcFF$sp (float v1) { throw new RuntimeException(); }
69+
+ static public int apply$mcIF$sp (float v1) { throw new RuntimeException(); }
70+
+ static public long apply$mcJF$sp (float v1) { throw new RuntimeException(); }
71+
+ static public void apply$mcVF$sp (float v1) { throw new RuntimeException(); }
72+
+ static public boolean apply$mcZI$sp (int v1) { throw new RuntimeException(); }
73+
+ static public double apply$mcDI$sp (int v1) { throw new RuntimeException(); }
74+
+ static public float apply$mcFI$sp (int v1) { throw new RuntimeException(); }
75+
+ static public int apply$mcII$sp (int v1) { throw new RuntimeException(); }
76+
+ static public long apply$mcJI$sp (int v1) { throw new RuntimeException(); }
77+
+ static public void apply$mcVI$sp (int v1) { throw new RuntimeException(); }
78+
+ static public boolean apply$mcZJ$sp (long v1) { throw new RuntimeException(); }
79+
+ static public double apply$mcDJ$sp (long v1) { throw new RuntimeException(); }
80+
+ static public float apply$mcFJ$sp (long v1) { throw new RuntimeException(); }
81+
+ static public int apply$mcIJ$sp (long v1) { throw new RuntimeException(); }
82+
+ static public long apply$mcJJ$sp (long v1) { throw new RuntimeException(); }
83+
+ static public void apply$mcVJ$sp (long v1) { throw new RuntimeException(); }
84+
public Object messageId () { throw new RuntimeException(); }
85+
// not preceding
86+
public Identify (Object messageId) { throw new RuntimeException(); }

‎plugin/src/test/resources/patches/2.12.2.patch‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,36 @@
5151
- */
5252
- public akka.rk.buh.is.it.A.D$ D () { throw new RuntimeException(); }
5353
}
54+
--- target/expected_output/basic/akka/actor/Identify.java
55+
+++ target/expected_output/basic/akka/actor/Identify.java
56+
@@ -3,6 +3,30 @@
57+
static public akka.actor.Identify apply (Object messageId) { throw new RuntimeException(); }
58+
static public scala.Option<java.lang.Object> unapply (akka.actor.Identify x$0) { throw new RuntimeException(); }
59+
static private java.lang.Object readResolve () { throw new RuntimeException(); }
60+
+ static public boolean apply$mcZD$sp (double v1) { throw new RuntimeException(); }
61+
+ static public double apply$mcDD$sp (double v1) { throw new RuntimeException(); }
62+
+ static public float apply$mcFD$sp (double v1) { throw new RuntimeException(); }
63+
+ static public int apply$mcID$sp (double v1) { throw new RuntimeException(); }
64+
+ static public long apply$mcJD$sp (double v1) { throw new RuntimeException(); }
65+
+ static public void apply$mcVD$sp (double v1) { throw new RuntimeException(); }
66+
+ static public boolean apply$mcZF$sp (float v1) { throw new RuntimeException(); }
67+
+ static public double apply$mcDF$sp (float v1) { throw new RuntimeException(); }
68+
+ static public float apply$mcFF$sp (float v1) { throw new RuntimeException(); }
69+
+ static public int apply$mcIF$sp (float v1) { throw new RuntimeException(); }
70+
+ static public long apply$mcJF$sp (float v1) { throw new RuntimeException(); }
71+
+ static public void apply$mcVF$sp (float v1) { throw new RuntimeException(); }
72+
+ static public boolean apply$mcZI$sp (int v1) { throw new RuntimeException(); }
73+
+ static public double apply$mcDI$sp (int v1) { throw new RuntimeException(); }
74+
+ static public float apply$mcFI$sp (int v1) { throw new RuntimeException(); }
75+
+ static public int apply$mcII$sp (int v1) { throw new RuntimeException(); }
76+
+ static public long apply$mcJI$sp (int v1) { throw new RuntimeException(); }
77+
+ static public void apply$mcVI$sp (int v1) { throw new RuntimeException(); }
78+
+ static public boolean apply$mcZJ$sp (long v1) { throw new RuntimeException(); }
79+
+ static public double apply$mcDJ$sp (long v1) { throw new RuntimeException(); }
80+
+ static public float apply$mcFJ$sp (long v1) { throw new RuntimeException(); }
81+
+ static public int apply$mcIJ$sp (long v1) { throw new RuntimeException(); }
82+
+ static public long apply$mcJJ$sp (long v1) { throw new RuntimeException(); }
83+
+ static public void apply$mcVJ$sp (long v1) { throw new RuntimeException(); }
84+
public Object messageId () { throw new RuntimeException(); }
85+
// not preceding
86+
public Identify (Object messageId) { throw new RuntimeException(); }

‎plugin/src/test/resources/patches/2.12.3.patch‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,36 @@
5151
- */
5252
- public akka.rk.buh.is.it.A.D$ D () { throw new RuntimeException(); }
5353
}
54+
--- target/expected_output/basic/akka/actor/Identify.java
55+
+++ target/expected_output/basic/akka/actor/Identify.java
56+
@@ -3,6 +3,30 @@
57+
static public akka.actor.Identify apply (Object messageId) { throw new RuntimeException(); }
58+
static public scala.Option<java.lang.Object> unapply (akka.actor.Identify x$0) { throw new RuntimeException(); }
59+
static private java.lang.Object readResolve () { throw new RuntimeException(); }
60+
+ static public boolean apply$mcZD$sp (double v1) { throw new RuntimeException(); }
61+
+ static public double apply$mcDD$sp (double v1) { throw new RuntimeException(); }
62+
+ static public float apply$mcFD$sp (double v1) { throw new RuntimeException(); }
63+
+ static public int apply$mcID$sp (double v1) { throw new RuntimeException(); }
64+
+ static public long apply$mcJD$sp (double v1) { throw new RuntimeException(); }
65+
+ static public void apply$mcVD$sp (double v1) { throw new RuntimeException(); }
66+
+ static public boolean apply$mcZF$sp (float v1) { throw new RuntimeException(); }
67+
+ static public double apply$mcDF$sp (float v1) { throw new RuntimeException(); }
68+
+ static public float apply$mcFF$sp (float v1) { throw new RuntimeException(); }
69+
+ static public int apply$mcIF$sp (float v1) { throw new RuntimeException(); }
70+
+ static public long apply$mcJF$sp (float v1) { throw new RuntimeException(); }
71+
+ static public void apply$mcVF$sp (float v1) { throw new RuntimeException(); }
72+
+ static public boolean apply$mcZI$sp (int v1) { throw new RuntimeException(); }
73+
+ static public double apply$mcDI$sp (int v1) { throw new RuntimeException(); }
74+
+ static public float apply$mcFI$sp (int v1) { throw new RuntimeException(); }
75+
+ static public int apply$mcII$sp (int v1) { throw new RuntimeException(); }
76+
+ static public long apply$mcJI$sp (int v1) { throw new RuntimeException(); }
77+
+ static public void apply$mcVI$sp (int v1) { throw new RuntimeException(); }
78+
+ static public boolean apply$mcZJ$sp (long v1) { throw new RuntimeException(); }
79+
+ static public double apply$mcDJ$sp (long v1) { throw new RuntimeException(); }
80+
+ static public float apply$mcFJ$sp (long v1) { throw new RuntimeException(); }
81+
+ static public int apply$mcIJ$sp (long v1) { throw new RuntimeException(); }
82+
+ static public long apply$mcJJ$sp (long v1) { throw new RuntimeException(); }
83+
+ static public void apply$mcVJ$sp (long v1) { throw new RuntimeException(); }
84+
public Object messageId () { throw new RuntimeException(); }
85+
// not preceding
86+
public Identify (Object messageId) { throw new RuntimeException(); }

‎plugin/src/test/resources/patches/2.12.4.patch‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,36 @@
5151
- */
5252
- public akka.rk.buh.is.it.A.D$ D () { throw new RuntimeException(); }
5353
}
54+
--- target/expected_output/basic/akka/actor/Identify.java
55+
+++ target/expected_output/basic/akka/actor/Identify.java
56+
@@ -3,6 +3,30 @@
57+
static public akka.actor.Identify apply (Object messageId) { throw new RuntimeException(); }
58+
static public scala.Option<java.lang.Object> unapply (akka.actor.Identify x$0) { throw new RuntimeException(); }
59+
static private java.lang.Object readResolve () { throw new RuntimeException(); }
60+
+ static public boolean apply$mcZD$sp (double v1) { throw new RuntimeException(); }
61+
+ static public double apply$mcDD$sp (double v1) { throw new RuntimeException(); }
62+
+ static public float apply$mcFD$sp (double v1) { throw new RuntimeException(); }
63+
+ static public int apply$mcID$sp (double v1) { throw new RuntimeException(); }
64+
+ static public long apply$mcJD$sp (double v1) { throw new RuntimeException(); }
65+
+ static public void apply$mcVD$sp (double v1) { throw new RuntimeException(); }
66+
+ static public boolean apply$mcZF$sp (float v1) { throw new RuntimeException(); }
67+
+ static public double apply$mcDF$sp (float v1) { throw new RuntimeException(); }
68+
+ static public float apply$mcFF$sp (float v1) { throw new RuntimeException(); }
69+
+ static public int apply$mcIF$sp (float v1) { throw new RuntimeException(); }
70+
+ static public long apply$mcJF$sp (float v1) { throw new RuntimeException(); }
71+
+ static public void apply$mcVF$sp (float v1) { throw new RuntimeException(); }
72+
+ static public boolean apply$mcZI$sp (int v1) { throw new RuntimeException(); }
73+
+ static public double apply$mcDI$sp (int v1) { throw new RuntimeException(); }
74+
+ static public float apply$mcFI$sp (int v1) { throw new RuntimeException(); }
75+
+ static public int apply$mcII$sp (int v1) { throw new RuntimeException(); }
76+
+ static public long apply$mcJI$sp (int v1) { throw new RuntimeException(); }
77+
+ static public void apply$mcVI$sp (int v1) { throw new RuntimeException(); }
78+
+ static public boolean apply$mcZJ$sp (long v1) { throw new RuntimeException(); }
79+
+ static public double apply$mcDJ$sp (long v1) { throw new RuntimeException(); }
80+
+ static public float apply$mcFJ$sp (long v1) { throw new RuntimeException(); }
81+
+ static public int apply$mcIJ$sp (long v1) { throw new RuntimeException(); }
82+
+ static public long apply$mcJJ$sp (long v1) { throw new RuntimeException(); }
83+
+ static public void apply$mcVJ$sp (long v1) { throw new RuntimeException(); }
84+
public Object messageId () { throw new RuntimeException(); }
85+
// not preceding
86+
public Identify (Object messageId) { throw new RuntimeException(); }

‎plugin/src/test/resources/patches/2.12.5.patch‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,36 @@
5151
- */
5252
- public akka.rk.buh.is.it.A.D$ D () { throw new RuntimeException(); }
5353
}
54+
--- target/expected_output/basic/akka/actor/Identify.java
55+
+++ target/expected_output/basic/akka/actor/Identify.java
56+
@@ -3,6 +3,30 @@
57+
static public akka.actor.Identify apply (Object messageId) { throw new RuntimeException(); }
58+
static public scala.Option<java.lang.Object> unapply (akka.actor.Identify x$0) { throw new RuntimeException(); }
59+
static private java.lang.Object readResolve () { throw new RuntimeException(); }
60+
+ static public boolean apply$mcZD$sp (double v1) { throw new RuntimeException(); }
61+
+ static public double apply$mcDD$sp (double v1) { throw new RuntimeException(); }
62+
+ static public float apply$mcFD$sp (double v1) { throw new RuntimeException(); }
63+
+ static public int apply$mcID$sp (double v1) { throw new RuntimeException(); }
64+
+ static public long apply$mcJD$sp (double v1) { throw new RuntimeException(); }
65+
+ static public void apply$mcVD$sp (double v1) { throw new RuntimeException(); }
66+
+ static public boolean apply$mcZF$sp (float v1) { throw new RuntimeException(); }
67+
+ static public double apply$mcDF$sp (float v1) { throw new RuntimeException(); }
68+
+ static public float apply$mcFF$sp (float v1) { throw new RuntimeException(); }
69+
+ static public int apply$mcIF$sp (float v1) { throw new RuntimeException(); }
70+
+ static public long apply$mcJF$sp (float v1) { throw new RuntimeException(); }
71+
+ static public void apply$mcVF$sp (float v1) { throw new RuntimeException(); }
72+
+ static public boolean apply$mcZI$sp (int v1) { throw new RuntimeException(); }
73+
+ static public double apply$mcDI$sp (int v1) { throw new RuntimeException(); }
74+
+ static public float apply$mcFI$sp (int v1) { throw new RuntimeException(); }
75+
+ static public int apply$mcII$sp (int v1) { throw new RuntimeException(); }
76+
+ static public long apply$mcJI$sp (int v1) { throw new RuntimeException(); }
77+
+ static public void apply$mcVI$sp (int v1) { throw new RuntimeException(); }
78+
+ static public boolean apply$mcZJ$sp (long v1) { throw new RuntimeException(); }
79+
+ static public double apply$mcDJ$sp (long v1) { throw new RuntimeException(); }
80+
+ static public float apply$mcFJ$sp (long v1) { throw new RuntimeException(); }
81+
+ static public int apply$mcIJ$sp (long v1) { throw new RuntimeException(); }
82+
+ static public long apply$mcJJ$sp (long v1) { throw new RuntimeException(); }
83+
+ static public void apply$mcVJ$sp (long v1) { throw new RuntimeException(); }
84+
public Object messageId () { throw new RuntimeException(); }
85+
// not preceding
86+
public Identify (Object messageId) { throw new RuntimeException(); }

0 commit comments

Comments
 (0)