svn commit: r1860028 - in /ofbiz/ofbiz-plugins/trunk: birt/src/main/java/org/apache/ofbiz/birt/webapp/view/ ecommerce/src/main/java/org/apache/ofbiz/ecommerce/webapp/view/ ldap/src/main/java/org/apache/ofbiz/ldap/commons/ lucene/src/main/java/org/apach...

[mthl]

Author: mthl
Date: Sat May 25 23:44:25 2019
New Revision: 1860028

URL: http://svn.apache.org/viewvc?rev=1860028&view=rev
Log:
Improved: Use the ‘@Override’ annotation
(OFBIZ-10939)

The ‘@Override’ annotation helps readers understand that the method at
hand is overriding a super class or implementing an interface.
Additionally it allows the compiler to check if the methods annotated
with ‘@Override’ are actually implementing an abstract method.

Using that annotation makes ‘@see foo.bar.ParentClass#myMethod’
comments useless, so those they have been removed for the newly
annotated methods.

Modified:
    ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/webapp/view/BirtViewHandler.java
    ofbiz/ofbiz-plugins/trunk/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/webapp/view/JspViewHandler.java
    ofbiz/ofbiz-plugins/trunk/ldap/src/main/java/org/apache/ofbiz/ldap/commons/AbstractOFBizAuthenticationHandler.java
    ofbiz/ofbiz-plugins/trunk/lucene/src/main/java/org/apache/ofbiz/content/search/ContentDocument.java
    ofbiz/ofbiz-plugins/trunk/lucene/src/main/java/org/apache/ofbiz/content/search/ProductDocument.java
    ofbiz/ofbiz-plugins/trunk/passport/src/main/java/org/apache/ofbiz/passport/user/GitHubAuthenticator.java
    ofbiz/ofbiz-plugins/trunk/passport/src/main/java/org/apache/ofbiz/passport/user/LinkedInAuthenticator.java
    ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReport.java
    ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReportThread.java
    ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/htmlreport/HtmlReport.java
    ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/htmlreport/sample/SampleHtmlReport.java
    ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/htmlreport/sample/SampleHtmlThread.java
    ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/AbstractPricatParser.java
    ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/PricatParseExcelHtmlReport.java
    ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/PricatParseExcelHtmlThread.java
    ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/sample/SamplePricatParser.java
    ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java

Modified: ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/webapp/view/BirtViewHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/webapp/view/BirtViewHandler.java?rev=1860028&r1=1860027&r2=1860028&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/webapp/view/BirtViewHandler.java (original)
+++ ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/webapp/view/BirtViewHandler.java Sat May 25 23:44:25 2019
@@ -58,18 +58,22 @@ public class BirtViewHandler implements
 
     private String name = "birt";
 
+    @Override
     public void init(ServletContext context) throws ViewHandlerException {
         this.servletContext = context;
     }
 
+    @Override
     public String getName() {
         return name;
     }
 
+    @Override
     public void setName(String name) {
         this.name = name;
     }
 
