Merge branch 'zacharysabourin/master/20' into 'master'

feat: Update copyright headers on all Java files

Closes #20

See merge request !28

src/main/java/org/eclipsefoundation/geoip/client/config/MaxmindReflectionRegistrationConfig.java

+/*********************************************************************
+* Copyright (c) 2022 Eclipse Foundation.
+*
+* This program and the accompanying materials are made
+* available under the terms of the Eclipse Public License 2.0
+* which is available at https://www.eclipse.org/legal/epl-2.0/
+*
+* Author: Martin Lowe <martin.lowe@eclipse-foundation.org>
+*
+* SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 package org.eclipsefoundation.geoip.client.config;
 
 import com.maxmind.db.MaxMindDbConstructor;

src/main/java/org/eclipsefoundation/geoip/client/helper/InetAddressHelper.java

-/* Copyright (c) 2019 Eclipse Foundation and others.
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Public License 2.0
- * which is available at http://www.eclipse.org/legal/epl-v20.html,
- * SPDX-License-Identifier: EPL-2.0
- */
+/*********************************************************************
+* Copyright (c) 2019 Eclipse Foundation.
+*
+* This program and the accompanying materials are made
+* available under the terms of the Eclipse Public License 2.0
+* which is available at https://www.eclipse.org/legal/epl-2.0/
+*
+* Author: Martin Lowe <martin.lowe@eclipse-foundation.org>
+*
+* SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 package org.eclipsefoundation.geoip.client.helper;
 
 import java.util.Arrays;
@@ -34,7 +39,7 @@ public class InetAddressHelper {
 		if (address == null) {
 			return false;
 		}
-		
+
 		// check lightweight options first for invalid addresses
 		if (INVALID_ADDRESSES_IPv4.contains(address) || INVALID_ADDRESSES_IPv6.contains(address)) {
 			return false;

src/main/java/org/eclipsefoundation/geoip/client/model/Country.java

-/* Copyright (c) 2019 Eclipse Foundation and others.
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Public License 2.0
- * which is available at http://www.eclipse.org/legal/epl-v20.html,
- * SPDX-License-Identifier: EPL-2.0
- */
+/*********************************************************************
+* Copyright (c) 2019 Eclipse Foundation.
+*
+* This program and the accompanying materials are made
+* available under the terms of the Eclipse Public License 2.0
+* which is available at https://www.eclipse.org/legal/epl-2.0/
+*
+* Author: Martin Lowe <martin.lowe@eclipse-foundation.org>
+*
+* SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 package org.eclipsefoundation.geoip.client.model;
 
 import com.opencsv.bean.CsvBindByName;

src/main/java/org/eclipsefoundation/geoip/client/model/IPVersion.java

-/* Copyright (c) 2019 Eclipse Foundation and others.
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Public License 2.0
- * which is available at http://www.eclipse.org/legal/epl-v20.html,
- * SPDX-License-Identifier: EPL-2.0
- */
+/*********************************************************************
+* Copyright (c) 2019 Eclipse Foundation.
+*
+* This program and the accompanying materials are made
+* available under the terms of the Eclipse Public License 2.0
+* which is available at https://www.eclipse.org/legal/epl-2.0/
+*
+* Author: Martin Lowe <martin.lowe@eclipse-foundation.org>
+*
+* SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 package org.eclipsefoundation.geoip.client.model;
 
 /**

src/main/java/org/eclipsefoundation/geoip/client/model/SubnetRange.java

-/* Copyright (c) 2019 Eclipse Foundation and others.
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Public License 2.0
- * which is available at http://www.eclipse.org/legal/epl-v20.html,
- * SPDX-License-Identifier: EPL-2.0
- */
+/*********************************************************************
+* Copyright (c) 2019 Eclipse Foundation.
+*
+* This program and the accompanying materials are made
+* available under the terms of the Eclipse Public License 2.0
+* which is available at https://www.eclipse.org/legal/epl-2.0/
+*
+* Author: Martin Lowe <martin.lowe@eclipse-foundation.org>
+*
+* SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 package org.eclipsefoundation.geoip.client.model;
 
 import com.opencsv.bean.CsvBindByName;

src/main/java/org/eclipsefoundation/geoip/client/resources/CityResource.java

-/* Copyright (c) 2019 Eclipse Foundation and others.
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Public License 2.0
- * which is available at http://www.eclipse.org/legal/epl-v20.html,
- * SPDX-License-Identifier: EPL-2.0
- */
+/*********************************************************************
+* Copyright (c) 2019 Eclipse Foundation.
+*
+* This program and the accompanying materials are made
+* available under the terms of the Eclipse Public License 2.0
+* which is available at https://www.eclipse.org/legal/epl-2.0/
+*
+* Author: Martin Lowe <martin.lowe@eclipse-foundation.org>
+*
+* SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 package org.eclipsefoundation.geoip.client.resources;
 
 import java.io.IOException;
@@ -24,7 +29,7 @@ import org.eclipsefoundation.geoip.client.helper.InetAddressHelper;
 import org.eclipsefoundation.geoip.client.service.GeoIPService;
 
 /**
- * @author martin
+ * @author Martin Lowe
  *
  */
 @Path("/cities")

