Refactor/extensive refactor

pom.xml

@@ -123,6 +123,17 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-pmd-plugin</artifactId>
+                <version>3.7</version>
+                <configuration>
+                    <rulesets>
+                        <ruleset>/rulesets/java/basic.xml</ruleset>
+                        <ruleset>ruleset.xml</ruleset>
+                    </rulesets>
+                </configuration>
+            </plugin>
         </plugins>
         <extensions>
             <extension>

result-3.csv

@@ -0,0 +1,36 @@
+src\main\java\yahoofinance\Stock.java:30:	ExcessiveClassLength:	Avoid really long classes.
+src\main\java\yahoofinance\YahooFinance.java:46:	ExcessiveClassLength:	Avoid really long classes.
+src\main\java\yahoofinance\exchanges\ExchangeTimeZone.java:15:	ExcessiveClassLength:	Avoid really long classes.
+src\main\java\yahoofinance\histquotes2\CrumbManager.java:27:	ExcessiveClassLength:	Avoid really long classes.
+src\main\java\yahoofinance\histquotes2\HistQuotes2Request.java:23:	ExcessiveClassLength:	Avoid really long classes.
+src\main\java\yahoofinance\histquotes2\HistoricalDividend.java:14:	DataClass:	The class 'HistoricalDividend' is suspected to be a Data Class (WOC=20.000%, NOPA=0, NOAM=4, WMC=7)
+src\main\java\yahoofinance\histquotes2\HistoricalSplit.java:12:	DataClass:	The class 'HistoricalSplit' is suspected to be a Data Class (WOC=20.000%, NOPA=0, NOAM=4, WMC=7)
+src\main\java\yahoofinance\histquotes\HistQuotesRequest.java:26:	ExcessiveClassLength:	Avoid really long classes.
+src\main\java\yahoofinance\histquotes\HistoricalQuote.java:13:	ExcessiveClassLength:	Avoid really long classes.
+src\main\java\yahoofinance\query2v8\HistQuotesQuery2V8Request.java:34:	ExcessiveClassLength:	Avoid really long classes.
+src\main\java\yahoofinance\query2v8\HistQuotesQuery2V8Request.java:96:	ExcessiveMethodLength:	Avoid really long methods.
+src\main\java\yahoofinance\quotes\csv\QuotesProperty.java:7:	ExcessiveClassLength:	Avoid really long classes.
+src\main\java\yahoofinance\quotes\csv\StockQuotesData.java:16:	ExcessiveClassLength:	Avoid really long classes.
+src\main\java\yahoofinance\quotes\csv\StockQuotesData.java:32:	ExcessiveMethodLength:	Avoid really long methods.
+src\main\java\yahoofinance\quotes\csv\StockQuotesRequest.java:10:	ExcessiveClassLength:	Avoid really long classes.
+src\main\java\yahoofinance\quotes\csv\StockQuotesRequest.java:107:	ExcessiveMethodLength:	Avoid really long methods.
+src\main\java\yahoofinance\quotes\fx\FxSymbols.java:6:	DataClass:	The class 'FxSymbols' is suspected to be a Data Class (WOC=0.000%, NOPA=89, NOAM=0, WMC=0)
+src\main\java\yahoofinance\quotes\query1v7\StockQuotesQuery1V7Request.java:20:	ExcessiveClassLength:	Avoid really long classes.
+src\main\java\yahoofinance\quotes\query1v7\StockQuotesQuery1V7Request.java:58:	ExcessiveMethodLength:	Avoid really long methods.
+src\main\java\yahoofinance\quotes\query1v7\StockQuotesQuery1V7Request.java:112:	ExcessiveMethodLength:	Avoid really long methods.
+src\main\java\yahoofinance\quotes\stock\StockDividend.java:12:	DataClass:	The class 'StockDividend' is suspected to be a Data Class (WOC=18.182%, NOPA=0, NOAM=9, WMC=15)
+src\main\java\yahoofinance\quotes\stock\StockQuote.java:16:	ExcessiveClassLength:	Avoid really long classes.
+src\main\java\yahoofinance\quotes\stock\StockStats.java:14:	ExcessiveClassLength:	Avoid really long classes.
+src\main\java\yahoofinance\quotes\stock\StockStats.java:14:	DataClass:	The class 'StockStats' is suspected to be a Data Class (WOC=5.128%, NOPA=0, NOAM=37, WMC=41)
+src\main\java\yahoofinance\utils\CalendarUtil.java:11:	ExcessiveClassLength:	Avoid really long classes.
+src\main\java\yahoofinance\utils\RedirectableRequest.java:12:	DataClass:	The class 'RedirectableRequest' is suspected to be a Data Class (WOC=20.000%, NOPA=0, NOAM=8, WMC=22)
+src\main\java\yahoofinance\utils\RedirectableRequest.java:37:	ExcessiveMethodLength:	Avoid really long methods.
+src\main\java\yahoofinance\utils\Utils.java:63:	ExcessiveMethodLength:	Avoid really long methods.
+src\test\java\yahoofinance\HistoricalQuoteRequestTest.java:21:	ExcessiveClassLength:	Avoid really long classes.
+src\test\java\yahoofinance\HistoricalQuoteRequestTest.java:38:	ExcessiveMethodLength:	Avoid really long methods.
+src\test\java\yahoofinance\HistoricalQuoteRequestTest.java:81:	ExcessiveMethodLength:	Avoid really long methods.
+src\test\java\yahoofinance\SimpleQuoteRequestTest.java:18:	ExcessiveClassLength:	Avoid really long classes.
+src\test\java\yahoofinance\SimpleQuoteRequestTest.java:21:	ExcessiveMethodLength:	Avoid really long methods.
+src\test\java\yahoofinance\SimpleQuoteRequestTest.java:91:	ExcessiveMethodLength:	Avoid really long methods.
+src\test\java\yahoofinance\SimpleQuoteRequestTest.java:125:	ExcessiveMethodLength:	Avoid really long methods.
+src\test\java\yahoofinance\mock\MockedServersTest.java:27:	ExcessiveMethodLength:	Avoid really long methods.

