mirror of
https://github.com/scm-manager/scm-manager.git
synced 2025-11-09 06:55:47 +01:00
rename jax-rs prefix to rest
This commit is contained in:
@@ -100,9 +100,9 @@ public class ScmModule
|
|||||||
*
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public Iterable<Class<?>> getJaxrsProviders()
|
public Iterable<Class<?>> getRestProviders()
|
||||||
{
|
{
|
||||||
return unwrap(jaxrsProviders);
|
return unwrap(restProviders);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -111,9 +111,9 @@ public class ScmModule
|
|||||||
*
|
*
|
||||||
* @return
|
* @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;
|
private Set<ClassElement> extensions;
|
||||||
|
|
||||||
/** Field description */
|
/** Field description */
|
||||||
@XmlElement(name = "jaxrs-provider")
|
@XmlElement(name = "rest-provider")
|
||||||
private Set<ClassElement> jaxrsProviders;
|
private Set<ClassElement> restProviders;
|
||||||
|
|
||||||
/** Field description */
|
/** Field description */
|
||||||
@XmlElement(name = "jaxrs-resource")
|
@XmlElement(name = "rest-resource")
|
||||||
private Set<ClassElement> jaxrsResources;
|
private Set<ClassElement> restResources;
|
||||||
|
|
||||||
/** Field description */
|
/** Field description */
|
||||||
@XmlElement(name = "subscriber")
|
@XmlElement(name = "subscriber")
|
||||||
|
|||||||
@@ -97,14 +97,14 @@ public class ScmModuleTest
|
|||||||
)
|
)
|
||||||
);
|
);
|
||||||
assertThat(
|
assertThat(
|
||||||
module.getJaxrsProviders(),
|
module.getRestProviders(),
|
||||||
containsInAnyOrder(
|
containsInAnyOrder(
|
||||||
(Class<?>) Integer.class,
|
(Class<?>) Integer.class,
|
||||||
(Class<?>) Long.class
|
(Class<?>) Long.class
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
assertThat(
|
assertThat(
|
||||||
module.getJaxrsResources(),
|
module.getRestResources(),
|
||||||
containsInAnyOrder(
|
containsInAnyOrder(
|
||||||
(Class<?>) Float.class,
|
(Class<?>) Float.class,
|
||||||
(Class<?>) Double.class
|
(Class<?>) Double.class
|
||||||
|
|||||||
@@ -121,8 +121,8 @@ public final class ScmAnnotationProcessor extends AbstractProcessor
|
|||||||
|
|
||||||
/** Field description */
|
/** Field description */
|
||||||
private static final Set<ClassAnnotation> CLASS_ANNOTATIONS =
|
private static final Set<ClassAnnotation> CLASS_ANNOTATIONS =
|
||||||
ImmutableSet.of(new ClassAnnotation("jaxrs-resource", Path.class),
|
ImmutableSet.of(new ClassAnnotation("rest-resource", Path.class),
|
||||||
new ClassAnnotation("jaxrs-provider", Provider.class));
|
new ClassAnnotation("rest-provider", Provider.class));
|
||||||
|
|
||||||
//~--- methods --------------------------------------------------------------
|
//~--- methods --------------------------------------------------------------
|
||||||
|
|
||||||
|
|||||||
@@ -218,8 +218,8 @@ public class DefaultPluginLoader implements PluginLoader
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Iterables.addAll(extensions, mod.getJaxrsProviders());
|
Iterables.addAll(extensions, mod.getRestProviders());
|
||||||
Iterables.addAll(extensions, mod.getJaxrsResources());
|
Iterables.addAll(extensions, mod.getRestResources());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user