From 1f0cca7fa44bf8e5340094de5d595449690e3bb7 Mon Sep 17 00:00:00 2001 From: Jacques Le Roux Date: Sun, 5 Dec 2021 12:24:30 +0100 Subject: [PATCH] Improved: Fix some bugs Spotbugs reports (OFBIZ-12386) Renames BirtEngineServlet class to OfbizBirtEngineServlet, because it shadowed the simple name of it superclass. It can be exceptionally confusing, create lots of situations in which you have to look at import statements to resolve references and creates many opportunities to accidentally define methods that do not override methods in their superclasses. Also remove trailing spaces in OpenApiUtil class --- ...BirtEngineServlet.java => OfbizBirtEngineServlet.java} | 8 +++----- .../java/org/apache/ofbiz/ws/rs/util/OpenApiUtil.java | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) rename birt/src/main/java/org/apache/ofbiz/birt/report/servlet/{BirtEngineServlet.java => OfbizBirtEngineServlet.java} (93%) diff --git a/birt/src/main/java/org/apache/ofbiz/birt/report/servlet/BirtEngineServlet.java b/birt/src/main/java/org/apache/ofbiz/birt/report/servlet/OfbizBirtEngineServlet.java similarity index 93% rename from birt/src/main/java/org/apache/ofbiz/birt/report/servlet/BirtEngineServlet.java rename to birt/src/main/java/org/apache/ofbiz/birt/report/servlet/OfbizBirtEngineServlet.java index dd979b449..e9c6f3594 100644 --- a/birt/src/main/java/org/apache/ofbiz/birt/report/servlet/BirtEngineServlet.java +++ b/birt/src/main/java/org/apache/ofbiz/birt/report/servlet/OfbizBirtEngineServlet.java @@ -24,19 +24,17 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.ofbiz.base.util.GeneralException; +import org.apache.ofbiz.base.util.UtilGenerics; +import org.apache.ofbiz.birt.BirtWorker; import org.eclipse.birt.core.exception.BirtException; import org.eclipse.birt.report.context.BirtContext; import org.eclipse.birt.report.context.IContext; import org.eclipse.birt.report.service.BirtReportServiceFactory; import org.eclipse.birt.report.service.ReportEngineService; import org.eclipse.birt.report.utility.ParameterAccessor; -import org.apache.ofbiz.base.util.UtilGenerics; -import org.apache.ofbiz.birt.BirtWorker; @SuppressWarnings("serial") -public class BirtEngineServlet extends org.eclipse.birt.report.servlet.BirtEngineServlet { - - private static final String MODULE = BirtEngineServlet.class.getName(); +public class OfbizBirtEngineServlet extends org.eclipse.birt.report.servlet.BirtEngineServlet { @Override protected IContext __getContext(HttpServletRequest request, HttpServletResponse response) throws BirtException { diff --git a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/OpenApiUtil.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/OpenApiUtil.java index 96d7d3c63..9f679f60e 100644 --- a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/OpenApiUtil.java +++ b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/OpenApiUtil.java @@ -245,7 +245,7 @@ public final class OpenApiUtil { .schema(new Schema<>() .$ref("#/components/schemas/" + "api.response.service.unprocessableentity")) .example(unprocessableEntExample))); - + final ApiResponse methodNotAllowed = new ApiResponse() .description("Method Not Allowed: Service called with HTTP method other than the declared one.") .content(new Content()