hook{,s} -> webhook{,s}

Author: Vladimir Kotal

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

@@ -37,7 +37,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import opengrok.auth.plugin.ldap.LdapServer;
-import opengrok.auth.plugin.util.Hooks;
+import opengrok.auth.plugin.util.WebHooks;
 
 public class Configuration implements Serializable {
 
@@ -46,7 +46,7 @@ public class Configuration implements Serializable {
     private List<LdapServer> servers = new ArrayList<>();
     private int interval;
     private String searchBase;
-    private Hooks hooks;
+    private WebHooks webHooks;
     private int searchTimeout;
     private int connectTimeout;
     private int countLimit;
@@ -59,12 +59,12 @@ public List<LdapServer> getServers() {
         return servers;
     }
 
-    public void setHooks(Hooks hooks) {
-        this.hooks = hooks;
+    public void setWebHooks(WebHooks webHooks) {
+        this.webHooks = webHooks;
     }
 
-    public Hooks getHooks() {
-        return hooks;
+    public WebHooks getWebHooks() {
+        return webHooks;
     }
 
     public int getInterval() {

plugins/src/opengrok/auth/plugin/ldap/LdapFacade.java

@@ -43,8 +43,8 @@
 
 import opengrok.auth.plugin.configuration.Configuration;
 import opengrok.auth.plugin.entity.User;
-import opengrok.auth.plugin.util.Hook;
-import opengrok.auth.plugin.util.Hooks;
+import opengrok.auth.plugin.util.WebHook;
+import opengrok.auth.plugin.util.WebHooks;
 import org.opengrok.indexer.authorization.LdapException;
 import opengrok.auth.plugin.util.RestfulClient;
 
@@ -97,9 +97,9 @@ public class LdapFacade extends AbstractLdapProvider {
     private List<LdapServer> servers = new ArrayList<>();
 
     /**
-     * server hooks
+     * server webHooks
      */
-    Hooks hooks;
+    private WebHooks webHooks;
 
     private SearchControls controls;
     private int actualServer = 0;
@@ -183,13 +183,13 @@ public LdapFacade(Configuration cfg) {
         setServers(cfg.getServers(), cfg.getConnectTimeout());
         setInterval(cfg.getInterval());
         setSearchBase(cfg.getSearchBase());
-        setHooks(cfg.getHooks());
+        setWebHooks(cfg.getWebHooks());
         prepareSearchControls(cfg.getSearchTimeout(), cfg.getCountLimit());
         prepareServers();
     }
 
-    private void setHooks(Hooks hooks) {
-        this.hooks = hooks;
+    private void setWebHooks(WebHooks webHooks) {
+        this.webHooks = webHooks;
     }
 
     /**
@@ -330,8 +330,8 @@ private <T> T lookup(String dn, String filter, String[] attributes, AttributeMap
             LOGGER.log(Level.SEVERE, "Tried all LDAP servers in a pool but no server works");
             errorTimestamp = System.currentTimeMillis();
             reported = false;
-            Hook hook;
-            if ((hook = hooks.getFail()) != null) {
+            WebHook hook;
+            if ((hook = webHooks.getFail()) != null) {
                 RestfulClient.postIt(hook.getURI(), hook.getContent());
             }
             throw new LdapException("Tried all LDAP servers in a pool but no server works");
@@ -351,8 +351,8 @@ private <T> T lookup(String dn, String filter, String[] attributes, AttributeMap
                 reported = false;
                 if (errorTimestamp > 0) {
                     errorTimestamp = 0;
-                    Hook hook;
-                    if ((hook = hooks.getRecover()) != null) {
+                    WebHook hook;
+                    if ((hook = webHooks.getRecover()) != null) {
                         RestfulClient.postIt(hook.getURI(), hook.getContent());
                     }
                 }

plugins/src/opengrok/auth/plugin/util/Hook.java renamed to plugins/src/opengrok/auth/plugin/util/WebHook.java

@@ -25,7 +25,7 @@
 
 import java.io.Serializable;
 
-public class Hook implements Serializable {
+public class WebHook implements Serializable {
     private static final long serialVersionUID = -1;
 
     private String URI;

plugins/src/opengrok/auth/plugin/util/Hooks.java renamed to plugins/src/opengrok/auth/plugin/util/WebHooks.java

@@ -25,21 +25,21 @@
 
 import java.io.Serializable;
 
-public class Hooks implements Serializable {
+public class WebHooks implements Serializable {
     private static final long serialVersionUID = -1;
 
-    Hook fail;
-    Hook recover;
+    WebHook fail;
+    WebHook recover;
 
-    public void setFail(Hook fail) {
+    public void setFail(WebHook fail) {
         this.fail = fail;
     }
 
-    public Hook getFail() { return fail; }
+    public WebHook getFail() { return fail; }
 
-    public void setRecover(Hook recover) {
+    public void setRecover(WebHook recover) {
         this.recover = recover;
     }
 
-    public Hook getRecover() { return recover; }
+    public WebHook getRecover() { return recover; }
 }

plugins/test/opengrok/auth/plugin/configuration/ConfigurationTest.java

@@ -32,8 +32,8 @@
 import java.util.LinkedList;
 import junit.framework.AssertionFailedError;
 import opengrok.auth.plugin.ldap.LdapServer;
-import opengrok.auth.plugin.util.Hook;
-import opengrok.auth.plugin.util.Hooks;
+import opengrok.auth.plugin.util.WebHook;
+import opengrok.auth.plugin.util.WebHooks;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
@@ -67,12 +67,12 @@ public void exceptionThrown(Exception e) {
         configuration1.setConnectTimeout(42);
         configuration1.setCountLimit(10);
         configuration1.setServers(new ArrayList<>(Arrays.asList(new LdapServer("http://server.com"))));
-        Hooks hooks = new Hooks();
-        Hook hook = new Hook();
+        WebHooks webHooks = new WebHooks();
+        WebHook hook = new WebHook();
         hook.setContent("foo");
         hook.setURI("http://localhost:8080/source/api/v1/messages");
-        hooks.setFail(hook);
-        configuration1.setHooks(hooks);
+        webHooks.setFail(hook);
+        configuration1.setWebHooks(webHooks);
 
         enc.writeObject(configuration1);
         enc.close();