lewismc commented on a change in pull request #6: SDAP-35 (completed the
configuration change)
URL:
https://github.com/apache/incubator-sdap-mudrod/pull/6#discussion_r172927978
##########
File path:
core/src/main/java/org/apache/sdap/mudrod/metadata/structure/PODAACMetadata.java
##########
@@ -16,322 +16,368 @@
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+
+import org.apache.sdap.mudrod.driver.ESDriver;
/**
* ClassName: PODAACMetadata Function: PODAACMetadata setter and getter methods
*/
-public class PODAACMetadata implements Serializable {
-
- /**
- *
- */
- private static final long serialVersionUID = 1L;
- // shortname: data set short name
- private String shortname;
- // abstractStr: data set abstract
- private String abstractStr;
- // isoTopic: data set topic
- private String isoTopic;
- // sensor: sensor
- private String sensor;
- // source: data source
- private String source;
- // project: data project
- private String project;
- // hasAbstarct: whether data set has abstract
- boolean hasAbstarct;
-
- // longnameList: data set long name list
- private List<String> longnameList;
- // keywordList:data set key word list
- private List<String> keywordList;
- // termList: data set term list
- private List<String> termList;
- // topicList: data set topic list
- private List<String> topicList;
- // variableList: data set variable list
- private List<String> variableList;
- // abstractList: data set abstract term list
- private List<String> abstractList;
- // isotopicList: data set iso topic list
- private List<String> isotopicList;
- // sensorList: data set sensor list
- private List<String> sensorList;
- // sourceList: data set source list
- private List<String> sourceList;
- // projectList: data set project list
- private List<String> projectList;
- // regionList: data set region list
- private List<String> regionList;
-
- public PODAACMetadata() {
- // Default constructor
- }
-
- /**
- * Creates a new instance of PODAACMetadata.
- *
- * @param shortname data set short name
- * @param longname data set long name
- * @param topics data set topics
- * @param terms data set terms
- * @param variables data set variables
- * @param keywords data set keywords
- * @param region list of regions
- */
- public PODAACMetadata(String shortname, List<String> longname, List<String>
topics, List<String> terms, List<String> variables, List<String> keywords,
List<String> region) {
- this.shortname = shortname;
- this.longnameList = longname;
- this.keywordList = keywords;
- this.termList = terms;
- this.topicList = topics;
- this.variableList = variables;
- this.regionList = region;
- }
-
- /**
- * setTerms: set term of data set
- *
- * @param termstr data set terms
- */
- public void setTerms(String termstr) {
- this.splitString(termstr, this.termList);
- }
-
- /**
- * setKeywords: set key word of data set
- *
- * @param keywords data set keywords
- */
- public void setKeywords(String keywords) {
- this.splitString(keywords, this.keywordList);
- }
-
- /**
- * setTopicList: set topic of data set
- *
- * @param topicStr data set topics
- */
- public void setTopicList(String topicStr) {
- this.splitString(topicStr, this.topicList);
- }
-
- /**
- * setVaraliableList: set varilable of data set
- *
- * @param varilableStr data set variables
- */
- public void setVaraliableList(String varilableStr) {
- this.splitString(varilableStr, this.variableList);
- }
-
- /**
- * setProjectList:set project of data set
- *
- * @param project data set projects
- */
- public void setProjectList(String project) {
- this.splitString(project, this.projectList);
- }
-
- /**
- * setSourceList: set source of data set
- *
- * @param source data set sources
- */
- public void setSourceList(String source) {
- this.splitString(source, this.sourceList);
- }
-
- /**
- * setSensorList: set sensor of data set
- *
- * @param sensor data set sensors
- */
- public void setSensorList(String sensor) {
- this.splitString(sensor, this.sensorList);
- }
-
- /**
- * setISOTopicList:set iso topic of data set
- *
- * @param isoTopic data set iso topics
- */
- public void setISOTopicList(String isoTopic) {
- this.splitString(isoTopic, this.isotopicList);
- }
-
- /**
- * getKeywordList: get key word of data set
- *
- * @return data set keyword list
- */
- public List<String> getKeywordList() {
- return this.keywordList;
- }
-
- /**
- * getTermList:get term list of data set
- *
- * @return data set term list
- */
- public List<String> getTermList() {
- return this.termList;
- }
-
- /**
- * getShortName:get short name of data set
- *
- * @return data set short name
- */
- public String getShortName() {
- return this.shortname;
- }
-
- /**
- * getKeyword:get key word of data set
- *
- * @return data set keyword string
- */
- public String getKeyword() {
- return String.join(",", this.keywordList);
- }
-
- /**
- * getTerm:get term of data set
- *
- * @return data set term string
- */
- public String getTerm() {
- return String.join(",", this.termList);
- }
-
- /**
- * getTopic:get topic of data set
- *
- * @return data set topic string
- */
- public String getTopic() {
- return String.join(",", this.topicList);
- }
-
- /**
- * getVariable:get variable of data set
- *
- * @return data set variable string
- */
- public String getVariable() {
- return String.join(",", this.variableList);
- }
-
- /**
- * getAbstract:get abstract of data set
- *
- * @return data set abstract
- */
- public String getAbstract() {
- return this.abstractStr;
- }
-
- /**
- * getProject:get project of data set
- *
- * @return data set project string
- */
- public String getProject() {
- return this.project;
- }
-
- /**
- * getSource:get source of data set
- *
- * @return data set source string
- */
- public String getSource() {
- return this.source;
- }
-
- /**
- * getSensor:get sensor of data set
- *
- * @return data set sensor string
- */
- public String getSensor() {
- return this.sensor;
- }
-
- /**
- * getISOTopic:get iso topic of data set
- *
- * @return data set ISO topic string
- */
- public String getISOTopic() {
- return this.isoTopic;
- }
-
- /**
- * getAllTermList: get all term list of data set
- *
- * @return data set term list
- */
- public List<String> getAllTermList() {
- List<String> allterms = new ArrayList<>();
-
- if (this.termList != null && !this.termList.isEmpty()) {
- allterms.addAll(this.termList);
- }
-
- if (this.keywordList != null && !this.keywordList.isEmpty()) {
- allterms.addAll(this.keywordList);
- }
-
- if (this.topicList != null && !this.topicList.isEmpty()) {
- allterms.addAll(this.topicList);
- }
-
- if (this.variableList != null && !this.variableList.isEmpty()) {
- allterms.addAll(this.variableList);
- }
-
- if (this.regionList != null && !this.regionList.isEmpty()) {
- allterms.addAll(this.regionList);
- }
- return allterms;
- }
-
- /**
- * splitString: split value of fields of data set
- *
- * @param oristr original string
- * @param list result after splitting
- */
- private void splitString(String oristr, List<String> list) {
- if (oristr == null) {
- return;
- }
-
- if (oristr.startsWith("\"")) {
- oristr = oristr.substring(1);
- }
- if (oristr.endsWith("\"")) {
- oristr = oristr.substring(0, oristr.length() - 1);
- }
-
- String strs[] = oristr.trim().split(",");
- if (strs != null) {
- for (String str1 : strs) {
- String str = str1.trim();
- if (str.startsWith(",") || str.startsWith("\"")) {
- str = str.substring(1);
- }
- if (str.endsWith(",") || str.endsWith("\"")) {
- str = str.substring(0, str.length() - 1);
- }
- if ("".equals(str)) {
- continue;
- }
- list.add(str);
- }
- }
- }
+public class PODAACMetadata extends Metadata {
Review comment:
Why have you reformatted this entire file? Please revert. Tabs should be 2
spaces.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
