Ei- raml migration from 0.8 to 1.0 (#197)

* updating raml to version 1.0


* property name change to springmvc-raml-version

Author: saif-ericsson

pom.xml

@@ -16,7 +16,7 @@
 
     <properties>
         <java.version>1.8</java.version>
-        <plugin-version>0.10.11</plugin-version>
+        <springmvc-raml-version>2.0.4</springmvc-raml-version>
         <output-relative-path>src/main/java</output-relative-path>
         <raml-path>src/main/resources/public/raml/instance_info.raml</raml-path>
         <raml-path>src/main/resources/public/raml/eiffel-intelligence.raml</raml-path>
@@ -285,10 +285,10 @@
             <plugin>
                 <groupId>com.phoenixnap.oss</groupId>
                 <artifactId>springmvc-raml-plugin</artifactId>
-                <version>${plugin-version}</version>
+                <version>${springmvc-raml-version}</version>
                 <configuration>
                     <!-- path to raml file -->
-                    <ramlPath>${raml-path}</ramlPath>
+                    <ramlPath>${raml-path}</ramlPath>                    
                     <!-- output of generated code -->
                     <outputRelativePath>${output-relative-path}</outputRelativePath>
                     <addTimestampFolder>false</addTimestampFolder>
@@ -297,7 +297,8 @@
                     <baseUri>/</baseUri>
                     <seperateMethodsByContentType>false</seperateMethodsByContentType>
                     <useJackson1xCompatibility>false</useJackson1xCompatibility>
-                    <rule>com.phoenixnap.oss.ramlapisync.generation.rules.Spring4ControllerInterfaceRule</rule>
+                    <rule>com.phoenixnap.oss.ramlplugin.raml2code.rules.Spring4ControllerInterfaceRule</rule>
+                    <methodsNamingLogic>RESOURCES</methodsNamingLogic>
                     <generationConfig>
                         <useCommonsLang3>true</useCommonsLang3>
                     </generationConfig>

src/main/java/com/ericsson/ei/controller/AuthController.java

@@ -2,17 +2,19 @@
 package com.ericsson.ei.controller;
 
 import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 
 /**
  * No description
- * (Generated with springmvc-raml-parser v.0.10.11)
+ * (Generated with springmvc-raml-parser v.2.0.4)
  * 
  */
 @RestController
+@Validated
 @RequestMapping(value = "/auth", produces = "application/json")
 public interface AuthController {
 
@@ -29,13 +31,13 @@ public interface AuthController {
      * 
      */
     @RequestMapping(value = "/login", method = RequestMethod.GET)
-    public ResponseEntity<?> getLogin();
+    public ResponseEntity<?> getAuthLogin();
 
     /**
      * This call for checking backend status
      * 
      */
     @RequestMapping(value = "/checkStatus", method = RequestMethod.GET)
-    public ResponseEntity<?> getCheckStatus();
+    public ResponseEntity<?> getAuthCheckStatus();
 
 }

src/main/java/com/ericsson/ei/controller/AuthControllerImpl.java

@@ -16,8 +16,6 @@
 */
 package com.ericsson.ei.controller;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -28,6 +26,9 @@
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.CrossOrigin;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
 /**
  * Endpoints /auth/login and /auth/checkStatus should be secured in case LDAP is enabled
  * Endpoint /auth should be not secured
@@ -37,7 +38,7 @@
 @Api(value = "Auth", description = "REST endpoints for authentication and authorization")
 public class AuthControllerImpl implements AuthController {
 
-    private static final Logger LOGGER = (Logger) LoggerFactory.getLogger(AuthControllerImpl.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(AuthControllerImpl.class);
 
     @Value("${ldap.enabled:false}")
     private boolean ldapEnabled;
@@ -58,7 +59,7 @@ public ResponseEntity<?> getAuth() {
     @Override
     @CrossOrigin
     @ApiOperation(value = "To get login of current user", response = String.class)
-    public ResponseEntity<?> getLogin() {
+    public ResponseEntity<?> getAuthLogin() {
         try {
             String currentUser = SecurityContextHolder.getContext().getAuthentication().getName();
             return new ResponseEntity<>(new JSONObject().put("user", currentUser).toString(), HttpStatus.OK);
@@ -72,7 +73,7 @@ public ResponseEntity<?> getLogin() {
     @Override
     @CrossOrigin
     @ApiOperation(value = "To check backend status", response = String.class)
-    public ResponseEntity<?> getCheckStatus() {
+    public ResponseEntity<?> getAuthCheckStatus() {
         try {
             return new ResponseEntity<>("Backend server is up and running", HttpStatus.OK);
         } catch (Exception e) {

src/main/java/com/ericsson/ei/controller/DownloadController.java

@@ -2,17 +2,19 @@
 package com.ericsson.ei.controller;
 
 import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 
 /**
  * No description
- * (Generated with springmvc-raml-parser v.0.10.11)
+ * (Generated with springmvc-raml-parser v.2.0.4)
  * 
  */
 @RestController
+@Validated
 @RequestMapping(value = "/download", produces = "application/json")
 public interface DownloadController {
 
@@ -29,20 +31,20 @@ public interface DownloadController {
      * 
      */
     @RequestMapping(value = "/subscriptionsTemplate", method = RequestMethod.GET)
-    public ResponseEntity<?> getSubscriptionsTemplate();
+    public ResponseEntity<?> getDownloadSubscriptionsTemplate();
 
     /**
      * This call for getting rules template
      * 
      */
     @RequestMapping(value = "/rulesTemplate", method = RequestMethod.GET)
-    public ResponseEntity<?> getRulesTemplate();
+    public ResponseEntity<?> getDownloadRulesTemplate();
 
     /**
      * This call for getting events template
      * 
      */
     @RequestMapping(value = "/eventsTemplate", method = RequestMethod.GET)
-    public ResponseEntity<?> getEventsTemplate();
+    public ResponseEntity<?> getDownloadEventsTemplate();
 
 }

src/main/java/com/ericsson/ei/controller/DownloadControllerImpl.java

@@ -16,7 +16,9 @@
 */
 package com.ericsson.ei.controller;
 
-import io.swagger.annotations.Api;
+import java.io.IOException;
+import java.io.InputStream;
+
 import org.apache.commons.io.IOUtils;
 import org.json.JSONObject;
 import org.slf4j.Logger;
@@ -26,15 +28,14 @@
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.CrossOrigin;
 
-import java.io.IOException;
-import java.io.InputStream;
+import io.swagger.annotations.Api;
 
 @Component
 @CrossOrigin
 @Api(value = "Get Templates", description = "REST endpoints for getting templates")
 public class DownloadControllerImpl implements DownloadController {
 
-    private static final Logger LOGGER = (Logger) LoggerFactory.getLogger(DownloadControllerImpl.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(DownloadControllerImpl.class);
 
     @Override
     public ResponseEntity<?> getDownload() {
@@ -52,7 +53,7 @@ public ResponseEntity<?> getDownload() {
     }
 
     @Override
-    public ResponseEntity<?> getSubscriptionsTemplate() {
+    public ResponseEntity<?> getDownloadSubscriptionsTemplate() {
         try {
             InputStream is = getClass().getResourceAsStream("/templates/subscriptionsTemplate.json");
             return new ResponseEntity<>(IOUtils.toByteArray(is), HttpStatus.OK);
@@ -67,7 +68,7 @@ public ResponseEntity<?> getSubscriptionsTemplate() {
     }
 
     @Override
-    public ResponseEntity<?> getRulesTemplate() {
+    public ResponseEntity<?> getDownloadRulesTemplate() {
         try {
             InputStream is = getClass().getResourceAsStream("/templates/rulesTemplate.json");
             return new ResponseEntity<>(IOUtils.toByteArray(is), HttpStatus.OK);
@@ -82,7 +83,7 @@ public ResponseEntity<?> getRulesTemplate() {
     }
 
     @Override
-    public ResponseEntity<?> getEventsTemplate() {
+    public ResponseEntity<?> getDownloadEventsTemplate() {
         try {
             InputStream is = getClass().getResourceAsStream("/templates/eventsTemplate.json");
             return new ResponseEntity<>(IOUtils.toByteArray(is), HttpStatus.OK);

src/main/java/com/ericsson/ei/controller/InformationController.java

@@ -2,6 +2,7 @@
 package com.ericsson.ei.controller;
 
 import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -10,10 +11,11 @@
 /**
  * Provides interaction with InstanceInfo resource
  * 
- * (Generated with springmvc-raml-parser v.0.10.11)
+ * (Generated with springmvc-raml-parser v.2.0.4)
  * 
  */
 @RestController
+@Validated
 @RequestMapping(value = "/information", produces = "application/json")
 public interface InformationController {
 

src/main/java/com/ericsson/ei/controller/QueryAggregatedObjectController.java

@@ -3,6 +3,7 @@
 
 import com.ericsson.ei.controller.model.QueryResponse;
 import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -11,10 +12,11 @@
 
 /**
  * No description
- * (Generated with springmvc-raml-parser v.0.10.11)
+ * (Generated with springmvc-raml-parser v.2.0.4)
  * 
  */
 @RestController
+@Validated
 @RequestMapping(value = "/queryAggregatedObject", produces = "application/json")
 public interface QueryAggregatedObjectController {
 

src/main/java/com/ericsson/ei/controller/QueryController.java

@@ -4,6 +4,7 @@
 import javax.validation.Valid;
 import com.ericsson.ei.controller.model.QueryBody;
 import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -12,10 +13,11 @@
 
 /**
  * No description
- * (Generated with springmvc-raml-parser v.0.10.11)
+ * (Generated with springmvc-raml-parser v.2.0.4)
  * 
  */
 @RestController
+@Validated
 @RequestMapping(value = "/query", produces = "application/json")
 public interface QueryController {
 
@@ -25,7 +27,7 @@ public interface QueryController {
      * 
      */
     @RequestMapping(value = "", method = RequestMethod.POST)
-    public ResponseEntity<?> updateQuery(
+    public ResponseEntity<?> createQuery(
         @Valid
         @RequestBody
         QueryBody queryBody);

src/main/java/com/ericsson/ei/controller/QueryControllerImpl.java

@@ -16,10 +16,6 @@
 */
 package com.ericsson.ei.controller;
 
-import com.ericsson.ei.controller.model.QueryBody;
-import com.ericsson.ei.queryservice.ProcessQueryParams;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.slf4j.Logger;
@@ -31,6 +27,12 @@
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import com.ericsson.ei.controller.model.QueryBody;
+import com.ericsson.ei.queryservice.ProcessQueryParams;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
 /**
  * This class represents the REST end-points for the query service. It can take
  * both query parameters and form parameters as criterias.
@@ -40,15 +42,15 @@
 @Api(value = "query", description = "REST endpoints for the freestyle query service")
 public class QueryControllerImpl implements QueryController {
 
-    private static final Logger LOGGER = (Logger) LoggerFactory.getLogger(QueryControllerImpl.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(QueryControllerImpl.class);
 
     @Autowired
     private ProcessQueryParams processQueryParams;
 
     @Override
     @CrossOrigin
     @ApiOperation(value = "")
-    public ResponseEntity<?> updateQuery(@RequestBody final QueryBody body) {
+    public ResponseEntity<?> createQuery(@RequestBody final QueryBody body) {
         try {
             JSONObject criteria = new JSONObject(body.getCriteria().getAdditionalProperties());
             JSONObject options = null;

src/main/java/com/ericsson/ei/controller/QueryMissedNotificationController.java

@@ -3,6 +3,7 @@
 
 import com.ericsson.ei.controller.model.QueryResponse;
 import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -11,10 +12,11 @@
 
 /**
  * No description
- * (Generated with springmvc-raml-parser v.0.10.11)
+ * (Generated with springmvc-raml-parser v.2.0.4)
  * 
  */
 @RestController
+@Validated
 @RequestMapping(value = "/queryMissedNotifications", produces = "application/json")
 public interface QueryMissedNotificationController {