noneable fundamental data numeric fields (#21)

crazzyghost · Nov 15, 2021 · d091ffa · d091ffa
1 parent 03e7576
commit d091ffa
Show file tree

Hide file tree

Showing 13 changed files with 178 additions and 103 deletions.
diff --git a/src/main/java/com/crazzyghost/alphavantage/fundamentaldata/response/AnnualEarning.java b/src/main/java/com/crazzyghost/alphavantage/fundamentaldata/response/AnnualEarning.java
@@ -1,12 +1,14 @@
 package com.crazzyghost.alphavantage.fundamentaldata.response;
 
+import com.crazzyghost.alphavantage.parser.NoneableDouble;
 import com.squareup.moshi.Json;
 
 public class AnnualEarning {
 
     @Json(name="fiscalDateEnding")
     private String fiscalDateEnding;
     @Json(name="reportedEPS")
+    @NoneableDouble
     private Double reportedEPS;
 
     public String getFiscalDateEnding() {

diff --git a/src/main/java/com/crazzyghost/alphavantage/fundamentaldata/response/BalanceSheet.java b/src/main/java/com/crazzyghost/alphavantage/fundamentaldata/response/BalanceSheet.java
@@ -22,7 +22,7 @@
  */
 package com.crazzyghost.alphavantage.fundamentaldata.response;
 
-import com.crazzyghost.alphavantage.parser.Noneable;
+import com.crazzyghost.alphavantage.parser.NoneableLong;
 import com.squareup.moshi.Json;
 
 public class BalanceSheet {
@@ -31,112 +31,112 @@ public class BalanceSheet {
     @Json(name = "reportedCurrency")
     private String reportedCurrency;
     @Json(name = "totalAssets")
-    @Noneable
+    @NoneableLong
     private Long totalAssets;
     @Json(name = "totalCurrentAssets")
-    @Noneable
+    @NoneableLong
     private Long totalCurrentAssets;
     @Json(name = "cashAndCashEquivalentsAtCarryingValue")
-    @Noneable
+    @NoneableLong
     private Long cashAndCashEquivalentsAtCarryingValue;
     @Json(name = "cashAndShortTermInvestments")
-    @Noneable
+    @NoneableLong
     private Long cashAndShortTermInvestments;
     @Json(name = "inventory")
-    @Noneable
+    @NoneableLong
     private Long inventory;
     @Json(name = "currentNetReceivables")
-    @Noneable
+    @NoneableLong
     private Long currentNetReceivables;
     @Json(name = "totalNonCurrentAssets")
-    @Noneable
+    @NoneableLong
     private Long totalNonCurrentAssets;
     @Json(name = "propertyPlantEquipment")
-    @Noneable
+    @NoneableLong
     private Long propertyPlantEquipment;
     @Json(name = "accumulatedDepreciationAmortizationPPE")
-    @Noneable
+    @NoneableLong
     private Long accumulatedDepreciationAmortizationPPE;
     @Json(name = "intangibleAssets")
-    @Noneable
+    @NoneableLong
     private Long intangibleAssets;
     @Json(name = "intangibleAssetsExcludingGoodwill")
-    @Noneable
+    @NoneableLong
     private Long intangibleAssetsExcludingGoodwill;
     @Json(name = "goodwill")
-    @Noneable
+    @NoneableLong
     private Long goodWill;
     @Json(name = "investments")
-    @Noneable
+    @NoneableLong
     private Long investments;
     @Json(name = "longTermInvestments")
-    @Noneable
+    @NoneableLong
     private Long longTermInvestments;
     @Json(name = "shortTermInvestments")
-    @Noneable
+    @NoneableLong
     private Long shortTermInvestments;
     @Json(name = "otherCurrentAssets")
-    @Noneable
+    @NoneableLong
     private Long otherCurrentAssets;
     @Json(name = "otherNonCurrrentAssets")
-    @Noneable
+    @NoneableLong
     private Long otherNonCurrentAssets;
     @Json(name = "totalLiabilities")
-    @Noneable
+    @NoneableLong
     private Long totalLiabilities;
     @Json(name = "totalCurrentLiabilities")
-    @Noneable
+    @NoneableLong
     private Long totalCurrentLiabilities;
     @Json(name = "currentAccountsPayable")
-    @Noneable
+    @NoneableLong
     private Long currentAccountsPayable;
     @Json(name = "deferredRevenue")
-    @Noneable
+    @NoneableLong
     private Long deferredRevenue;
     @Json(name = "currentDebt")
-    @Noneable
+    @NoneableLong
     private Long currentDebt;
     @Json(name = "shortTermDebt")
-    @Noneable
+    @NoneableLong
     private Long shortTermDebt;
     @Json(name = "totalNonCurrentLiabilities")
-    @Noneable
+    @NoneableLong
     private Long totalNonCurrentLiabilities;
     @Json(name = "capitalLeaseObligations")
-    @Noneable
+    @NoneableLong
     private Long capitalLeaseObligations;
     @Json(name = "longTermDebt")
-    @Noneable
+    @NoneableLong
     private Long longTermDebt;
     @Json(name = "currentLongTermDebt")
-    @Noneable
+    @NoneableLong
     private Long currentLongTermDebt;
     @Json(name = "longTermDebtNoncurrent")
-    @Noneable
+    @NoneableLong
     private Long longTermDebtNonCurrent;
     @Json(name = "shortLongTermDebtTotal")
-    @Noneable
+    @NoneableLong
     private Long shortLongTermDebtTotal;
     @Json(name = "otherCurrentLiabilities")
-    @Noneable
+    @NoneableLong
     private Long otherCurrentLiabilities;
     @Json(name = "otherNonCurrentLiabilities")
-    @Noneable
+    @NoneableLong
     private Long otherNonCurrentLiabilities;
     @Json(name = "totalShareholderEquity")
-    @Noneable
+    @NoneableLong
     private Long totalShareholderEquity;
     @Json(name = "treasuryStock")
-    @Noneable
+    @NoneableLong
     private Long treasuryStock;
     @Json(name = "retainedEarnings")
-    @Noneable
+    @NoneableLong
     private Long retainedEarnings;
     @Json(name = "commonStock")
-    @Noneable
+    @NoneableLong
     private Long commonStock;
     @Json(name = "commonStockSharesOutstanding")
-    @Noneable
+    @NoneableLong
     private Long commonStockSharesOutstanding;
 
     public String getFiscalDateEnding() {

diff --git a/src/main/java/com/crazzyghost/alphavantage/fundamentaldata/response/CashFlow.java b/src/main/java/com/crazzyghost/alphavantage/fundamentaldata/response/CashFlow.java
@@ -1,6 +1,6 @@
 package com.crazzyghost.alphavantage.fundamentaldata.response;
 
-import com.crazzyghost.alphavantage.parser.Noneable;
+import com.crazzyghost.alphavantage.parser.NoneableLong;
 import com.squareup.moshi.Json;
 
 public class CashFlow {
@@ -10,111 +10,111 @@ public class CashFlow {
     private String reportedCurrency;
 
     @Json(name="operatingCashflow")
-    @Noneable
+    @NoneableLong
     private Long operatingCashflow;
 
     @Json(name="paymentsForOperatingActivities")
-    @Noneable
+    @NoneableLong
     private Long paymentsForOperatingActivities;
 
     @Json(name="proceedsFromOperatingActivities")
-    @Noneable
+    @NoneableLong
     private Long proceedsFromOperatingActivities;
 
     @Json(name="changeInOperatingLiabilities")
-    @Noneable
+    @NoneableLong
     private Long changeInOperatingLiabilities;
 
     @Json(name="changeInOperatingAssets")
-    @Noneable
+    @NoneableLong
     private Long changeInOperatingAssets;
 
     @Json(name="depreciationDepletionAndAmortization")
-    @Noneable
+    @NoneableLong
     private Long depreciationDepletionAndAmortization;
 
     @Json(name="capitalExpenditures")
-    @Noneable
+    @NoneableLong
     private Long capitalExpenditures;
 
     @Json(name="changeInReceivables")
-    @Noneable
+    @NoneableLong
     private Long changeInReceivables;
 
     @Json(name="changeInInventory")
-    @Noneable
+    @NoneableLong
     private Long changeInInventory;
 
     @Json(name="profitLoss")
-    @Noneable
+    @NoneableLong
     private Long profitLoss;
 
     @Json(name="cashflowFromInvestment")
-    @Noneable
+    @NoneableLong
     private Long cashflowFromInvestment;
 
     @Json(name="cashflowFromFinancing")
-    @Noneable
+    @NoneableLong
     private Long cashflowFromFinancing;
 
     @Json(name="proceedsFromRepaymentsOfShortTermDebt")
-    @Noneable
+    @NoneableLong
     private Long proceedsFromRepaymentsOfShortTermDebt;
 
     @Json(name="paymentsForRepurchaseOfCommonStock")
-    @Noneable
+    @NoneableLong
     private Long paymentsForRepurchaseOfCommonStock;
 
     @Json(name="paymentsForRepurchaseOfEquity")
-    @Noneable
+    @NoneableLong
     private Long paymentsForRepurchaseOfEquity;
 
     @Json(name="paymentsForRepurchaseOfPreferredStock")
-    @Noneable
+    @NoneableLong
     private Long paymentsForRepurchaseOfPreferredStock;
 
     @Json(name="dividendPayout")
-    @Noneable
+    @NoneableLong
     private Long dividendPayout;
 
     @Json(name="dividendPayoutCommonStock")
-    @Noneable
+    @NoneableLong
     private Long dividendPayoutCommonStock;
 
     @Json(name="dividendPayoutPreferredStock")
-    @Noneable
+    @NoneableLong
     private Long dividendPayoutPreferredStock;
 
     @Json(name="proceedsFromIssuanceOfCommonStock")
-    @Noneable
+    @NoneableLong
     private Long proceedsFromIssuanceOfCommonStock;
 
     @Json(name="proceedsFromIssuanceOfLongTermDebtAndCapitalSecuritiesNet")
-    @Noneable
+    @NoneableLong
     private Long proceedsFromIssuanceOfLongTermDebtAndCapitalSecuritiesNet;
 
     @Json(name="proceedsFromIssuanceOfPreferredStock")
-    @Noneable
+    @NoneableLong
     private Long proceedsFromIssuanceOfPreferredStock;
 
     @Json(name="proceedsFromRepurchaseOfEquity")
-    @Noneable
+    @NoneableLong
     private Long proceedsFromRepurchaseOfEquity;
 
     @Json(name="proceedsFromSaleOfTreasuryStock")
-    @Noneable
+    @NoneableLong
     private Long proceedsFromSaleOfTreasuryStock;
 
     @Json(name="changeInCashAndCashEquivalents")
-    @Noneable
+    @NoneableLong
     private Long changeInCashAndCashEquivalents;
 
     @Json(name="changeInExchangeRate")
-    @Noneable
+    @NoneableLong
     private Long changeInExchangeRate;
 
     @Json(name="netIncome")
-    @Noneable
+    @NoneableLong
     private Long netIncome;
 
     public String getFiscalDateEnding() {