Fix some Sonar issues

Nathanael Jourdane
1 parent d3a65e87
Showing 13 changed files with 79 additions and 63 deletions Show diff stats
src/main/java/eu/omp/irap/vespa/epntapclient/controller/EpnTapController.java
src/main/java/eu/omp/irap/vespa/epntapclient/utils/Queries.java
src/main/java/eu/omp/irap/vespa/epntapclient/view/Dim.java
src/main/java/eu/omp/irap/vespa/epntapclient/view/EpnTapMainView.java
src/main/java/eu/omp/irap/vespa/epntapclient/view/Event.java
src/main/java/eu/omp/irap/vespa/epntapclient/view/ParamField.java
src/main/java/eu/omp/irap/vespa/epntapclient/view/panels/RequestPanel.java
src/main/java/eu/omp/irap/vespa/epntapclient/view/panels/ServicesPanel.java
src/main/java/eu/omp/irap/vespa/epntapclient/votable/Utils.java
src/main/java/eu/omp/irap/vespa/epntapclient/votable/VOTableApp.java
src/main/java/eu/omp/irap/vespa/epntapclient/votable/controller/VOTableConnection.java
src/main/java/eu/omp/irap/vespa/epntapclient/votable/controller/VOTableController.java
src/main/java/eu/omp/irap/vespa/epntapclient/votable/controller/VOTableException.java
@@ -164,16 +164,16 @@ public class EpnTapController implements MainViewListener {
 		try {
 			Object object = args[0];
 			switch (event) {
-			case serviceSelected:
+			case SERVICE_SELECTED:
 				updateSelected(((Integer) args[0]).intValue());
 				break;
-			case btnSendClicked:
+			case SEND_BUTTON_CLICKED:
 				sendQuery((String) object);
 				break;
-			case paramChanged:
+			case PARAMETER_CHANGED:
 				updateParameter((String) object, args[1]);
 				break;
-			case paramRemoved:
+			case PARAMETER_REMOVED:
 				removeParameter((String) object);
 				break;
 			default:
@@ -182,7 +182,7 @@ public class EpnTapController implements MainViewListener {
 		} catch (Exception e) {
 			mainView.displayError("Error", e.getMessage());
 			logger.log(Level.WARNING,
-					"Exception thrown when " + event.toString() + ": " + e.getMessage());
+					"Exception thrown when " + event.toString() + ": " + e.getMessage(), e);
 		}
 	}
 }
@@ -47,6 +47,10 @@ public final class Queries {
 			+ "1=ivo_nocasematch(detail_value, 'ivo://vopdc.obspm/std/EpnCore%') "
 			+ "ORDER BY short_name, table_name";
+	/** Constructor to hide the implicit public one. */
+	private Queries() {
+	}
+
 	/**
 	 * The default query, with these parameters, respectively: max_rows, target_name, time_min,
 	 * time_max, dataproduct_type, spectral_range_min, spectral_range_max.
@@ -76,8 +80,4 @@ public final class Queries {
 		return "SELECT TOP " + nbRow + " target_name, target_class FROM " + tableName + where;
 	}
-	/** Constructor to hide the implicit public one. */
-	private Queries() {
-	}
-
 }
@@ -39,4 +39,8 @@ public class Dim {
 	public static final int BOTTOM_PANEL_HEIGHT = 150;
 	/** The minimum height of the bottom panel (result view). */
 	public static final int BOTTOM_PANEL_MIN_HEIGHT = 100;
+
+	/** Private constructor to hide the implicit public one. */
+	private Dim() {
+	}
 }
