Merge branch 'develop' into 'master'

Develop

See merge request !3

src/main/java/es/bsc/inb/ades/rest/api/controllers/DocumentController.java

@@ -8,12 +8,14 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import es.bsc.inb.ades.rest.api.model.Document;
 import es.bsc.inb.ades.rest.api.model.DocumentAnnotations;
+import es.bsc.inb.ades.rest.api.security.basic.inmemory.AuthenticationBean;
 import es.bsc.inb.ades.rest.api.services.DocumentService;
 
 
@@ -24,7 +26,7 @@ public class DocumentController {
 	@Autowired
 	public DocumentService documentService;
 	
-	@RequestMapping("/documents/")
+	@RequestMapping("/documents")
     public List<Document> findAll() {
         return documentService.findAll();
     }

src/main/java/es/bsc/inb/ades/rest/api/security/basic/inmemory/SecurityConfig.java

@@ -20,6 +20,6 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
 
 	@Autowired
 	public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-		auth.inMemoryAuthentication().withUser("admin").password("{noop}password").roles("USER");
+		auth.inMemoryAuthentication().withUser("admin").password("{noop}eTRAN2019!").roles("USER");
 	}
 }

src/main/resources/application-prod.properties

 spring.application.name =ades_rest_api
+server.servlet.context-path=/pretoxapi
 #Spring Boot Port
 server.port = ${SERVER_PORT}
 #PRETOX Database

src/main/resources/application.properties

 spring.application.name =ades_rest_api
+server.servlet.context-path=/pretoxapi
 #Spring Boot Port
 #server.port = ${SERVER_PORT}
 server.port = 8090