From ab934d880405dc6145b33bdb363b34087438ccb7 Mon Sep 17 00:00:00 2001 From: francesco Date: Mon, 9 Mar 2020 13:31:21 +0100 Subject: [PATCH] Remapping the APIs call --- pom.xml | 4 ++-- .../config/DevCorsConfiguration.java | 16 ++++++++++++++++ .../controller/GreetingController.java | 5 ++++- .../controller/GreetingRestController.java | 1 + src/main/resources/application.properties | 3 ++- .../pom.properties | 2 +- .../springboot-angular-app-demo/pom.xml | 4 ++-- target/classes/application.properties | 3 ++- .../controller/GreetingController.class | Bin 1135 -> 1268 bytes .../controller/GreetingRestController.class | Bin 1387 -> 1406 bytes 10 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 src/main/java/org/gcube/app/springbootangulardemo/config/DevCorsConfiguration.java diff --git a/pom.xml b/pom.xml index 0822ab1..2dea42e 100644 --- a/pom.xml +++ b/pom.xml @@ -27,10 +27,10 @@ spring-boot-starter-web - + org.springframework.boot diff --git a/src/main/java/org/gcube/app/springbootangulardemo/config/DevCorsConfiguration.java b/src/main/java/org/gcube/app/springbootangulardemo/config/DevCorsConfiguration.java new file mode 100644 index 0000000..99cebbb --- /dev/null +++ b/src/main/java/org/gcube/app/springbootangulardemo/config/DevCorsConfiguration.java @@ -0,0 +1,16 @@ +package org.gcube.app.springbootangulardemo.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Profile; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +@Profile("development") +public class DevCorsConfiguration implements WebMvcConfigurer { + + @Override + public void addCorsMappings(CorsRegistry registry) { + registry.addMapping("/api/**").allowedMethods("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"); + } +} diff --git a/src/main/java/org/gcube/app/springbootangulardemo/controller/GreetingController.java b/src/main/java/org/gcube/app/springbootangulardemo/controller/GreetingController.java index eae0c09..2ce743c 100644 --- a/src/main/java/org/gcube/app/springbootangulardemo/controller/GreetingController.java +++ b/src/main/java/org/gcube/app/springbootangulardemo/controller/GreetingController.java @@ -3,13 +3,16 @@ package org.gcube.app.springbootangulardemo.controller; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; @Controller +@RequestMapping("/api") +//@ResponseBody public class GreetingController { //This return the templates/greeting.html - @RequestMapping("/greeting") + @RequestMapping(value = "/greeting", method = RequestMethod.GET, produces = {"text/html"}) public String greeting(@RequestParam(name="name", required=false, defaultValue="World") final String name, final Model model) { diff --git a/src/main/java/org/gcube/app/springbootangulardemo/controller/GreetingRestController.java b/src/main/java/org/gcube/app/springbootangulardemo/controller/GreetingRestController.java index acb9778..9996d86 100644 --- a/src/main/java/org/gcube/app/springbootangulardemo/controller/GreetingRestController.java +++ b/src/main/java/org/gcube/app/springbootangulardemo/controller/GreetingRestController.java @@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @RestController +@RequestMapping("/api") public class GreetingRestController { String template = "Hello, %s!"; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 8b13789..be7d8f2 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1 +1,2 @@ - +# application.properties +spring.profiles.active=development diff --git a/target/classes/META-INF/maven/org.gcube.app/springboot-angular-app-demo/pom.properties b/target/classes/META-INF/maven/org.gcube.app/springboot-angular-app-demo/pom.properties index 596726b..1da56fb 100644 --- a/target/classes/META-INF/maven/org.gcube.app/springboot-angular-app-demo/pom.properties +++ b/target/classes/META-INF/maven/org.gcube.app/springboot-angular-app-demo/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven Integration for Eclipse -#Fri Mar 06 15:27:28 CET 2020 +#Mon Mar 09 13:17:17 CET 2020 version=0.0.1-SNAPSHOT groupId=org.gcube.app m2e.projectName=springboot-angular-app-demo-0.0.1-SNAPSHOT diff --git a/target/classes/META-INF/maven/org.gcube.app/springboot-angular-app-demo/pom.xml b/target/classes/META-INF/maven/org.gcube.app/springboot-angular-app-demo/pom.xml index 0822ab1..2dea42e 100644 --- a/target/classes/META-INF/maven/org.gcube.app/springboot-angular-app-demo/pom.xml +++ b/target/classes/META-INF/maven/org.gcube.app/springboot-angular-app-demo/pom.xml @@ -27,10 +27,10 @@ spring-boot-starter-web - + org.springframework.boot diff --git a/target/classes/application.properties b/target/classes/application.properties index 8b13789..be7d8f2 100644 --- a/target/classes/application.properties +++ b/target/classes/application.properties @@ -1 +1,2 @@ - +# application.properties +spring.profiles.active=development diff --git a/target/classes/org/gcube/app/springbootangulardemo/controller/GreetingController.class b/target/classes/org/gcube/app/springbootangulardemo/controller/GreetingController.class index c8e4c9ac1ef8daec0d0ca0ff6fc35f91055b7072..ce953972f3d8db0031a7ff52490f78887de82372 100644 GIT binary patch delta 314 zcmXAjy-or_6ot>7F)lkm0xKxGDvRPT=u#LhtkufUn3!l~WD`sz5N1v6d;^<#3Onr7 z!Uymvd;=S6^$5ki-?`_W$=t8Zw{Jdv-rfQ1q4jJ=Vy1gZ+U<7)2kui^_0#cmD9|TI zXM)UN*zeq3CsyF6$$c7k)84Inkw-twVg+>%tFEnTdJXH&s$Wkq6<-Z*+)(dJ&OPbs zLj*w)8o?#RVg@BLK^e1{8#@)u^O}lcY=N=RBE;eamauG5<;G*RxzJ?38AOd&)HKe6 zjS&q6!){2RM3#}IiY8&?kjF7+BE%*?_*YxlX1qb|E7}Db1sY8n3Om$5K($L2`DAi- F{0G`5Ehhi~ delta 205 zcmWNJJ5s|y5JcbZs*trVD6s}f2y9{V|AZ>8;m}psx6n15ZOj=gLL6`ar$n5BgxJu* zOi#V;>EG;U;CK7&C(!cv?t2q!yUvOsW15sn+}NqRWE#KhU;K72CX0E}td1}oYr+!K zG2%r3l@&O}QFIiPuT-3M)N)eIT!xb#K8N$C4=x;wFzW>@UfWAir6