ruleset.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<ruleset name="Custom ruleset"
+         xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0
+  http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
+    <description>
+        This ruleset checks my code for bad stuff
+    </description>
+    <rule ref="category/java/design.xml/ExcessiveParameterList">
+        <properties>
+            <property name="minimum" value="4" />
+        </properties>
+    </rule>
+    <rule ref="category/java/design.xml/ExcessiveClassLength">
+        <properties>
+            <property name="minimum" value="100" />
+        </properties>
+    </rule>
+    <rule ref="category/java/design.xml/ExcessiveMethodLength">
+        <properties>
+            <property name="minimum" value="20" />
+        </properties>
+    </rule>
+    <rule ref="category/java/design.xml/GodClass" />
+    <rule ref="category/java/design.xml/DataClass" />
+</ruleset>

src/main/java/yahoofinance/Stock.java

@@ -39,42 +39,20 @@ public class Stock {
     private StockQuote quote;
     private StockStats stats;
     private StockDividend dividend;
+
+    private final StockDataUpdater dataUpdater;
 
     private List<HistoricalQuote> history;
     private List<HistoricalDividend> dividendHistory;
     private List<HistoricalSplit> splitHistory;
 
     public Stock(String symbol) {
         this.symbol = symbol;
+        this.dataUpdater = new StockDataUpdater(this, symbol);
     }
 
     private void update() throws IOException {
-        if(YahooFinance.QUOTES_QUERY1V7_ENABLED.equalsIgnoreCase("true")) {
-            StockQuotesQuery1V7Request request = new StockQuotesQuery1V7Request(this.symbol);
-            Stock stock = request.getSingleResult();
-            if (stock != null) {
-                this.setName(stock.getName());
-                this.setCurrency(stock.getCurrency());
-                this.setStockExchange(stock.getStockExchange());
-                this.setQuote(stock.getQuote());
-                this.setStats(stock.getStats());
-                this.setDividend(stock.getDividend());
-                log.info("Updated Stock with symbol: {}", this.symbol);
-            } else {
-                log.error("Failed to update Stock with symbol: {}", this.symbol);
-            }
-        } else {
-            StockQuotesRequest request = new StockQuotesRequest(this.symbol);
-            StockQuotesData data = request.getSingleResult();
-            if (data != null) {
-                this.setQuote(data.getQuote());
-                this.setStats(data.getStats());
-                this.setDividend(data.getDividend());
-                log.info("Updated Stock with symbol: {}", this.symbol);
-            } else {
-                log.error("Failed to update Stock with symbol: {}", this.symbol);
-            }
-        }
+        dataUpdater.update();
     }
 
     /**
@@ -114,10 +92,7 @@ public StockQuote getQuote() {
      * @throws java.io.IOException when there's a connection problem
      */
     public StockQuote getQuote(boolean refresh) throws IOException {
-        if(refresh) {
-            this.update();
-        }
-        return this.quote;
+        return dataUpdater.getQuote(refresh);
     }
 
     public void setQuote(StockQuote quote) {
@@ -153,10 +128,7 @@ public StockStats getStats() {
      * @throws java.io.IOException when there's a connection problem
      */
     public StockStats getStats(boolean refresh) throws IOException {
-        if(refresh) {
-            this.update();
-        }
-        return this.stats;
+        return dataUpdater.getStats(refresh);
     }
 
     public void setStats(StockStats stats) {
@@ -193,10 +165,7 @@ public StockDividend getDividend() {
      * @throws java.io.IOException when there's a connection problem
      */
     public StockDividend getDividend(boolean refresh) throws IOException {
-        if(refresh) {
-            this.update();
-        }
-        return this.dividend;
+        return dataUpdater.getDividend(refresh);
     }
 
     public void setDividend(StockDividend dividend) {

src/main/java/yahoofinance/StockDataUpdater.java

@@ -0,0 +1,95 @@
+package yahoofinance;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import yahoofinance.quotes.csv.StockQuotesData;
+import yahoofinance.quotes.csv.StockQuotesRequest;
+import yahoofinance.quotes.query1v7.StockQuotesQuery1V7Request;
+import yahoofinance.quotes.stock.StockDividend;
+import yahoofinance.quotes.stock.StockQuote;
+import yahoofinance.quotes.stock.StockStats;
+
+import java.io.IOException;
+
+public class StockDataUpdater {
+    private static final Logger log = LoggerFactory.getLogger(StockDataUpdater.class);
+
+    private Stock stock;
+    private String symbol;
+
+    public StockDataUpdater(Stock stock, String symbol) {
+        this.stock = stock;
+        this.symbol = symbol;
+    }
+
+    public void update() throws IOException {
+        if(YahooFinance.QUOTES_QUERY1V7_ENABLED.equalsIgnoreCase("true")) {
+            StockQuotesQuery1V7Request request = new StockQuotesQuery1V7Request(this.symbol);
+            Stock stockResponse = request.getSingleResult();
+            if (stockResponse != null) {
+                updateStock(stockResponse);
+            } else {
+                log.error("Failed to update Stock with symbol: {}", this.symbol);
+            }
+        } else {
+            StockQuotesRequest request = new StockQuotesRequest(this.symbol);
+            StockQuotesData data = request.getSingleResult();
+            if (data != null) {
+                updateStock(data);
+            } else {
+                log.error("Failed to update Stock with symbol: {}", this.symbol);
+            }
+        }
+    }
+
+    public StockQuote getQuote() {
+        return stock.getQuote();
+    }
+
+    public StockQuote getQuote(boolean refresh) throws IOException {
+        if(refresh) {
+            update();
+        }
+        return getQuote();
+    }
+
+    public StockStats getStats() {
+        return stock.getStats();
+    }
+
+    public StockStats getStats(boolean refresh) throws IOException {
+        if(refresh) {
+            update();
+        }
+        return getStats();
+    }
+
+    public StockDividend getDividend() {
+        return stock.getDividend();
+    }
+
+    public StockDividend getDividend(boolean refresh) throws IOException {
+        if(refresh) {
+            update();
+        }
+
+        return getDividend();
+    }
+
+    private void updateStock(Stock stockResponse){
+        stock.setName(stockResponse.getName());
+        stock.setCurrency(stockResponse.getCurrency());
+        stock.setStockExchange(stockResponse.getStockExchange());
+        stock.setQuote(stockResponse.getQuote());
+        stock.setStats(stockResponse.getStats());
+        stock.setDividend(stockResponse.getDividend());
+        log.info("Updated Stock with symbol: {}", this.symbol);
+    }
+
+    private void updateStock(StockQuotesData data) {
+        stock.setQuote(data.getQuote());
+        stock.setStats(data.getStats());
+        stock.setDividend(data.getDividend());
+        log.info("Updated Stock with symbol: {}", this.symbol);
+    }
+}