Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-08 22:45:45 +01:00
Code Issues Packages Projects Releases Activity

rename jax-rs prefix to rest

Browse Source
This commit is contained in:
Sebastian Sdorra
2014-04-03 19:25:57 +02:00
parent 057bea43ad
commit d454a9b42b
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scm-core/src/main/java/sonia/scm/plugin/ScmModule.java
View File

@@ -100,9 +100,9 @@ public class ScmModule
*
* @return
*/
public Iterable<Class<?>> getJaxrsProviders()
public Iterable<Class<?>> getRestProviders()
{
return unwrap(jaxrsProviders);
return unwrap(restProviders);
}
/**
@@ -111,9 +111,9 @@ public class ScmModule
*
* @return
*/
public Iterable<Class<?>> getJaxrsResources()
public Iterable<Class<?>> getRestResources()
{
return unwrap(jaxrsResources);
return unwrap(restResources);
}
/**
@@ -217,12 +217,12 @@ public class ScmModule
private Set<ClassElement> extensions;
/** Field description */
@XmlElement(name = "jaxrs-provider")
private Set<ClassElement> jaxrsProviders;
@XmlElement(name = "rest-provider")
private Set<ClassElement> restProviders;
/** Field description */
@XmlElement(name = "jaxrs-resource")
private Set<ClassElement> jaxrsResources;
@XmlElement(name = "rest-resource")
private Set<ClassElement> restResources;
/** Field description */
@XmlElement(name = "subscriber")

4
scm-core/src/test/java/sonia/scm/plugin/ScmModuleTest.java
View File

@@ -97,14 +97,14 @@ public class ScmModuleTest
)
);
assertThat(
module.getJaxrsProviders(),
module.getRestProviders(),
containsInAnyOrder(
(Class<?>) Integer.class,
(Class<?>) Long.class
)
);
assertThat(
module.getJaxrsResources(),
module.getRestResources(),
containsInAnyOrder(
(Class<?>) Float.class,
(Class<?>) Double.class

4
scm-maven-plugins/scm-annotation-processor/src/main/java/sonia/scm/annotation/ScmAnnotationProcessor.java
View File

@@ -121,8 +121,8 @@ public final class ScmAnnotationProcessor extends AbstractProcessor
/** Field description */
private static final Set<ClassAnnotation> CLASS_ANNOTATIONS =
ImmutableSet.of(new ClassAnnotation("jaxrs-resource", Path.class),
new ClassAnnotation("jaxrs-provider", Provider.class));
ImmutableSet.of(new ClassAnnotation("rest-resource", Path.class),
new ClassAnnotation("rest-provider", Provider.class));
//~--- methods --------------------------------------------------------------

4
scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginLoader.java
View File

@@ -218,8 +218,8 @@ public class DefaultPluginLoader implements PluginLoader
}
}
Iterables.addAll(extensions, mod.getJaxrsProviders());
Iterables.addAll(extensions, mod.getJaxrsResources());
Iterables.addAll(extensions, mod.getRestProviders());
Iterables.addAll(extensions, mod.getRestResources());
}
}