Skip to content
This repository was archived by the owner on Feb 26, 2023. It is now read-only.

WIP Plugin system #1480

Merged
WonderCsabo merged 72 commits into from
Sep 10, 2015
Merged

WIP Plugin system #1480

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
db7270e
Ease validation
yDelouis Jun 7, 2014
a4d025c
Remove code relative to api copy
yDelouis Jun 7, 2014
e140ac1
New folder structure
yDelouis Jun 25, 2015
7bd9fa1
Create plugin OrmLite
yDelouis Jul 1, 2015
9fc1038
Rename package org.androidannotations.test15 to org.androidannotation…
yDelouis Jul 1, 2015
d5c42e7
Relax Maven enforcement to 3.0.5
WonderCsabo Jul 9, 2015
a06e957
Fix Ormlite test project POM
WonderCsabo Jul 9, 2015
f3d570a
Moved OrmLite to better structure
WonderCsabo Jul 9, 2015
dc41d31
Change folder structure
WonderCsabo Jul 9, 2015
27e6a97
Remove bundle and fat-jar modules
WonderCsabo Jul 9, 2015
01ea8b9
Remove unnecessary dependencies and plugins
WonderCsabo Jul 9, 2015
62e5578
Delete old tests related to api class generation
WonderCsabo Jul 9, 2015
f13abd5
Fix some problems with ValidatorHelper
WonderCsabo Jul 10, 2015
9266cc8
Clean up androidannotations-test AndroidManifest.xml
WonderCsabo Jul 10, 2015
af00856
Use Java 7 diamond where missing
WonderCsabo Jul 10, 2015
89ef719
Create Otto plugin
WonderCsabo Jul 10, 2015
08c7be5
Refactor Otto handlers
WonderCsabo Jul 10, 2015
855f28c
Only depend on Android 2.3.1 in processor modules
WonderCsabo Jul 10, 2015
4613d98
Fix generated source header format
WonderCsabo Jul 10, 2015
fdb878d
Fix Otto plugin pom
yDelouis Jul 11, 2015
4d39180
Move test classes in main folder
yDelouis Jul 11, 2015
ee49d40
Create Rest Spring plugin
yDelouis Jul 11, 2015
c6e9859
Fix JavaDoc in ClassFinder
WonderCsabo Jul 11, 2015
73723eb
Fix JavaDoc in classes of org.androidannotations.rest.spring.api package
WonderCsabo Jul 11, 2015
5290a6f
Create seperate module for compile-time test utilities
WonderCsabo Jul 11, 2015
8f2e07f
Add an Android xml resource to rest-spring-test module
WonderCsabo Jul 11, 2015
d6ec9ef
Move up common configuration to parent POM
WonderCsabo Jul 12, 2015
1802403
Introduce AndroidAnnotationsEnvironment
yDelouis Jul 13, 2015
35e4825
Add ValidatedElements in AndroidAnnotationsEnvironment
yDelouis Jul 13, 2015
31e833a
Fix typo in class name
yDelouis Jul 13, 2015
baddbd4
Add Options and let plugin add its options
yDelouis Jul 14, 2015
eb72538
Fix AndroidManifestFinderTest if it fails once
yDelouis Jul 16, 2015
98e87c8
Remove ugly hack for RestHandler
yDelouis Jul 17, 2015
0bc449e
Fix typo
yDelouis Jul 17, 2015
b452a5c
Remove stuff needed for development in Eclipse
WonderCsabo Jul 16, 2015
92cc7b9
Make APTCodeModelHelper environment aware
yDelouis Jul 19, 2015
1e4258f
Fix Otto annotations not copied to generated method
yDelouis Jul 19, 2015
f884b35
Remove Option class
yDelouis Jul 23, 2015
b37c08d
Fix typo in APTCodeModelHelper
yDelouis Jul 26, 2015
3fb74f3
Extract RoboGuice plugin
yDelouis Jul 26, 2015
1bf60d8
Rename method to copy annotations in APTCodeModelHelper
yDelouis Jul 26, 2015
8c3566e
Unify annotation location on coding style
WonderCsabo Jul 27, 2015
1035c03
Remove M2Eclipse lifecycle mapping from POMs
WonderCsabo Jul 27, 2015
ae23d81
Move Spring-specific code from core module
WonderCsabo Jul 27, 2015
2c10bf2
Move Ormlite-specific code from core module
WonderCsabo Jul 27, 2015
04b7611
Move Otto-specific code from core module
WonderCsabo Jul 27, 2015
36fafbf
Move Handler hack to core test module
WonderCsabo Jul 27, 2015
775877f
Less verbose output of JavaDoc generation
WonderCsabo Jul 27, 2015
5595fa3
Log AA messages at WARNING level in test projects
WonderCsabo Jul 27, 2015
36957ee
Check API and processor version pairs for all plugins
WonderCsabo Jul 27, 2015
8535ce0
Format pom.xml files
WonderCsabo Jul 27, 2015
a63c663
Remove getProcessingEnvironment from GeneratedClassHolder
yDelouis Aug 2, 2015
da65f78
Remove classes method from GeneratedClassHolder
yDelouis Aug 2, 2015
068dd25
Remove codemodel method from GeneratedClassHolder
yDelouis Aug 2, 2015
4b5ae53
Make BundleHelper independent of GeneratedClassHolder
yDelouis Aug 2, 2015
2273155
Remove refClass from GeneratedClassHolder
yDelouis Aug 2, 2015
137a27d
Remove definedClass method from GeneratedClassHolder
yDelouis Aug 2, 2015
8577d80
Clean BaseGeneratedClassHolder
yDelouis Aug 2, 2015
df4cfb7
Rename processingEnvironment method in BaseAnnotationHandler
yDelouis Aug 2, 2015
1b5439b
Remove ProcessHolder from BaseAnnotation Handler
yDelouis Aug 2, 2015
98845d8
Remove getProcessHolder from AndroidAnnotationsEnvironment
yDelouis Aug 2, 2015
997c324
Rename methods ing BaseAnnotationHandler
yDelouis Aug 2, 2015
2c76f2c
Update Checkstyle to 6.10.1 and plugin to 2.16
WonderCsabo Sep 3, 2015
164feb6
Add import order Checkstyle rule
WonderCsabo Sep 3, 2015
da1c656
Use CS for JavaDoc of annotations in plugins
WonderCsabo Sep 4, 2015
b16d8f4
Update Maven plugins to latest
WonderCsabo Sep 4, 2015
9d50b40
Define API
yDelouis Sep 5, 2015
4063937
Create interface for AndroidAnnotationsEnvironment
yDelouis Sep 5, 2015
db9345e
Cut off methods from ValidatorHelper to core
WonderCsabo Sep 5, 2015
a66bf87
Fix line length in code formatter settings
WonderCsabo Sep 6, 2015
3a16332
Move Options into internal
yDelouis Sep 6, 2015
0a8cf13
Move AnnotationHandlers into internal
yDelouis Sep 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Define API
  • Loading branch information
