You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2022/04/22 16:38:44 UTC
[ofbiz-framework] branch release22.01 updated: Fixed: no functional changes, fixes chekstyle issues
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch release22.01
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/release22.01 by this push:
new 40c3973a60 Fixed: no functional changes, fixes chekstyle issues
40c3973a60 is described below
commit 40c3973a6011f4feb1bacd39750aa4eab394c344
Author: Jacques Le Roux <ja...@les7arts.com>
AuthorDate: Fri Apr 22 18:33:57 2022 +0200
Fixed: no functional changes, fixes chekstyle issues
Also adds javadoc task to GH actions, let's see if it works there.
Conflicts handled by hand in github/workflows/gradle.yaml
---
.github/workflows/gradle.yaml | 6 +++---
.../org/apache/ofbiz/webapp/event/ServiceMultiEventHandler.java | 6 ++----
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/gradle.yaml b/.github/workflows/gradle.yaml
index a91ea75fca..d7b96a1e7d 100644
--- a/.github/workflows/gradle.yaml
+++ b/.github/workflows/gradle.yaml
@@ -39,7 +39,7 @@ jobs:
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
- run: ./gradlew pullAllPluginsSource check
-# Below does not work, see https://lists.apache.org/thread/80wzf4kclfk5nh2fss56jd6otf7y4n2f
+ run: ./gradlew pullAllPluginsSource check javadoc
+# Below does not work, see see https://lists.apache.org/thread/80wzf4kclfk5nh2fss56jd6otf7y4n2f
# - name: Builds with Gradle, checks style and run integration tests (just to know if they pass)
-# run: ./gradlew pullAllPluginsSource check loadAll testIntegration
+# run: ./gradlew pullAllPluginsSource check javadoc loadAll testIntegration
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceMultiEventHandler.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceMultiEventHandler.java
index 439c3631c2..ca0298a39c 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceMultiEventHandler.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceMultiEventHandler.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
+* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
@@ -47,11 +47,8 @@ import org.apache.ofbiz.service.ModelService;
import org.apache.ofbiz.service.ServiceAuthException;
import org.apache.ofbiz.service.ServiceUtil;
import org.apache.ofbiz.service.ServiceValidationException;
-import org.apache.ofbiz.webapp.control.ConfigXMLReader;
import org.apache.ofbiz.webapp.control.ConfigXMLReader.Event;
import org.apache.ofbiz.webapp.control.ConfigXMLReader.RequestMap;
-import org.apache.ofbiz.webapp.control.RequestHandler;
-import org.apache.ofbiz.webapp.control.WebAppConfigurationException;
/**
* ServiceMultiEventHandler - Event handler for running a service multiple times; for bulk forms
@@ -63,6 +60,7 @@ public class ServiceMultiEventHandler implements EventHandler {
public static final String SYNC = "sync";
public static final String ASYNC = "async";
+ @SuppressWarnings("unused")
private ServletContext servletContext;
@Override