[ofbiz-plugins] branch trunk updated (e964d61 -> 0474982)

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

[ofbiz-plugins] branch trunk updated (e964d61 -> 0474982)

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

mbrohl pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git.


    from e964d61  Improved: Default ordering of webapps titles in main menu (OFBIZ-12166)
     new 3bfac03  Improved: Declare classes final as suggested by checkstyle (OFBIZ-12169)
     new 9465c20  Improved: Adds newline at the end of the file (OFBIZ-12169)
     new 0474982  Improved: if else construct must use parentheses (OFBIZ-12169)

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../main/java/org/apache/ofbiz/content/search/ContentDocument.java  | 6 ++++--
 .../main/java/org/apache/ofbiz/content/search/DocumentIndexer.java  | 2 +-
 .../src/main/java/org/apache/ofbiz/passport/util/PassportUtil.java  | 2 +-
 .../main/java/org/apache/ofbiz/htmlreport/AbstractHtmlReport.java   | 2 +-
 .../src/main/java/org/apache/ofbiz/htmlreport/AbstractReport.java   | 2 +-
 .../src/main/java/org/apache/ofbiz/htmlreport/InterfaceReport.java  | 2 +-
 .../main/java/org/apache/ofbiz/htmlreport/util/ReportEncoder.java   | 2 +-
 .../java/org/apache/ofbiz/htmlreport/util/ReportStringUtil.java     | 2 +-
 solr/src/main/java/org/apache/ofbiz/solr/CategoryUtil.java          | 2 +-
 .../java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java   | 3 ++-
 webpos/src/main/java/org/apache/ofbiz/webpos/WebPosEvents.java      | 2 +-
 11 files changed, 15 insertions(+), 12 deletions(-)

Reply | Threaded
Open this post in threaded view
|

[ofbiz-plugins] 01/03: Improved: Declare classes final as suggested by checkstyle (OFBIZ-12169)

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

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

commit 3bfac03158a92484113339c7a740542c03eb9cec
Author: Michael Brohl <[hidden email]>
AuthorDate: Mon Feb 8 17:58:16 2021 +0100

    Improved: Declare classes final as suggested by checkstyle (OFBIZ-12169)
---
 .../src/main/java/org/apache/ofbiz/content/search/DocumentIndexer.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lucene/src/main/java/org/apache/ofbiz/content/search/DocumentIndexer.java b/lucene/src/main/java/org/apache/ofbiz/content/search/DocumentIndexer.java
index 94e83bb..8acdc23 100644
--- a/lucene/src/main/java/org/apache/ofbiz/content/search/DocumentIndexer.java
+++ b/lucene/src/main/java/org/apache/ofbiz/content/search/DocumentIndexer.java
@@ -37,7 +37,7 @@ import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.FSDirectory;
 import org.apache.lucene.store.LockObtainFailedException;
 
-public class DocumentIndexer extends Thread {
+public final class DocumentIndexer extends Thread {
 
     private static final String MODULE = DocumentIndexer.class.getName();
 

Reply | Threaded
Open this post in threaded view
|

[ofbiz-plugins] 02/03: Improved: Adds newline at the end of the file (OFBIZ-12169)

mbrohl
In reply to this post by mbrohl
This is an automated email from the ASF dual-hosted git repository.

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

commit 9465c20566b504e365e8f6f65b7895926d28e908
Author: Wiebke Pätzold <[hidden email]>
AuthorDate: Tue Feb 9 09:25:14 2021 +0100

    Improved: Adds newline at the end of the file (OFBIZ-12169)
---
 passport/src/main/java/org/apache/ofbiz/passport/util/PassportUtil.java | 2 +-
 .../src/main/java/org/apache/ofbiz/htmlreport/AbstractHtmlReport.java   | 2 +-
 pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReport.java    | 2 +-
 pricat/src/main/java/org/apache/ofbiz/htmlreport/InterfaceReport.java   | 2 +-
 .../src/main/java/org/apache/ofbiz/htmlreport/util/ReportEncoder.java   | 2 +-
 .../main/java/org/apache/ofbiz/htmlreport/util/ReportStringUtil.java    | 2 +-
 solr/src/main/java/org/apache/ofbiz/solr/CategoryUtil.java              | 2 +-
 webpos/src/main/java/org/apache/ofbiz/webpos/WebPosEvents.java          | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/passport/src/main/java/org/apache/ofbiz/passport/util/PassportUtil.java b/passport/src/main/java/org/apache/ofbiz/passport/util/PassportUtil.java
index e0f4f2b..d273fda 100644
--- a/passport/src/main/java/org/apache/ofbiz/passport/util/PassportUtil.java
+++ b/passport/src/main/java/org/apache/ofbiz/passport/util/PassportUtil.java
@@ -88,4 +88,4 @@ public class PassportUtil {
         }
         return prefix;
     }
-}
\ No newline at end of file
+}
diff --git a/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractHtmlReport.java b/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractHtmlReport.java
index dccde2d..68a4d91 100644
--- a/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractHtmlReport.java
+++ b/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractHtmlReport.java
@@ -120,4 +120,4 @@ public abstract class AbstractHtmlReport extends HtmlReport {
         }
         return "success";
     }
-}
\ No newline at end of file
+}
diff --git a/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReport.java b/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReport.java
index 5d1be4a..ed0f02d 100644
--- a/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReport.java
+++ b/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReport.java
@@ -186,4 +186,4 @@ public abstract class AbstractReport implements InterfaceReport {
         println();
     }
 
