svn commit: r1750340 - /ofbiz/trunk/specialpurpose/solr/src/org/ofbiz/solr/SolrUtil.java

[arunpatidar]

Author: arunpatidar
Date: Mon Jun 27 14:01:00 2016
New Revision: 1750340

URL: http://svn.apache.org/viewvc?rev=1750340&view=rev
Log:
Applied patch from jira issue - OFBIZ-7398 - Enforce noninstantiability to 
SolrUtil.java Class. Thanks Chinmay Patidar  for your contribution.

Modified:
    ofbiz/trunk/specialpurpose/solr/src/org/ofbiz/solr/SolrUtil.java

Modified: ofbiz/trunk/specialpurpose/solr/src/org/ofbiz/solr/SolrUtil.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/solr/src/org/ofbiz/solr/SolrUtil.java?rev=1750340&r1=1750339&r2=1750340&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/solr/src/org/ofbiz/solr/SolrUtil.java (original)
+++ ofbiz/trunk/specialpurpose/solr/src/org/ofbiz/solr/SolrUtil.java Mon Jun 27 
14:01:00 2016
@@ -52,27 +52,28 @@ import org.ofbiz.entity.GenericEntityExc
  */
 public final class SolrUtil {
     
+    private SolrUtil() {}
     public static final String module = SolrUtil.class.getName();
-    private static String[] solrProdAttribute = { "productId", "internalName", 
"manu", "size", "smallImage", "mediumImage", "largeImage", "listPrice", 
"defaultPrice", "inStock", "isVirtual" };
+    private static final String[] solrProdAttribute = { "productId", 
"internalName", "manu", "size", "smallImage", "mediumImage", "largeImage", 
"listPrice", "defaultPrice", "inStock", "isVirtual" };
 
-    public static final String solrConfigName = "solrconfig.properties";
-    public static final String solrUrl = makeSolrWebappUrl();
+    private static final String solrConfigName = "solrconfig.properties";
+    private static final String solrUrl = makeSolrWebappUrl();
     
-    protected static final String socketTimeoutString = 
UtilProperties.getPropertyValue(solrConfigName, "solr.client.socket.timeout");
+    private static final String socketTimeoutString = 
UtilProperties.getPropertyValue(solrConfigName, "solr.client.socket.timeout");
     
-    protected static final String connectionTimeoutString = 
UtilProperties.getPropertyValue(solrConfigName, 
"solr.client.connection.timeout");
+    private static final String connectionTimeoutString = 
UtilProperties.getPropertyValue(solrConfigName, 
"solr.client.connection.timeout");
     
-    protected static final String clientUsername = 
UtilProperties.getPropertyValue(solrConfigName, "solr.client.username");
+    private static final String clientUsername = 
UtilProperties.getPropertyValue(solrConfigName, "solr.client.username");
     
-    protected static final String clientPassword = 
UtilProperties.getPropertyValue(solrConfigName, "solr.client.password");
+    private static final String clientPassword = 
UtilProperties.getPropertyValue(solrConfigName, "solr.client.password");
 
-    protected static final Integer socketTimeout = getSocketTimeout();
+    private static final Integer socketTimeout = getSocketTimeout();
     
-    protected static final Integer connectionTimeout = getConnectionTimeout();
+    private static final Integer connectionTimeout = getConnectionTimeout();
     
-    protected static final String trustSelfSignedCertString = 
UtilProperties.getPropertyValue(solrConfigName, 
"solr.client.trust.selfsigned.cert", "false");
+    private static final String trustSelfSignedCertString = 
UtilProperties.getPropertyValue(solrConfigName, 
"solr.client.trust.selfsigned.cert", "false");
     
-    protected static final boolean trustSelfSignedCert = 
getTrustSelfSignedCert();
+    private static final boolean trustSelfSignedCert = 
getTrustSelfSignedCert();
     
     public static String makeSolrWebappUrl() {
         final String solrWebappProtocol = 
UtilProperties.getPropertyValue(solrConfigName, "solr.webapp.protocol");