- CHG: Fixing typos and method name collisions with Restlet methods.

src/main/java/uk/ac/hutton/ics/brapi/client/BrapiCoreService.java

@@ -35,7 +35,7 @@ Call<BaseResult<ArrayResult<Lists>>> getLists(
 	Call<BaseResult<ArrayResult<Lists>>> postLists(@Body List<Lists> newLists);
 
 	@GET("lists/{listDbId}")
-	Call<BaseResult<ArrayResult<Lists>>> getListsById(
+	Call<BaseResult<Lists>> getListById(
 		@Path("listDbId") String listDbId,
 		@Query("page") int page,
 		@Query("pageSize") int pageSize

src/main/java/uk/ac/hutton/ics/brapi/resource/germplasm/germplasm/Mcpd.java

@@ -1,6 +1,5 @@
 package uk.ac.hutton.ics.brapi.resource.germplasm.germplasm;
 
-import java.util.Collection;
 import java.util.*;
 
 public class Mcpd

src/main/java/uk/ac/hutton/ics/brapi/server/base/TokenBaseServerResource.java

@@ -7,7 +7,7 @@
 
 import uk.ac.hutton.ics.brapi.resource.base.TokenBaseResult;
 
-public abstract class TokenBaseServerResource<T> extends ServerResource
+public abstract class TokenBaseServerResource extends ServerResource
 {
 	protected static final String PARAM_PAGE_SIZE    = "pageSize";
 	protected static final String PARAM_CURRENT_PAGE = "pageToken";
@@ -16,11 +16,6 @@ public abstract class TokenBaseServerResource<T> extends ServerResource
 	protected int pageSize    = Integer.MAX_VALUE;
 	protected int currentPage = 0;
 
-	protected static String toString(Object value)
-	{
-		return value == null ? null : Objects.toString(value);
-	}
-
 	@Override
 	public void doInit()
 	{
@@ -52,15 +47,4 @@ public void doInit()
 			}
 		}
 	}
-
-	@Get("json")
-	public abstract TokenBaseResult<T> getJson();
-
-	protected Timestamp getTimestamp(Date date)
-	{
-		if (date != null)
-			return new Timestamp(date.getTime());
-		else
-			return null;
-	}
 }

src/main/java/uk/ac/hutton/ics/brapi/server/core/list/BrapiListIndividualItemServerResource.java

@@ -8,5 +8,5 @@
 public interface BrapiListIndividualItemServerResource
 {
 	@Post
-	BaseResult<Lists> postJson(String[] ids);
+	BaseResult<Lists> postListItems(String[] ids);
 }

src/main/java/uk/ac/hutton/ics/brapi/server/core/list/BrapiListIndividualServerResource.java

@@ -8,7 +8,7 @@
 public interface BrapiListIndividualServerResource
 {
 	@Get
-	BaseResult<ArrayResult<Lists>> getListsById();
+	BaseResult<Lists> getListsById();
 
 	@Put
 	BaseResult<Lists> putListById(Lists updatedLists);

src/main/java/uk/ac/hutton/ics/brapi/server/core/season/BrapiSeasonServerResource.java

@@ -11,5 +11,5 @@ public interface BrapiSeasonServerResource
 	BaseResult<ArrayResult<Season>> getSeasons();
 
 	@Post
-	BaseResult<ArrayResult<Season>> postSeason(Season[] newSeasons);
+	BaseResult<ArrayResult<Season>> postSeasons(Season[] newSeasons);
 }

src/main/java/uk/ac/hutton/ics/brapi/server/core/serverinfo/BrapiServerInfoResource.java

@@ -8,5 +8,5 @@
 public interface BrapiServerInfoResource
 {
 	@Get
-	BaseResult<ServerInfo> getServerInfo();
+	BaseResult<ServerInfo> getServerinfo();
 }

src/main/java/uk/ac/hutton/ics/brapi/server/genotyping/variant/BrapiVariantServerResource.java

@@ -8,5 +8,5 @@
 public interface BrapiVariantServerResource
 {
 	@Get
-	TokenBaseResult<ArrayResult<Variant>> getVariants();
+	TokenBaseResult<ArrayResult<Variant>> getAllVariants();
 }