Merge branch 'master' of github.com:oracle/opengrok into lucene-9.10.0

plugins/src/main/java/opengrok/auth/plugin/configuration/Configuration.java

@@ -54,6 +54,7 @@ public class Configuration implements Serializable {
 
     private static final long serialVersionUID = -1;
 
+    @JsonProperty
     @SuppressWarnings("serial")
     private List<LdapServer> servers = new ArrayList<>();
     @JsonProperty

plugins/src/main/java/opengrok/auth/plugin/ldap/LdapServer.java

@@ -25,7 +25,6 @@
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -82,6 +81,8 @@ public class LdapServer implements Serializable {
     @JsonProperty
     private int readTimeout;
 
+    private int interval = 10 * 1000;
+
     @SuppressWarnings("serial")
     private final Map<String, String> env;
     private transient LdapContext ctx;
@@ -210,7 +211,6 @@ public InetAddress[] getAddresses(String hostname) throws UnknownHostException {
      * Go through all IP addresses and find out if they are reachable.
      * @return true if all IP addresses are reachable, false otherwise
      */
-    @JsonIgnore
     public boolean isReachable() {
         try {
             InetAddress[] addresses = getAddresses(urlToHostname(getUrl()));
@@ -245,7 +245,6 @@ public boolean isReachable() {
      *
      * @return true if it is working
      */
-    @JsonIgnore
     public synchronized boolean isWorking() {
         if (ctx == null) {
             if (!isReachable()) {
@@ -262,7 +261,6 @@ public synchronized boolean isWorking() {
      *
      * @return the new connection or null
      */
-    @Nullable
     private synchronized LdapContext connect() {
         LOGGER.log(Level.INFO, "Connecting to LDAP server {0} ", this);
 
@@ -294,8 +292,7 @@ private synchronized LdapContext connect() {
                 LOGGER.log(Level.INFO, "Connected to LDAP server {0}", this);
                 errorTimestamp = 0;
             } catch (NamingException ex) {
-                LOGGER.log(Level.WARNING,
-                        String.format("LDAP server %s is not responding", env.get(Context.PROVIDER_URL)), ex);
+                LOGGER.log(Level.WARNING, "LDAP server {0} is not responding", env.get(Context.PROVIDER_URL));
                 errorTimestamp = System.currentTimeMillis();
                 close();
                 ctx = null;