@@ -63,6 +63,7 @@ public class EpnTapMainView extends JPanel {
 	 * @author N. Jourdane
 	 */
 	public interface MainViewListener {
+
 		/**
 		 * When an event is detected on the main view.
 		 * 
@@ -21,11 +21,11 @@ package eu.omp.irap.vespa.epntapclient.view;
  */
 public enum Event {
 	/** When a service is selected on the service panel. */
-	serviceSelected,
+	SERVICE_SELECTED,
 	/** When the `Send query` button is clicked. */
-	btnSendClicked,
+	SEND_BUTTON_CLICKED,
 	/** When a parameter is removed on the parameter panel. */
-	paramRemoved,
+	PARAMETER_REMOVED,
 	/** When a parameter is updated to a valid value on the parameter panel. */
-	paramChanged;
+	PARAMETER_CHANGED;
 }
@@ -138,9 +138,9 @@ public abstract class ParamField extends JPanel {
 		@Override
 		public void update(JTextField textField) {
 			if ("".equals(textField.getText())) {
-				mainView.event(Event.paramChanged, paramName, null);
+				mainView.event(Event.PARAMETER_CHANGED, paramName, null);
 			} else {
-				mainView.event(Event.paramChanged, paramName, textField.getText());
+				mainView.event(Event.PARAMETER_CHANGED, paramName, textField.getText());
 			}
 		}
 	}
@@ -178,11 +178,11 @@ public abstract class ParamField extends JPanel {
 		public void update(JTextField textField) {
 			if ("".equals(textField.getText())) {
 				textField.setBackground(Color.WHITE);
-				mainView.event(Event.paramRemoved, paramName);
+				mainView.event(Event.PARAMETER_REMOVED, paramName);
 			} else {
 				try {
 					float value = Float.parseFloat(textField.getText());
-					mainView.event(Event.paramChanged, paramName, value);
+					mainView.event(Event.PARAMETER_CHANGED, paramName, value);
 					textField.setBackground(Color.WHITE);
 				} catch (@SuppressWarnings("unused") NumberFormatException e) {
 					textField.setBackground(Color.PINK);
@@ -238,12 +238,12 @@ public abstract class ParamField extends JPanel {
 			DateFormat df = new SimpleDateFormat(DATE_FORMAT, Locale.ENGLISH);
 			if ("".equals(field.getText())) {
 				field.setBackground(Color.WHITE);
-				mainView.event(Event.paramRemoved, paramName + field.getName());
+				mainView.event(Event.PARAMETER_REMOVED, paramName + field.getName());
 			} else if (field.getText().matches(DATE_REGEX)) {
 				try {
 					long date = df.parse(field.getText()).getTime();
 					date = Math.round((date / 86400000.0) + 2440587.5); // to JD
-					mainView.event(Event.paramChanged, paramName + field.getName(), date);
+					mainView.event(Event.PARAMETER_CHANGED, paramName + field.getName(), date);
 					field.setBackground(Color.WHITE);
 				} catch (@SuppressWarnings("unused") ParseException e) {
 					field.setBackground(Color.PINK);
@@ -296,10 +296,10 @@ public abstract class ParamField extends JPanel {
 		public void update(JTextField field) {
 			if ("".equals(field.getText())) {
 				field.setBackground(Color.WHITE);
-				mainView.event(Event.paramRemoved, paramName + field.getName());
+				mainView.event(Event.PARAMETER_REMOVED, paramName + field.getName());
 			} else {
 				try {
-					mainView.event(Event.paramChanged, paramName + field.getName(),
+					mainView.event(Event.PARAMETER_CHANGED, paramName + field.getName(),
 							Float.parseFloat(field.getText()));
 					field.setBackground(Color.WHITE);
 				} catch (@SuppressWarnings("unused") NumberFormatException e) {
@@ -332,6 +332,36 @@ public abstract class ParamField extends JPanel {
 		String lastContent;
 		/**
+		 * This method is called each time the field is modified. A Runnable is used it is
+		 * impossible to modify the comboBox from a DocumentEvent.
+		 */
+		Runnable updateComboBox = new Runnable() {
+			@Override
+			public void run() {
+				String content = field.getText();
+				if (!content.equals(lastContent)) {
+					if (content.length() >= 2) {
+						lastContent = content;
+						comboBox.removeAllItems();
+						try {
+							for (String s : getItems(content)) {
+								comboBox.addItem(s);
+							}
+						} catch (CantSendQueryException e) {
+							logger.log(Level.WARNING, "Can't get table names for the resolver", e);
+						}
+						comboBox.getEditor().setItem(content);
+					}
+					if ("".equals(content)) {
+						mainView.event(Event.PARAMETER_REMOVED, paramName);
+					} else {
+						mainView.event(Event.PARAMETER_CHANGED, paramName, content);
+					}
+				}
+			}
+		};
+
+		/**
 		 * Method constructor
 		 * 
 		 * @param mainView The main view of the application.
@@ -356,7 +386,7 @@ public abstract class ParamField extends JPanel {
 		 * @throws CantSendQueryException If the resolver do not work.
 		 */
 		static String[] getItems(String begining) throws CantSendQueryException {
-			StringBuilder resolverResult = null;
+			StringBuilder resolverResult;
 			resolverResult = VOTableConnection.sendGet(RESOLVER_URL, "q=\"" + begining + "\"");
 			JsonObject root = new JsonParser().parse(resolverResult.toString()).getAsJsonObject();
 			int count = Integer.parseInt(root.get("count").toString());
@@ -371,36 +401,6 @@ public abstract class ParamField extends JPanel {
 		}
 		/**
-		 * This method is called each time the field is modified. A Runnable is used it is
-		 * impossible to modify the comboBox from a DocumentEvent.
-		 */
-		Runnable updateComboBox = new Runnable() {
-			@Override
-			public void run() {
-				String content = field.getText();
-				if (!content.equals(lastContent)) {
-					if (content.length() >= 2) {
-						lastContent = content;
-						comboBox.removeAllItems();
-						try {
-							for (String s : getItems(content)) {
-								comboBox.addItem(s);
-							}
-						} catch (CantSendQueryException e) {
-							logger.log(Level.WARNING, "Can't get table names for the resolver", e);
-						}
-						comboBox.getEditor().setItem(content);
-					}
-					if ("".equals(content)) {
-						mainView.event(Event.paramRemoved, paramName);
-					} else {
-						mainView.event(Event.paramChanged, paramName, content);
-					}
-				}
-			}
-		};
-
-		/**
 		 * This method is called each time the field is modified.
 		 */
 		@Override
@@ -500,9 +500,9 @@ public abstract class ParamField extends JPanel {
 		void update() {
 			DataProductType item = (DataProductType) comboBox.getSelectedItem();
 			if (DataProductType.ALL.equals(item)) {
-				mainView.event(Event.paramRemoved, paramName);
+				mainView.event(Event.PARAMETER_REMOVED, paramName);
 			} else {
-				mainView.event(Event.paramChanged, paramName, item.query());
+				mainView.event(Event.PARAMETER_CHANGED, paramName, item.query());
 			}
 		}
 	}
@@ -581,9 +581,9 @@ public abstract class ParamField extends JPanel {
 		void update() {
 			TargetClass value = (TargetClass) comboBox.getSelectedItem();
 			if (TargetClass.ALL.equals(value)) {
-				mainView.event(Event.paramRemoved, paramName);
+				mainView.event(Event.PARAMETER_REMOVED, paramName);
 			} else {
-				mainView.event(Event.paramChanged, paramName, value.query());
+				mainView.event(Event.PARAMETER_CHANGED, paramName, value.query());
 			}
 		}
 	}
@@ -169,7 +169,7 @@ public class RequestPanel extends JPanel implements ActionListener {
 	@Override
 	public void actionPerformed(ActionEvent evt) {
 		if (((JButton) evt.getSource()).getName() == BTN_NAME) {
-			this.mainView.event(Event.btnSendClicked, queryArea.getText());
+			this.mainView.event(Event.SEND_BUTTON_CLICKED, queryArea.getText());
 		}
 	}
@@ -69,7 +69,7 @@ public class ServicesPanel extends JPanel {
 				.addListSelectionListener(new ListSelectionListener() {
 					@Override
 					public void valueChanged(ListSelectionEvent evt) {
-						mainView.event(Event.serviceSelected,
+						mainView.event(Event.SERVICE_SELECTED,
 								voTableView.getTable().getSelectedRow());
 					}
 				});
@@ -34,6 +34,10 @@ public class Utils {
 	/** The logger for the class Utils. */
 	private static final Logger logger = Logger.getLogger(Utils.class.getName());
+	/** Private constructor to hide the implicit public one. */
+	private Utils() {
+	}
+
 	/**
 	 * StringJoiner has the same purpose of Java 8 StringJoiner, it has been rewritten for Java7
 	 * compatibility.
@@ -16,6 +16,7 @@
 package eu.omp.irap.vespa.epntapclient.votable;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.swing.JFrame;
@@ -35,6 +36,10 @@ public class VOTableApp {
 	/** The logger for the class VOTableApp. */
 	static final Logger logger = Logger.getLogger(VOTableApp.class.getName());
+	/** Private constructor to hide the implicit public one. */
+	private VOTableApp() {
+	}
+
 	/**
 	 * Main function to start the application as standalone.
 	 * 
@@ -57,13 +62,14 @@ public class VOTableApp {
 			@Override
 			public void run() {
 				// TODO: Add option to export to CSV and HTML in CLI.
-				VOTableController voTableControl = null;
+				VOTableController voTableControl;
 				logger.info("Lauching VOTable app with arguments:\n  " + new Gson().toJson(args));
 				if (args.length == 1) {
 					try {
 						voTableControl = new VOTableController(args[0]);
 					} catch (VOTableException e) {
 						System.console().writer().println("Error: " + e.getMessage());
+						logger.log(Level.WARNING, e.getMessage(), e);
 						return;
 					}
 				} else if (args.length == 3) {
@@ -27,6 +27,7 @@ import java.net.URL;
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import eu.omp.irap.vespa.epntapclient.utils.Const;
@@ -132,7 +133,8 @@ public final class VOTableConnection {
 				response.append(inputLine);
 			}
 			in.close();
-		} catch (@SuppressWarnings("unused") IOException e1) {
+		} catch (IOException e1) {
+			logger.log(Level.WARNING, "Can not get input stream", e1);
 			try (BufferedReader in = new BufferedReader(
 					new InputStreamReader(con.getErrorStream()))) {
 				while ((inputLine = in.readLine()) != null) {
@@ -82,8 +82,7 @@ public class VOTableController {
 	 * @param queryLanguage The language used for the queries (ie. "ADQL").
 	 * @param query The query to ask to the registry.
 	 * @throws CantSendQueryException If the query can not be sent.
-	 * @throws CantDisplayVOTableException If the table can not be filled. @see
-	 *             CantFillTableException
+	 * @throws CantDisplayVOTableException If the table can not be filled.
 	 */
 	public void fillTable(String targetURL, String queryLanguage, String query)
 			throws CantDisplayVOTableException, CantSendQueryException {
@@ -132,7 +132,7 @@ public abstract class VOTableException extends Exception {
 			 */
 			public CantGetErrorStream(String uri, IOException e) {
 				super("Can not get the input stream of the result, neither the error stream "
-						+ "for the request " + uri);
+						+ "for the request " + uri, e);
 			}
 		}