Skip to content

Commit ee49d40

Browse files
yDelouisyDelouis
committed
Create Rest Spring plugin
1 parent 4d39180 commit ee49d40

92 files changed

Lines changed: 1177 additions & 624 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎AndroidAnnotations/androidannotations-core/androidannotations-api/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,6 @@
4040
<version>2.3.1</version>
4141
<scope>provided</scope>
4242
</dependency>
43-
<dependency>
44-
<!-- spring-android-rest-template is required to use the Rest API -->
45-
<groupId>org.springframework.android</groupId>
46-
<artifactId>spring-android-rest-template</artifactId>
47-
<scope>provided</scope>
48-
</dependency>
4943
</dependencies>
5044

5145
<build>

‎AndroidAnnotations/androidannotations-core/androidannotations-test/pom.xml‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@
3131

3232
<properties>
3333
<main.basedir>${project.parent.parent.basedir}</main.basedir>
34-
<jackson-version>1.9.11</jackson-version>
35-
<simple-version>2.7.1</simple-version>
36-
<spring-android-version>1.0.1.RELEASE</spring-android-version>
37-
<jackson-version>1.9.6</jackson-version>
38-
<simple-version>2.4.1</simple-version>
3934
<android-rome-version>1.0.0-r2</android-rome-version>
4035
<checkstyle.excludes>**/R.java,**/BuildConfig.java,</checkstyle.excludes>
4136
</properties>
@@ -61,37 +56,6 @@
6156
<artifactId>roboguice</artifactId>
6257
<version>3.0</version>
6358
</dependency>
64-
<dependency>
65-
<!-- spring-android-rest-template is required to use the Rest API -->
66-
<groupId>org.springframework.android</groupId>
67-
<artifactId>spring-android-rest-template</artifactId>
68-
</dependency>
69-
<dependency>
70-
<!-- Using Jackson for JSON marshaling -->
71-
<groupId>org.codehaus.jackson</groupId>
72-
<artifactId>jackson-mapper-asl</artifactId>
73-
<version>${jackson-version}</version>
74-
</dependency>
75-
<dependency>
76-
<!-- Using Simple for XML marshaling -->
77-
<groupId>org.simpleframework</groupId>
78-
<artifactId>simple-xml</artifactId>
79-
<version>${simple-version}</version>
80-
<exclusions>
81-
<exclusion>
82-
<artifactId>stax</artifactId>
83-
<groupId>stax</groupId>
84-
</exclusion>
85-
<exclusion>
86-
<artifactId>stax-api</artifactId>
87-
<groupId>stax</groupId>
88-
</exclusion>
89-
<exclusion>
90-
<groupId>xpp3</groupId>
91-
<artifactId>xpp3</artifactId>
92-
</exclusion>
93-
</exclusions>
94-
</dependency>
9559
<dependency>
9660
<groupId>com.google.android</groupId>
9761
<artifactId>support-v4</artifactId>

‎AndroidAnnotations/androidannotations-core/androidannotations/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,6 @@
5252
<version>4.1.1.4</version>
5353
<scope>provided</scope>
5454
</dependency>
55-
<dependency>
56-
<!-- spring-android-rest-template is required to use the Rest API -->
57-
<groupId>org.springframework.android</groupId>
58-
<artifactId>spring-android-rest-template</artifactId>
59-
<scope>test</scope>
60-
</dependency>
6155
</dependencies>
6256

6357
<build>

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

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,6 @@
2323

2424
import javax.annotation.processing.ProcessingEnvironment;
2525

26-
import org.androidannotations.handler.rest.DeleteHandler;
27-
import org.androidannotations.handler.rest.GetHandler;
28-
import org.androidannotations.handler.rest.HeadHandler;
29-
import org.androidannotations.handler.rest.OptionsHandler;
30-
import org.androidannotations.handler.rest.PostHandler;
31-
import org.androidannotations.handler.rest.PutHandler;
32-
import org.androidannotations.handler.rest.RestHandler;
33-
import org.androidannotations.handler.rest.RestServiceHandler;
3426
import org.androidannotations.helper.AndroidManifest;
3527
import org.androidannotations.helper.OptionsHelper;
3628
import org.androidannotations.holder.GeneratedClassHolder;
@@ -92,13 +84,7 @@ public AnnotationHandlers(ProcessingEnvironment processingEnvironment) {
9284
add(new TransactionalHandler(processingEnvironment));
9385
add(new FragmentArgHandler(processingEnvironment));
9486
add(new SystemServiceHandler(processingEnvironment));
95-
add(new RestHandler(processingEnvironment));
96-
add(new GetHandler(processingEnvironment));
97-
add(new PostHandler(processingEnvironment));
98-
add(new PutHandler(processingEnvironment));
99-
add(new DeleteHandler(processingEnvironment));
100-
add(new HeadHandler(processingEnvironment));
101-
add(new OptionsHandler(processingEnvironment));
87+
10288
add(new AppHandler(processingEnvironment));
10389
add(new BeanHandler(processingEnvironment));
10490
add(new InjectMenuHandler(processingEnvironment));
@@ -107,7 +93,6 @@ public AnnotationHandlers(ProcessingEnvironment processingEnvironment) {
10793
add(new OptionsItemHandler(processingEnvironment));
10894
add(new CustomTitleHandler(processingEnvironment));
10995
add(new FullscreenHandler(processingEnvironment));
110-
add(new RestServiceHandler(processingEnvironment));
11196
add(new RootContextHandler(processingEnvironment));
11297
add(new NonConfigurationInstanceHandler(processingEnvironment));
11398
add(new ExtraHandler(processingEnvironment));

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/ModelConstants.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import org.androidannotations.annotations.EService;
3434
import org.androidannotations.annotations.EView;
3535
import org.androidannotations.annotations.EViewGroup;
36-
import org.androidannotations.annotations.rest.Rest;
3736
import org.androidannotations.annotations.sharedpreferences.SharedPref;
3837

3938
public abstract class ModelConstants {
@@ -47,7 +46,7 @@ public abstract class ModelConstants {
4746
EService.class, EIntentService.class, EReceiver.class, EProvider.class, EFragment.class);
4847

4948
public static final List<Class<? extends Annotation>> VALID_ANDROID_ANNOTATIONS = asList(EApplication.class, EActivity.class, EViewGroup.class, EView.class, EBean.class, EService.class,
50-
EReceiver.class, EProvider.class, EFragment.class, SharedPref.class, Rest.class);
49+
EReceiver.class, EProvider.class, EFragment.class, SharedPref.class);
5150

5251
private ModelConstants() {
5352
}

0 commit comments

Comments
 (0)