Skip to content

Commit 0a8cf13

Browse files
yDelouisyDelouis
committed
Move AnnotationHandlers into internal
1 parent 3a16332 commit 0a8cf13

14 files changed

Lines changed: 74 additions & 52 deletions

File tree

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/AndroidAnnotationsEnvironment.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ public interface AndroidAnnotationsEnvironment {
5151

5252
Set<String> getSupportedAnnotationTypes();
5353

54-
List<AnnotationHandler<? extends GeneratedClassHolder>> getHandlers();
54+
List<AnnotationHandler<?>> getHandlers();
5555

56-
List<AnnotationHandler<? extends GeneratedClassHolder>> getDecoratingHandlers();
56+
List<AnnotationHandler<?>> getDecoratingHandlers();
5757

58-
List<GeneratingAnnotationHandler<? extends GeneratedClassHolder>> getGeneratingHandlers();
58+
List<GeneratingAnnotationHandler<?>> getGeneratingHandlers();
5959

6060
IRClass getRClass();
6161

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/handler/HasParameterHandlers.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919

2020
public interface HasParameterHandlers<T extends GeneratedClassHolder> extends AnnotationHandler<T> {
2121

22-
Iterable<AnnotationHandler<? extends GeneratedClassHolder>> getParameterHandlers();
22+
Iterable<AnnotationHandler> getParameterHandlers();
2323
}

AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/handler/AnnotationHandlers.java renamed to AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/AnnotationHandlers.java

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* License for the specific language governing permissions and limitations under
1414
* the License.
1515
*/
16-
package org.androidannotations.handler;
16+
package org.androidannotations.internal;
1717

1818
import java.lang.annotation.Annotation;
1919
import java.util.ArrayList;
@@ -22,55 +22,55 @@
2222
import java.util.List;
2323
import java.util.Set;
2424

25-
import org.androidannotations.holder.GeneratedClassHolder;
25+
import org.androidannotations.handler.AnnotationHandler;
26+
import org.androidannotations.handler.GeneratingAnnotationHandler;
27+
import org.androidannotations.handler.HasParameterHandlers;
2628

2729
public class AnnotationHandlers {
2830

29-
private List<AnnotationHandler<? extends GeneratedClassHolder>> annotationHandlers = new ArrayList<>();
30-
private List<GeneratingAnnotationHandler<? extends GeneratedClassHolder>> generatingAnnotationHandlers = new ArrayList<>();
31-
private List<AnnotationHandler<? extends GeneratedClassHolder>> decoratingAnnotationHandlers = new ArrayList<>();
31+
private List<AnnotationHandler<?>> annotationHandlers = new ArrayList<>();
32+
private List<GeneratingAnnotationHandler<?>> generatingAnnotationHandlers = new ArrayList<>();
33+
private List<AnnotationHandler<?>> decoratingAnnotationHandlers = new ArrayList<>();
3234
private Set<String> supportedAnnotationNames;
3335

3436
public AnnotationHandlers() {
3537
}
3638

37-
public void add(AnnotationHandler<? extends GeneratedClassHolder> annotationHandler) {
39+
public void add(AnnotationHandler<?> annotationHandler) {
3840
annotationHandlers.add(annotationHandler);
39-
decoratingAnnotationHandlers.add(annotationHandler);
40-
addParameterHandlers(annotationHandler);
41-
}
42-
43-
public void add(GeneratingAnnotationHandler<? extends GeneratedClassHolder> annotationHandler) {
44-
annotationHandlers.add(annotationHandler);
45-
generatingAnnotationHandlers.add(annotationHandler);
41+
if (annotationHandler instanceof GeneratingAnnotationHandler) {
42+
generatingAnnotationHandlers.add((GeneratingAnnotationHandler) annotationHandler);
43+
} else {
44+
decoratingAnnotationHandlers.add(annotationHandler);
45+
}
4646
addParameterHandlers(annotationHandler);
4747
}
4848

49-
private void addParameterHandlers(AnnotationHandler<? extends GeneratedClassHolder> annotationHandler) {
49+
private void addParameterHandlers(AnnotationHandler<?> annotationHandler) {
5050
if (annotationHandler instanceof HasParameterHandlers) {
51-
HasParameterHandlers<? extends GeneratedClassHolder> hasParameterHandlers = (HasParameterHandlers<? extends GeneratedClassHolder>) annotationHandler;
52-
for (AnnotationHandler<? extends GeneratedClassHolder> parameterHandler : hasParameterHandlers.getParameterHandlers()) {
51+
HasParameterHandlers<?> hasParameterHandlers = (HasParameterHandlers<?>) annotationHandler;
52+
for (AnnotationHandler<?> parameterHandler : hasParameterHandlers.getParameterHandlers()) {
5353
add(parameterHandler);
5454
}
5555
}
5656
}
5757

58-
public List<AnnotationHandler<? extends GeneratedClassHolder>> get() {
58+
public List<AnnotationHandler<?>> get() {
5959
return annotationHandlers;
6060
}
6161

62-
public List<GeneratingAnnotationHandler<? extends GeneratedClassHolder>> getGenerating() {
62+
public List<GeneratingAnnotationHandler<?>> getGenerating() {
6363
return generatingAnnotationHandlers;
6464
}
6565

66-
public List<AnnotationHandler<? extends GeneratedClassHolder>> getDecorating() {
66+
public List<AnnotationHandler<?>> getDecorating() {
6767
return decoratingAnnotationHandlers;
6868
}
6969

7070
public Set<String> getSupportedAnnotationTypes() {
7171
if (supportedAnnotationNames == null) {
7272
Set<String> annotationNames = new HashSet<>();
73-
for (AnnotationHandler<?> annotationHandler : annotationHandlers) {
73+
for (AnnotationHandler annotationHandler : annotationHandlers) {
7474
annotationNames.add(annotationHandler.getTarget());
7575
}
7676
supportedAnnotationNames = Collections.unmodifiableSet(annotationNames);
@@ -81,7 +81,7 @@ public Set<String> getSupportedAnnotationTypes() {
8181
@SuppressWarnings("unchecked")
8282
public List<Class<? extends Annotation>> getGeneratingAnnotations() {
8383
List<Class<? extends Annotation>> generatingAnnotations = new ArrayList<>();
84-
for (GeneratingAnnotationHandler<? extends GeneratedClassHolder> generatingAnnotationHandler : getGenerating()) {
84+
for (GeneratingAnnotationHandler generatingAnnotationHandler : getGenerating()) {
8585
try {
8686
generatingAnnotations.add((Class<? extends Annotation>) Class.forName(generatingAnnotationHandler.getTarget()));
8787
} catch (ClassNotFoundException | ClassCastException e) {

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/InternalAndroidAnnotationsEnvironment.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.androidannotations.AndroidAnnotationsEnvironment;
2626
import org.androidannotations.Option;
2727
import org.androidannotations.handler.AnnotationHandler;
28-
import org.androidannotations.handler.AnnotationHandlers;
2928
import org.androidannotations.handler.GeneratingAnnotationHandler;
3029
import org.androidannotations.helper.AndroidManifest;
3130
import org.androidannotations.holder.GeneratedClassHolder;
@@ -63,7 +62,9 @@ public void setPlugins(List<AndroidAnnotationsPlugin> plugins) {
6362
this.plugins = plugins;
6463
for (AndroidAnnotationsPlugin plugin : plugins) {
6564
options.addAllSupportedOptions(plugin.getSupportedOptions());
66-
plugin.addHandlers(annotationHandlers, this);
65+
for (AnnotationHandler<?> annotationHandler : plugin.getHandlers(this)) {
66+
annotationHandlers.add(annotationHandler);
67+
}
6768
}
6869
}
6970

@@ -116,17 +117,17 @@ public Set<String> getSupportedAnnotationTypes() {
116117
}
117118

118119
@Override
119-
public List<AnnotationHandler<? extends GeneratedClassHolder>> getHandlers() {
120+
public List<AnnotationHandler<?>> getHandlers() {
120121
return annotationHandlers.get();
121122
}
122123

123124
@Override
124-
public List<AnnotationHandler<? extends GeneratedClassHolder>> getDecoratingHandlers() {
125+
public List<AnnotationHandler<?>> getDecoratingHandlers() {
125126
return annotationHandlers.getDecorating();
126127
}
127128

128129
@Override
129-
public List<GeneratingAnnotationHandler<? extends GeneratedClassHolder>> getGeneratingHandlers() {
130+
public List<GeneratingAnnotationHandler<?>> getGeneratingHandlers() {
130131
return annotationHandlers.getGenerating();
131132
}
132133

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/CorePlugin.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@
1515
*/
1616
package org.androidannotations.internal.core;
1717

18+
import java.util.ArrayList;
1819
import java.util.Arrays;
1920
import java.util.List;
2021

2122
import org.androidannotations.AndroidAnnotationsEnvironment;
2223
import org.androidannotations.Option;
23-
import org.androidannotations.handler.AnnotationHandlers;
24+
import org.androidannotations.handler.AnnotationHandler;
2425
import org.androidannotations.internal.core.handler.AfterExtrasHandler;
2526
import org.androidannotations.internal.core.handler.AfterInjectHandler;
2627
import org.androidannotations.internal.core.handler.AfterPreferencesHandler;
@@ -116,7 +117,8 @@ public List<Option> getSupportedOptions() {
116117
}
117118

118119
@Override
119-
public void addHandlers(AnnotationHandlers annotationHandlers, AndroidAnnotationsEnvironment androidAnnotationEnv) {
120+
public List<AnnotationHandler<?>> getHandlers(AndroidAnnotationsEnvironment androidAnnotationEnv) {
121+
List<AnnotationHandler<?>> annotationHandlers = new ArrayList<>();
120122
annotationHandlers.add(new EApplicationHandler(androidAnnotationEnv));
121123
annotationHandlers.add(new EActivityHandler(androidAnnotationEnv));
122124
annotationHandlers.add(new EProviderHandler(androidAnnotationEnv));
@@ -225,5 +227,7 @@ public void addHandlers(AnnotationHandlers annotationHandlers, AndroidAnnotation
225227
annotationHandlers.add(new SupposeUiThreadHandler(androidAnnotationEnv));
226228
annotationHandlers.add(new SupposeBackgroundHandler(androidAnnotationEnv));
227229
}
230+
231+
return annotationHandlers;
228232
}
229233
}

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/OnActivityResultHandler.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import org.androidannotations.handler.BaseAnnotationHandler;
3535
import org.androidannotations.handler.HasParameterHandlers;
3636
import org.androidannotations.helper.CanonicalNameConstants;
37-
import org.androidannotations.holder.GeneratedClassHolder;
3837
import org.androidannotations.holder.HasOnActivityResult;
3938

4039
import com.sun.codemodel.JBlock;
@@ -54,8 +53,8 @@ public OnActivityResultHandler(AndroidAnnotationsEnvironment environment) {
5453
}
5554

5655
@Override
57-
public Iterable<AnnotationHandler<? extends GeneratedClassHolder>> getParameterHandlers() {
58-
return Collections.<AnnotationHandler<? extends GeneratedClassHolder>> singleton(extraHandler);
56+
public Iterable<AnnotationHandler> getParameterHandlers() {
57+
return Collections.<AnnotationHandler> singleton(extraHandler);
5958
}
6059

6160
@Override

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ReceiverActionHandler.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import org.androidannotations.helper.CanonicalNameConstants;
3939
import org.androidannotations.helper.CaseHelper;
4040
import org.androidannotations.holder.EReceiverHolder;
41-
import org.androidannotations.holder.GeneratedClassHolder;
4241

4342
import com.sun.codemodel.JBlock;
4443
import com.sun.codemodel.JClass;
@@ -58,8 +57,8 @@ public ReceiverActionHandler(AndroidAnnotationsEnvironment environment) {
5857
}
5958

6059
@Override
61-
public Iterable<AnnotationHandler<? extends GeneratedClassHolder>> getParameterHandlers() {
62-
return Collections.<AnnotationHandler<? extends GeneratedClassHolder>> singleton(extraHandler);
60+
public Iterable<AnnotationHandler> getParameterHandlers() {
61+
return Collections.<AnnotationHandler> singleton(extraHandler);
6362
}
6463

6564
@Override

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/ReceiverHandler.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import org.androidannotations.handler.AnnotationHandler;
3636
import org.androidannotations.handler.HasParameterHandlers;
3737
import org.androidannotations.helper.CanonicalNameConstants;
38-
import org.androidannotations.holder.GeneratedClassHolder;
3938
import org.androidannotations.holder.HasReceiverRegistration;
4039
import org.androidannotations.holder.ReceiverRegistrationDelegate.IntentFilterData;
4140

@@ -59,8 +58,8 @@ public ReceiverHandler(AndroidAnnotationsEnvironment environment) {
5958
}
6059

6160
@Override
62-
public Iterable<AnnotationHandler<? extends GeneratedClassHolder>> getParameterHandlers() {
63-
return Collections.<AnnotationHandler<? extends GeneratedClassHolder>> singleton(extraHandler);
61+
public Iterable<AnnotationHandler> getParameterHandlers() {
62+
return Collections.<AnnotationHandler> singleton(extraHandler);
6463
}
6564

6665

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/process/ModelValidator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public AnnotationElements validate(AnnotationElements extractedModel, Annotation
5252
* unique ids might not be check all situations.
5353
*/
5454

55-
for (AnnotationHandler<?> annotationHandler : environment.getHandlers()) {
55+
for (AnnotationHandler annotationHandler : environment.getHandlers()) {
5656
String validatorSimpleName = annotationHandler.getClass().getSimpleName();
5757
String annotationName = annotationHandler.getTarget();
5858

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/plugin/AndroidAnnotationsPlugin.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
import org.androidannotations.AndroidAnnotationsEnvironment;
2525
import org.androidannotations.Option;
26-
import org.androidannotations.handler.AnnotationHandlers;
26+
import org.androidannotations.handler.AnnotationHandler;
2727
import org.androidannotations.internal.exception.VersionNotFoundException;
2828
import org.androidannotations.logger.Logger;
2929
import org.androidannotations.logger.LoggerFactory;
@@ -36,7 +36,7 @@ public abstract class AndroidAnnotationsPlugin {
3636
private String apiVersion;
3737

3838
public abstract String getName();
39-
public abstract void addHandlers(AnnotationHandlers annotationHandlers, AndroidAnnotationsEnvironment androidAnnotationEnv);
39+
public abstract List<AnnotationHandler<?>> getHandlers(AndroidAnnotationsEnvironment androidAnnotationEnv);
4040

4141
@Override
4242
public String toString() {

0 commit comments

Comments
 (0)