src/main/java/org/eclipsefoundation/geoip/client/resources/CountryResource.java

-/* Copyright (c) 2019 Eclipse Foundation and others.
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Public License 2.0
- * which is available at http://www.eclipse.org/legal/epl-v20.html,
- * SPDX-License-Identifier: EPL-2.0
- */
+/*********************************************************************
+* Copyright (c) 2019 Eclipse Foundation.
+*
+* This program and the accompanying materials are made
+* available under the terms of the Eclipse Public License 2.0
+* which is available at https://www.eclipse.org/legal/epl-2.0/
+*
+* Author: Martin Lowe <martin.lowe@eclipse-foundation.org>
+*
+* SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 package org.eclipsefoundation.geoip.client.resources;
 
 import java.io.IOException;
@@ -24,7 +29,7 @@ import org.eclipsefoundation.geoip.client.helper.InetAddressHelper;
 import org.eclipsefoundation.geoip.client.service.GeoIPService;
 
 /**
- * @author martin
+ * @author Martin Lowe
  *
  */
 @Path("/countries")

src/main/java/org/eclipsefoundation/geoip/client/resources/SubnetResource.java

-/* Copyright (c) 2019 Eclipse Foundation and others.
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Public License 2.0
- * which is available at http://www.eclipse.org/legal/epl-v20.html,
- * SPDX-License-Identifier: EPL-2.0
- */
+/*********************************************************************
+* Copyright (c) 2019 Eclipse Foundation.
+*
+* This program and the accompanying materials are made
+* available under the terms of the Eclipse Public License 2.0
+* which is available at https://www.eclipse.org/legal/epl-2.0/
+*
+* Author: Martin Lowe <martin.lowe@eclipse-foundation.org>
+*
+* SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 package org.eclipsefoundation.geoip.client.resources;
 
 import javax.inject.Inject;

src/main/java/org/eclipsefoundation/geoip/client/resources/mapper/RuntimeMapper.java

-/* Copyright (c) 2019 Eclipse Foundation and others.
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Public License 2.0
- * which is available at http://www.eclipse.org/legal/epl-v20.html,
- * SPDX-License-Identifier: EPL-2.0
- */
+/*********************************************************************
+* Copyright (c) 2019 Eclipse Foundation.
+*
+* This program and the accompanying materials are made
+* available under the terms of the Eclipse Public License 2.0
+* which is available at https://www.eclipse.org/legal/epl-2.0/
+*
+* Author: Martin Lowe <martin.lowe@eclipse-foundation.org>
+*
+* SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 package org.eclipsefoundation.geoip.client.resources.mapper;
 
 import java.net.UnknownHostException;

src/main/java/org/eclipsefoundation/geoip/client/service/GeoIPService.java

-/* Copyright (c) 2019 Eclipse Foundation and others.
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Public License 2.0
- * which is available at http://www.eclipse.org/legal/epl-v20.html,
- * SPDX-License-Identifier: EPL-2.0
- */
+/*********************************************************************
+* Copyright (c) 2019 Eclipse Foundation.
+*
+* This program and the accompanying materials are made
+* available under the terms of the Eclipse Public License 2.0
+* which is available at https://www.eclipse.org/legal/epl-2.0/
+*
+* Author: Martin Lowe <martin.lowe@eclipse-foundation.org>
+*
+* SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 package org.eclipsefoundation.geoip.client.service;
 
 import com.maxmind.geoip2.record.City;
 import com.maxmind.geoip2.record.Country;
 
 /**
- * @author martin
+ * @author Martin Lowe
  *
  */
 public interface GeoIPService {

src/main/java/org/eclipsefoundation/geoip/client/service/NetworkService.java

-/* Copyright (c) 2019 Eclipse Foundation and others.
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Public License 2.0
- * which is available at http://www.eclipse.org/legal/epl-v20.html,
- * SPDX-License-Identifier: EPL-2.0
- */
+/*********************************************************************
+* Copyright (c) 2019 Eclipse Foundation.
+*
+* This program and the accompanying materials are made
+* available under the terms of the Eclipse Public License 2.0
+* which is available at https://www.eclipse.org/legal/epl-2.0/
+*
+* Author: Martin Lowe <martin.lowe@eclipse-foundation.org>
+*
+* SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 package org.eclipsefoundation.geoip.client.service;
 
 import java.util.List;

src/main/java/org/eclipsefoundation/geoip/client/service/impl/CSVNetworkService.java

-/* Copyright (c) 2019 Eclipse Foundation and others.
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Public License 2.0
- * which is available at http://www.eclipse.org/legal/epl-v20.html,
- * SPDX-License-Identifier: EPL-2.0
- */
+/*********************************************************************
+* Copyright (c) 2019 Eclipse Foundation.
+*
+* This program and the accompanying materials are made
+* available under the terms of the Eclipse Public License 2.0
+* which is available at https://www.eclipse.org/legal/epl-2.0/
+*
+* Author: Martin Lowe <martin.lowe@eclipse-foundation.org>
+*
+* SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 package org.eclipsefoundation.geoip.client.service.impl;
 
 import java.io.FileNotFoundException;
@@ -58,7 +63,7 @@ public class CSVNetworkService implements NetworkService {
 		loadCountries(countriesFilePath, countryIdToIso);
 		loadMap(ipv4FilePath, ipv4Subnets);
 		// Disabled as it is a 2million item list and crashes the app
-		//loadMap(ipv6FilePath, ipv6Subnets);
+		// loadMap(ipv6FilePath, ipv6Subnets);
 	}
 
 	@Override
@@ -110,5 +115,5 @@ public class CSVNetworkService implements NetworkService {
 			throw new RuntimeException("Error while reading in CSV file at path " + filePath, e);
 		}
 	}
-	
+
 }

src/main/java/org/eclipsefoundation/geoip/client/service/impl/MaxMindGeoIPService.java

-/* Copyright (c) 2019 Eclipse Foundation and others.
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Public License 2.0
- * which is available at http://www.eclipse.org/legal/epl-v20.html,
- * SPDX-License-Identifier: EPL-2.0
- */
+/*********************************************************************
+* Copyright (c) 2019 Eclipse Foundation.
+*
+* This program and the accompanying materials are made
+* available under the terms of the Eclipse Public License 2.0
+* which is available at https://www.eclipse.org/legal/epl-2.0/
+*
+* Author: Martin Lowe <martin.lowe@eclipse-foundation.org>
+*
+* SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 package org.eclipsefoundation.geoip.client.service.impl;
 
 import java.io.File;
@@ -66,17 +71,17 @@ public class MaxMindGeoIPService implements GeoIPService {
 			throw new RuntimeException(e);
 		}
 	}
-	
+
 	@PreDestroy
 	public void destroy() {
 		try {
 			this.countryReader.close();
 			this.cityReader.close();
 		} catch (IOException e) {
-			LOGGER.error("Error while closing Geo IP databases, potential memory leak",e);
+			LOGGER.error("Error while closing Geo IP databases, potential memory leak", e);
 		}
 	}
-	
+
 	@Override
 	public City getCity(String ipAddr) {
 		try {

src/test/java/org/eclipsefoundation/geoip/client/resources/CityResourceTest.java

-/* Copyright (c) 2019 Eclipse Foundation and others.
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Public License 2.0
- * which is available at http://www.eclipse.org/legal/epl-v20.html,
- * SPDX-License-Identifier: EPL-2.0
- */
+/*********************************************************************
+* Copyright (c) 2019 Eclipse Foundation.
+*
+* This program and the accompanying materials are made
+* available under the terms of the Eclipse Public License 2.0
+* which is available at https://www.eclipse.org/legal/epl-2.0/
+*
+* Author: Martin Lowe <martin.lowe@eclipse-foundation.org>
+*
+* SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 package org.eclipsefoundation.geoip.client.resources;
 
 import static io.restassured.RestAssured.given;

src/test/java/org/eclipsefoundation/geoip/client/resources/CountryResourceTest.java

-/* Copyright (c) 2019 Eclipse Foundation and others.
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Public License 2.0
- * which is available at http://www.eclipse.org/legal/epl-v20.html,
- * SPDX-License-Identifier: EPL-2.0
- */
+/*********************************************************************
+* Copyright (c) 2019 Eclipse Foundation.
+*
+* This program and the accompanying materials are made
+* available under the terms of the Eclipse Public License 2.0
+* which is available at https://www.eclipse.org/legal/epl-2.0/
+*
+* Author: Martin Lowe <martin.lowe@eclipse-foundation.org>
+*
+* SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 package org.eclipsefoundation.geoip.client.resources;
 
 import static io.restassured.RestAssured.given;

src/test/java/org/eclipsefoundation/geoip/client/resources/SubnetResourceTest.java

-/* Copyright (c) 2019 Eclipse Foundation and others.
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Public License 2.0
- * which is available at http://www.eclipse.org/legal/epl-v20.html,
- * SPDX-License-Identifier: EPL-2.0
- */
+/*********************************************************************
+* Copyright (c) 2019 Eclipse Foundation.
+*
+* This program and the accompanying materials are made
+* available under the terms of the Eclipse Public License 2.0
+* which is available at https://www.eclipse.org/legal/epl-2.0/
+*
+* Author: Martin Lowe <martin.lowe@eclipse-foundation.org>
+*
+* SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 package org.eclipsefoundation.geoip.client.resources;
 
 import static io.restassured.RestAssured.given;

src/test/java/org/eclipsefoundation/geoip/client/test/namespaces/SchemaNamespaceHelper.java

+/*********************************************************************
+* Copyright (c) 2022 Eclipse Foundation.
+*
+* This program and the accompanying materials are made
+* available under the terms of the Eclipse Public License 2.0
+* which is available at https://www.eclipse.org/legal/epl-2.0/
+*
+* Author: Martin Lowe <martin.lowe@eclipse-foundation.org>
+*
+* SPDX-License-Identifier: EPL-2.0
+**********************************************************************/
 package org.eclipsefoundation.geoip.client.test.namespaces;
 
 public class SchemaNamespaceHelper {
-        public static final String BASE_SCHEMAS_PATH = "schemas/";
-        public static final String BASE_SCHEMAS_PATH_SUFFIX = "-schema.json";
-        public static final String CITY_SCHEMA_PATH = BASE_SCHEMAS_PATH + "city"
-                        + BASE_SCHEMAS_PATH_SUFFIX;
-        public static final String COUNTRY_SCHEMA_PATH = BASE_SCHEMAS_PATH + "country"
-                        + BASE_SCHEMAS_PATH_SUFFIX;
-        public static final String IP_ADDRESSES_SCHEMA_PATH = BASE_SCHEMAS_PATH + "ip-addresses"
-                        + BASE_SCHEMAS_PATH_SUFFIX;
+    public static final String BASE_SCHEMAS_PATH = "schemas/";
+    public static final String BASE_SCHEMAS_PATH_SUFFIX = "-schema.json";
+    public static final String CITY_SCHEMA_PATH = BASE_SCHEMAS_PATH + "city"
+            + BASE_SCHEMAS_PATH_SUFFIX;
+    public static final String COUNTRY_SCHEMA_PATH = BASE_SCHEMAS_PATH + "country"
+            + BASE_SCHEMAS_PATH_SUFFIX;
+    public static final String IP_ADDRESSES_SCHEMA_PATH = BASE_SCHEMAS_PATH + "ip-addresses"
+            + BASE_SCHEMAS_PATH_SUFFIX;
 }