@yDelouis
yDelouis committed Sep 5, 2015
commit 9d50b40507ca8d427903edc4603e1432eb814c0a
2 changes: 1 addition & 1 deletion ...nnotations/process/ElementValidation.java → ...androidannotations/ElementValidation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
package org.androidannotations.process;
package org.androidannotations;

import java.util.ArrayList;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion ...rg/androidannotations/process/Option.java → ...n/java/org/androidannotations/Option.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
package org.androidannotations.process;
package org.androidannotations;

public class Option {

Expand Down
6 changes: 3 additions & 3 deletions ...g/androidannotations/process/Options.java → .../java/org/androidannotations/Options.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
package org.androidannotations.process;
package org.androidannotations;

import java.util.HashMap;
import java.util.List;
Expand All @@ -22,11 +22,11 @@

import javax.annotation.processing.ProcessingEnvironment;

import org.androidannotations.helper.AndroidManifestFinder;
import org.androidannotations.helper.ModelConstants;
import org.androidannotations.internal.helper.AndroidManifestFinder;
import org.androidannotations.internal.rclass.ProjectRClassFinder;
import org.androidannotations.logger.LoggerContext;
import org.androidannotations.logger.appender.FileAppender;
import org.androidannotations.rclass.ProjectRClassFinder;

public class Options {

Expand Down
2 changes: 1 addition & 1 deletion ...re/androidannotations/src/main/java/org/androidannotations/handler/AnnotationHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

import javax.lang.model.element.Element;

import org.androidannotations.ElementValidation;
import org.androidannotations.holder.GeneratedClassHolder;
import org.androidannotations.process.ElementValidation;

public interface AnnotationHandler<T extends GeneratedClassHolder> {

Expand Down
4 changes: 2 additions & 2 deletions ...ndroidannotations/src/main/java/org/androidannotations/handler/BaseAnnotationHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
import javax.lang.model.element.Element;

import org.androidannotations.AndroidAnnotationsEnvironment;
import org.androidannotations.ElementValidation;
import org.androidannotations.helper.APTCodeModelHelper;
import org.androidannotations.helper.IdAnnotationHelper;
import org.androidannotations.helper.IdValidatorHelper;
import org.androidannotations.holder.GeneratedClassHolder;
import org.androidannotations.process.ElementValidation;
import org.androidannotations.process.ProcessHolder;
import org.androidannotations.internal.process.ProcessHolder;

import com.sun.codemodel.JClass;
import com.sun.codemodel.JCodeModel;
Expand Down
2 changes: 1 addition & 1 deletion ...tations/src/main/java/org/androidannotations/handler/BaseGeneratingAnnotationHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
import javax.lang.model.element.TypeElement;

import org.androidannotations.AndroidAnnotationsEnvironment;
import org.androidannotations.ElementValidation;
import org.androidannotations.holder.GeneratedClassHolder;
import org.androidannotations.process.ElementValidation;

public abstract class BaseGeneratingAnnotationHandler<T extends GeneratedClassHolder> extends BaseAnnotationHandler<T> implements GeneratingAnnotationHandler<T> {

Expand Down
1 change: 1 addition & 0 deletions ...re/androidannotations/src/main/java/org/androidannotations/helper/APTCodeModelHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import org.androidannotations.annotations.EBean;
import org.androidannotations.holder.EBeanHolder;
import org.androidannotations.holder.GeneratedClassHolder;
import org.androidannotations.internal.helper.AnnotationParamExtractor;

import com.sun.codemodel.JAnnotatable;
import com.sun.codemodel.JAnnotationArrayMember;
Expand Down
2 changes: 1 addition & 1 deletion ...core/androidannotations/src/main/java/org/androidannotations/helper/AnnotationHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@
import org.androidannotations.annotations.OptionsItem;
import org.androidannotations.annotations.ResId;
import org.androidannotations.annotations.SeekBarTouchStop;
import org.androidannotations.internal.rclass.RInnerClass;
import org.androidannotations.logger.Logger;
import org.androidannotations.logger.LoggerFactory;
import org.androidannotations.rclass.IRInnerClass;
import org.androidannotations.rclass.RInnerClass;

import com.sun.codemodel.JFieldRef;

Expand Down
2 changes: 1 addition & 1 deletion ...ore/androidannotations/src/main/java/org/androidannotations/helper/IdValidatorHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

import javax.lang.model.element.Element;

import org.androidannotations.ElementValidation;
import org.androidannotations.annotations.ResId;
import org.androidannotations.process.ElementValidation;
import org.androidannotations.rclass.IRClass.Res;

public class IdValidatorHelper extends ValidatorHelper {
Expand Down
2 changes: 1 addition & 1 deletion ...s-core/androidannotations/src/main/java/org/androidannotations/helper/ModelConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import javax.lang.model.SourceVersion;

import org.androidannotations.AndroidAnnotationsEnvironment;
import org.androidannotations.Option;
import org.androidannotations.annotations.EActivity;
import org.androidannotations.annotations.EApplication;
import org.androidannotations.annotations.EBean;
Expand All @@ -33,7 +34,6 @@
import org.androidannotations.annotations.EService;
import org.androidannotations.annotations.EView;
import org.androidannotations.annotations.EViewGroup;
import org.androidannotations.process.Option;

public abstract class ModelConstants {

Expand Down
9 changes: 5 additions & 4 deletions ...-core/androidannotations/src/main/java/org/androidannotations/helper/ValidatorHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
import javax.lang.model.util.Elements;

import org.androidannotations.AndroidAnnotationsEnvironment;
import org.androidannotations.ElementValidation;
import org.androidannotations.annotations.EActivity;
import org.androidannotations.annotations.EBean;
import org.androidannotations.annotations.EFragment;
Expand All @@ -73,9 +74,8 @@
import org.androidannotations.annotations.sharedpreferences.DefaultString;
import org.androidannotations.annotations.sharedpreferences.SharedPref;
import org.androidannotations.api.sharedpreferences.SharedPreferencesHelper;
import org.androidannotations.model.AndroidSystemServices;
import org.androidannotations.model.AnnotationElements;
import org.androidannotations.process.ElementValidation;
import org.androidannotations.internal.core.model.AndroidSystemServices;
import org.androidannotations.internal.model.AnnotationElements;

@SuppressWarnings("checkstyle:methodcount")
public class ValidatorHelper {
Expand Down Expand Up @@ -556,7 +556,8 @@ public void allowedType(TypeMirror fieldTypeMirror, List<String> allowedTypes, E
}
}

public void androidService(AndroidSystemServices androidSystemServices, Element element, ElementValidation valid) {
public void androidService(Element element, ElementValidation valid) {
AndroidSystemServices androidSystemServices = new AndroidSystemServices(environment());
TypeMirror serviceType = element.asType();
if (!androidSystemServices.contains(serviceType)) {
valid.addError("Unknown service type: " + serviceType.toString());
Expand Down
2 changes: 1 addition & 1 deletion ...roidannotations/src/main/java/org/androidannotations/helper/ValidatorParameterHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import javax.lang.model.type.TypeKind;
import javax.lang.model.type.TypeMirror;

import org.androidannotations.process.ElementValidation;
import org.androidannotations.ElementValidation;

public class ValidatorParameterHelper {

Expand Down
2 changes: 1 addition & 1 deletion ...roidannotations/src/main/java/org/androidannotations/holder/BaseGeneratedClassHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

import org.androidannotations.AndroidAnnotationsEnvironment;
import org.androidannotations.helper.APTCodeModelHelper;
import org.androidannotations.process.ProcessHolder;
import org.androidannotations.internal.process.ProcessHolder;

import com.sun.codemodel.ClassType;
import com.sun.codemodel.JClass;
Expand Down
4 changes: 2 additions & 2 deletions ...-core/androidannotations/src/main/java/org/androidannotations/holder/EActivityHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@
import javax.lang.model.element.TypeElement;

import org.androidannotations.AndroidAnnotationsEnvironment;
import org.androidannotations.helper.ActivityIntentBuilder;
import org.androidannotations.helper.AndroidManifest;
import org.androidannotations.helper.AnnotationHelper;
import org.androidannotations.helper.CanonicalNameConstants;
import org.androidannotations.helper.IntentBuilder;
import org.androidannotations.holder.ReceiverRegistrationDelegate.IntentFilterData;
import org.androidannotations.internal.core.helper.ActivityIntentBuilder;
import org.androidannotations.internal.core.helper.IntentBuilder;

import com.sun.codemodel.JBlock;
import com.sun.codemodel.JClass;
Expand Down
2 changes: 1 addition & 1 deletion ...otations/src/main/java/org/androidannotations/holder/EComponentWithViewSupportHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
import org.androidannotations.api.view.HasViews;
import org.androidannotations.api.view.OnViewChangedListener;
import org.androidannotations.api.view.OnViewChangedNotifier;
import org.androidannotations.helper.ViewNotifierHelper;
import org.androidannotations.internal.helper.ViewNotifierHelper;

import com.sun.codemodel.JBlock;
import com.sun.codemodel.JClass;
Expand Down
4 changes: 2 additions & 2 deletions ...s-core/androidannotations/src/main/java/org/androidannotations/holder/EServiceHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@

import org.androidannotations.AndroidAnnotationsEnvironment;
import org.androidannotations.helper.AndroidManifest;
import org.androidannotations.helper.IntentBuilder;
import org.androidannotations.helper.ServiceIntentBuilder;
import org.androidannotations.holder.ReceiverRegistrationDelegate.IntentFilterData;
import org.androidannotations.internal.core.helper.IntentBuilder;
import org.androidannotations.internal.core.helper.ServiceIntentBuilder;

import com.sun.codemodel.JBlock;
import com.sun.codemodel.JDefinedClass;
Expand Down
2 changes: 1 addition & 1 deletion ...ions-core/androidannotations/src/main/java/org/androidannotations/holder/FoundHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import static com.sun.codemodel.JExpr._null;
import static com.sun.codemodel.JExpr.cast;

import org.androidannotations.process.ProcessHolder;
import org.androidannotations.internal.process.ProcessHolder;

import com.sun.codemodel.JBlock;
import com.sun.codemodel.JClass;
Expand Down
2 changes: 1 addition & 1 deletion ...annotations/src/main/java/org/androidannotations/holder/GeneratedClassHolderDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import javax.lang.model.element.TypeElement;

import org.androidannotations.AndroidAnnotationsEnvironment;
import org.androidannotations.process.ProcessHolder.Classes;
import org.androidannotations.internal.process.ProcessHolder.Classes;

import com.sun.codemodel.JClass;
import com.sun.codemodel.JCodeModel;
Expand Down
2 changes: 1 addition & 1 deletion ...core/androidannotations/src/main/java/org/androidannotations/holder/HasIntentBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package org.androidannotations.holder;

import org.androidannotations.helper.IntentBuilder;
import org.androidannotations.internal.core.helper.IntentBuilder;

import com.sun.codemodel.JDefinedClass;

Expand Down
39 changes: 20 additions & 19 deletions ...notations/AndroidAnnotationProcessor.java → .../internal/AndroidAnnotationProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
package org.androidannotations;
package org.androidannotations.internal;

import java.io.FileNotFoundException;
import java.io.IOException;
Expand All @@ -31,32 +31,33 @@
import javax.lang.model.element.Element;
import javax.lang.model.element.TypeElement;

import org.androidannotations.exception.AndroidManifestNotFoundException;
import org.androidannotations.exception.ProcessingException;
import org.androidannotations.exception.RClassNotFoundException;
import org.androidannotations.exception.ValidationException;
import org.androidannotations.exception.VersionMismatchException;
import org.androidannotations.exception.VersionNotFoundException;
import org.androidannotations.generation.CodeModelGenerator;
import org.androidannotations.helper.AndroidManifest;
import org.androidannotations.helper.AndroidManifestFinder;
import org.androidannotations.helper.ErrorHelper;
import org.androidannotations.helper.ModelConstants;
import org.androidannotations.internal.core.CorePlugin;
import org.androidannotations.internal.exception.AndroidManifestNotFoundException;
import org.androidannotations.internal.exception.ProcessingException;
import org.androidannotations.internal.exception.RClassNotFoundException;
import org.androidannotations.internal.exception.ValidationException;
import org.androidannotations.internal.exception.VersionMismatchException;
import org.androidannotations.internal.exception.VersionNotFoundException;
import org.androidannotations.internal.generation.CodeModelGenerator;
import org.androidannotations.internal.helper.AndroidManifestFinder;
import org.androidannotations.internal.helper.ErrorHelper;
import org.androidannotations.internal.model.AnnotationElements;
import org.androidannotations.internal.model.AnnotationElementsHolder;
import org.androidannotations.internal.model.ModelExtractor;
import org.androidannotations.internal.process.ModelProcessor;
import org.androidannotations.internal.process.ModelValidator;
import org.androidannotations.internal.process.TimeStats;
import org.androidannotations.internal.rclass.AndroidRClassFinder;
import org.androidannotations.internal.rclass.CompoundRClass;
import org.androidannotations.internal.rclass.ProjectRClassFinder;
import org.androidannotations.logger.Level;
import org.androidannotations.logger.Logger;
import org.androidannotations.logger.LoggerContext;
import org.androidannotations.logger.LoggerFactory;
import org.androidannotations.model.AnnotationElements;
import org.androidannotations.model.AnnotationElementsHolder;
import org.androidannotations.model.ModelExtractor;
import org.androidannotations.plugin.AndroidAnnotationsPlugin;
import org.androidannotations.process.ModelProcessor;
import org.androidannotations.process.ModelValidator;
import org.androidannotations.process.TimeStats;
import org.androidannotations.rclass.AndroidRClassFinder;
import org.androidannotations.rclass.CompoundRClass;
import org.androidannotations.rclass.IRClass;
import org.androidannotations.rclass.ProjectRClassFinder;

public class AndroidAnnotationProcessor extends AbstractProcessor {

Expand Down
Loading