[ofbiz-framework] branch trunk updated: Improved: Install a Checkstyle pre-push (on every committer machine?) (OFBIZ-11304)

This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 88bda0b  Improved: Install a Checkstyle pre-push (on every committer machine?) (OFBIZ-11304)
88bda0b is described below

commit 88bda0b4dcd7a88a17c8e1bcb050f572f6409df4
Author: Jacques Le Roux <[hidden email]>
AuthorDate: Sat Jun 13 10:09:48 2020 +0200

    Improved: Install a Checkstyle pre-push (on every committer machine?) (OFBIZ-11304)
   
    Updates tasks.checkstyleMain.maxErrors to 26842
    Remove a trailing space in RequestHandler I used to test the pre-push hook.
   
    In the previous commit (c4b5f5e) I have pushed a pre-push hook rather than a
    pre-commit hook. I think it makes sense. I noticed that this does not clear the
    existing pre-commit hook in .git\hooks. You have to clear it by hand.
   
    But anyway I believe we should rather use a webhook as Suggested by Samuel and
    proposed by Infra. This for at least 3 reasons:
        Handles PRs and not only local commits
        Minimise the CPU usage locally
        Simplify usage for custom projects
   
    I think it's the best solution but I'll continue the discussion on dev ML about
---
 build.gradle                                                            | 2 +-
 .../src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 88e9fd5..a43546b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -287,7 +287,7 @@ checkstyle {
     // the sum of errors found last time it was changed after using the
     // ‘checkstyle’ tool present in the framework and in the official
     // plugins.
-    tasks.checkstyleMain.maxErrors = 26844
+    tasks.checkstyleMain.maxErrors = 26842
     // Currently there are a lot of errors so we need to temporarily
     // hide them to avoid polluting the terminal output.
     showViolations = false
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
index 8a48ca7..72ee26d 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
@@ -100,7 +100,7 @@ public class RequestHandler {
 
     private RequestHandler(ServletContext context) {
         // init the ControllerConfig, but don't save it anywhere, just load it into the cache
-        this.controllerConfigURL = ConfigXMLReader.getControllerConfigURL(context);
+        this.controllerConfigURL = ConfigXMLReader.getControllerConfigURL(context);
         try {
             ConfigXMLReader.getControllerConfig(this.controllerConfigURL);
         } catch (WebAppConfigurationException e) {