add ticket to changelog file

NASA-AMMOS · Jun 13, 2024 · 7beaf7a · 7beaf7a
1 parent e2f2af1
commit 7beaf7a
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 51 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [X.Y.Z](https://github.com/NASA-AMMOS/<repo_name>/releases/tag/X.Y.Z) - 2023-MM-DD
 
-### Added 
-
-- 
+### Added
+- IDS-10140
+  - Configure Elasticsearch Index name with Prefix setting: `elasticsearch_index_prefix`
 
+### Changed
+### Deprecated
+### Removed
+### Fixed
+### Security
diff --git a/cws-service/src/main/java/jpl/cws/controller/MvcCore.java b/cws-service/src/main/java/jpl/cws/controller/MvcCore.java
@@ -20,54 +20,31 @@
 public class MvcCore {
 	private static final Logger log = LoggerFactory.getLogger(MvcCore.class);
 
-	@Autowired
-	protected CamundaExecutionService cwsExecutionService;
-	@Autowired
-	protected SchedulerQueueUtils cwsSchedulerUtils;
-	@Autowired
-	private CwsConsoleService cwsConsoleService;
-
-	@Value("${cws.console.app.root}")
-	private String appRoot;
-	@Value("${cws.version}")
-	private String version;
-	@Value("${cws.db.type}")
-	private String dbType;
-	@Value("${cws.db.host}")
-	private String dbHost;
-	@Value("${cws.db.name}")
-	private String dbName;
-	@Value("${cws.db.port}")
-	private String dbPort;
-	@Value("${cws.elasticsearch.protocol}")
-	private String esProtocol;
-	@Value("${cws.elasticsearch.hostname}")
-	private String esHost;
-	@Value("${cws.elasticsearch.index.prefix}")
-	private String esIndexPrefix;
-	@Value("${cws.elasticsearch.port}")
-	private String esPort;
-	@Value("${cws.auth.scheme}")
-	private String authScheme;
-	@Value("${cws.install.dir}")
-	private String installDir;
-	@Value("${cws.tomcat.lib}")
-	private String tomcatLib;
-	@Value("${cws.tomcat.bin}")
-	private String tomcatBin;
-	@Value("${cws.tomcat.home}")
-	private String tomcatHome;
-	@Value("${cws.tomcat.webapps}")
-	private String tomcatWebapps;
-	@Value("${cws.project.webapp.root}")
-	private String projectWebappRoot;
-	@Value("${cws.history.days.to.live}")
-	private String historyDaysToLive;
-	@Value("${cws.history.level}")
-	private String historyLevel;
-
-	public MvcCore() {
-	}
+	@Autowired protected CamundaExecutionService cwsExecutionService;
+	@Autowired protected SchedulerQueueUtils cwsSchedulerUtils;
+	@Autowired private CwsConsoleService cwsConsoleService;
+
+	@Value("${cws.console.app.root}") private String appRoot;
+	@Value("${cws.version}") private String version;
+	@Value("${cws.db.type}") private String dbType;
+	@Value("${cws.db.host}") private String dbHost;
+	@Value("${cws.db.name}") private String dbName;
+	@Value("${cws.db.port}") private String dbPort;
+	@Value("${cws.elasticsearch.protocol}") private String esProtocol;
+	@Value("${cws.elasticsearch.hostname}") private String esHost;
+	@Value("${cws.elasticsearch.index.prefix}") private String esIndexPrefix;
+	@Value("${cws.elasticsearch.port}") private String esPort;
+	@Value("${cws.auth.scheme}") private String authScheme;
+	@Value("${cws.install.dir}") private String installDir;
+	@Value("${cws.tomcat.lib}") private String tomcatLib;
+	@Value("${cws.tomcat.bin}") private String tomcatBin;
+	@Value("${cws.tomcat.home}") private String tomcatHome;
+	@Value("${cws.tomcat.webapps}") private String tomcatWebapps;
+	@Value("${cws.project.webapp.root}") private String projectWebappRoot;
+	@Value("${cws.history.days.to.live}") private String historyDaysToLive;
+	@Value("${cws.history.level}") private String historyLevel;
+
+	public MvcCore() {}
 
 	protected ModelAndView buildModel(String page, String message) {
 		ModelAndView model = new ModelAndView(page);