-}
\ No newline at end of file
+}
diff --git a/pricat/src/main/java/org/apache/ofbiz/htmlreport/InterfaceReport.java b/pricat/src/main/java/org/apache/ofbiz/htmlreport/InterfaceReport.java
index e4fd320..7047638 100644
--- a/pricat/src/main/java/org/apache/ofbiz/htmlreport/InterfaceReport.java
+++ b/pricat/src/main/java/org/apache/ofbiz/htmlreport/InterfaceReport.java
@@ -198,4 +198,4 @@ public interface InterfaceReport {
     void setSequenceNum(long sequenceNum);
     long getSequenceNum();
 
-}
\ No newline at end of file
+}
diff --git a/pricat/src/main/java/org/apache/ofbiz/htmlreport/util/ReportEncoder.java b/pricat/src/main/java/org/apache/ofbiz/htmlreport/util/ReportEncoder.java
index 9e67dad..2efe6ba 100644
--- a/pricat/src/main/java/org/apache/ofbiz/htmlreport/util/ReportEncoder.java
+++ b/pricat/src/main/java/org/apache/ofbiz/htmlreport/util/ReportEncoder.java
@@ -611,4 +611,4 @@ public final class ReportEncoder {
         }
         return decode(preparedSource.toString(), encoding);
     }
-}
\ No newline at end of file
+}
diff --git a/pricat/src/main/java/org/apache/ofbiz/htmlreport/util/ReportStringUtil.java b/pricat/src/main/java/org/apache/ofbiz/htmlreport/util/ReportStringUtil.java
index 373fdfb..6ad61cb 100644
--- a/pricat/src/main/java/org/apache/ofbiz/htmlreport/util/ReportStringUtil.java
+++ b/pricat/src/main/java/org/apache/ofbiz/htmlreport/util/ReportStringUtil.java
@@ -517,4 +517,4 @@ public final class ReportStringUtil {
 
         return result;
     }
-}
\ No newline at end of file
+}
diff --git a/solr/src/main/java/org/apache/ofbiz/solr/CategoryUtil.java b/solr/src/main/java/org/apache/ofbiz/solr/CategoryUtil.java
index 427d8d2..92a8628 100644
--- a/solr/src/main/java/org/apache/ofbiz/solr/CategoryUtil.java
+++ b/solr/src/main/java/org/apache/ofbiz/solr/CategoryUtil.java
@@ -183,4 +183,4 @@ public final class CategoryUtil {
             return productCategoryId;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/webpos/src/main/java/org/apache/ofbiz/webpos/WebPosEvents.java b/webpos/src/main/java/org/apache/ofbiz/webpos/WebPosEvents.java
index c80cf03..f781056 100755
--- a/webpos/src/main/java/org/apache/ofbiz/webpos/WebPosEvents.java
+++ b/webpos/src/main/java/org/apache/ofbiz/webpos/WebPosEvents.java
@@ -246,4 +246,4 @@ public class WebPosEvents {
         }
         return "success";
     }
-}
\ No newline at end of file
+}

Reply | Threaded
Open this post in threaded view
|

[ofbiz-plugins] 03/03: Improved: if else construct must use parentheses (OFBIZ-12169)

mbrohl
In reply to this post by mbrohl
This is an automated email from the ASF dual-hosted git repository.

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

commit 0474982534dfcee4de2b32ef29923f21805dbbd1
Author: Wiebke Pätzold <[hidden email]>
AuthorDate: Tue Feb 9 09:57:10 2021 +0100

    Improved: if else construct must use parentheses (OFBIZ-12169)
---
 .../main/java/org/apache/ofbiz/content/search/ContentDocument.java  | 6 ++++--
 .../java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java   | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lucene/src/main/java/org/apache/ofbiz/content/search/ContentDocument.java b/lucene/src/main/java/org/apache/ofbiz/content/search/ContentDocument.java
index 64f8c55..27b6a85 100644
--- a/lucene/src/main/java/org/apache/ofbiz/content/search/ContentDocument.java
+++ b/lucene/src/main/java/org/apache/ofbiz/content/search/ContentDocument.java
@@ -86,11 +86,13 @@ public class ContentDocument implements LuceneDocument {
             doc.add(new StringField("modified", modDate.toString(), Store.YES));
         }
         String contentName = content.getString("contentName");
-        if (UtilValidate.isNotEmpty(contentName))
+        if (UtilValidate.isNotEmpty(contentName)) {
             doc.add(new TextField("title", contentName, Store.YES));
+        }
         String description = content.getString("description");
-        if (UtilValidate.isNotEmpty(description))
+        if (UtilValidate.isNotEmpty(description)) {
             doc.add(new TextField("description", description, Store.YES));
+        }
         List<String> ancestorList = new ArrayList<>();
         ContentWorker.getContentAncestryAll(content.getDelegator(), contentId, "WEB_SITE_PUB_PT", "TO", ancestorList);
         String ancestorString = StringUtil.join(ancestorList, " ");
diff --git a/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java b/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java
index 947bd5d..1ef0c12 100644
--- a/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java
+++ b/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java
@@ -182,8 +182,9 @@ public class OFBizSolrContextFilter extends SolrDispatchFilter {
         }
         // NOTE: there's a chain.doFilter in SolrDispatchFilter's doFilter
         super.doFilter(request, response, chain);
-        if (Debug.timingOn() && rname != null)
+        if (Debug.timingOn() && rname != null) {
             timer.timerString("[" + rname + "(Domain:" + request.getScheme() + "://" + request.getServerName() + ")] Request Done", MODULE);
+        }
     }
     /** Destroy */
     @Override