Extract path to ontologies to constant

Author: linkvt

src/main/java/de/linkvt/bachelor/web/GeneratorController.java

@@ -36,6 +36,9 @@
 @RestController
 public class GeneratorController {
 
+  public static final String ONTOLOGY_PATH_WITHOUT_SLASH = "ontology";
+  public static final String ONTOLOGY_PATH = ONTOLOGY_PATH_WITHOUT_SLASH + "/";
+
   private ApplicationContext applicationContext;
   private FeatureParameterMapping featureMapping;
   private StoredGenerationRepository repository;
@@ -47,23 +50,23 @@ public GeneratorController(ApplicationContext applicationContext, FeatureParamet
     this.repository = repository;
   }
 
-  @RequestMapping("/ontology/")
+  @RequestMapping(ONTOLOGY_PATH)
   public OWLOntology completeOntology(HttpServletResponse response) throws OWLOntologyCreationException {
     return ontologyFromParameters(response, featureMapping.getAll());
   }
 
-  @RequestMapping(value = "/ontology/", params = "features")
+  @RequestMapping(value = ONTOLOGY_PATH, params = "features")
   public OWLOntology ontologyFromParameters(HttpServletResponse response, @RequestParam("features") List<Feature> features) {
     return ontologyFromParametersWithFilename(response, features);
   }
 
-  @RequestMapping(value = "/ontology/{filename}", params = "features", method = RequestMethod.GET)
+  @RequestMapping(value = ONTOLOGY_PATH + "{filename}", params = "features", method = RequestMethod.GET)
   public OWLOntology ontologyFromParametersWithFilename(HttpServletResponse response, @RequestParam("features") List<Feature> features) {
     OntologyGenerator generator = applicationContext.getBean(OntologyGenerator.class);
     RequestInformation information = applicationContext.getBean(RequestInformation.class);
 
     StoredGeneration generation = storeGenerationIfRequired(features);
-    response.addHeader("Short-Path", "/ontology/" + generation.getId() + "/" + generation.getId());
+    response.addHeader("Short-Path", "/" + ONTOLOGY_PATH + generation.getId() + "/" + generation.getId());
 
     information.setGenerationId(generation.getId());
 
@@ -87,12 +90,12 @@ private StoredGeneration storeGenerationIfRequired(List<Feature> features) {
     return generation;
   }
 
-  @RequestMapping("/ontology/{id}/")
+  @RequestMapping(ONTOLOGY_PATH + "{id}/")
   public OWLOntology ontologyFromId(HttpServletResponse response, @PathVariable("id") Long id) {
     return ontologyFromIdWithFilename(response, id);
   }
 
-  @RequestMapping("/ontology/{id}/{filename}")
+  @RequestMapping(ONTOLOGY_PATH + "{id}/{filename}")
   public OWLOntology ontologyFromIdWithFilename(HttpServletResponse response, @PathVariable("id") Long id) {
     StoredGeneration storedGeneration = repository.findOne(id);
     if (storedGeneration == null) {

src/main/java/de/linkvt/bachelor/web/TrailingSlashRedirectController.java

@@ -1,6 +1,6 @@
 package de.linkvt.bachelor.web;
 
-import org.springframework.util.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -16,14 +16,14 @@
 @RestController
 public class TrailingSlashRedirectController {
 
-  @RequestMapping("/ontology")
+  @RequestMapping(GeneratorController.ONTOLOGY_PATH_WITHOUT_SLASH)
   public void ontologyRedirect(HttpServletRequest request, HttpServletResponse response) throws IOException {
-    response.sendRedirect(appendQueryString("/ontology/", request));
+    response.sendRedirect(appendQueryString("/" + GeneratorController.ONTOLOGY_PATH, request));
   }
 
-  @RequestMapping("/ontology/{id}")
+  @RequestMapping(GeneratorController.ONTOLOGY_PATH + "{id}")
   public void ontologyFromIdRedirect(HttpServletRequest request, HttpServletResponse response, @PathVariable("id") Long id) throws IOException {
-    response.sendRedirect(appendQueryString("/ontology/" + id + "/", request));
+    response.sendRedirect(appendQueryString("/" + GeneratorController.ONTOLOGY_PATH + id + "/", request));
   }
 
   private String appendQueryString(String path, HttpServletRequest request) {