Device Software version management

[oam/tr069-adapter.git] / config-data / src / main / java / org / commscope / tr069adapter / config / controllers / ConfugurationDataController.java

diff --git a/config-data/src/main/java/org/commscope/tr069adapter/config/controllers/ConfugurationDataController.java b/config-data/src/main/java/org/commscope/tr069adapter/config/controllers/ConfugurationDataController.java
index e6262e5..44bd394 100644 (file)
--- a/config-data/src/main/java/org/commscope/tr069adapter/config/controllers/ConfugurationDataController.java
+++ b/config-data/src/main/java/org/commscope/tr069adapter/config/controllers/ConfugurationDataController.java
@@ -22,18 +22,15 @@ package org.commscope.tr069adapter.config.controllers;
 import java.util.Arrays;\r
 import java.util.List;\r
 import java.util.Optional;\r
-\r
 import org.commscope.tr069adapter.acs.common.dto.ConfigurationData;\r
 import org.commscope.tr069adapter.config.constants.ConfigurationServiceConstant;\r
 import org.commscope.tr069adapter.config.exceptions.InvalidConfigurationServiceException;\r
-import org.commscope.tr069adapter.config.model.ConfigFileContent;\r
 import org.commscope.tr069adapter.config.service.ConfigurationDataService;\r
 import org.slf4j.Logger;\r
 import org.slf4j.LoggerFactory;\r
 import org.springframework.beans.factory.annotation.Autowired;\r
 import org.springframework.util.StringUtils;\r
 import org.springframework.web.bind.annotation.GetMapping;\r
-import org.springframework.web.bind.annotation.PathVariable;\r
 import org.springframework.web.bind.annotation.PostMapping;\r
 import org.springframework.web.bind.annotation.RequestParam;\r
 import org.springframework.web.bind.annotation.RestController;\r
@@ -51,17 +48,12 @@ public class ConfugurationDataController {
     return "Application is running";\r
   }\r
 \r
-  @GetMapping("/getFileContent/{id}")\r
-  public Optional<ConfigFileContent> viewFileContent(@PathVariable("id") String macId) {\r
-    logger.info("Processing request to view configuration file content for device {}", macId);\r
-    return configDataService.getConfigFileContent(macId);\r
-  }\r
-\r
-  @GetMapping("/getConfig/{id}")\r
-  public ConfigurationData viewConfigurationData(@PathVariable("id") String macId)\r
+  @PostMapping("/getConfig")\r
+  public ConfigurationData viewConfigurationData(@RequestParam String macId,\r
+      @RequestParam String swVersion, @RequestParam String hwVersion)\r
       throws InvalidConfigurationServiceException {\r
     logger.info("Processing request to get configuration data for device {}", macId);\r
-    Optional<ConfigurationData> configData = configDataService.getConfigurationData(macId);\r
+    Optional<ConfigurationData> configData = configDataService.getConfigurationData(macId, swVersion, hwVersion);\r
     if (configData.isPresent()) {\r
       return configData.get();\r
     }\r