diff --git a/dspace-rest/src/main/java/org/dspace/rest/CollectionsResource.java b/dspace-rest/src/main/java/org/dspace/rest/CollectionsResource.java index 476f505d96..ed92001197 100644 --- a/dspace-rest/src/main/java/org/dspace/rest/CollectionsResource.java +++ b/dspace-rest/src/main/java/org/dspace/rest/CollectionsResource.java @@ -49,36 +49,6 @@ public class CollectionsResource { writeStatistics=ConfigurationManager.getBooleanProperty("rest","stats",false); } - /* - The "GET" annotation indicates this method will respond to HTTP Get requests. - The "Produces" annotation indicates the MIME response the method will return. - */ - @GET - @Path("/") - @Produces(MediaType.TEXT_HTML) - public String listHTML() { - StringBuilder everything = new StringBuilder(); - try { - if(context == null || !context.isValid() ) { - context = new org.dspace.core.Context(); - //Failed SQL is ignored as a failed SQL statement, prevent: current transaction is aborted, commands ignored until end of transaction block - context.getDBConnection().setAutoCommit(true); - } - - org.dspace.content.Collection[] collections = org.dspace.content.Collection.findAll(context); - for(org.dspace.content.Collection collection : collections) { - //TODO check auth... - everything.append("
  • " + collection.getID() + " - " + collection.getName() + "
  • \n"); - } - - return "Hello!Collections
    . "; - - } catch (SQLException e) { - log.error(e.getMessage()); - throw new WebApplicationException(Response.Status.INTERNAL_SERVER_ERROR); - } - } - @GET @Path("/") @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) diff --git a/dspace-rest/src/main/java/org/dspace/rest/CommunitiesResource.java b/dspace-rest/src/main/java/org/dspace/rest/CommunitiesResource.java index 3be038972d..67653a4373 100644 --- a/dspace-rest/src/main/java/org/dspace/rest/CommunitiesResource.java +++ b/dspace-rest/src/main/java/org/dspace/rest/CommunitiesResource.java @@ -43,34 +43,6 @@ public class CommunitiesResource { static{ writeStatistics=ConfigurationManager.getBooleanProperty("rest","stats",false); } - - /* - The "GET" annotation indicates this method will respond to HTTP Get requests. - The "Produces" annotation indicates the MIME response the method will return. - */ - @GET - @Produces(MediaType.TEXT_HTML) - public String list() { - StringBuilder everything = new StringBuilder(); - try { - if(context == null || !context.isValid() ) { - context = new org.dspace.core.Context(); - //Failed SQL is ignored as a failed SQL statement, prevent: current transaction is aborted, commands ignored until end of transaction block - context.getDBConnection().setAutoCommit(true); - } - org.dspace.content.Community[] communities = org.dspace.content.Community.findAllTop(context); - for(org.dspace.content.Community community : communities) { - everything.append(community.getName() + "
    \n"); - } - return "Hello!Communities:
    " + everything.toString() + ". "; - - } catch (SQLException e) { - log.error(e.getMessage()); - throw new WebApplicationException(Response.Status.INTERNAL_SERVER_ERROR); - } - } - - //TODO Respond to html for communities/:id @GET @Path("/")