update license and fix code review comments

Author: pranair2

Diff for: .teamcity/AE_ElasticsearchMonitoringExtension/pluginData/plugin-settings.xml

@@ -1,3 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2020 AppDynamics,Inc.
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
 <settings />
 

Diff for: pom.xml

@@ -1,20 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!--
-  ~ Copyright (c) 2019 AppDynamics,Inc.
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>

Diff for: src/integration-test/java/com/appdynamics/extensions/elasticsearch/IntegrationTestUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 AppDynamics,Inc.
+ * Copyright (c) 2020 AppDynamics,Inc.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

Diff for: src/integration-test/java/com/appdynamics/extensions/elasticsearch/MetricCheckIT.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 AppDynamics,Inc.
+ * Copyright (c) 2020 AppDynamics,Inc.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

Diff for: src/main/java/com/appdynamics/extensions/elasticsearch/ElasticsearchMonitor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 AppDynamics,Inc.
+ * Copyright (c) 2020 AppDynamics,Inc.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -12,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-//TODO Change all licenses to 2020
 package com.appdynamics.extensions.elasticsearch;
 
 import com.appdynamics.extensions.ABaseMonitor;

Diff for: src/main/java/com/appdynamics/extensions/elasticsearch/ElasticsearchMonitorTask.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 AppDynamics,Inc.
+ * Copyright (c) 2020 AppDynamics,Inc.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

Diff for: src/main/java/com/appdynamics/extensions/elasticsearch/endpoints/CatEndpoint.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 AppDynamics,Inc.
+ * Copyright (c) 2020 AppDynamics,Inc.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

Diff for: src/main/java/com/appdynamics/extensions/elasticsearch/endpoints/CatEndpoints.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 AppDynamics,Inc.
+ * Copyright (c) 2020 AppDynamics,Inc.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

Diff for: src/main/java/com/appdynamics/extensions/elasticsearch/endpoints/CatEndpointsUtil.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 AppDynamics,Inc.
+ * Copyright (c) 2020 AppDynamics,Inc.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

Diff for: src/main/java/com/appdynamics/extensions/elasticsearch/metrics/CatMetricsClient.java

@@ -1,8 +1,16 @@
 /*
- * Copyright 2018. AppDynamics LLC and its affiliates.
- * All Rights Reserved.
- * This is unpublished proprietary source code of AppDynamics LLC and its affiliates.
- * The copyright notice above does not evidence any actual or intended publication of such source code.
+ * Copyright (c) 2020 AppDynamics,Inc.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package com.appdynamics.extensions.elasticsearch.metrics;

Diff for: src/main/java/com/appdynamics/extensions/elasticsearch/util/Constants.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 AppDynamics,Inc.
+ * Copyright (c) 2020 AppDynamics,Inc.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

Diff for: src/main/java/com/appdynamics/extensions/elasticsearch/util/LineUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 AppDynamics,Inc.
+ * Copyright (c) 2020 AppDynamics,Inc.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

Diff for: src/main/resources/conf/config.yml

@@ -7,13 +7,13 @@ metricPrefix: "Server|Component:<ComponentID>|Custom Metrics|Elasticsearch"
 
 servers:
   - displayName: Server1
-    uri: "http://localhost:9200" #TODO clear this before releasing
+    uri: ""
     username: ""
     password: ""
     encryptedPassword: ""
 
 # To get the metrics through CAT apis
-catEndpoints: # TODO : consider moving all this information to a metrics.xml file
+catEndpoints:
   # shard allocation stats
   - endpoint: "/_cat/allocation?v&bytes=b"
     displayName: "Allocations"

Diff for: src/main/resources/conf/monitor.xml

@@ -1,20 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!--
-  ~ Copyright (c) 2019 AppDynamics,Inc.
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
 <monitor>
     <name>ElasticsearchMonitor</name>
     <type>managed</type>

Diff for: src/test/java/com/appdynamics/extensions/elasticsearch/ElasticsearchMonitorTaskTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 AppDynamics,Inc.
+ * Copyright (c) 2020 AppDynamics,Inc.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

Diff for: src/test/java/com/appdynamics/extensions/elasticsearch/endpoints/CatEndpointsUtilTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 AppDynamics,Inc.
+ * Copyright (c) 2020 AppDynamics,Inc.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

Diff for: src/test/java/com/appdynamics/extensions/elasticsearch/metrics/CatMetricsClientTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 AppDynamics,Inc.
+ * Copyright (c) 2020 AppDynamics,Inc.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

Diff for: src/test/java/com/appdynamics/extensions/elasticsearch/util/LineUtilsTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 AppDynamics,Inc.
+ * Copyright (c) 2020 AppDynamics,Inc.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at