Skip to content
This repository has been archived by the owner on Oct 12, 2021. It is now read-only.

Commit

Permalink
Bug 509392 - TODO markers cannot be removed
Browse files Browse the repository at this point in the history 
* moved all developer-related TODOs under protected blocks

Signed-off-by: Andrew Berezovskyi <andriib@kth.se>
Change-Id: I6c3ef4c5a55dca8e8e1b000bfbe544a90de79faa
  • Loading branch information
@berezovskyi
berezovskyi committed Dec 18, 2016
1 parent 07ae012 commit b071c0e
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 15 deletions.
2 changes: 1 addition & 1 deletion ...4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorClient.mtl
View file
Expand Up @@ -66,7 +66,7 @@ import [javaClassFullName(aResource, anAdaptorInterface) /];

public class [javaClassNameForClient(aRequiredAdaptor) /]
{
// TODO The very basic functionality of a client is generated. a more complete set of functions (query, C.R.U.D., etc) ought to be generated.
[comment TODO The very basic functionality of a client is generated. a more complete set of functions (query, C.R.U.D., etc) ought to be generated. /]

// [protected ('class_attributes')]
// [/protected]
Expand Down
22 changes: 11 additions & 11 deletions ...j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorManager.mtl
View file
Expand Up @@ -113,27 +113,27 @@ public class [javaClassNameForAdaptorManager(anAdaptorInterface) /] {

public static void contextInitializeServletListener(final ServletContextEvent servletContextEvent)
{
// TODO Implement code to establish connection to data backbone etc ...
[backendCode(anAdaptorInterface.backendCodeTemplate_servletListenerInitialize)/]
// [protected ('contextInitializeServletListener')]
// TODO Implement code to establish connection to data backbone etc ...
// [/protected]
}

public static void contextDestroyServletListener(ServletContextEvent servletContextEvent)
{
// TODO Implement code to shutdown connections to data backbone etc...
[backendCode(anAdaptorInterface.backendCodeTemplate_servletListenerDestroy)/]
// [protected ('contextDestroyed')]
// TODO Implement code to shutdown connections to data backbone etc...
// [/protected]
}

[for (aServiceProvider: ServiceProvider | anAdaptorInterface.serviceProviders())]
public static [aServiceProvider.javaClassName()/]['[' ']'/] get[aServiceProvider.javaClassName()/]s(HttpServletRequest httpServletRequest)
{
[aServiceProvider.javaClassName() /][ '[' ']' /] serviceProviderInfos = {};
// TODO Implement code to return the set of ServiceProviders
[backendCode(anAdaptorInterface.backendCodeTemplate_getServiceProviders)/]
// [protected ('"'.concat(aServiceProvider.javaClassName()).concat('[] get'.concat(aServiceProvider.javaClassName()).concat('s(...)"')))]
// TODO Implement code to return the set of ServiceProviders
// [/protected]
return serviceProviderInfos;
}
Expand All @@ -144,9 +144,9 @@ public class [javaClassNameForAdaptorManager(anAdaptorInterface) /] {
public static List<[queryMethodResourceType(aQueryCapability)/]> [queryMethodName(aQueryCapability, true)/](HttpServletRequest httpServletRequest[commaSeparate(queryMethodSignature(aQueryCapability, false), true, false)/], String where, int page, int limit)
{
List<[queryMethodResourceType(aQueryCapability)/]> resources = null;
// TODO Implement code to return a set of resources
[backendCode(anAdaptorInterface.backendCodeTemplate_getResources, queryMethodResourceType(aQueryCapability), 'resources', queryCompositeID(aQueryCapability))/]
// [protected (queryMethodName(aQueryCapability, true))]
// TODO Implement code to return a set of resources
// [/protected]
return resources;
}
Expand All @@ -155,9 +155,9 @@ public class [javaClassNameForAdaptorManager(anAdaptorInterface) /] {
public static List<[dialogMethodResourceType(aSelectionDialog)/]> [dialogMethodName(aSelectionDialog, true)/](HttpServletRequest httpServletRequest[commaSeparate(dialogMethodSignature(aSelectionDialog, true, false), true, false)/], String terms)
{
List<[dialogMethodResourceType(aSelectionDialog)/]> resources = null;
// TODO Implement code to return a set of resources, based on search criteria
[backendCode(anAdaptorInterface.backendCodeTemplate_searchResources, dialogMethodResourceType(aSelectionDialog), 'resources', dialogCompositeID(aSelectionDialog, true))/]
// [protected (dialogMethodName(aSelectionDialog, true))]
// TODO Implement code to return a set of resources, based on search criteria
// [/protected]
return resources;
}
Expand All @@ -166,9 +166,9 @@ public class [javaClassNameForAdaptorManager(anAdaptorInterface) /] {
public static [creationMethodResourceType(aCreationFactory)/] [creationMethodName(aCreationFactory)/](HttpServletRequest httpServletRequest, final [creationMethodResourceType(aCreationFactory)/] aResource[commaSeparate(creationMethodSignature(aCreationFactory, false), true, false)/])
{
[creationMethodResourceType(aCreationFactory)/] newResource = null;
// TODO Implement code to create a resource
[backendCode(anAdaptorInterface.backendCodeTemplate_createResource, creationMethodResourceType(aCreationFactory), 'newResource', creationCompositeID(aCreationFactory))/]
// [protected (creationMethodName(aCreationFactory))]
// TODO Implement code to create a resource
// [/protected]
return newResource;
}
Expand All @@ -179,9 +179,9 @@ public class [javaClassNameForAdaptorManager(anAdaptorInterface) /] {
public static [creationMethodResourceType(aCreationDialog)/] [creationMethodName(aCreationDialog)/](HttpServletRequest httpServletRequest, final [creationMethodResourceType(aCreationDialog)/] aResource[commaSeparate(dialogMethodSignature(aCreationDialog, false, false), true, false)/])
{
[creationMethodResourceType(aCreationDialog)/] newResource = null;
// TODO Implement code to create a resource
[backendCode(anAdaptorInterface.backendCodeTemplate_createResource, creationMethodResourceType(aCreationDialog), 'newResource', dialogCompositeID(aCreationDialog, false))/]
// [protected (creationMethodName(aCreationDialog))]
// TODO Implement code to create a resource
// [/protected]
return newResource;
}
Expand All @@ -194,9 +194,9 @@ public class [javaClassNameForAdaptorManager(anAdaptorInterface) /] {
public static [getResourceMethodResourceType(aBasicCapability, aResource)/] [getResourceMethodName(aBasicCapability, aResource, true)/](HttpServletRequest httpServletRequest[commaSeparate(instanceMethodSignature(aResource, aBasicCapability, false), true, false)/])
{
[getResourceMethodResourceType(aBasicCapability, aResource)/] aResource = null;
// TODO Implement code to return a resource
[backendCode(anAdaptorInterface.backendCodeTemplate_getResource, getResourceMethodResourceType(aBasicCapability, aResource), 'aResource', instanceCompositeID(aResource, aBasicCapability))/]
// [protected (getResourceMethodName(aBasicCapability, aResource, true))]
// TODO Implement code to return a resource
// [/protected]
return aResource;
}
Expand All @@ -208,8 +208,8 @@ public class [javaClassNameForAdaptorManager(anAdaptorInterface) /] {
public static Boolean [deleteResourceMethodName(aBasicCapability, aResource)/](HttpServletRequest httpServletRequest[commaSeparate(instanceMethodSignature(aResource, aBasicCapability, false), true, false)/])
{
Boolean deleted = false;
// TODO Implement code to delete a resource
// [protected (deleteResourceMethodName(aBasicCapability, aResource))]
// TODO Implement code to delete a resource
// [/protected]
return deleted;
}
Expand All @@ -220,8 +220,8 @@ public class [javaClassNameForAdaptorManager(anAdaptorInterface) /] {
[for (aResource: Resource | aBasicCapability.resourceTypes)]
public static [updateResourceMethodResourceType(aBasicCapability, aResource)/] [updateResourceMethodName(aBasicCapability, aResource)/](HttpServletRequest httpServletRequest, final [updateResourceMethodResourceType(aBasicCapability, aResource)/] aResource[commaSeparate(instanceMethodSignature(aResource, aBasicCapability, false), true, false)/]) {
[updateResourceMethodResourceType(aBasicCapability, aResource)/] updatedResource = null;
// TODO Implement code to update and return a resource
// [protected (updateResourceMethodName(aBasicCapability, aResource))]
// TODO Implement code to update and return a resource
// [/protected]
return updatedResource;
}
Expand All @@ -235,8 +235,8 @@ public class [javaClassNameForAdaptorManager(anAdaptorInterface) /] {
public static String [getResourceETagMethodName(aResource)/](final [javaClassName(aResource)/] aResource)
{
String eTag = null;
// TODO Implement code to return an ETag for a particular resource
// [protected (getResourceETagMethodName(aResource))]
// TODO Implement code to return an ETag for a particular resource
// [/protected]
return eTag;
}
Expand Down
5 changes: 2 additions & 3 deletions ....codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateResourceService.mtl
View file
Expand Up @@ -138,12 +138,11 @@ public class [javaClassName(aService) /]
super();
}

[comment TODO: add query support /]
[for (aQueryCapability: QueryCapability | aService.queryCapabilities)]
/**
* RDF/XML, XML and JSON representation of a change request collection
*
* TODO: add query support
*
* @param productId
* @param where
* @param pageString
Expand Down Expand Up @@ -406,8 +405,8 @@ public class [javaClassName(aService) /]
[creationMethodResourceType(aCreationDialog)/] newResource = null;

[if not (aCreationDialog.resourceTypes->size() = 1)]
// TODO Implement code to create the new resource. This method seems to be expected to handle more than a single type of resources.
// [protected (creationMethodName(aCreationDialog))]
// TODO Implement code to create the new resource. This method seems to be expected to handle more than a single type of resources.
// [/protected]
[else]
[let aResource : Resource = aCreationDialog.resourceTypes->first()]
Expand Down

0 comments on commit b071c0e

Please sign in to comment.