Allow public key retrieval

Author: Tom-Willemsen

base/uk.ac.stfc.isis.ibex.alarm/src/uk/ac/stfc/isis/ibex/alarm/AlarmSettings.java

@@ -80,7 +80,7 @@ public void setInstrument(InstrumentInfo instrument) {
      *         instrument.
      */
     private static String buildRdbUrl(String hostName, String table) {
-        return "jdbc:mysql://" + hostName + "/" + table + "?useSSL=false&useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Europe/London&autoReconnect=true";
+        return "jdbc:mysql://" + hostName + "/" + table + "?useSSL=false&useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Europe/London&autoReconnect=true&allowPublicKeyRetrieval=true";
     }
 
     /**

base/uk.ac.stfc.isis.ibex.databases/src/uk/ac/stfc/isis/ibex/databases/Rdb.java

@@ -31,7 +31,7 @@
  * Represents the RDB connection.
  */
 public class Rdb {
-    private static final String MYSQL_OPTIONS = "?useSSL=false&useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Europe/London&autoReconnect=true";
+    private static final String MYSQL_OPTIONS = "?useSSL=false&useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Europe/London&autoReconnect=true&allowPublicKeyRetrieval=true";
 	private static final Logger LOG = IsisLog.getLogger(Rdb.class);
     private final String schema;
     private static final String PROTOCOL = "jdbc:mysql:";

base/uk.ac.stfc.isis.ibex.ui.logplotter.tests/src/uk/ac/stfc/isis/ibex/ui/logplotter/tests/LogPlotterSettingsTest.java

@@ -75,17 +75,17 @@ public class LogPlotterSettingsTest {
      *         instrument.
      */
     private static String BuildArchiveSettings(String instrumentName) {
-        return "RDB|1|jdbc:mysql://" + instrumentName + "/archive?useSSL=false&useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Europe/London&autoReconnect=true"
-        		+ "*RDB|2|jdbc:mysql://130.246.39.152/archive?useSSL=false&useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Europe/London&autoReconnect=true";
+        return "RDB|1|jdbc:mysql://" + instrumentName + "/archive?useSSL=false&useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Europe/London&autoReconnect=true&allowPublicKeyRetrieval=true"
+        		+ "*RDB|2|jdbc:mysql://130.246.39.152/archive?useSSL=false&useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Europe/London&autoReconnect=true&allowPublicKeyRetrieval=true";
     }
 
     /**
      * @param instrumentName The instrument name
      * @return The URLs settings string corresponding to the given instrument.
      */
     private static String BuildUrlsSettings(String instrumentName) {
-        return "jdbc:mysql://" + instrumentName + "/archive?useSSL=false&useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Europe/London&autoReconnect=true"
-        		+ "*jdbc:mysql://130.246.39.152/archive?useSSL=false&useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Europe/London&autoReconnect=true";
+        return "jdbc:mysql://" + instrumentName + "/archive?useSSL=false&useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Europe/London&autoReconnect=true&allowPublicKeyRetrieval=true"
+        		+ "*jdbc:mysql://130.246.39.152/archive?useSSL=false&useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Europe/London&autoReconnect=true&allowPublicKeyRetrieval=true";
     }
 
     // These settings represent the defaults, as set in

base/uk.ac.stfc.isis.ibex.ui.logplotter/src/uk/ac/stfc/isis/ibex/ui/logplotter/LogPlotterSettings.java

@@ -101,16 +101,16 @@ private void setArchives(String hostName) {
      * @return The database URL corresponding to the given instrument.
      */
     private static String buildDatabaseUrl(String hostName) {
-        return "jdbc:mysql://" + hostName + "/archive?useSSL=false&useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Europe/London&autoReconnect=true"
-        		+ "*jdbc:mysql://130.246.39.152/archive?useSSL=false&useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Europe/London&autoReconnect=true";
+        return "jdbc:mysql://" + hostName + "/archive?useSSL=false&useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Europe/London&autoReconnect=true&allowPublicKeyRetrieval=true"
+        		+ "*jdbc:mysql://130.246.39.152/archive?useSSL=false&useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Europe/London&autoReconnect=true&allowPublicKeyRetrieval=true";
     }
 
     /**
      * @param hostName The instrument name
      * @return The archives URL corresponding to the given instrument.
      */
     private static String buildArchivesUrl(String hostName) {
-        return "RDB|1|jdbc:mysql://" + hostName + "/archive?useSSL=false&useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Europe/London&autoReconnect=true"
-        		+ "*RDB|2|jdbc:mysql://130.246.39.152/archive?useSSL=false&useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Europe/London&autoReconnect=true";
+        return "RDB|1|jdbc:mysql://" + hostName + "/archive?useSSL=false&useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Europe/London&autoReconnect=true&allowPublicKeyRetrieval=true"
+        		+ "*RDB|2|jdbc:mysql://130.246.39.152/archive?useSSL=false&useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Europe/London&autoReconnect=true&allowPublicKeyRetrieval=true";
     }
 }