diff --git a/model/toolchain.xml b/model/toolchain.xml index 848457f3..ec172b97 100644 --- a/model/toolchain.xml +++ b/model/toolchain.xml @@ -38,7 +38,7 @@ - + diff --git a/src/lib-common/pom.xml b/src/lib-common/pom.xml index ab643770..92fa4657 100644 --- a/src/lib-common/pom.xml +++ b/src/lib-common/pom.xml @@ -96,4 +96,22 @@ test + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + org.apache.maven.plugins + maven-compiler-plugin + 3.14.1 + + + -Xlint:fallthrough,unchecked,removal,deprecation,dep-ann,varargs,overloads,serial,try,finally + + + + + diff --git a/src/server-am/Dockerfile b/src/server-am/Dockerfile index 9e1af920..e1a204ce 100644 --- a/src/server-am/Dockerfile +++ b/src/server-am/Dockerfile @@ -32,6 +32,6 @@ LABEL org.opencontainers.image.licenses="EPL-2.0" COPY --from=build /src/server-am/target/*.war /var/lib/jetty/webapps/ROOT.war -RUN java -jar "$JETTY_HOME/start.jar" --add-modules=ee9-deploy,ee9-jsp,ee9-jstl +RUN java -jar "$JETTY_HOME/start.jar" --add-modules=ee10-deploy,ee10-jsp,ee10-jstl EXPOSE 8080 diff --git a/src/server-am/pom.xml b/src/server-am/pom.xml index 39826d1a..4d9a7b2e 100644 --- a/src/server-am/pom.xml +++ b/src/server-am/pom.xml @@ -286,14 +286,15 @@ ${application.filename} - + + + org.apache.maven.plugins maven-enforcer-plugin - org.apache.maven.plugins maven-compiler-plugin @@ -305,9 +306,9 @@ - org.eclipse.jetty - jetty-maven-plugin - 11.0.20 + org.eclipse.jetty.ee10 + jetty-ee10-maven-plugin + 12.0.16 ${application.contextpath} @@ -396,7 +397,7 @@ - diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/RestDelegate.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/RestDelegate.java index a531a4fb..ce7c4e98 100644 --- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/RestDelegate.java +++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/RestDelegate.java @@ -20,31 +20,31 @@ * * This file is generated by org.eclipse.lyo.oslc4j.codegenerator *******************************************************************************/ -// End of user code - -package co.oslc.refimpl.am.gen; - - -// spotless:off -import jakarta.inject.Inject; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.ServletContextEvent; -import java.util.List; -import java.util.ArrayList; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import org.eclipse.lyo.oslc4j.core.model.ServiceProvider; -import org.eclipse.lyo.oslc4j.core.OSLC4JUtils; -import org.eclipse.lyo.oslc4j.core.model.AbstractResource; -import co.oslc.refimpl.am.gen.servlet.ServiceProviderCatalogSingleton; -import co.oslc.refimpl.am.gen.ServiceProviderInfo; -import org.eclipse.lyo.oslc.domains.am.LinkType; -import org.eclipse.lyo.oslc.domains.Person; -import org.eclipse.lyo.oslc.domains.am.Resource; - - - +// End of user code + +package co.oslc.refimpl.am.gen; + + +// spotless:off +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletContextEvent; +import java.util.List; +import java.util.ArrayList; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.eclipse.lyo.oslc4j.core.model.ServiceProvider; +import org.eclipse.lyo.oslc4j.core.OSLC4JUtils; +import org.eclipse.lyo.oslc4j.core.model.AbstractResource; +import co.oslc.refimpl.am.gen.servlet.ServiceProviderCatalogSingleton; +import co.oslc.refimpl.am.gen.ServiceProviderInfo; +import org.eclipse.lyo.oslc.domains.am.LinkType; +import org.eclipse.lyo.oslc.domains.Person; +import org.eclipse.lyo.oslc.domains.am.Resource; + + + // Start of user code imports import java.net.URI; import java.util.Date; @@ -55,76 +55,76 @@ import co.oslc.refimpl.lib.MemResourceRepository; import co.oslc.refimpl.lib.ResourceRepository; -// End of user code -// spotless:on - +// End of user code +// spotless:on + // Start of user code pre_class_code -// End of user code - -public class RestDelegate { - - private static final Logger log = LoggerFactory.getLogger(RestDelegate.class); - - - - @Inject ResourcesFactory resourcesFactory; +// End of user code + +public class RestDelegate { + + private static final Logger log = LoggerFactory.getLogger(RestDelegate.class); + + + + @Inject ResourcesFactory resourcesFactory; // Start of user code class_attributes public static final String SP_DEFAULT = "sp_single"; private static final ResourceRepository resourceRepository = new MemResourceRepository<>(); private static final ResourceRepository linkRepository = new MemResourceRepository<>(); - // End of user code - - public RestDelegate() { - log.trace("Delegate is initialized"); - } - - + // End of user code + + public RestDelegate() { + log.trace("Delegate is initialized"); + } + + // Start of user code class_methods - // End of user code - - //The methods contextInitializeServletListener() and contextDestroyServletListener() no longer exits - //Migrate any user-specific code blocks to the class co.oslc.refimpl.am.gen.servlet.ServletListener - //Any user-specific code should be found in *.lost files. - - public static ServiceProviderInfo[] getServiceProviderInfos(HttpServletRequest httpServletRequest) - { - ServiceProviderInfo[] serviceProviderInfos = {}; - + // End of user code + + //The methods contextInitializeServletListener() and contextDestroyServletListener() no longer exits + //Migrate any user-specific code blocks to the class co.oslc.refimpl.am.gen.servlet.ServletListener + //Any user-specific code should be found in *.lost files. + + public static ServiceProviderInfo[] getServiceProviderInfos(HttpServletRequest httpServletRequest) + { + ServiceProviderInfo[] serviceProviderInfos = {}; + // Start of user code "ServiceProviderInfo[] getServiceProviderInfos(...)" ServiceProviderInfo spInfo = new ServiceProviderInfo(); spInfo.serviceProviderId = SP_DEFAULT; spInfo.name = "Default ServiceProvider"; serviceProviderInfos = new ServiceProviderInfo[] {spInfo}; - // End of user code - return serviceProviderInfos; - } - - public List queryResources(HttpServletRequest httpServletRequest, String where, String prefix, boolean paging, int page, int limit) - { - List resources = null; - - + // End of user code + return serviceProviderInfos; + } + + public List queryResources(HttpServletRequest httpServletRequest, String where, String prefix, boolean paging, int page, int limit) + { + List resources = null; + + // Start of user code queryResources resources = resourceRepository.fetchResourcePageForSP(SP_DEFAULT, 1, limit); - // End of user code - return resources; - } - public List ResourceSelector(HttpServletRequest httpServletRequest, String terms) - { - List resources = null; - - + // End of user code + return resources; + } + public List ResourceSelector(HttpServletRequest httpServletRequest, String terms) + { + List resources = null; + + // Start of user code ResourceSelector // TODO Implement code to return a set of resources, based on search criteria - // End of user code - return resources; - } - public Resource createResource(HttpServletRequest httpServletRequest, final Resource aResource) - { - Resource newResource = null; - - + // End of user code + return resources; + } + public Resource createResource(HttpServletRequest httpServletRequest, final Resource aResource) + { + Resource newResource = null; + + // Start of user code createResource String id = aResource.getIdentifier(); if(id == null) { @@ -136,37 +136,37 @@ public Resource createResource(HttpServletRequest httpServletRequest, final Reso aResource.setCreated(new Date()); resourceRepository.addResource(SP_DEFAULT, id, aResource); newResource = aResource; - // End of user code - return newResource; - } - - - - public List queryLinkTypes(HttpServletRequest httpServletRequest, String where, String prefix, boolean paging, int page, int limit) - { - List resources = null; - - + // End of user code + return newResource; + } + + + + public List queryLinkTypes(HttpServletRequest httpServletRequest, String where, String prefix, boolean paging, int page, int limit) + { + List resources = null; + + // Start of user code queryLinkTypes resources = linkRepository.fetchResourcePageForSP(SP_DEFAULT, 1, limit); - // End of user code - return resources; - } - public List LinkTypeSelector(HttpServletRequest httpServletRequest, String terms) - { - List resources = null; - - + // End of user code + return resources; + } + public List LinkTypeSelector(HttpServletRequest httpServletRequest, String terms) + { + List resources = null; + + // Start of user code LinkTypeSelector // TODO Implement code to return a set of resources, based on search criteria - // End of user code - return resources; - } - public LinkType createLinkType(HttpServletRequest httpServletRequest, final LinkType aResource) - { - LinkType newResource = null; - - + // End of user code + return resources; + } + public LinkType createLinkType(HttpServletRequest httpServletRequest, final LinkType aResource) + { + LinkType newResource = null; + + // Start of user code createLinkType String id = aResource.getIdentifier(); if(id == null) { @@ -178,41 +178,41 @@ public LinkType createLinkType(HttpServletRequest httpServletRequest, final Link aResource.setCreated(new Date()); linkRepository.addResource(SP_DEFAULT, id, aResource); newResource = aResource; - // End of user code - return newResource; - } - - - - - public Resource getResource(HttpServletRequest httpServletRequest, final String id) - { - Resource aResource = null; - - + // End of user code + return newResource; + } + + + + + public Resource getResource(HttpServletRequest httpServletRequest, final String id) + { + Resource aResource = null; + + // Start of user code getResource if(resourceRepository.hasResource(SP_DEFAULT, id)) { aResource = resourceRepository.getResource(SP_DEFAULT, id); } - // End of user code - return aResource; - } - - public Boolean deleteResource(HttpServletRequest httpServletRequest, final String id) - { - Boolean deleted = false; - + // End of user code + return aResource; + } + + public Boolean deleteResource(HttpServletRequest httpServletRequest, final String id) + { + Boolean deleted = false; + // Start of user code deleteResource resourceRepository.deleteResource(SP_DEFAULT, id); deleted = true; // If you encounter problems, consider throwing the runtime exception WebApplicationException(message, cause, final httpStatus) - // End of user code - return deleted; - } - - public Resource updateResource(HttpServletRequest httpServletRequest, final Resource aResource, final String id) { - Resource updatedResource = null; - + // End of user code + return deleted; + } + + public Resource updateResource(HttpServletRequest httpServletRequest, final Resource aResource, final String id) { + Resource updatedResource = null; + // Start of user code updateResource if(!resourcesFactory.constructURIForResource(id).equals(aResource.getAbout())) { throw new WebApplicationException("Subject URI shall match the endpoint", Response.Status.BAD_REQUEST); @@ -220,36 +220,36 @@ public Resource updateResource(HttpServletRequest httpServletRequest, final Reso aResource.setModified(new Date()); resourceRepository.updateResource(SP_DEFAULT, id, aResource); updatedResource = aResource; - // End of user code - return updatedResource; - } - public LinkType getLinkType(HttpServletRequest httpServletRequest, final String id) - { - LinkType aResource = null; - - + // End of user code + return updatedResource; + } + public LinkType getLinkType(HttpServletRequest httpServletRequest, final String id) + { + LinkType aResource = null; + + // Start of user code getLinkType if(linkRepository.hasResource(SP_DEFAULT, id)) { aResource = linkRepository.getResource(SP_DEFAULT, id); - } // End of user code - return aResource; - } - - public Boolean deleteLinkType(HttpServletRequest httpServletRequest, final String id) - { - Boolean deleted = false; - + } // End of user code + return aResource; + } + + public Boolean deleteLinkType(HttpServletRequest httpServletRequest, final String id) + { + Boolean deleted = false; + // Start of user code deleteLinkType linkRepository.deleteResource(SP_DEFAULT, id); deleted = true; // If you encounter problems, consider throwing the runtime exception WebApplicationException(message, cause, final httpStatus) - // End of user code - return deleted; - } - - public LinkType updateLinkType(HttpServletRequest httpServletRequest, final LinkType aResource, final String id) { - LinkType updatedResource = null; - + // End of user code + return deleted; + } + + public LinkType updateLinkType(HttpServletRequest httpServletRequest, final LinkType aResource, final String id) { + LinkType updatedResource = null; + // Start of user code updateLinkType if(!resourcesFactory.constructURIForLinkType(id).equals(aResource.getAbout())) { throw new WebApplicationException("Subject URI shall match the endpoint", Response.Status.BAD_REQUEST); @@ -258,25 +258,25 @@ public LinkType updateLinkType(HttpServletRequest httpServletRequest, final Link linkRepository.updateResource(SP_DEFAULT, id, aResource); updatedResource = aResource; // If you encounter problems, consider throwing the runtime exception WebApplicationException(message, cause, final httpStatus) - // End of user code - return updatedResource; - } - - public String getETagFromLinkType(final LinkType aResource) - { - String eTag = null; + // End of user code + return updatedResource; + } + + public String getETagFromLinkType(final LinkType aResource) + { + String eTag = null; // Start of user code getETagFromLinkType eTag = linkRepository.calculateETag(aResource); - // End of user code - return eTag; - } - public String getETagFromResource(final Resource aResource) - { - String eTag = null; + // End of user code + return eTag; + } + public String getETagFromResource(final Resource aResource) + { + String eTag = null; // Start of user code getETagFromResource eTag = resourceRepository.calculateETag(aResource); - // End of user code - return eTag; - } - -} + // End of user code + return eTag; + } + +} diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/ServiceProvidersFactory.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/ServiceProvidersFactory.java index fa090a81..67c54780 100644 --- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/ServiceProvidersFactory.java +++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/ServiceProvidersFactory.java @@ -23,132 +23,127 @@ * * This file is generated by org.eclipse.lyo.oslc4j.codegenerator *******************************************************************************/ -// End of user code - -package co.oslc.refimpl.am.gen.servlet; - -// spotless:off -import java.net.URI; -import java.net.URISyntaxException; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - -import jakarta.ws.rs.core.UriBuilder; - -import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException; -import org.eclipse.lyo.oslc4j.core.model.OslcConstants; -import org.eclipse.lyo.oslc4j.core.model.PrefixDefinition; -import org.eclipse.lyo.oslc4j.core.model.Publisher; -import org.eclipse.lyo.oslc4j.core.model.ServiceProvider; -import org.eclipse.lyo.oslc4j.core.model.ServiceProviderFactory; -import org.eclipse.lyo.oslc4j.core.OSLC4JUtils; - -import co.oslc.refimpl.am.gen.ServiceProviderInfo; - -import org.eclipse.lyo.oslc.domains.am.Oslc_amDomainConstants; -import org.eclipse.lyo.oslc.domains.DctermsDomainConstants; -import org.eclipse.lyo.oslc.domains.FoafDomainConstants; -import org.eclipse.lyo.oslc.domains.jazz_am.Jazz_amDomainConstants; -import org.eclipse.lyo.oslc4j.core.model.OslcDomainConstants; -import org.eclipse.lyo.oslc.domains.RdfsDomainConstants; -import co.oslc.refimpl.am.gen.services.ResourcesService; -import co.oslc.refimpl.am.gen.services.LinksService; - +// End of user code + +package co.oslc.refimpl.am.gen.servlet; + +// spotless:off +import java.net.URI; +import java.net.URISyntaxException; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +import jakarta.ws.rs.core.UriBuilder; + +import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException; +import org.eclipse.lyo.oslc4j.core.model.OslcConstants; +import org.eclipse.lyo.oslc4j.core.model.PrefixDefinition; +import org.eclipse.lyo.oslc4j.core.model.Publisher; +import org.eclipse.lyo.oslc4j.core.model.ServiceProvider; +import org.eclipse.lyo.oslc4j.core.model.ServiceProviderFactory; +import org.eclipse.lyo.oslc4j.core.OSLC4JUtils; + +import co.oslc.refimpl.am.gen.ServiceProviderInfo; + +import org.eclipse.lyo.oslc.domains.am.Oslc_amDomainConstants; +import org.eclipse.lyo.oslc.domains.DctermsDomainConstants; +import org.eclipse.lyo.oslc.domains.FoafDomainConstants; +import org.eclipse.lyo.oslc.domains.jazz_am.Jazz_amDomainConstants; +import org.eclipse.lyo.oslc4j.core.model.OslcDomainConstants; +import org.eclipse.lyo.oslc.domains.RdfsDomainConstants; +import co.oslc.refimpl.am.gen.services.ResourcesService; +import co.oslc.refimpl.am.gen.services.LinksService; + // Start of user code imports -// End of user code -// spotless:on - -public class ServiceProvidersFactory -{ - private static Class[] RESOURCE_CLASSES = - { - ResourcesService.class, LinksService.class - }; - - private ServiceProvidersFactory() - { - super(); - } - - public static URI constructURI(final String serviceProviderId) - { - String basePath = OSLC4JUtils.getServletURI(); - Map pathParameters = new HashMap(); - pathParameters.put("serviceProviderId", serviceProviderId); - String instanceURI = "serviceProviders/{serviceProviderId}"; - - final UriBuilder builder = UriBuilder.fromUri(basePath); - return builder.path(instanceURI).buildFromMap(pathParameters); - } - - public static URI constructURI(final ServiceProviderInfo serviceProviderInfo) - { - return constructURI(serviceProviderInfo.serviceProviderId); - } - - public static String constructIdentifier(final String serviceProviderId) - { - return serviceProviderId; - } - - public static String constructIdentifier(final ServiceProviderInfo serviceProviderInfo) - { - return constructIdentifier(serviceProviderInfo.serviceProviderId); - } - - public static ServiceProvider createServiceProvider(final ServiceProviderInfo serviceProviderInfo) - throws OslcCoreApplicationException, URISyntaxException, IllegalArgumentException { +// End of user code +// spotless:on + +public class ServiceProvidersFactory +{ + private static Class[] RESOURCE_CLASSES = + { + ResourcesService.class, LinksService.class + }; + + private ServiceProvidersFactory() + { + super(); + } + + public static URI constructURI(final String serviceProviderId) + { + String basePath = OSLC4JUtils.getServletURI(); + Map pathParameters = new HashMap(); + pathParameters.put("serviceProviderId", serviceProviderId); + String instanceURI = "serviceProviders/{serviceProviderId}"; + + final UriBuilder builder = UriBuilder.fromUri(basePath); + return builder.path(instanceURI).buildFromMap(pathParameters); + } + + public static URI constructURI(final ServiceProviderInfo serviceProviderInfo) + { + return constructURI(serviceProviderInfo.serviceProviderId); + } + + public static String constructIdentifier(final String serviceProviderId) + { + return serviceProviderId; + } + + public static String constructIdentifier(final ServiceProviderInfo serviceProviderInfo) + { + return constructIdentifier(serviceProviderInfo.serviceProviderId); + } + + public static ServiceProvider createServiceProvider(final ServiceProviderInfo serviceProviderInfo) + throws OslcCoreApplicationException, URISyntaxException, IllegalArgumentException { // Start of user code init - // End of user code - URI serviceProviderURI = constructURI(serviceProviderInfo); - String identifier = constructIdentifier(serviceProviderInfo); - String basePath = OSLC4JUtils.getServletURI(); - String title = serviceProviderInfo.name; - String description = String.format("%s (id: %s; kind: %s)", - "Service Provider", - identifier, - "Service Provider"); - Publisher publisher = null; - Map parameterMap = new HashMap(); - parameterMap.put("serviceProviderId", serviceProviderInfo.serviceProviderId); - - ServiceProvider serviceProvider = ServiceProviderFactory.createServiceProvider(basePath, - "", - title, - description, - publisher, - RESOURCE_CLASSES, - parameterMap); - - final PrefixDefinition[] prefixDefinitions = - { - new PrefixDefinition(OslcConstants.DCTERMS_NAMESPACE_PREFIX, new URI(OslcConstants.DCTERMS_NAMESPACE)), - new PrefixDefinition(OslcConstants.OSLC_CORE_NAMESPACE_PREFIX, new URI(OslcConstants.OSLC_CORE_NAMESPACE)), - new PrefixDefinition(OslcConstants.OSLC_DATA_NAMESPACE_PREFIX, new URI(OslcConstants.OSLC_DATA_NAMESPACE)), - new PrefixDefinition(OslcConstants.RDF_NAMESPACE_PREFIX, new URI(OslcConstants.RDF_NAMESPACE)), - new PrefixDefinition(OslcConstants.RDFS_NAMESPACE_PREFIX, new URI(OslcConstants.RDFS_NAMESPACE)), - new PrefixDefinition(Oslc_amDomainConstants.ARCHITECTURE_MANAGEMENT_NAMSPACE_PREFIX, new URI(Oslc_amDomainConstants.ARCHITECTURE_MANAGEMENT_NAMSPACE)) -, - new PrefixDefinition(DctermsDomainConstants.DUBLIN_CORE_NAMSPACE_PREFIX, new URI(DctermsDomainConstants.DUBLIN_CORE_NAMSPACE)) -, - new PrefixDefinition(FoafDomainConstants.FOAF_NAMSPACE_PREFIX, new URI(FoafDomainConstants.FOAF_NAMSPACE)) -, - new PrefixDefinition(Jazz_amDomainConstants.JAZZ_ARCHITECTURE_MANAGEMENT_NAMSPACE_PREFIX, new URI(Jazz_amDomainConstants.JAZZ_ARCHITECTURE_MANAGEMENT_NAMSPACE)) -, - new PrefixDefinition(OslcDomainConstants.OSLC_NAMSPACE_PREFIX, new URI(OslcDomainConstants.OSLC_NAMSPACE)) -, - new PrefixDefinition(RdfsDomainConstants.RDFS_NAMSPACE_PREFIX, new URI(RdfsDomainConstants.RDFS_NAMSPACE)) - }; - serviceProvider.setPrefixDefinitions(prefixDefinitions); - - serviceProvider.setAbout(serviceProviderURI); - serviceProvider.setIdentifier(identifier); - serviceProvider.setCreated(new Date()); - serviceProvider.setDetails(new URI[] {serviceProviderURI}); - + // End of user code + URI serviceProviderURI = constructURI(serviceProviderInfo); + String identifier = constructIdentifier(serviceProviderInfo); + String basePath = OSLC4JUtils.getServletURI(); + String title = serviceProviderInfo.name; + String description = String.format("%s (id: %s; kind: %s)", + "Service Provider", + identifier, + "Service Provider"); + Publisher publisher = null; + Map parameterMap = new HashMap(); + parameterMap.put("serviceProviderId", serviceProviderInfo.serviceProviderId); + + ServiceProvider serviceProvider = ServiceProviderFactory.createServiceProvider(basePath, + "", + title, + description, + publisher, + RESOURCE_CLASSES, + parameterMap); + + final PrefixDefinition[] prefixDefinitions = + { + new PrefixDefinition(OslcConstants.DCTERMS_NAMESPACE_PREFIX, new URI(OslcConstants.DCTERMS_NAMESPACE)), + new PrefixDefinition(OslcConstants.OSLC_CORE_NAMESPACE_PREFIX, new URI(OslcConstants.OSLC_CORE_NAMESPACE)), + new PrefixDefinition(OslcConstants.OSLC_DATA_NAMESPACE_PREFIX, new URI(OslcConstants.OSLC_DATA_NAMESPACE)), + new PrefixDefinition(OslcConstants.RDF_NAMESPACE_PREFIX, new URI(OslcConstants.RDF_NAMESPACE)), + new PrefixDefinition(OslcConstants.RDFS_NAMESPACE_PREFIX, new URI(OslcConstants.RDFS_NAMESPACE)), + new PrefixDefinition(Oslc_amDomainConstants.ARCHITECTURE_MANAGEMENT_NAMSPACE_PREFIX, new URI(Oslc_amDomainConstants.ARCHITECTURE_MANAGEMENT_NAMSPACE)), + new PrefixDefinition(DctermsDomainConstants.DUBLIN_CORE_NAMSPACE_PREFIX, new URI(DctermsDomainConstants.DUBLIN_CORE_NAMSPACE)), + new PrefixDefinition(FoafDomainConstants.FOAF_NAMSPACE_PREFIX, new URI(FoafDomainConstants.FOAF_NAMSPACE)), + new PrefixDefinition(Jazz_amDomainConstants.JAZZ_ARCHITECTURE_MANAGEMENT_NAMSPACE_PREFIX, new URI(Jazz_amDomainConstants.JAZZ_ARCHITECTURE_MANAGEMENT_NAMSPACE)), + new PrefixDefinition(OslcDomainConstants.OSLC_NAMSPACE_PREFIX, new URI(OslcDomainConstants.OSLC_NAMSPACE)), + new PrefixDefinition(RdfsDomainConstants.RDFS_NAMSPACE_PREFIX, new URI(RdfsDomainConstants.RDFS_NAMSPACE)) + }; + serviceProvider.setPrefixDefinitions(prefixDefinitions); + + serviceProvider.setAbout(serviceProviderURI); + serviceProvider.setIdentifier(identifier); + serviceProvider.setCreated(new Date()); + serviceProvider.setDetails(new URI[] {serviceProviderURI}); + // Start of user code finalize - // End of user code - return serviceProvider; - } -} + // End of user code + return serviceProvider; + } +} diff --git a/src/server-am/src/main/webapp/WEB-INF/web.xml b/src/server-am/src/main/webapp/WEB-INF/web.xml index 1ece1248..82e117f1 100644 --- a/src/server-am/src/main/webapp/WEB-INF/web.xml +++ b/src/server-am/src/main/webapp/WEB-INF/web.xml @@ -1,8 +1,8 @@ - + AM Base URI for the adaptor. diff --git a/src/server-cm/Dockerfile b/src/server-cm/Dockerfile index cd93f632..92b2d6d0 100644 --- a/src/server-cm/Dockerfile +++ b/src/server-cm/Dockerfile @@ -32,6 +32,6 @@ LABEL org.opencontainers.image.licenses="EPL-2.0" COPY --from=build /src/server-cm/target/*.war /var/lib/jetty/webapps/ROOT.war -RUN java -jar "$JETTY_HOME/start.jar" --add-modules=ee9-deploy,ee9-jsp,ee9-jstl +RUN java -jar "$JETTY_HOME/start.jar" --add-modules=ee10-deploy,ee10-jsp,ee10-jstl EXPOSE 8080 diff --git a/src/server-cm/pom.xml b/src/server-cm/pom.xml index 3d5bec23..62e373c8 100644 --- a/src/server-cm/pom.xml +++ b/src/server-cm/pom.xml @@ -290,14 +290,14 @@ ${application.filename} - + + org.apache.maven.plugins maven-enforcer-plugin - org.apache.maven.plugins maven-compiler-plugin @@ -309,9 +309,9 @@ - org.eclipse.jetty - jetty-maven-plugin - 11.0.20 + org.eclipse.jetty.ee10 + jetty-ee10-maven-plugin + 12.0.16 ${application.contextpath} @@ -400,7 +400,7 @@ - diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/RestDelegate.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/RestDelegate.java index de9be87d..aed0cf33 100644 --- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/RestDelegate.java +++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/RestDelegate.java @@ -20,48 +20,48 @@ * * This file is generated by org.eclipse.lyo.oslc4j.codegenerator *******************************************************************************/ -// End of user code - -package co.oslc.refimpl.cm.gen; - - -// spotless:off -import jakarta.inject.Inject; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.ServletContextEvent; -import java.util.List; -import java.util.ArrayList; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import org.eclipse.lyo.oslc4j.core.model.ServiceProvider; -import org.eclipse.lyo.oslc4j.core.OSLC4JUtils; -import org.eclipse.lyo.oslc4j.core.model.AbstractResource; -import co.oslc.refimpl.cm.gen.servlet.ServiceProviderCatalogSingleton; -import co.oslc.refimpl.cm.gen.ServiceProviderInfo; -import org.eclipse.lyo.oslc.domains.Agent; -import org.eclipse.lyo.oslc.domains.cm.ChangeNotice; -import org.eclipse.lyo.oslc.domains.cm.ChangeRequest; -import org.eclipse.lyo.oslc.domains.config.ChangeSet; -import org.eclipse.lyo.oslc.domains.RdfsClass; -import org.eclipse.lyo.oslc.domains.config.Component; -import org.eclipse.lyo.oslc.domains.config.ConceptResource; -import org.eclipse.lyo.oslc.domains.config.Configuration; -import org.eclipse.lyo.oslc.domains.config.Contribution; -import org.eclipse.lyo.oslc.domains.cm.Defect; -import org.eclipse.lyo.oslc4j.core.model.Discussion; -import org.eclipse.lyo.oslc.domains.cm.Enhancement; -import org.eclipse.lyo.oslc.domains.Person; -import org.eclipse.lyo.oslc.domains.cm.Priority; -import org.eclipse.lyo.oslc.domains.rm.Requirement; -import org.eclipse.lyo.oslc.domains.cm.ReviewTask; -import org.eclipse.lyo.oslc.domains.config.Selections; -import org.eclipse.lyo.oslc.domains.cm.State; -import org.eclipse.lyo.oslc.domains.cm.Task; -import org.eclipse.lyo.oslc.domains.config.VersionResource; - - - +// End of user code + +package co.oslc.refimpl.cm.gen; + + +// spotless:off +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletContextEvent; +import java.util.List; +import java.util.ArrayList; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.eclipse.lyo.oslc4j.core.model.ServiceProvider; +import org.eclipse.lyo.oslc4j.core.OSLC4JUtils; +import org.eclipse.lyo.oslc4j.core.model.AbstractResource; +import co.oslc.refimpl.cm.gen.servlet.ServiceProviderCatalogSingleton; +import co.oslc.refimpl.cm.gen.ServiceProviderInfo; +import org.eclipse.lyo.oslc.domains.Agent; +import org.eclipse.lyo.oslc.domains.cm.ChangeNotice; +import org.eclipse.lyo.oslc.domains.cm.ChangeRequest; +import org.eclipse.lyo.oslc.domains.config.ChangeSet; +import org.eclipse.lyo.oslc.domains.RdfsClass; +import org.eclipse.lyo.oslc.domains.config.Component; +import org.eclipse.lyo.oslc.domains.config.ConceptResource; +import org.eclipse.lyo.oslc.domains.config.Configuration; +import org.eclipse.lyo.oslc.domains.config.Contribution; +import org.eclipse.lyo.oslc.domains.cm.Defect; +import org.eclipse.lyo.oslc4j.core.model.Discussion; +import org.eclipse.lyo.oslc.domains.cm.Enhancement; +import org.eclipse.lyo.oslc.domains.Person; +import org.eclipse.lyo.oslc.domains.cm.Priority; +import org.eclipse.lyo.oslc.domains.rm.Requirement; +import org.eclipse.lyo.oslc.domains.cm.ReviewTask; +import org.eclipse.lyo.oslc.domains.config.Selections; +import org.eclipse.lyo.oslc.domains.cm.State; +import org.eclipse.lyo.oslc.domains.cm.Task; +import org.eclipse.lyo.oslc.domains.config.VersionResource; + + + // Start of user code imports import java.net.URI; import java.util.Date; @@ -73,197 +73,197 @@ import co.oslc.refimpl.lib.MemResourceRepository; import co.oslc.refimpl.lib.ResourceRepository; -// End of user code -// spotless:on - +// End of user code +// spotless:on + // Start of user code pre_class_code -// End of user code - -public class RestDelegate { - - private static final Logger log = LoggerFactory.getLogger(RestDelegate.class); - - - - @Inject ResourcesFactory resourcesFactory; +// End of user code + +public class RestDelegate { + + private static final Logger log = LoggerFactory.getLogger(RestDelegate.class); + + + + @Inject ResourcesFactory resourcesFactory; // Start of user code class_attributes public static final String SP_DEFAULT = "sp_single"; private static final Logger LOG = LoggerFactory.getLogger(RestDelegate.class); private static final ResourceRepository changeRequestRepository = new MemResourceRepository<>(); - // End of user code - - public RestDelegate() { - log.trace("Delegate is initialized"); - } - - + // End of user code + + public RestDelegate() { + log.trace("Delegate is initialized"); + } + + // Start of user code class_methods - // End of user code - - //The methods contextInitializeServletListener() and contextDestroyServletListener() no longer exits - //Migrate any user-specific code blocks to the class co.oslc.refimpl.cm.gen.servlet.ServletListener - //Any user-specific code should be found in *.lost files. - - public static ServiceProviderInfo[] getServiceProviderInfos(HttpServletRequest httpServletRequest) - { - ServiceProviderInfo[] serviceProviderInfos = {}; - + // End of user code + + //The methods contextInitializeServletListener() and contextDestroyServletListener() no longer exits + //Migrate any user-specific code blocks to the class co.oslc.refimpl.cm.gen.servlet.ServletListener + //Any user-specific code should be found in *.lost files. + + public static ServiceProviderInfo[] getServiceProviderInfos(HttpServletRequest httpServletRequest) + { + ServiceProviderInfo[] serviceProviderInfos = {}; + // Start of user code "ServiceProviderInfo[] getServiceProviderInfos(...)" ServiceProviderInfo spInfo = new ServiceProviderInfo(); spInfo.serviceProviderId = SP_DEFAULT; spInfo.name = "Default ServiceProvider"; serviceProviderInfos = new ServiceProviderInfo[] {spInfo}; - // End of user code - return serviceProviderInfos; - } - - public List queryChangeRequests(HttpServletRequest httpServletRequest, String where, String prefix, boolean paging, int page, int limit) - { - List resources = null; - - + // End of user code + return serviceProviderInfos; + } + + public List queryChangeRequests(HttpServletRequest httpServletRequest, String where, String prefix, boolean paging, int page, int limit) + { + List resources = null; + + // Start of user code queryChangeRequests resources = changeRequestRepository.fetchResourcePageForSP(SP_DEFAULT, page, limit); - // End of user code - return resources; - } - public List queryDefects(HttpServletRequest httpServletRequest, String where, String prefix, boolean paging, int page, int limit) - { - List resources = null; - - + // End of user code + return resources; + } + public List queryDefects(HttpServletRequest httpServletRequest, String where, String prefix, boolean paging, int page, int limit) + { + List resources = null; + + // Start of user code queryDefects // TODO Implement code to return a set of resources. // An empty List should imply that no resources where found. // If you encounter problems, consider throwing the runtime exception WebApplicationException(message, cause, final httpStatus) LOG.warn("QC for Defect resources not implemented"); resources = new ArrayList<>(); - // End of user code - return resources; - } - public List queryTasks(HttpServletRequest httpServletRequest, String where, String prefix, boolean paging, int page, int limit) - { - List resources = null; - - + // End of user code + return resources; + } + public List queryTasks(HttpServletRequest httpServletRequest, String where, String prefix, boolean paging, int page, int limit) + { + List resources = null; + + // Start of user code queryTasks // TODO Implement code to return a set of resources. // An empty List should imply that no resources where found. // If you encounter problems, consider throwing the runtime exception WebApplicationException(message, cause, final httpStatus) LOG.warn("QC for Task resources not implemented"); resources = new ArrayList<>(); - // End of user code - return resources; - } - public List queryEnhancements(HttpServletRequest httpServletRequest, String where, String prefix, boolean paging, int page, int limit) - { - List resources = null; - - + // End of user code + return resources; + } + public List queryEnhancements(HttpServletRequest httpServletRequest, String where, String prefix, boolean paging, int page, int limit) + { + List resources = null; + + // Start of user code queryEnhancements // TODO Implement code to return a set of resources. // An empty List should imply that no resources where found. // If you encounter problems, consider throwing the runtime exception WebApplicationException(message, cause, final httpStatus) LOG.warn("QC for Enhancement resources not implemented"); resources = new ArrayList<>(); - // End of user code - return resources; - } - public List queryReviewTasks(HttpServletRequest httpServletRequest, String where, String prefix, boolean paging, int page, int limit) - { - List resources = null; - - + // End of user code + return resources; + } + public List queryReviewTasks(HttpServletRequest httpServletRequest, String where, String prefix, boolean paging, int page, int limit) + { + List resources = null; + + // Start of user code queryReviewTasks // TODO Implement code to return a set of resources. // An empty List should imply that no resources where found. // If you encounter problems, consider throwing the runtime exception WebApplicationException(message, cause, final httpStatus) LOG.warn("QC for Review resources not implemented"); resources = new ArrayList<>(); - // End of user code - return resources; - } - public List queryChangeNotices(HttpServletRequest httpServletRequest, String where, String prefix, boolean paging, int page, int limit) - { - List resources = null; - - + // End of user code + return resources; + } + public List queryChangeNotices(HttpServletRequest httpServletRequest, String where, String prefix, boolean paging, int page, int limit) + { + List resources = null; + + // Start of user code queryChangeNotices // TODO Implement code to return a set of resources. // An empty List should imply that no resources where found. // If you encounter problems, consider throwing the runtime exception WebApplicationException(message, cause, final httpStatus) LOG.warn("QC for ChangeNotice resources not implemented"); resources = new ArrayList<>(); - // End of user code - return resources; - } - public List ChangeRequestSelector(HttpServletRequest httpServletRequest, String terms) - { - List resources = null; - - + // End of user code + return resources; + } + public List ChangeRequestSelector(HttpServletRequest httpServletRequest, String terms) + { + List resources = null; + + // Start of user code ChangeRequestSelector // resources = changeRequestRepository.fetchResourcePageForSP(SP_DEFAULT, 1, 20); resources = changeRequestRepository.findResources(SP_DEFAULT, terms, 20); - // End of user code - return resources; - } - public List DefectSelector(HttpServletRequest httpServletRequest, String terms) - { - List resources = null; - - + // End of user code + return resources; + } + public List DefectSelector(HttpServletRequest httpServletRequest, String terms) + { + List resources = null; + + // Start of user code DefectSelector // TODO Implement code to return a set of resources, based on search criteria - // End of user code - return resources; - } - public List TaskSelector(HttpServletRequest httpServletRequest, String terms) - { - List resources = null; - - + // End of user code + return resources; + } + public List TaskSelector(HttpServletRequest httpServletRequest, String terms) + { + List resources = null; + + // Start of user code TaskSelector // TODO Implement code to return a set of resources, based on search criteria - // End of user code - return resources; - } - public List ReviewTaskSelector(HttpServletRequest httpServletRequest, String terms) - { - List resources = null; - - + // End of user code + return resources; + } + public List ReviewTaskSelector(HttpServletRequest httpServletRequest, String terms) + { + List resources = null; + + // Start of user code ReviewTaskSelector // TODO Implement code to return a set of resources, based on search criteria - // End of user code - return resources; - } - public List ChangeNoticeSelector(HttpServletRequest httpServletRequest, String terms) - { - List resources = null; - - + // End of user code + return resources; + } + public List ChangeNoticeSelector(HttpServletRequest httpServletRequest, String terms) + { + List resources = null; + + // Start of user code ChangeNoticeSelector // TODO Implement code to return a set of resources, based on search criteria - // End of user code - return resources; - } - public List EnhancementSelector(HttpServletRequest httpServletRequest, String terms) - { - List resources = null; - - + // End of user code + return resources; + } + public List EnhancementSelector(HttpServletRequest httpServletRequest, String terms) + { + List resources = null; + + // Start of user code EnhancementSelector // TODO Implement code to return a set of resources, based on search criteria - // End of user code - return resources; - } - public ChangeRequest createChangeRequest(HttpServletRequest httpServletRequest, final ChangeRequest aResource) - { - ChangeRequest newResource = null; - - + // End of user code + return resources; + } + public ChangeRequest createChangeRequest(HttpServletRequest httpServletRequest, final ChangeRequest aResource) + { + ChangeRequest newResource = null; + + // Start of user code createChangeRequest String id = aResource.getIdentifier(); if(id == null) { @@ -275,68 +275,68 @@ public ChangeRequest createChangeRequest(HttpServletRequest httpServletRequest, aResource.setCreated(new Date()); changeRequestRepository.addResource(SP_DEFAULT, id, aResource); newResource = aResource; - // End of user code - return newResource; - } - - public Defect createDefectFromDialog(HttpServletRequest httpServletRequest, final Defect aResource) - { - Defect newResource = null; - - + // End of user code + return newResource; + } + + public Defect createDefectFromDialog(HttpServletRequest httpServletRequest, final Defect aResource) + { + Defect newResource = null; + + // Start of user code createDefectFromDialog // TODO Implement code to create a resource - // End of user code - return newResource; - } - public Task createTaskFromDialog(HttpServletRequest httpServletRequest, final Task aResource) - { - Task newResource = null; - - + // End of user code + return newResource; + } + public Task createTaskFromDialog(HttpServletRequest httpServletRequest, final Task aResource) + { + Task newResource = null; + + // Start of user code createTaskFromDialog // TODO Implement code to create a resource - // End of user code - return newResource; - } - public ReviewTask createReviewTaskFromDialog(HttpServletRequest httpServletRequest, final ReviewTask aResource) - { - ReviewTask newResource = null; - - + // End of user code + return newResource; + } + public ReviewTask createReviewTaskFromDialog(HttpServletRequest httpServletRequest, final ReviewTask aResource) + { + ReviewTask newResource = null; + + // Start of user code createReviewTaskFromDialog // TODO Implement code to create a resource - // End of user code - return newResource; - } - public ChangeNotice createChangeNoticeFromDialog(HttpServletRequest httpServletRequest, final ChangeNotice aResource) - { - ChangeNotice newResource = null; - - + // End of user code + return newResource; + } + public ChangeNotice createChangeNoticeFromDialog(HttpServletRequest httpServletRequest, final ChangeNotice aResource) + { + ChangeNotice newResource = null; + + // Start of user code createChangeNoticeFromDialog // TODO Implement code to create a resource - // End of user code - return newResource; - } - public Enhancement createEnhancementFromDialog(HttpServletRequest httpServletRequest, final Enhancement aResource) - { - Enhancement newResource = null; - - + // End of user code + return newResource; + } + public Enhancement createEnhancementFromDialog(HttpServletRequest httpServletRequest, final Enhancement aResource) + { + Enhancement newResource = null; + + // Start of user code createEnhancementFromDialog // TODO Implement code to create a resource - // End of user code - return newResource; - } - - - - public ChangeRequest getChangeRequest(HttpServletRequest httpServletRequest, final String id) - { - ChangeRequest aResource = null; - - + // End of user code + return newResource; + } + + + + public ChangeRequest getChangeRequest(HttpServletRequest httpServletRequest, final String id) + { + ChangeRequest aResource = null; + + // Start of user code getChangeRequest try { aResource = changeRequestRepository.getResource(SP_DEFAULT, id); @@ -344,24 +344,24 @@ public ChangeRequest getChangeRequest(HttpServletRequest httpServletRequest, fin return null; // throw new WebApplicationException(Response.Status.NOT_FOUND); } - // End of user code - return aResource; - } - - public Boolean deleteChangeRequest(HttpServletRequest httpServletRequest, final String id) - { - Boolean deleted = false; - + // End of user code + return aResource; + } + + public Boolean deleteChangeRequest(HttpServletRequest httpServletRequest, final String id) + { + Boolean deleted = false; + // Start of user code deleteChangeRequest changeRequestRepository.deleteResource(SP_DEFAULT, id); deleted = true; - // End of user code - return deleted; - } - - public ChangeRequest updateChangeRequest(HttpServletRequest httpServletRequest, final ChangeRequest aResource, final String id) { - ChangeRequest updatedResource = null; - + // End of user code + return deleted; + } + + public ChangeRequest updateChangeRequest(HttpServletRequest httpServletRequest, final ChangeRequest aResource, final String id) { + ChangeRequest updatedResource = null; + // Start of user code updateChangeRequest if(!resourcesFactory.constructURIForChangeRequest(id).equals(aResource.getAbout())) { throw new WebApplicationException("Subject URI shall match the endpoint", Response.Status.BAD_REQUEST); @@ -369,57 +369,57 @@ public ChangeRequest updateChangeRequest(HttpServletRequest httpServletRequest, aResource.setModified(new Date()); changeRequestRepository.updateResource(SP_DEFAULT, id, aResource); updatedResource = aResource; - // End of user code - return updatedResource; - } - - public String getETagFromChangeNotice(final ChangeNotice aResource) - { - String eTag = null; + // End of user code + return updatedResource; + } + + public String getETagFromChangeNotice(final ChangeNotice aResource) + { + String eTag = null; // Start of user code getETagFromChangeNotice eTag = changeRequestRepository.calculateETag(aResource); - // End of user code - return eTag; - } - public String getETagFromChangeRequest(final ChangeRequest aResource) - { - String eTag = null; + // End of user code + return eTag; + } + public String getETagFromChangeRequest(final ChangeRequest aResource) + { + String eTag = null; // Start of user code getETagFromChangeRequest eTag = changeRequestRepository.calculateETag(aResource); - // End of user code - return eTag; - } - public String getETagFromDefect(final Defect aResource) - { - String eTag = null; + // End of user code + return eTag; + } + public String getETagFromDefect(final Defect aResource) + { + String eTag = null; // Start of user code getETagFromDefect eTag = changeRequestRepository.calculateETag(aResource); - // End of user code - return eTag; - } - public String getETagFromEnhancement(final Enhancement aResource) - { - String eTag = null; + // End of user code + return eTag; + } + public String getETagFromEnhancement(final Enhancement aResource) + { + String eTag = null; // Start of user code getETagFromEnhancement eTag = changeRequestRepository.calculateETag(aResource); - // End of user code - return eTag; - } - public String getETagFromReviewTask(final ReviewTask aResource) - { - String eTag = null; + // End of user code + return eTag; + } + public String getETagFromReviewTask(final ReviewTask aResource) + { + String eTag = null; // Start of user code getETagFromReviewTask eTag = changeRequestRepository.calculateETag(aResource); - // End of user code - return eTag; - } - public String getETagFromTask(final Task aResource) - { - String eTag = null; + // End of user code + return eTag; + } + public String getETagFromTask(final Task aResource) + { + String eTag = null; // Start of user code getETagFromTask eTag = changeRequestRepository.calculateETag(aResource); - // End of user code - return eTag; - } - -} + // End of user code + return eTag; + } + +} diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ServiceProvidersFactory.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ServiceProvidersFactory.java index f42a2f94..91d0fa87 100644 --- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ServiceProvidersFactory.java +++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/servlet/ServiceProvidersFactory.java @@ -23,134 +23,128 @@ * * This file is generated by org.eclipse.lyo.oslc4j.codegenerator *******************************************************************************/ -// End of user code - -package co.oslc.refimpl.cm.gen.servlet; - -// spotless:off -import java.net.URI; -import java.net.URISyntaxException; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - -import jakarta.ws.rs.core.UriBuilder; - -import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException; -import org.eclipse.lyo.oslc4j.core.model.OslcConstants; -import org.eclipse.lyo.oslc4j.core.model.PrefixDefinition; -import org.eclipse.lyo.oslc4j.core.model.Publisher; -import org.eclipse.lyo.oslc4j.core.model.ServiceProvider; -import org.eclipse.lyo.oslc4j.core.model.ServiceProviderFactory; -import org.eclipse.lyo.oslc4j.core.OSLC4JUtils; - -import co.oslc.refimpl.cm.gen.ServiceProviderInfo; - -import org.eclipse.lyo.oslc.domains.cm.Oslc_cmDomainConstants; -import org.eclipse.lyo.oslc.domains.config.Oslc_configDomainConstants; -import org.eclipse.lyo.oslc.domains.DctermsDomainConstants; -import org.eclipse.lyo.oslc.domains.FoafDomainConstants; -import org.eclipse.lyo.oslc4j.core.model.OslcDomainConstants; -import org.eclipse.lyo.oslc.domains.RdfsDomainConstants; -import org.eclipse.lyo.oslc.domains.rm.Oslc_rmDomainConstants; -import co.oslc.refimpl.cm.gen.services.Change_requestsService; - +// End of user code + +package co.oslc.refimpl.cm.gen.servlet; + +// spotless:off +import java.net.URI; +import java.net.URISyntaxException; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +import jakarta.ws.rs.core.UriBuilder; + +import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException; +import org.eclipse.lyo.oslc4j.core.model.OslcConstants; +import org.eclipse.lyo.oslc4j.core.model.PrefixDefinition; +import org.eclipse.lyo.oslc4j.core.model.Publisher; +import org.eclipse.lyo.oslc4j.core.model.ServiceProvider; +import org.eclipse.lyo.oslc4j.core.model.ServiceProviderFactory; +import org.eclipse.lyo.oslc4j.core.OSLC4JUtils; + +import co.oslc.refimpl.cm.gen.ServiceProviderInfo; + +import org.eclipse.lyo.oslc.domains.cm.Oslc_cmDomainConstants; +import org.eclipse.lyo.oslc.domains.config.Oslc_configDomainConstants; +import org.eclipse.lyo.oslc.domains.DctermsDomainConstants; +import org.eclipse.lyo.oslc.domains.FoafDomainConstants; +import org.eclipse.lyo.oslc4j.core.model.OslcDomainConstants; +import org.eclipse.lyo.oslc.domains.RdfsDomainConstants; +import org.eclipse.lyo.oslc.domains.rm.Oslc_rmDomainConstants; +import co.oslc.refimpl.cm.gen.services.Change_requestsService; + // Start of user code imports -// End of user code -// spotless:on - -public class ServiceProvidersFactory -{ - private static Class[] RESOURCE_CLASSES = - { - Change_requestsService.class - }; - - private ServiceProvidersFactory() - { - super(); - } - - public static URI constructURI(final String serviceProviderId) - { - String basePath = OSLC4JUtils.getServletURI(); - Map pathParameters = new HashMap(); - pathParameters.put("serviceProviderId", serviceProviderId); - String instanceURI = "serviceProviders/{serviceProviderId}"; - - final UriBuilder builder = UriBuilder.fromUri(basePath); - return builder.path(instanceURI).buildFromMap(pathParameters); - } - - public static URI constructURI(final ServiceProviderInfo serviceProviderInfo) - { - return constructURI(serviceProviderInfo.serviceProviderId); - } - - public static String constructIdentifier(final String serviceProviderId) - { - return serviceProviderId; - } - - public static String constructIdentifier(final ServiceProviderInfo serviceProviderInfo) - { - return constructIdentifier(serviceProviderInfo.serviceProviderId); - } - - public static ServiceProvider createServiceProvider(final ServiceProviderInfo serviceProviderInfo) - throws OslcCoreApplicationException, URISyntaxException, IllegalArgumentException { +// End of user code +// spotless:on + +public class ServiceProvidersFactory +{ + private static Class[] RESOURCE_CLASSES = + { + Change_requestsService.class + }; + + private ServiceProvidersFactory() + { + super(); + } + + public static URI constructURI(final String serviceProviderId) + { + String basePath = OSLC4JUtils.getServletURI(); + Map pathParameters = new HashMap(); + pathParameters.put("serviceProviderId", serviceProviderId); + String instanceURI = "serviceProviders/{serviceProviderId}"; + + final UriBuilder builder = UriBuilder.fromUri(basePath); + return builder.path(instanceURI).buildFromMap(pathParameters); + } + + public static URI constructURI(final ServiceProviderInfo serviceProviderInfo) + { + return constructURI(serviceProviderInfo.serviceProviderId); + } + + public static String constructIdentifier(final String serviceProviderId) + { + return serviceProviderId; + } + + public static String constructIdentifier(final ServiceProviderInfo serviceProviderInfo) + { + return constructIdentifier(serviceProviderInfo.serviceProviderId); + } + + public static ServiceProvider createServiceProvider(final ServiceProviderInfo serviceProviderInfo) + throws OslcCoreApplicationException, URISyntaxException, IllegalArgumentException { // Start of user code init - // End of user code - URI serviceProviderURI = constructURI(serviceProviderInfo); - String identifier = constructIdentifier(serviceProviderInfo); - String basePath = OSLC4JUtils.getServletURI(); - String title = serviceProviderInfo.name; - String description = String.format("%s (id: %s; kind: %s)", - "Service Provider", - identifier, - "Service Provider"); - Publisher publisher = null; - Map parameterMap = new HashMap(); - parameterMap.put("serviceProviderId", serviceProviderInfo.serviceProviderId); - - ServiceProvider serviceProvider = ServiceProviderFactory.createServiceProvider(basePath, - "", - title, - description, - publisher, - RESOURCE_CLASSES, - parameterMap); - - final PrefixDefinition[] prefixDefinitions = - { - new PrefixDefinition(OslcConstants.DCTERMS_NAMESPACE_PREFIX, new URI(OslcConstants.DCTERMS_NAMESPACE)), - new PrefixDefinition(OslcConstants.OSLC_CORE_NAMESPACE_PREFIX, new URI(OslcConstants.OSLC_CORE_NAMESPACE)), - new PrefixDefinition(OslcConstants.OSLC_DATA_NAMESPACE_PREFIX, new URI(OslcConstants.OSLC_DATA_NAMESPACE)), - new PrefixDefinition(OslcConstants.RDF_NAMESPACE_PREFIX, new URI(OslcConstants.RDF_NAMESPACE)), - new PrefixDefinition(OslcConstants.RDFS_NAMESPACE_PREFIX, new URI(OslcConstants.RDFS_NAMESPACE)), - new PrefixDefinition(Oslc_cmDomainConstants.CHANGE_MANAGEMENT_SHAPES_NAMSPACE_PREFIX, new URI(Oslc_cmDomainConstants.CHANGE_MANAGEMENT_SHAPES_NAMSPACE)) -, - new PrefixDefinition(Oslc_configDomainConstants.CONFIGURATION_MANAGEMENT_NAMSPACE_PREFIX, new URI(Oslc_configDomainConstants.CONFIGURATION_MANAGEMENT_NAMSPACE)) -, - new PrefixDefinition(DctermsDomainConstants.DUBLIN_CORE_NAMSPACE_PREFIX, new URI(DctermsDomainConstants.DUBLIN_CORE_NAMSPACE)) -, - new PrefixDefinition(FoafDomainConstants.FOAF_NAMSPACE_PREFIX, new URI(FoafDomainConstants.FOAF_NAMSPACE)) -, - new PrefixDefinition(OslcDomainConstants.OSLC_NAMSPACE_PREFIX, new URI(OslcDomainConstants.OSLC_NAMSPACE)) -, - new PrefixDefinition(RdfsDomainConstants.RDFS_NAMSPACE_PREFIX, new URI(RdfsDomainConstants.RDFS_NAMSPACE)) -, - new PrefixDefinition(Oslc_rmDomainConstants.REQUIREMENTS_MANAGEMENT_SHAPES_NAMSPACE_PREFIX, new URI(Oslc_rmDomainConstants.REQUIREMENTS_MANAGEMENT_SHAPES_NAMSPACE)) - }; - serviceProvider.setPrefixDefinitions(prefixDefinitions); - - serviceProvider.setAbout(serviceProviderURI); - serviceProvider.setIdentifier(identifier); - serviceProvider.setCreated(new Date()); - serviceProvider.setDetails(new URI[] {serviceProviderURI}); - + // End of user code + URI serviceProviderURI = constructURI(serviceProviderInfo); + String identifier = constructIdentifier(serviceProviderInfo); + String basePath = OSLC4JUtils.getServletURI(); + String title = serviceProviderInfo.name; + String description = String.format("%s (id: %s; kind: %s)", + "Service Provider", + identifier, + "Service Provider"); + Publisher publisher = null; + Map parameterMap = new HashMap(); + parameterMap.put("serviceProviderId", serviceProviderInfo.serviceProviderId); + + ServiceProvider serviceProvider = ServiceProviderFactory.createServiceProvider(basePath, + "", + title, + description, + publisher, + RESOURCE_CLASSES, + parameterMap); + + final PrefixDefinition[] prefixDefinitions = + { + new PrefixDefinition(OslcConstants.DCTERMS_NAMESPACE_PREFIX, new URI(OslcConstants.DCTERMS_NAMESPACE)), + new PrefixDefinition(OslcConstants.OSLC_CORE_NAMESPACE_PREFIX, new URI(OslcConstants.OSLC_CORE_NAMESPACE)), + new PrefixDefinition(OslcConstants.OSLC_DATA_NAMESPACE_PREFIX, new URI(OslcConstants.OSLC_DATA_NAMESPACE)), + new PrefixDefinition(OslcConstants.RDF_NAMESPACE_PREFIX, new URI(OslcConstants.RDF_NAMESPACE)), + new PrefixDefinition(OslcConstants.RDFS_NAMESPACE_PREFIX, new URI(OslcConstants.RDFS_NAMESPACE)), + new PrefixDefinition(Oslc_cmDomainConstants.CHANGE_MANAGEMENT_SHAPES_NAMSPACE_PREFIX, new URI(Oslc_cmDomainConstants.CHANGE_MANAGEMENT_SHAPES_NAMSPACE)), + new PrefixDefinition(Oslc_configDomainConstants.CONFIGURATION_MANAGEMENT_NAMSPACE_PREFIX, new URI(Oslc_configDomainConstants.CONFIGURATION_MANAGEMENT_NAMSPACE)), + new PrefixDefinition(DctermsDomainConstants.DUBLIN_CORE_NAMSPACE_PREFIX, new URI(DctermsDomainConstants.DUBLIN_CORE_NAMSPACE)), + new PrefixDefinition(FoafDomainConstants.FOAF_NAMSPACE_PREFIX, new URI(FoafDomainConstants.FOAF_NAMSPACE)), + new PrefixDefinition(OslcDomainConstants.OSLC_NAMSPACE_PREFIX, new URI(OslcDomainConstants.OSLC_NAMSPACE)), + new PrefixDefinition(RdfsDomainConstants.RDFS_NAMSPACE_PREFIX, new URI(RdfsDomainConstants.RDFS_NAMSPACE)), + new PrefixDefinition(Oslc_rmDomainConstants.REQUIREMENTS_MANAGEMENT_SHAPES_NAMSPACE_PREFIX, new URI(Oslc_rmDomainConstants.REQUIREMENTS_MANAGEMENT_SHAPES_NAMSPACE)) + }; + serviceProvider.setPrefixDefinitions(prefixDefinitions); + + serviceProvider.setAbout(serviceProviderURI); + serviceProvider.setIdentifier(identifier); + serviceProvider.setCreated(new Date()); + serviceProvider.setDetails(new URI[] {serviceProviderURI}); + // Start of user code finalize - // End of user code - return serviceProvider; - } -} + // End of user code + return serviceProvider; + } +} diff --git a/src/server-cm/src/main/webapp/WEB-INF/web.xml b/src/server-cm/src/main/webapp/WEB-INF/web.xml index 41e956b5..1aa1a558 100644 --- a/src/server-cm/src/main/webapp/WEB-INF/web.xml +++ b/src/server-cm/src/main/webapp/WEB-INF/web.xml @@ -1,8 +1,8 @@ - + CM Base URI for the adaptor. diff --git a/src/server-qm/Dockerfile b/src/server-qm/Dockerfile index eae77886..e7f0fb07 100644 --- a/src/server-qm/Dockerfile +++ b/src/server-qm/Dockerfile @@ -32,6 +32,6 @@ LABEL org.opencontainers.image.licenses="EPL-2.0" COPY --from=build /src/server-qm/target/*.war /var/lib/jetty/webapps/ROOT.war -RUN java -jar "$JETTY_HOME/start.jar" --add-modules=ee9-deploy,ee9-jsp,ee9-jstl +RUN java -jar "$JETTY_HOME/start.jar" --add-modules=ee10-deploy,ee10-jsp,ee10-jstl EXPOSE 8080 diff --git a/src/server-qm/pom.xml b/src/server-qm/pom.xml index bd68fe9d..d19bf48f 100644 --- a/src/server-qm/pom.xml +++ b/src/server-qm/pom.xml @@ -285,14 +285,15 @@ ${application.filename} - + + + org.apache.maven.plugins maven-enforcer-plugin - org.apache.maven.plugins maven-compiler-plugin @@ -304,9 +305,9 @@ - org.eclipse.jetty - jetty-maven-plugin - 11.0.20 + org.eclipse.jetty.ee10 + jetty-ee10-maven-plugin + 12.0.16 ${application.contextpath} @@ -395,7 +396,7 @@ - diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/RestDelegate.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/RestDelegate.java index 142de2f8..77e491ac 100644 --- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/RestDelegate.java +++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/RestDelegate.java @@ -20,50 +20,50 @@ * * This file is generated by org.eclipse.lyo.oslc4j.codegenerator *******************************************************************************/ -// End of user code - -package co.oslc.refimpl.qm.gen; - - -// spotless:off -import jakarta.inject.Inject; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.ServletContextEvent; -import java.util.List; -import java.util.ArrayList; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import org.eclipse.lyo.oslc4j.core.model.ServiceProvider; -import org.eclipse.lyo.oslc4j.core.OSLC4JUtils; -import org.eclipse.lyo.oslc4j.core.model.AbstractResource; -import co.oslc.refimpl.qm.gen.servlet.ServiceProviderCatalogSingleton; -import co.oslc.refimpl.qm.gen.ServiceProviderInfo; -import org.eclipse.lyo.oslc.domains.Agent; -import org.eclipse.lyo.oslc.domains.cm.ChangeRequest; -import org.eclipse.lyo.oslc.domains.config.ChangeSet; -import org.eclipse.lyo.oslc.domains.RdfsClass; -import org.eclipse.lyo.oslc.domains.config.Component; -import org.eclipse.lyo.oslc.domains.config.ConceptResource; -import org.eclipse.lyo.oslc.domains.config.Configuration; -import org.eclipse.lyo.oslc.domains.config.Contribution; -import org.eclipse.lyo.oslc.domains.cm.Defect; -import org.eclipse.lyo.oslc4j.core.model.Discussion; -import org.eclipse.lyo.oslc.domains.Person; -import org.eclipse.lyo.oslc.domains.cm.Priority; -import org.eclipse.lyo.oslc.domains.rm.Requirement; -import org.eclipse.lyo.oslc.domains.rm.RequirementCollection; -import org.eclipse.lyo.oslc.domains.config.Selections; -import org.eclipse.lyo.oslc.domains.cm.State; -import org.eclipse.lyo.oslc.domains.qm.TestCase; -import org.eclipse.lyo.oslc.domains.qm.TestExecutionRecord; -import org.eclipse.lyo.oslc.domains.qm.TestPlan; -import org.eclipse.lyo.oslc.domains.qm.TestResult; -import org.eclipse.lyo.oslc.domains.qm.TestScript; -import org.eclipse.lyo.oslc.domains.config.VersionResource; - - - +// End of user code + +package co.oslc.refimpl.qm.gen; + + +// spotless:off +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletContextEvent; +import java.util.List; +import java.util.ArrayList; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.eclipse.lyo.oslc4j.core.model.ServiceProvider; +import org.eclipse.lyo.oslc4j.core.OSLC4JUtils; +import org.eclipse.lyo.oslc4j.core.model.AbstractResource; +import co.oslc.refimpl.qm.gen.servlet.ServiceProviderCatalogSingleton; +import co.oslc.refimpl.qm.gen.ServiceProviderInfo; +import org.eclipse.lyo.oslc.domains.Agent; +import org.eclipse.lyo.oslc.domains.cm.ChangeRequest; +import org.eclipse.lyo.oslc.domains.config.ChangeSet; +import org.eclipse.lyo.oslc.domains.RdfsClass; +import org.eclipse.lyo.oslc.domains.config.Component; +import org.eclipse.lyo.oslc.domains.config.ConceptResource; +import org.eclipse.lyo.oslc.domains.config.Configuration; +import org.eclipse.lyo.oslc.domains.config.Contribution; +import org.eclipse.lyo.oslc.domains.cm.Defect; +import org.eclipse.lyo.oslc4j.core.model.Discussion; +import org.eclipse.lyo.oslc.domains.Person; +import org.eclipse.lyo.oslc.domains.cm.Priority; +import org.eclipse.lyo.oslc.domains.rm.Requirement; +import org.eclipse.lyo.oslc.domains.rm.RequirementCollection; +import org.eclipse.lyo.oslc.domains.config.Selections; +import org.eclipse.lyo.oslc.domains.cm.State; +import org.eclipse.lyo.oslc.domains.qm.TestCase; +import org.eclipse.lyo.oslc.domains.qm.TestExecutionRecord; +import org.eclipse.lyo.oslc.domains.qm.TestPlan; +import org.eclipse.lyo.oslc.domains.qm.TestResult; +import org.eclipse.lyo.oslc.domains.qm.TestScript; +import org.eclipse.lyo.oslc.domains.config.VersionResource; + + + // Start of user code imports import java.net.URI; import java.util.Date; @@ -74,19 +74,19 @@ import co.oslc.refimpl.lib.MemResourceRepository; import co.oslc.refimpl.lib.ResourceRepository; -// End of user code -// spotless:on - +// End of user code +// spotless:on + // Start of user code pre_class_code -// End of user code - -public class RestDelegate { - - private static final Logger log = LoggerFactory.getLogger(RestDelegate.class); - - - - @Inject ResourcesFactory resourcesFactory; +// End of user code + +public class RestDelegate { + + private static final Logger log = LoggerFactory.getLogger(RestDelegate.class); + + + + @Inject ResourcesFactory resourcesFactory; // Start of user code class_attributes public static final String SP_DEFAULT = "sp_single"; public static final int SELECTOR_LIMIT = 30; @@ -96,58 +96,58 @@ public class RestDelegate { private static final ResourceRepository testPlanRepository = new MemResourceRepository<>(); private static final ResourceRepository testResultRepository = new MemResourceRepository<>(); private static final ResourceRepository testScriptRepository = new MemResourceRepository<>(); - // End of user code - - public RestDelegate() { - log.trace("Delegate is initialized"); - } - - + // End of user code + + public RestDelegate() { + log.trace("Delegate is initialized"); + } + + // Start of user code class_methods - // End of user code - - //The methods contextInitializeServletListener() and contextDestroyServletListener() no longer exits - //Migrate any user-specific code blocks to the class co.oslc.refimpl.qm.gen.servlet.ServletListener - //Any user-specific code should be found in *.lost files. - - public static ServiceProviderInfo[] getServiceProviderInfos(HttpServletRequest httpServletRequest) - { - ServiceProviderInfo[] serviceProviderInfos = {}; - + // End of user code + + //The methods contextInitializeServletListener() and contextDestroyServletListener() no longer exits + //Migrate any user-specific code blocks to the class co.oslc.refimpl.qm.gen.servlet.ServletListener + //Any user-specific code should be found in *.lost files. + + public static ServiceProviderInfo[] getServiceProviderInfos(HttpServletRequest httpServletRequest) + { + ServiceProviderInfo[] serviceProviderInfos = {}; + // Start of user code "ServiceProviderInfo[] getServiceProviderInfos(...)" ServiceProviderInfo providerInfo = new ServiceProviderInfo(); providerInfo.name = SP_DEFAULT; providerInfo.serviceProviderId = "Default SP"; serviceProviderInfos = new ServiceProviderInfo[] {providerInfo}; - // End of user code - return serviceProviderInfos; - } - - public List queryTestCases(HttpServletRequest httpServletRequest, String where, String prefix, boolean paging, int page, int limit) - { - List resources = null; - - + // End of user code + return serviceProviderInfos; + } + + public List queryTestCases(HttpServletRequest httpServletRequest, String where, String prefix, boolean paging, int page, int limit) + { + List resources = null; + + // Start of user code queryTestCases resources = testCaseRepository.fetchResourcePageForSP(SP_DEFAULT, page, limit); - // End of user code - return resources; - } - public List TestCaseSelector(HttpServletRequest httpServletRequest, String terms) - { - List resources = null; - - + // End of user code + return resources; + } + public List TestCaseSelector(HttpServletRequest httpServletRequest, String terms) + { + List resources = null; + + // Start of user code TestCaseSelector resources = testCaseRepository.findResources(SP_DEFAULT, terms, SELECTOR_LIMIT); - // End of user code - return resources; - } - public TestCase createTestCase(HttpServletRequest httpServletRequest, final TestCase aResource) - { - TestCase newResource = null; - - + // End of user code + return resources; + } + public TestCase createTestCase(HttpServletRequest httpServletRequest, final TestCase aResource) + { + TestCase newResource = null; + + // Start of user code createTestCase String id = aResource.getIdentifier(); if(id == null) { @@ -159,37 +159,37 @@ public TestCase createTestCase(HttpServletRequest httpServletRequest, final Test aResource.setCreated(new Date()); testCaseRepository.addResource(SP_DEFAULT, id, aResource); newResource = aResource; - // End of user code - return newResource; - } - - - - public List queryTestPlans(HttpServletRequest httpServletRequest, String where, String prefix, boolean paging, int page, int limit) - { - List resources = null; - - + // End of user code + return newResource; + } + + + + public List queryTestPlans(HttpServletRequest httpServletRequest, String where, String prefix, boolean paging, int page, int limit) + { + List resources = null; + + // Start of user code queryTestPlans resources = testPlanRepository.fetchResourcePageForSP(SP_DEFAULT, page, limit); - // End of user code - return resources; - } - public List TestPlanSelector(HttpServletRequest httpServletRequest, String terms) - { - List resources = null; - - + // End of user code + return resources; + } + public List TestPlanSelector(HttpServletRequest httpServletRequest, String terms) + { + List resources = null; + + // Start of user code TestPlanSelector resources = testPlanRepository.findResources(SP_DEFAULT, terms, SELECTOR_LIMIT); - // End of user code - return resources; - } - public TestPlan createTestPlan(HttpServletRequest httpServletRequest, final TestPlan aResource) - { - TestPlan newResource = null; - - + // End of user code + return resources; + } + public TestPlan createTestPlan(HttpServletRequest httpServletRequest, final TestPlan aResource) + { + TestPlan newResource = null; + + // Start of user code createTestPlan String id = aResource.getIdentifier(); if(id == null) { @@ -201,37 +201,37 @@ public TestPlan createTestPlan(HttpServletRequest httpServletRequest, final Test aResource.setCreated(new Date()); testPlanRepository.addResource(SP_DEFAULT, id, aResource); newResource = aResource; - // End of user code - return newResource; - } - - - - public List queryTestScripts(HttpServletRequest httpServletRequest, String where, String prefix, boolean paging, int page, int limit) - { - List resources = null; - - + // End of user code + return newResource; + } + + + + public List queryTestScripts(HttpServletRequest httpServletRequest, String where, String prefix, boolean paging, int page, int limit) + { + List resources = null; + + // Start of user code queryTestScripts resources = testScriptRepository.fetchResourcePageForSP(SP_DEFAULT, page, limit); - // End of user code - return resources; - } - public List TestScriptSelector(HttpServletRequest httpServletRequest, String terms) - { - List resources = null; - - + // End of user code + return resources; + } + public List TestScriptSelector(HttpServletRequest httpServletRequest, String terms) + { + List resources = null; + + // Start of user code TestScriptSelector resources = testScriptRepository.findResources(SP_DEFAULT, terms, SELECTOR_LIMIT); - // End of user code - return resources; - } - public TestScript createTestScript(HttpServletRequest httpServletRequest, final TestScript aResource) - { - TestScript newResource = null; - - + // End of user code + return resources; + } + public TestScript createTestScript(HttpServletRequest httpServletRequest, final TestScript aResource) + { + TestScript newResource = null; + + // Start of user code createTestScript String id = aResource.getIdentifier(); if(id == null) { @@ -243,37 +243,37 @@ public TestScript createTestScript(HttpServletRequest httpServletRequest, final aResource.setCreated(new Date()); testScriptRepository.addResource(SP_DEFAULT, id, aResource); newResource = aResource; - // End of user code - return newResource; - } - - - - public List queryTestResults(HttpServletRequest httpServletRequest, String where, String prefix, boolean paging, int page, int limit) - { - List resources = null; - - + // End of user code + return newResource; + } + + + + public List queryTestResults(HttpServletRequest httpServletRequest, String where, String prefix, boolean paging, int page, int limit) + { + List resources = null; + + // Start of user code queryTestResults resources = testResultRepository.fetchResourcePageForSP(SP_DEFAULT, page, limit); - // End of user code - return resources; - } - public List TestResultSelector(HttpServletRequest httpServletRequest, String terms) - { - List resources = null; - - + // End of user code + return resources; + } + public List TestResultSelector(HttpServletRequest httpServletRequest, String terms) + { + List resources = null; + + // Start of user code TestResultSelector resources = testResultRepository.findResources(SP_DEFAULT, terms, SELECTOR_LIMIT); - // End of user code - return resources; - } - public TestResult createTestResult(HttpServletRequest httpServletRequest, final TestResult aResource) - { - TestResult newResource = null; - - + // End of user code + return resources; + } + public TestResult createTestResult(HttpServletRequest httpServletRequest, final TestResult aResource) + { + TestResult newResource = null; + + // Start of user code createTestResult String id = aResource.getIdentifier(); if(id == null) { @@ -285,37 +285,37 @@ public TestResult createTestResult(HttpServletRequest httpServletRequest, final aResource.setCreated(new Date()); testResultRepository.addResource(SP_DEFAULT, id, aResource); newResource = aResource; - // End of user code - return newResource; - } - - - - public List queryTestExecutionRecords(HttpServletRequest httpServletRequest, String where, String prefix, boolean paging, int page, int limit) - { - List resources = null; - - + // End of user code + return newResource; + } + + + + public List queryTestExecutionRecords(HttpServletRequest httpServletRequest, String where, String prefix, boolean paging, int page, int limit) + { + List resources = null; + + // Start of user code queryTestExecutionRecords resources = testExecutionRecordRepository.fetchResourcePageForSP(SP_DEFAULT, page, limit); - // End of user code - return resources; - } - public List TestExecutionRecordSelector(HttpServletRequest httpServletRequest, String terms) - { - List resources = null; - - + // End of user code + return resources; + } + public List TestExecutionRecordSelector(HttpServletRequest httpServletRequest, String terms) + { + List resources = null; + + // Start of user code TestExecutionRecordSelector resources = testExecutionRecordRepository.findResources(SP_DEFAULT, terms, SELECTOR_LIMIT); - // End of user code - return resources; - } - public TestExecutionRecord createTestExecutionRecord(HttpServletRequest httpServletRequest, final TestExecutionRecord aResource) - { - TestExecutionRecord newResource = null; - - + // End of user code + return resources; + } + public TestExecutionRecord createTestExecutionRecord(HttpServletRequest httpServletRequest, final TestExecutionRecord aResource) + { + TestExecutionRecord newResource = null; + + // Start of user code createTestExecutionRecord String id = aResource.getIdentifier(); if(id == null) { @@ -327,40 +327,40 @@ public TestExecutionRecord createTestExecutionRecord(HttpServletRequest httpServ aResource.setCreated(new Date()); testExecutionRecordRepository.addResource(SP_DEFAULT, id, aResource); newResource = aResource; - // End of user code - return newResource; - } - - - - - public TestCase getTestCase(HttpServletRequest httpServletRequest, final String spSlug, final String id) - { - TestCase aResource = null; - - + // End of user code + return newResource; + } + + + + + public TestCase getTestCase(HttpServletRequest httpServletRequest, final String spSlug, final String id) + { + TestCase aResource = null; + + // Start of user code getTestCase if(testCaseRepository.hasResource(spSlug, id)) { aResource = testCaseRepository.getResource(spSlug, id); } - // End of user code - return aResource; - } - - public Boolean deleteTestCase(HttpServletRequest httpServletRequest, final String spSlug, final String id) - { - Boolean deleted = false; - + // End of user code + return aResource; + } + + public Boolean deleteTestCase(HttpServletRequest httpServletRequest, final String spSlug, final String id) + { + Boolean deleted = false; + // Start of user code deleteTestCase testCaseRepository.deleteResource(spSlug, id); deleted = true; - // End of user code - return deleted; - } - - public TestCase updateTestCase(HttpServletRequest httpServletRequest, final TestCase aResource, final String spSlug, final String id) { - TestCase updatedResource = null; - + // End of user code + return deleted; + } + + public TestCase updateTestCase(HttpServletRequest httpServletRequest, final TestCase aResource, final String spSlug, final String id) { + TestCase updatedResource = null; + // Start of user code updateTestCase if(!resourcesFactory.constructURIForTestCase(spSlug, id).equals(aResource.getAbout())) { throw new WebApplicationException("Subject URI shall match the endpoint", Response.Status.BAD_REQUEST); @@ -368,36 +368,36 @@ public TestCase updateTestCase(HttpServletRequest httpServletRequest, final Test aResource.setModified(new Date()); testCaseRepository.updateResource(SP_DEFAULT, id, aResource); updatedResource = aResource; - // End of user code - return updatedResource; - } - public TestPlan getTestPlan(HttpServletRequest httpServletRequest, final String spSlug, final String id) - { - TestPlan aResource = null; - - + // End of user code + return updatedResource; + } + public TestPlan getTestPlan(HttpServletRequest httpServletRequest, final String spSlug, final String id) + { + TestPlan aResource = null; + + // Start of user code getTestPlan if(testPlanRepository.hasResource(spSlug, id)) { aResource = testPlanRepository.getResource(spSlug, id); } - // End of user code - return aResource; - } - - public Boolean deleteTestPlan(HttpServletRequest httpServletRequest, final String spSlug, final String id) - { - Boolean deleted = false; - + // End of user code + return aResource; + } + + public Boolean deleteTestPlan(HttpServletRequest httpServletRequest, final String spSlug, final String id) + { + Boolean deleted = false; + // Start of user code deleteTestPlan testPlanRepository.deleteResource(spSlug, id); deleted = true; - // End of user code - return deleted; - } - - public TestPlan updateTestPlan(HttpServletRequest httpServletRequest, final TestPlan aResource, final String spSlug, final String id) { - TestPlan updatedResource = null; - + // End of user code + return deleted; + } + + public TestPlan updateTestPlan(HttpServletRequest httpServletRequest, final TestPlan aResource, final String spSlug, final String id) { + TestPlan updatedResource = null; + // Start of user code updateTestPlan if(!resourcesFactory.constructURIForTestPlan(spSlug, id).equals(aResource.getAbout())) { throw new WebApplicationException("Subject URI shall match the endpoint", Response.Status.BAD_REQUEST); @@ -405,36 +405,36 @@ public TestPlan updateTestPlan(HttpServletRequest httpServletRequest, final Test aResource.setModified(new Date()); testPlanRepository.updateResource(spSlug, id, aResource); updatedResource = aResource; - // End of user code - return updatedResource; - } - public TestScript getTestScript(HttpServletRequest httpServletRequest, final String spSlug, final String id) - { - TestScript aResource = null; - - + // End of user code + return updatedResource; + } + public TestScript getTestScript(HttpServletRequest httpServletRequest, final String spSlug, final String id) + { + TestScript aResource = null; + + // Start of user code getTestScript if(testScriptRepository.hasResource(spSlug, id)) { aResource = testScriptRepository.getResource(spSlug, id); } - // End of user code - return aResource; - } - - public Boolean deleteTestScript(HttpServletRequest httpServletRequest, final String spSlug, final String id) - { - Boolean deleted = false; - + // End of user code + return aResource; + } + + public Boolean deleteTestScript(HttpServletRequest httpServletRequest, final String spSlug, final String id) + { + Boolean deleted = false; + // Start of user code deleteTestScript testScriptRepository.deleteResource(spSlug, id); deleted = true; - // End of user code - return deleted; - } - - public TestScript updateTestScript(HttpServletRequest httpServletRequest, final TestScript aResource, final String spSlug, final String id) { - TestScript updatedResource = null; - + // End of user code + return deleted; + } + + public TestScript updateTestScript(HttpServletRequest httpServletRequest, final TestScript aResource, final String spSlug, final String id) { + TestScript updatedResource = null; + // Start of user code updateTestScript if(!resourcesFactory.constructURIForTestScript(spSlug, id).equals(aResource.getAbout())) { throw new WebApplicationException("Subject URI shall match the endpoint", Response.Status.BAD_REQUEST); @@ -442,36 +442,36 @@ public TestScript updateTestScript(HttpServletRequest httpServletRequest, final aResource.setModified(new Date()); testScriptRepository.updateResource(SP_DEFAULT, id, aResource); updatedResource = aResource; - // End of user code - return updatedResource; - } - public TestResult getTestResult(HttpServletRequest httpServletRequest, final String spSlug, final String id) - { - TestResult aResource = null; - - + // End of user code + return updatedResource; + } + public TestResult getTestResult(HttpServletRequest httpServletRequest, final String spSlug, final String id) + { + TestResult aResource = null; + + // Start of user code getTestResult if(testResultRepository.hasResource(spSlug, id)) { aResource = testResultRepository.getResource(spSlug, id); } - // End of user code - return aResource; - } - - public Boolean deleteTestResult(HttpServletRequest httpServletRequest, final String spSlug, final String id) - { - Boolean deleted = false; - + // End of user code + return aResource; + } + + public Boolean deleteTestResult(HttpServletRequest httpServletRequest, final String spSlug, final String id) + { + Boolean deleted = false; + // Start of user code deleteTestResult testResultRepository.deleteResource(spSlug, id); deleted = true; - // End of user code - return deleted; - } - - public TestResult updateTestResult(HttpServletRequest httpServletRequest, final TestResult aResource, final String spSlug, final String id) { - TestResult updatedResource = null; - + // End of user code + return deleted; + } + + public TestResult updateTestResult(HttpServletRequest httpServletRequest, final TestResult aResource, final String spSlug, final String id) { + TestResult updatedResource = null; + // Start of user code updateTestResult if(!resourcesFactory.constructURIForTestResult(spSlug, id).equals(aResource.getAbout())) { throw new WebApplicationException("Subject URI shall match the endpoint", Response.Status.BAD_REQUEST); @@ -479,34 +479,34 @@ public TestResult updateTestResult(HttpServletRequest httpServletRequest, final aResource.setModified(new Date()); testResultRepository.updateResource(SP_DEFAULT, id, aResource); updatedResource = aResource; - // End of user code - return updatedResource; - } - public TestExecutionRecord getTestExecutionRecord(HttpServletRequest httpServletRequest, final String spSlug, final String id) - { - TestExecutionRecord aResource = null; - - + // End of user code + return updatedResource; + } + public TestExecutionRecord getTestExecutionRecord(HttpServletRequest httpServletRequest, final String spSlug, final String id) + { + TestExecutionRecord aResource = null; + + // Start of user code getTestExecutionRecord aResource = testExecutionRecordRepository.getResource(spSlug, id); - // End of user code - return aResource; - } - - public Boolean deleteTestExecutionRecord(HttpServletRequest httpServletRequest, final String spSlug, final String id) - { - Boolean deleted = false; - + // End of user code + return aResource; + } + + public Boolean deleteTestExecutionRecord(HttpServletRequest httpServletRequest, final String spSlug, final String id) + { + Boolean deleted = false; + // Start of user code deleteTestExecutionRecord testExecutionRecordRepository.deleteResource(spSlug, id); deleted = true; - // End of user code - return deleted; - } - - public TestExecutionRecord updateTestExecutionRecord(HttpServletRequest httpServletRequest, final TestExecutionRecord aResource, final String spSlug, final String id) { - TestExecutionRecord updatedResource = null; - + // End of user code + return deleted; + } + + public TestExecutionRecord updateTestExecutionRecord(HttpServletRequest httpServletRequest, final TestExecutionRecord aResource, final String spSlug, final String id) { + TestExecutionRecord updatedResource = null; + // Start of user code updateTestExecutionRecord if(!resourcesFactory.constructURIForTestExecutionRecord(spSlug, id).equals(aResource.getAbout())) { throw new WebApplicationException("Subject URI shall match the endpoint", Response.Status.BAD_REQUEST); @@ -514,49 +514,49 @@ public TestExecutionRecord updateTestExecutionRecord(HttpServletRequest httpServ aResource.setModified(new Date()); testExecutionRecordRepository.updateResource(SP_DEFAULT, id, aResource); updatedResource = aResource; - // End of user code - return updatedResource; - } - - public String getETagFromTestCase(final TestCase aResource) - { - String eTag = null; + // End of user code + return updatedResource; + } + + public String getETagFromTestCase(final TestCase aResource) + { + String eTag = null; // Start of user code getETagFromTestCase eTag = testCaseRepository.calculateETag(aResource); - // End of user code - return eTag; - } - public String getETagFromTestExecutionRecord(final TestExecutionRecord aResource) - { - String eTag = null; + // End of user code + return eTag; + } + public String getETagFromTestExecutionRecord(final TestExecutionRecord aResource) + { + String eTag = null; // Start of user code getETagFromTestExecutionRecord eTag = testExecutionRecordRepository.calculateETag(aResource); - // End of user code - return eTag; - } - public String getETagFromTestPlan(final TestPlan aResource) - { - String eTag = null; + // End of user code + return eTag; + } + public String getETagFromTestPlan(final TestPlan aResource) + { + String eTag = null; // Start of user code getETagFromTestPlan eTag = testPlanRepository.calculateETag(aResource); - // End of user code - return eTag; - } - public String getETagFromTestResult(final TestResult aResource) - { - String eTag = null; + // End of user code + return eTag; + } + public String getETagFromTestResult(final TestResult aResource) + { + String eTag = null; // Start of user code getETagFromTestResult eTag = testResultRepository.calculateETag(aResource); - // End of user code - return eTag; - } - public String getETagFromTestScript(final TestScript aResource) - { - String eTag = null; + // End of user code + return eTag; + } + public String getETagFromTestScript(final TestScript aResource) + { + String eTag = null; // Start of user code getETagFromTestScript eTag = testScriptRepository.calculateETag(aResource); - // End of user code - return eTag; - } - -} + // End of user code + return eTag; + } + +} diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ServiceProvidersFactory.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ServiceProvidersFactory.java index 6906e53c..9d43458b 100644 --- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ServiceProvidersFactory.java +++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ServiceProvidersFactory.java @@ -23,144 +23,136 @@ * * This file is generated by org.eclipse.lyo.oslc4j.codegenerator *******************************************************************************/ -// End of user code - -package co.oslc.refimpl.qm.gen.servlet; - -// spotless:off -import java.net.URI; -import java.net.URISyntaxException; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - -import jakarta.ws.rs.core.UriBuilder; - -import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException; -import org.eclipse.lyo.oslc4j.core.model.OslcConstants; -import org.eclipse.lyo.oslc4j.core.model.PrefixDefinition; -import org.eclipse.lyo.oslc4j.core.model.Publisher; -import org.eclipse.lyo.oslc4j.core.model.ServiceProvider; -import org.eclipse.lyo.oslc4j.core.model.ServiceProviderFactory; -import org.eclipse.lyo.oslc4j.core.OSLC4JUtils; - -import co.oslc.refimpl.qm.gen.ServiceProviderInfo; - -import org.eclipse.lyo.oslc.domains.cm.Oslc_cmDomainConstants; -import org.eclipse.lyo.oslc.domains.config.Oslc_configDomainConstants; -import org.eclipse.lyo.oslc.domains.DctermsDomainConstants; -import org.eclipse.lyo.oslc.domains.FoafDomainConstants; -import org.eclipse.lyo.oslc4j.core.model.OslcDomainConstants; -import org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants; -import org.eclipse.lyo.oslc.domains.RdfDomainConstants; -import org.eclipse.lyo.oslc.domains.RdfsDomainConstants; -import org.eclipse.lyo.oslc.domains.rm.Oslc_rmDomainConstants; -import co.oslc.refimpl.qm.gen.services.CasesService; -import co.oslc.refimpl.qm.gen.services.PlansService; -import co.oslc.refimpl.qm.gen.services.ScriptsService; -import co.oslc.refimpl.qm.gen.services.ResultsService; -import co.oslc.refimpl.qm.gen.services.Execution_recordsService; - +// End of user code + +package co.oslc.refimpl.qm.gen.servlet; + +// spotless:off +import java.net.URI; +import java.net.URISyntaxException; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +import jakarta.ws.rs.core.UriBuilder; + +import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException; +import org.eclipse.lyo.oslc4j.core.model.OslcConstants; +import org.eclipse.lyo.oslc4j.core.model.PrefixDefinition; +import org.eclipse.lyo.oslc4j.core.model.Publisher; +import org.eclipse.lyo.oslc4j.core.model.ServiceProvider; +import org.eclipse.lyo.oslc4j.core.model.ServiceProviderFactory; +import org.eclipse.lyo.oslc4j.core.OSLC4JUtils; + +import co.oslc.refimpl.qm.gen.ServiceProviderInfo; + +import org.eclipse.lyo.oslc.domains.cm.Oslc_cmDomainConstants; +import org.eclipse.lyo.oslc.domains.config.Oslc_configDomainConstants; +import org.eclipse.lyo.oslc.domains.DctermsDomainConstants; +import org.eclipse.lyo.oslc.domains.FoafDomainConstants; +import org.eclipse.lyo.oslc4j.core.model.OslcDomainConstants; +import org.eclipse.lyo.oslc.domains.qm.Oslc_qmDomainConstants; +import org.eclipse.lyo.oslc.domains.RdfDomainConstants; +import org.eclipse.lyo.oslc.domains.RdfsDomainConstants; +import org.eclipse.lyo.oslc.domains.rm.Oslc_rmDomainConstants; +import co.oslc.refimpl.qm.gen.services.CasesService; +import co.oslc.refimpl.qm.gen.services.PlansService; +import co.oslc.refimpl.qm.gen.services.ScriptsService; +import co.oslc.refimpl.qm.gen.services.ResultsService; +import co.oslc.refimpl.qm.gen.services.Execution_recordsService; + // Start of user code imports -// End of user code -// spotless:on - -public class ServiceProvidersFactory -{ - private static Class[] RESOURCE_CLASSES = - { - CasesService.class, PlansService.class, ScriptsService.class, ResultsService.class, Execution_recordsService.class - }; - - private ServiceProvidersFactory() - { - super(); - } - - public static URI constructURI(final String serviceProviderId) - { - String basePath = OSLC4JUtils.getServletURI(); - Map pathParameters = new HashMap(); - pathParameters.put("serviceProviderId", serviceProviderId); - String instanceURI = "serviceProviders/{serviceProviderId}"; - - final UriBuilder builder = UriBuilder.fromUri(basePath); - return builder.path(instanceURI).buildFromMap(pathParameters); - } - - public static URI constructURI(final ServiceProviderInfo serviceProviderInfo) - { - return constructURI(serviceProviderInfo.serviceProviderId); - } - - public static String constructIdentifier(final String serviceProviderId) - { - return serviceProviderId; - } - - public static String constructIdentifier(final ServiceProviderInfo serviceProviderInfo) - { - return constructIdentifier(serviceProviderInfo.serviceProviderId); - } - - public static ServiceProvider createServiceProvider(final ServiceProviderInfo serviceProviderInfo) - throws OslcCoreApplicationException, URISyntaxException, IllegalArgumentException { +// End of user code +// spotless:on + +public class ServiceProvidersFactory +{ + private static Class[] RESOURCE_CLASSES = + { + CasesService.class, PlansService.class, ScriptsService.class, ResultsService.class, Execution_recordsService.class + }; + + private ServiceProvidersFactory() + { + super(); + } + + public static URI constructURI(final String serviceProviderId) + { + String basePath = OSLC4JUtils.getServletURI(); + Map pathParameters = new HashMap(); + pathParameters.put("serviceProviderId", serviceProviderId); + String instanceURI = "serviceProviders/{serviceProviderId}"; + + final UriBuilder builder = UriBuilder.fromUri(basePath); + return builder.path(instanceURI).buildFromMap(pathParameters); + } + + public static URI constructURI(final ServiceProviderInfo serviceProviderInfo) + { + return constructURI(serviceProviderInfo.serviceProviderId); + } + + public static String constructIdentifier(final String serviceProviderId) + { + return serviceProviderId; + } + + public static String constructIdentifier(final ServiceProviderInfo serviceProviderInfo) + { + return constructIdentifier(serviceProviderInfo.serviceProviderId); + } + + public static ServiceProvider createServiceProvider(final ServiceProviderInfo serviceProviderInfo) + throws OslcCoreApplicationException, URISyntaxException, IllegalArgumentException { // Start of user code init - // End of user code - URI serviceProviderURI = constructURI(serviceProviderInfo); - String identifier = constructIdentifier(serviceProviderInfo); - String basePath = OSLC4JUtils.getServletURI(); - String title = serviceProviderInfo.name; - String description = String.format("%s (id: %s; kind: %s)", - "Quality Management Spec Service Provider", - identifier, - "QM Service Provider"); - Publisher publisher = null; - Map parameterMap = new HashMap(); - parameterMap.put("serviceProviderId", serviceProviderInfo.serviceProviderId); - - ServiceProvider serviceProvider = ServiceProviderFactory.createServiceProvider(basePath, - "", - title, - description, - publisher, - RESOURCE_CLASSES, - parameterMap); - - final PrefixDefinition[] prefixDefinitions = - { - new PrefixDefinition(OslcConstants.DCTERMS_NAMESPACE_PREFIX, new URI(OslcConstants.DCTERMS_NAMESPACE)), - new PrefixDefinition(OslcConstants.OSLC_CORE_NAMESPACE_PREFIX, new URI(OslcConstants.OSLC_CORE_NAMESPACE)), - new PrefixDefinition(OslcConstants.OSLC_DATA_NAMESPACE_PREFIX, new URI(OslcConstants.OSLC_DATA_NAMESPACE)), - new PrefixDefinition(OslcConstants.RDF_NAMESPACE_PREFIX, new URI(OslcConstants.RDF_NAMESPACE)), - new PrefixDefinition(OslcConstants.RDFS_NAMESPACE_PREFIX, new URI(OslcConstants.RDFS_NAMESPACE)), - new PrefixDefinition(Oslc_cmDomainConstants.CHANGE_MANAGEMENT_SHAPES_NAMSPACE_PREFIX, new URI(Oslc_cmDomainConstants.CHANGE_MANAGEMENT_SHAPES_NAMSPACE)) -, - new PrefixDefinition(Oslc_configDomainConstants.CONFIGURATION_MANAGEMENT_NAMSPACE_PREFIX, new URI(Oslc_configDomainConstants.CONFIGURATION_MANAGEMENT_NAMSPACE)) -, - new PrefixDefinition(DctermsDomainConstants.DUBLIN_CORE_NAMSPACE_PREFIX, new URI(DctermsDomainConstants.DUBLIN_CORE_NAMSPACE)) -, - new PrefixDefinition(FoafDomainConstants.FOAF_NAMSPACE_PREFIX, new URI(FoafDomainConstants.FOAF_NAMSPACE)) -, - new PrefixDefinition(OslcDomainConstants.OSLC_NAMSPACE_PREFIX, new URI(OslcDomainConstants.OSLC_NAMSPACE)) -, - new PrefixDefinition(Oslc_qmDomainConstants.QUALITY_MANAGEMENT_NAMSPACE_PREFIX, new URI(Oslc_qmDomainConstants.QUALITY_MANAGEMENT_NAMSPACE)) -, - new PrefixDefinition(RdfDomainConstants.RDF_NAMSPACE_PREFIX, new URI(RdfDomainConstants.RDF_NAMSPACE)) -, - new PrefixDefinition(RdfsDomainConstants.RDFS_NAMSPACE_PREFIX, new URI(RdfsDomainConstants.RDFS_NAMSPACE)) -, - new PrefixDefinition(Oslc_rmDomainConstants.REQUIREMENTS_MANAGEMENT_SHAPES_NAMSPACE_PREFIX, new URI(Oslc_rmDomainConstants.REQUIREMENTS_MANAGEMENT_SHAPES_NAMSPACE)) - }; - serviceProvider.setPrefixDefinitions(prefixDefinitions); - - serviceProvider.setAbout(serviceProviderURI); - serviceProvider.setIdentifier(identifier); - serviceProvider.setCreated(new Date()); - serviceProvider.setDetails(new URI[] {serviceProviderURI}); - + // End of user code + URI serviceProviderURI = constructURI(serviceProviderInfo); + String identifier = constructIdentifier(serviceProviderInfo); + String basePath = OSLC4JUtils.getServletURI(); + String title = serviceProviderInfo.name; + String description = String.format("%s (id: %s; kind: %s)", + "Quality Management Spec Service Provider", + identifier, + "QM Service Provider"); + Publisher publisher = null; + Map parameterMap = new HashMap(); + parameterMap.put("serviceProviderId", serviceProviderInfo.serviceProviderId); + + ServiceProvider serviceProvider = ServiceProviderFactory.createServiceProvider(basePath, + "", + title, + description, + publisher, + RESOURCE_CLASSES, + parameterMap); + + final PrefixDefinition[] prefixDefinitions = + { + new PrefixDefinition(OslcConstants.DCTERMS_NAMESPACE_PREFIX, new URI(OslcConstants.DCTERMS_NAMESPACE)), + new PrefixDefinition(OslcConstants.OSLC_CORE_NAMESPACE_PREFIX, new URI(OslcConstants.OSLC_CORE_NAMESPACE)), + new PrefixDefinition(OslcConstants.OSLC_DATA_NAMESPACE_PREFIX, new URI(OslcConstants.OSLC_DATA_NAMESPACE)), + new PrefixDefinition(OslcConstants.RDF_NAMESPACE_PREFIX, new URI(OslcConstants.RDF_NAMESPACE)), + new PrefixDefinition(OslcConstants.RDFS_NAMESPACE_PREFIX, new URI(OslcConstants.RDFS_NAMESPACE)), + new PrefixDefinition(Oslc_cmDomainConstants.CHANGE_MANAGEMENT_SHAPES_NAMSPACE_PREFIX, new URI(Oslc_cmDomainConstants.CHANGE_MANAGEMENT_SHAPES_NAMSPACE)), + new PrefixDefinition(Oslc_configDomainConstants.CONFIGURATION_MANAGEMENT_NAMSPACE_PREFIX, new URI(Oslc_configDomainConstants.CONFIGURATION_MANAGEMENT_NAMSPACE)), + new PrefixDefinition(DctermsDomainConstants.DUBLIN_CORE_NAMSPACE_PREFIX, new URI(DctermsDomainConstants.DUBLIN_CORE_NAMSPACE)), + new PrefixDefinition(FoafDomainConstants.FOAF_NAMSPACE_PREFIX, new URI(FoafDomainConstants.FOAF_NAMSPACE)), + new PrefixDefinition(OslcDomainConstants.OSLC_NAMSPACE_PREFIX, new URI(OslcDomainConstants.OSLC_NAMSPACE)), + new PrefixDefinition(Oslc_qmDomainConstants.QUALITY_MANAGEMENT_NAMSPACE_PREFIX, new URI(Oslc_qmDomainConstants.QUALITY_MANAGEMENT_NAMSPACE)), + new PrefixDefinition(RdfDomainConstants.RDF_NAMSPACE_PREFIX, new URI(RdfDomainConstants.RDF_NAMSPACE)), + new PrefixDefinition(RdfsDomainConstants.RDFS_NAMSPACE_PREFIX, new URI(RdfsDomainConstants.RDFS_NAMSPACE)), + new PrefixDefinition(Oslc_rmDomainConstants.REQUIREMENTS_MANAGEMENT_SHAPES_NAMSPACE_PREFIX, new URI(Oslc_rmDomainConstants.REQUIREMENTS_MANAGEMENT_SHAPES_NAMSPACE)) + }; + serviceProvider.setPrefixDefinitions(prefixDefinitions); + + serviceProvider.setAbout(serviceProviderURI); + serviceProvider.setIdentifier(identifier); + serviceProvider.setCreated(new Date()); + serviceProvider.setDetails(new URI[] {serviceProviderURI}); + // Start of user code finalize - // End of user code - return serviceProvider; - } -} + // End of user code + return serviceProvider; + } +} diff --git a/src/server-qm/src/main/webapp/WEB-INF/web.xml b/src/server-qm/src/main/webapp/WEB-INF/web.xml index 1580966e..404531e0 100644 --- a/src/server-qm/src/main/webapp/WEB-INF/web.xml +++ b/src/server-qm/src/main/webapp/WEB-INF/web.xml @@ -1,8 +1,8 @@ - + QM Base URI for the adaptor. diff --git a/src/server-rm/Dockerfile b/src/server-rm/Dockerfile index a2d575fe..7441bc4c 100644 --- a/src/server-rm/Dockerfile +++ b/src/server-rm/Dockerfile @@ -32,6 +32,6 @@ LABEL org.opencontainers.image.licenses="EPL-2.0" COPY --from=build /src/server-rm/target/*.war /var/lib/jetty/webapps/ROOT.war -RUN java -jar "$JETTY_HOME/start.jar" --add-modules=ee9-deploy,ee9-jsp,ee9-jstl +RUN java -jar "$JETTY_HOME/start.jar" --add-modules=ee10-deploy,ee10-jsp,ee10-jstl EXPOSE 8080 diff --git a/src/server-rm/pom.xml b/src/server-rm/pom.xml index e2cedebf..2b5d0c50 100644 --- a/src/server-rm/pom.xml +++ b/src/server-rm/pom.xml @@ -29,6 +29,7 @@ 8800 / server-rm + 9.12.0 @@ -316,7 +317,9 @@ ${application.filename} - + org.apache.maven.plugins @@ -332,12 +335,10 @@ - - org.eclipse.jetty - jetty-maven-plugin - 11.0.20 + org.eclipse.jetty.ee10 + jetty-ee10-maven-plugin + 12.0.16 ${application.contextpath} @@ -426,6 +427,10 @@ + +