+    @Override
     public void render(String name, String page, String info,
             String contentType, String encoding, HttpServletRequest request,
             HttpServletResponse response) throws ViewHandlerException {

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/webapp/view/JspViewHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/webapp/view/JspViewHandler.java?rev=1860028&r1=1860027&r2=1860028&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/webapp/view/JspViewHandler.java (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/webapp/view/JspViewHandler.java Sat May 25 23:44:25 2019
@@ -43,10 +43,12 @@ public class JspViewHandler extends Abst
 
     protected ServletContext context;
 
+    @Override
     public void init(ServletContext context) throws ViewHandlerException {
         this.context = context;
     }
 
+    @Override
     public void render(String name, String page, String contentType, String encoding, String info, HttpServletRequest request, HttpServletResponse response) throws ViewHandlerException {
         // some containers call filters on EVERY request, even forwarded ones,
         // so let it know that it came from the control servlet

Modified: ofbiz/ofbiz-plugins/trunk/ldap/src/main/java/org/apache/ofbiz/ldap/commons/AbstractOFBizAuthenticationHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ldap/src/main/java/org/apache/ofbiz/ldap/commons/AbstractOFBizAuthenticationHandler.java?rev=1860028&r1=1860027&r2=1860028&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ldap/src/main/java/org/apache/ofbiz/ldap/commons/AbstractOFBizAuthenticationHandler.java (original)
+++ ofbiz/ofbiz-plugins/trunk/ldap/src/main/java/org/apache/ofbiz/ldap/commons/AbstractOFBizAuthenticationHandler.java Sat May 25 23:44:25 2019
@@ -65,16 +65,19 @@ public abstract class AbstractOFBizAuthe
 
     }
 
+    @Override
     public Object getPartyId(Element rootElement, SearchResult result) {
         Object partyId = UtilXml.childElementValue(rootElement, "AutoPartyId", "admin");
         return partyId;
     }
 
+    @Override
     public Object getSecurityGroup(Element rootElement, SearchResult result) {
         Object securityGroupId = UtilXml.childElementValue(rootElement, "AutoSecurityGroupId", "FULLADMIN");
         return securityGroupId;
     }
 
+    @Override
     public String login(HttpServletRequest request, HttpServletResponse response, Element rootElement) throws Exception {
 
         String username = request.getParameter("USERNAME");
@@ -87,10 +90,12 @@ public abstract class AbstractOFBizAuthe
         return "error";
     }
 
+    @Override
     public String logout(HttpServletRequest request, HttpServletResponse response, Element rootElement) {
         return "success";
     }
 
+    @Override
     public abstract SearchResult getLdapSearchResult(String username, String password, Element rootElement, boolean bindRequired) throws NamingException;
 
     public String login(HttpServletRequest request, HttpServletResponse response, String username, String password, Element rootElement, SearchResult result) throws Exception {
@@ -157,6 +162,7 @@ public abstract class AbstractOFBizAuthe
      * @param rootElement Element root element of ldap config file
      * @return true if the user has logged out from ldap; otherwise, false.
      */
+    @Override
     public boolean hasLdapLoggedOut(HttpServletRequest request, HttpServletResponse response, Element rootElement) {
         return false;
     }

Modified: ofbiz/ofbiz-plugins/trunk/lucene/src/main/java/org/apache/ofbiz/content/search/ContentDocument.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/lucene/src/main/java/org/apache/ofbiz/content/search/ContentDocument.java?rev=1860028&r1=1860027&r2=1860028&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/lucene/src/main/java/org/apache/ofbiz/content/search/ContentDocument.java (original)
+++ ofbiz/ofbiz-plugins/trunk/lucene/src/main/java/org/apache/ofbiz/content/search/ContentDocument.java Sat May 25 23:44:25 2019
@@ -63,10 +63,12 @@ public class ContentDocument implements
         return getDocumentIdentifier().toString();
     }
 
+    @Override
     public Term getDocumentIdentifier() {
         return documentIdentifier;
     }
 
+    @Override
     public Document prepareDocument(Delegator delegator) {
         Document doc;
         // make a new, empty document

Modified: ofbiz/ofbiz-plugins/trunk/lucene/src/main/java/org/apache/ofbiz/content/search/ProductDocument.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/lucene/src/main/java/org/apache/ofbiz/content/search/ProductDocument.java?rev=1860028&r1=1860027&r2=1860028&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/lucene/src/main/java/org/apache/ofbiz/content/search/ProductDocument.java (original)
+++ ofbiz/ofbiz-plugins/trunk/lucene/src/main/java/org/apache/ofbiz/content/search/ProductDocument.java Sat May 25 23:44:25 2019
@@ -61,10 +61,12 @@ public class ProductDocument implements
         return getDocumentIdentifier().toString();
     }
 
+    @Override
     public Term getDocumentIdentifier() {
         return documentIdentifier;
     }
 
+    @Override
     public Document prepareDocument(Delegator delegator) {
         String productId = getDocumentIdentifier().text();
         try {

Modified: ofbiz/ofbiz-plugins/trunk/passport/src/main/java/org/apache/ofbiz/passport/user/GitHubAuthenticator.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/passport/src/main/java/org/apache/ofbiz/passport/user/GitHubAuthenticator.java?rev=1860028&r1=1860027&r2=1860028&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/passport/src/main/java/org/apache/ofbiz/passport/user/GitHubAuthenticator.java (original)
+++ ofbiz/ofbiz-plugins/trunk/passport/src/main/java/org/apache/ofbiz/passport/user/GitHubAuthenticator.java Sat May 25 23:44:25 2019
@@ -78,6 +78,7 @@ public class GitHubAuthenticator impleme
      *
      * @param dispatcher The ServiceDispatcher to use for this Authenticator
      */
+    @Override
     public void initialize(LocalDispatcher dispatcher) {
         this.dispatcher = dispatcher;
         this.delegator = dispatcher.getDelegator();
@@ -97,6 +98,7 @@ public class GitHubAuthenticator impleme
      * @throws org.apache.ofbiz.common.authentication.api.AuthenticatorException
      *          when a fatal error occurs during authentication
      */
+    @Override
     public boolean authenticate(String userLoginId, String password, boolean isServiceAuth) throws AuthenticatorException {
         Map<String, Object> user = null;
         HttpGet getMethod = null;
@@ -133,6 +135,7 @@ public class GitHubAuthenticator impleme
      * @throws org.apache.ofbiz.common.authentication.api.AuthenticatorException
      *          when logout fails
      */
+    @Override
     public void logout(String username) throws AuthenticatorException {
     }
 
@@ -143,6 +146,7 @@ public class GitHubAuthenticator impleme
      * @throws org.apache.ofbiz.common.authentication.api.AuthenticatorException
      *          user synchronization fails
      */
+    @Override
     public void syncUser(String userLoginId) throws AuthenticatorException {
         Map<String, Object> userMap = getGitHubUserinfo(userLoginId);
         GenericValue system;
@@ -336,6 +340,7 @@ public class GitHubAuthenticator impleme
      * @throws org.apache.ofbiz.common.authentication.api.AuthenticatorException
      *          when update password fails
      */
+    @Override
     public void updatePassword(String username, String password, String newPassword) throws AuthenticatorException {
         Debug.logInfo("Calling GitHub:updatePassword() - ignored!!!", module);
     }
@@ -345,6 +350,7 @@ public class GitHubAuthenticator impleme
      *
      * @return the weight of this Authenicator
      */
+    @Override
     public float getWeight() {
         return 1;
     }
@@ -354,6 +360,7 @@ public class GitHubAuthenticator impleme
      *
      * @return true if the user record is copied to the OFB database
      */
+    @Override
     public boolean isUserSynchronized() {
         return true;
     }
@@ -363,6 +370,7 @@ public class GitHubAuthenticator impleme
      *
      * @return true if this is expected to be the only Authenticator
      */
+    @Override
     public boolean isSingleAuthenticator() {
         return false;
     }
@@ -372,6 +380,7 @@ public class GitHubAuthenticator impleme
      *
      * @return true if the Authenticator is enabled
      */
+    @Override
     public boolean isEnabled() {
         return "true".equalsIgnoreCase(UtilProperties.getPropertyValue(props, "github.authenticator.enabled", "true"));
     }

Modified: ofbiz/ofbiz-plugins/trunk/passport/src/main/java/org/apache/ofbiz/passport/user/LinkedInAuthenticator.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/passport/src/main/java/org/apache/ofbiz/passport/user/LinkedInAuthenticator.java?rev=1860028&r1=1860027&r2=1860028&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/passport/src/main/java/org/apache/ofbiz/passport/user/LinkedInAuthenticator.java (original)
+++ ofbiz/ofbiz-plugins/trunk/passport/src/main/java/org/apache/ofbiz/passport/user/LinkedInAuthenticator.java Sat May 25 23:44:25 2019
@@ -79,6 +79,7 @@ public class LinkedInAuthenticator imple
      *
      * @param dispatcher The ServiceDispatcher to use for this Authenticator
      */
+    @Override
     public void initialize(LocalDispatcher dispatcher) {
         this.dispatcher = dispatcher;
         this.delegator = dispatcher.getDelegator();
@@ -98,6 +99,7 @@ public class LinkedInAuthenticator imple
      * @throws org.apache.ofbiz.common.authentication.api.AuthenticatorException
      *          when a fatal error occurs during authentication
      */
+    @Override
     public boolean authenticate(String userLoginId, String password, boolean isServiceAuth) throws AuthenticatorException {
         Document user = null;
         HttpGet getMethod = null;
@@ -139,6 +141,7 @@ public class LinkedInAuthenticator imple
      * @throws org.apache.ofbiz.common.authentication.api.AuthenticatorException
      *          when logout fails
      */
+    @Override
     public void logout(String username) throws AuthenticatorException {
     }
 
@@ -149,6 +152,7 @@ public class LinkedInAuthenticator imple
      * @throws org.apache.ofbiz.common.authentication.api.AuthenticatorException
      *          user synchronization fails
      */
+    @Override
     public void syncUser(String userLoginId) throws AuthenticatorException {
         Document user = getLinkedInUserinfo(userLoginId);
 
@@ -356,6 +360,7 @@ public class LinkedInAuthenticator imple
      * @throws org.apache.ofbiz.common.authentication.api.AuthenticatorException
      *          when update password fails
      */
+    @Override
     public void updatePassword(String username, String password, String newPassword) throws AuthenticatorException {
         Debug.logInfo("Calling LinkedIn:updatePassword() - ignored!!!", module);
     }
@@ -365,6 +370,7 @@ public class LinkedInAuthenticator imple
      *
      * @return the weight of this Authenicator
      */
+    @Override
     public float getWeight() {
         return 1;
     }
@@ -374,6 +380,7 @@ public class LinkedInAuthenticator imple
      *
      * @return true if the user record is copied to the OFB database
      */
+    @Override
     public boolean isUserSynchronized() {
         return true;
     }
@@ -383,6 +390,7 @@ public class LinkedInAuthenticator imple
      *
      * @return true if this is expected to be the only Authenticator
      */
+    @Override
     public boolean isSingleAuthenticator() {
         return false;
     }
@@ -392,6 +400,7 @@ public class LinkedInAuthenticator imple
      *
      * @return true if the Authenticator is enabled
      */
+    @Override
     public boolean isEnabled() {
         return "true".equalsIgnoreCase(UtilProperties.getPropertyValue(props, "linked.authenticator.enabled", "true"));
     }

Modified: ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReport.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReport.java?rev=1860028&r1=1860027&r2=1860028&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReport.java (original)
+++ ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReport.java Sat May 25 23:44:25 2019
@@ -54,16 +54,19 @@ public abstract class AbstractReport imp
     
     public static final String SESSION_REPORT_CLASS = "OFBIZ_HTML_REPORT";
 
+    @Override
     public void addError(Object obj) {
 
         errors.add(obj);
     }
 
+    @Override
     public void addWarning(Object obj) {
 
         warnings.add(obj);
     }
 
+    @Override
     public String formatRuntime() {
 
         long runtime = getRuntime();
@@ -101,30 +104,37 @@ public abstract class AbstractReport imp
         return strBuf.toString();
     }
 
+    @Override
     public List<Object> getErrors() {
         return errors;
     }
 
+    @Override
     public Locale getLocale() {
         return locale;
     }
 
+    @Override
     public long getRuntime() {
         return System.currentTimeMillis() - startTime;
     }
 
+    @Override
     public List<Object> getWarnings() {
         return warnings;
     }
 
+    @Override
     public boolean hasError() {
         return (errors.size() > 0);
     }
     
+    @Override
     public boolean hasWarning() {
         return (warnings.size() > 0);
     }
 
+    @Override
     public void resetRuntime() {
         startTime = System.currentTimeMillis();
     }
@@ -145,6 +155,7 @@ public abstract class AbstractReport imp
      *
      * @param value the String to add
      */
+    @Override
     public void print(String value) {
         print(value, FORMAT_DEFAULT);
     }
@@ -158,6 +169,7 @@ public abstract class AbstractReport imp
      * @param value the message container to add
      * @param format the formatting to use for the output
      */
+    @Override
     public abstract void print(String value, int format);
 
     /**
@@ -165,6 +177,7 @@ public abstract class AbstractReport imp
      *
      * @param value the message container to add
      */
+    @Override
     public void println(String value) {
 
         println(value, FORMAT_DEFAULT);
@@ -179,6 +192,7 @@ public abstract class AbstractReport imp
      * @param value the String to add
      * @param format the formatting to use for the output
      */
+    @Override
     public void println(String value, int format) {
         print(value, format);
         println();

Modified: ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReportThread.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReportThread.java?rev=1860028&r1=1860027&r2=1860028&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReportThread.java (original)
+++ ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReportThread.java Sat May 25 23:44:25 2019
@@ -69,6 +69,7 @@ public abstract class AbstractReportThre
     }
     
     
+    @Override
     public UUID getUUID() {
         return uuid;
     }

Modified: ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/htmlreport/HtmlReport.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/htmlreport/HtmlReport.java?rev=1860028&r1=1860027&r2=1860028&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/htmlreport/HtmlReport.java (original)
+++ ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/htmlreport/HtmlReport.java Sat May 25 23:44:25 2019
@@ -252,6 +252,7 @@ public class HtmlReport extends Abstract
         paramThread = name;
     }
 
+    @Override
     public synchronized String getReportUpdate() {
         StringBuffer result = new StringBuffer();
         StringBuffer logResult = new StringBuffer();
@@ -302,6 +303,7 @@ public class HtmlReport extends Abstract
         return writeHtml;
     }
 
+    @Override
     public synchronized void print(String value, int format) {
         StringBuffer buf = null;
         value = ReportStringUtil.escapeJavaScript(value);
@@ -393,10 +395,12 @@ public class HtmlReport extends Abstract
         logContent.add(buf.toString());
     }
 
+    @Override
     public void println() {
         print(getLineBreak());
     }
 
+    @Override
     public synchronized void println(Throwable t) {
         addError(t.getMessage());
         content.add(getExceptionElementJS(t));
@@ -476,10 +480,12 @@ public class HtmlReport extends Abstract
         return buf;
     }
 
+    @Override
     public void printMessageWithParam(String uiLabel, Object param) {
         print(uiLabel, InterfaceReport.FORMAT_NOTE);
     }
 
+    @Override
     public void printMessageWithParam(int m, int n, String uiLabel, Object param) {
         print(uiLabel, InterfaceReport.FORMAT_NOTE);
     }
@@ -1301,6 +1307,7 @@ public class HtmlReport extends Abstract
         return (String) request.getAttribute(FORM_URI);
     }
 
+    @Override
     public void addLogFile(String logFileName) {
         if (logFile == null || logFileOutputStream == null) {
             this.logFileName = logFileName;
@@ -1313,6 +1320,7 @@ public class HtmlReport extends Abstract
         }
     }
     
+    @Override
     public String closeLogFile() {
         if (logFileOutputStream != null) {
             try {
@@ -1337,10 +1345,12 @@ public class HtmlReport extends Abstract
         return logFileName;
     }
     
+    @Override
     public long getSequenceNum() {
         return sequenceNum;
     }
 
+    @Override
     public void setSequenceNum(long sequenceNum) {
         this.sequenceNum = sequenceNum;
     }

Modified: ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/htmlreport/sample/SampleHtmlReport.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/htmlreport/sample/SampleHtmlReport.java?rev=1860028&r1=1860027&r2=1860028&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/htmlreport/sample/SampleHtmlReport.java (original)
+++ ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/htmlreport/sample/SampleHtmlReport.java Sat May 25 23:44:25 2019
@@ -51,6 +51,7 @@ public class SampleHtmlReport extends Ab
         return wp;
     }
     
+    @Override
     public InterfaceReportThread initializeThread(HttpServletRequest request, HttpServletResponse response, String name) {
 
         if (name == null) {

Modified: ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/htmlreport/sample/SampleHtmlThread.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/htmlreport/sample/SampleHtmlThread.java?rev=1860028&r1=1860027&r2=1860028&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/htmlreport/sample/SampleHtmlThread.java (original)
+++ ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/htmlreport/sample/SampleHtmlThread.java Sat May 25 23:44:25 2019
@@ -59,13 +59,12 @@ public class SampleHtmlThread extends Ab
         initHtmlReport(request, response);
     }
 
+    @Override
     public String getReportUpdate() {
         return getReport().getReportUpdate();
     }
 
-    /**
-     * @see java.lang.Runnable#run()
-     */
+    @Override
     public void run() {
         try {
             if (getName().startsWith(COUNT_DOWN)) {

Modified: ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/AbstractPricatParser.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/AbstractPricatParser.java?rev=1860028&r1=1860027&r2=1860028&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/AbstractPricatParser.java (original)
+++ ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/AbstractPricatParser.java Sat May 25 23:44:25 2019
@@ -133,6 +133,7 @@ public abstract class AbstractPricatPars
         initBasicConds(UtilMisc.toList(userLogin.getString("partyId")));
     }
     
+    @Override
     public void writeCommentsToFile(XSSFWorkbook workbook, XSSFSheet sheet) {
         report.println();
         report.print(UtilProperties.getMessage(resource, "WriteCommentsBackToExcel", locale), InterfaceReport.FORMAT_NOTE);
@@ -339,6 +340,7 @@ public abstract class AbstractPricatPars
         }
     }
 
+    @Override
     public void initBasicConds(List<String> orgPartyIds) {
         basicCategoryConds = new ArrayList<>();
         basicCategoryConds.add(EntityCondition.makeCondition("isPublic", "N"));
@@ -358,10 +360,12 @@ public abstract class AbstractPricatPars
         }
     }
 
+    @Override
     public Map<String, Object> updateSkuPrice(String skuId, String ownerPartyId, BigDecimal memberPrice) {
         return ServiceUtil.returnSuccess();
     }
 
+    @Override
     public Map<String, Object> updateColorAndDimension(String productId, String ownerPartyId, String color, String dimension) {
         Map<String, Object> results = ServiceUtil.returnSuccess();
         results.put("colorId", "sampleColorId");
@@ -369,12 +373,14 @@ public abstract class AbstractPricatPars
         return results;
     }
 
+    @Override
     public Map<String, Object> getDimensionIds(String productId, String ownerPartyId, String dimension) {
         Map<String, Object> results = ServiceUtil.returnSuccess();
         results.put("dimensionId", "sampleDimensionId");
         return results;
     }
 
+    @Override
     public Map<String, Object> getColorIds(String productId, String ownerPartyId, String color) {
         Map<String, Object> results = ServiceUtil.returnSuccess();
         results.put("foundColor", Boolean.TRUE);
@@ -382,10 +388,12 @@ public abstract class AbstractPricatPars
         return results;
     }
 
+    @Override
     public String getBrandId(String brandName, String ownerPartyId) {
         return "sampleBrandId";
     }
 
+    @Override
     public boolean isNumOfSheetsOK(XSSFWorkbook workbook) {
         report.print(UtilProperties.getMessage(resource, "CheckPricatHasSheet", locale), InterfaceReport.FORMAT_NOTE);
         int sheets = workbook.getNumberOfSheets();
@@ -407,6 +415,7 @@ public abstract class AbstractPricatPars
      * @param size
      * @return
      */
+    @Override
     public List<Object> getCellContents(XSSFRow row, List<Object[]> colNames, int size) {
         List<Object> results = new ArrayList<>();
         boolean foundError = false;
@@ -505,6 +514,7 @@ public abstract class AbstractPricatPars
         return results;
     }
 
+    @Override
     public void setFacilityId(String selectedFacilityId) {
         this.selectedFacilityId = selectedFacilityId;
     }
@@ -545,6 +555,7 @@ public abstract class AbstractPricatPars
     protected abstract int getHeaderRowNo();
     
 
+    @Override
     public synchronized void endExcelImportHistory(String logFileName, String thruReasonId) {
         Thread currentThread = Thread.currentThread();
         String threadName = null;
@@ -580,6 +591,7 @@ public abstract class AbstractPricatPars
         }
     }
     
+    @Override
     public boolean hasErrorMessages() {
         return !errorMessages.keySet().isEmpty();
     }

Modified: ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/PricatParseExcelHtmlReport.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/PricatParseExcelHtmlReport.java?rev=1860028&r1=1860027&r2=1860028&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/PricatParseExcelHtmlReport.java (original)
+++ ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/PricatParseExcelHtmlReport.java Sat May 25 23:44:25 2019
@@ -55,6 +55,7 @@ public class PricatParseExcelHtmlReport
         return wp;
     }
     
+    @Override
     public InterfaceReportThread initializeThread(HttpServletRequest request, HttpServletResponse response, String name) {
 
         if (name == null) {
@@ -117,6 +118,7 @@ public class PricatParseExcelHtmlReport
      *
      * @throws IOException
      */
+    @Override
     public void prepareDisplayReport(HttpServletRequest request, HttpServletResponse response, String name, String dialogUri) throws IOException {
 
         if (ReportStringUtil.isNotEmpty(dialogUri)) {

Modified: ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/PricatParseExcelHtmlThread.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/PricatParseExcelHtmlThread.java?rev=1860028&r1=1860027&r2=1860028&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/PricatParseExcelHtmlThread.java (original)
+++ ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/PricatParseExcelHtmlThread.java Sat May 25 23:44:25 2019
@@ -166,14 +166,13 @@ public class PricatParseExcelHtmlThread
         }
     }
 
+    @Override
     public String getReportUpdate() {
 
         return getReport().getReportUpdate();
     }
 
-    /**
-     * @see java.lang.Runnable#run()
-     */
+    @Override
     public void run() {
 
         try {

Modified: ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/sample/SamplePricatParser.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/sample/SamplePricatParser.java?rev=1860028&r1=1860027&r2=1860028&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/sample/SamplePricatParser.java (original)
+++ ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/pricat/sample/SamplePricatParser.java Sat May 25 23:44:25 2019
@@ -151,6 +151,7 @@ public class SamplePricatParser extends
         }
     }
 
+    @Override
     public boolean existsCurrencyId(XSSFSheet sheet) {
         report.print(UtilProperties.getMessage(resource, "StartCheckCurrencyId", locale), InterfaceReport.FORMAT_NOTE);
         XSSFCell currencyIdCell = sheet.getRow(2).getCell(1);
@@ -181,6 +182,7 @@ public class SamplePricatParser extends
         return true;
     }
 
+    @Override
     public void parseRowByRow(XSSFSheet sheet) {
         int rows = sheet.getLastRowNum() + 1;
         List<Object[]> colNames = ColNamesList.get(pricatFileVersion);
@@ -236,6 +238,7 @@ public class SamplePricatParser extends
      * @return
      * @throws GenericTransactionException
      */
+    @Override
     public boolean parseCellContentsAndStore(XSSFRow row, List<Object> cellContents) throws GenericTransactionException {
         if (UtilValidate.isEmpty(cellContents)) {
             return false;
@@ -323,15 +326,18 @@ public class SamplePricatParser extends
     }
 
 
+    @Override
     public String updateSku(XSSFRow row, String productId, String ownerPartyId, String facilityId, String barcode, BigDecimal inventory,
             String colorId, String color, String dimensionId, String dimension, BigDecimal listPrice, BigDecimal averageCost) {
         return "sampleSkuId";
     }
 
+    @Override
     public String getProductId(XSSFRow row, String brandId, String modelName, String productName, String productCategoryId, String ownerPartyId, BigDecimal listPrice) {
         return "sampleProductId";
     }
 
+    @Override
     public Object getCellContent(List<Object> cellContents, String colName) {
         if (UtilValidate.isNotEmpty(headerColNames) && headerColNames.contains(colName)) {
             return cellContents.get(headerColNames.indexOf(colName));
@@ -339,10 +345,12 @@ public class SamplePricatParser extends
         return null;
     }
 
+    @Override
     public String getProductCategoryId(List<Object> cellContents, String ownerPartyId) {
         return "sampleProductCategoryId";
     }
 
+    @Override
     public boolean isFacilityOk(XSSFRow row, String facilityName, String facilityId) {
         if (!facilities.containsKey(facilityId)) {
             if (UtilValidate.isEmpty(facilityId) && facilities.keySet().size() == 1) {
@@ -382,6 +390,7 @@ public class SamplePricatParser extends
         return true;
     }
 
+    @Override
     public boolean isTableHeaderMatched(XSSFSheet sheet) {
         List<Object[]> columnNames = ColNamesList.get(pricatFileVersion);
         short cols = sheet.getRow(headerRowNo).getLastCellNum();
@@ -423,6 +432,7 @@ public class SamplePricatParser extends
         return true;
     }
 
+    @Override
     public boolean isVersionSupported(XSSFSheet sheet) {
         report.print(UtilProperties.getMessage(resource, "StartCheckPricatVersion", locale), InterfaceReport.FORMAT_NOTE);
         pricatFileVersion = sheet.getRow(2).getCell(0).getStringCellValue().trim();
@@ -437,6 +447,7 @@ public class SamplePricatParser extends
         return true;
     }
 
+    @Override
     public boolean containsDataRows(XSSFSheet sheet) {
         int rows = sheet.getPhysicalNumberOfRows();
         if (rows > headerRowNo + 1) {
@@ -540,6 +551,7 @@ public class SamplePricatParser extends
      * @param size
      * @return
      */
+    @Override
     public List<Object> getCellContents(XSSFRow row, List<Object[]> colNames, int size) {
         List<Object> results = new ArrayList<>();
         boolean foundError = false;
@@ -655,6 +667,7 @@ public class SamplePricatParser extends
         return results;
     }
 
+    @Override
     protected int getHeaderRowNo() {
         return headerRowNo;
     }

Modified: ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java?rev=1860028&r1=1860027&r2=1860028&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java (original)
+++ ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java Sat May 25 23:44:25 2019
@@ -61,9 +61,7 @@ public class OFBizSolrContextFilter exte
     
     private static final String resource = "SolrUiLabels";
 
-    /**
-     * @see javax.servlet.Filter#init(javax.servlet.FilterConfig)
-     */
+    @Override
     public void init(FilterConfig config) throws ServletException {
         Properties props = System.getProperties();
         props.setProperty("solr.log.dir", UtilProperties.getPropertyValue("solrconfig", "solr.log.dir", "runtime/logs/solr"));
@@ -71,9 +69,7 @@ public class OFBizSolrContextFilter exte
         super.init(config);
     }
 
-    /**
-     * @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain)
-     */
+    @Override
     public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
         HttpServletRequest httpRequest = (HttpServletRequest) request;
         HttpServletResponse httpResponse = (HttpServletResponse) response;
@@ -152,9 +148,7 @@ public class OFBizSolrContextFilter exte
         if (Debug.timingOn() && rname != null) timer.timerString("[" + rname + "(Domain:" + request.getScheme() + "://" + request.getServerName() + ")] Request Done", module);
     }
 
-    /**
-     * @see javax.servlet.Filter#destroy()
-     */
+    @Override
     public void destroy() {
         super.destroy();
     }
@@ -163,6 +157,7 @@ public class OFBizSolrContextFilter exte
      * Override this to change CoreContainer initialization
      * @return a CoreContainer to hold this server's cores
      */
+    @Override
     protected CoreContainer createCoreContainer(Path solrHome, Properties extraProperties) {
         NodeConfig nodeConfig = null;
         try {