improve utils package hierarchy.

Nathanael Jourdane
1 parent 18fad48e
Showing 3 changed files with 62 additions and 33 deletions Show diff stats
src/main/java/eu/omp/irap/vespa/epntapclient/votable/utils/Const.java -> src/main/java/eu/omp/irap/vespa/epntapclient/votable/utils/Consts.java
src/main/java/eu/omp/irap/vespa/epntapclient/votable/utils/Debug.java
src/main/java/eu/omp/irap/vespa/epntapclient/votable/utils/Utils.java -> src/main/java/eu/omp/irap/vespa/epntapclient/votable/utils/Strings.java
@@ -21,7 +21,7 @@ package eu.omp.irap.vespa.epntapclient.votable.utils;
  *
  * @author N. Jourdane
  */
-public class Const {
+public class Consts {
  
 	/** The character set used (for http requests, writing in files, etc.). */
 	public static final String ENCODING = "UTF-8";
@@ -38,6 +38,6 @@ public class Const {
  
  
 	/** Constructor to hide the implicit public one. */
-	private Const() {
+	private Consts() {
 	}
 }
@@ -0,0 +1,57 @@
+/*
+ * This file is a part of EpnTAPClient.
+ * This program aims to provide EPN-TAP support for software clients, like CASSIS spectrum analyzer.
+ * See draft specifications: https://voparis-confluence.obspm.fr/pages/viewpage.action?pageId=559861
+ * Copyright (C) 2016 Institut de Recherche en Astrophysique et Planétologie.
+ *
+ * This program is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or (at your option) any later
+ * version. This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details. You should have received a copy of
+ * the GNU General Public License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package eu.omp.irap.vespa.epntapclient.votable.utils;
+
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.logging.Logger;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+/**
+ * @author N. Jourdane
+ */
+public class Debug {
+
+	/** The logger for the class Debug. */
+	private static final Logger logger = Logger.getLogger(Debug.class.getName());
+
+
+	/**
+	 * Print the specified object in JSON format in a file on the temporary directory.
+	 *
+	 * @param title The name of the file.
+	 * @param obj the object to print in a file.
+	 * @return The path of the file.
+	 */
+	public static String printObject(String title, Object obj) {
+		Gson gson = new GsonBuilder().setPrettyPrinting().create();
+		String json = gson.toJson(obj);
+		String path = Consts.TMP_DIR + "/" + title + ".json";
+		try (FileWriter writer = new FileWriter(path)) {
+			writer.write(json);
+
+		} catch (IOException e) {
+			Debug.logger.warning("Can not print in the file " + path + e);
+		}
+		Debug.logger.info("A json file representing " + title + " (" + obj.getClass().getName()
+				+ ") has been created on " + path);
+
+		return path;
+	}
+}
@@ -16,24 +16,19 @@
  
 package eu.omp.irap.vespa.epntapclient.votable.utils;
  
-import java.io.FileWriter;
-import java.io.IOException;
 import java.util.logging.Logger;
  
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
 /**
  * @author N. Jourdane
  */
-public class Utils {
+public class Strings {
  
 	/** The logger for the class Utils. */
-	private static final Logger logger = Logger.getLogger(Utils.class.getName());
+	private static final Logger logger = Logger.getLogger(Strings.class.getName());
  
  
 	/** Private constructor to hide the implicit public one. */
-	private Utils() {
+	private Strings() {
 	}
  
  
@@ -88,27 +83,4 @@ public class Utils {
 		}
 	}
  
-
-	/**
-	 * Print the specified object in JSON format in a file on the temporary directory.
-	 *
-	 * @param title The name of the file.
-	 * @param obj the object to print in a file.
-	 * @return The path of the file.
-	 */
-	public static String printObject(String title, Object obj) {
-		Gson gson = new GsonBuilder().setPrettyPrinting().create();
-		String json = gson.toJson(obj);
-		String path = Const.TMP_DIR + "/" + title + ".json";
-		try (FileWriter writer = new FileWriter(path)) {
-			writer.write(json);
-
-		} catch (IOException e) {
-			Utils.logger.warning("Can not print in the file " + path + e);
-		}
-		Utils.logger.info("A json file representing " + title + " (" + obj.getClass().getName()
-				+ ") has been created on " + path);
-
-		return path;
-	}
 }