From a692498190f9be6f43a1e98bb0527afd0e1efd90 Mon Sep 17 00:00:00 2001
From: Neale Upstone <neale@nealeupstone.com>
Date: Tue, 3 Dec 2024 14:25:07 +0000
Subject: [PATCH] org imports

---
 .../strata/measure/StandardComponents.java         |  2 +-
 .../measure/fxopt/FxCollarMeasureCalculations.java |  3 ++-
 .../fxopt/FxCollarTradeCalculationFunction.java    |  9 +++++----
 .../fxopt/DiscountingFxCollarTradePricer.java      |  3 ++-
 .../com/opengamma/strata/product/ProductType.java  |  7 ++++---
 .../opengamma/strata/product/fxopt/FxCollar.java   | 10 ++++++----
 .../strata/product/fxopt/FxCollarTrade.java        | 14 ++++++++------
 .../strata/product/fxopt/ResolvedFxCollar.java     |  6 ++++--
 .../product/fxopt/ResolvedFxCollarTrade.java       | 10 ++++++----
 9 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/modules/measure/src/main/java/com/opengamma/strata/measure/StandardComponents.java b/modules/measure/src/main/java/com/opengamma/strata/measure/StandardComponents.java
index 9ce2b89696..dec6c8e40a 100644
--- a/modules/measure/src/main/java/com/opengamma/strata/measure/StandardComponents.java
+++ b/modules/measure/src/main/java/com/opengamma/strata/measure/StandardComponents.java
@@ -5,7 +5,6 @@
  */
 package com.opengamma.strata.measure;
 
-import com.opengamma.strata.measure.fxopt.FxCollarTradeCalculationFunction;
 import java.util.List;
 
 import com.google.common.collect.ImmutableList;
@@ -32,6 +31,7 @@
 import com.opengamma.strata.measure.fx.FxRateMarketDataFunction;
 import com.opengamma.strata.measure.fx.FxSingleTradeCalculationFunction;
 import com.opengamma.strata.measure.fx.FxSwapTradeCalculationFunction;
+import com.opengamma.strata.measure.fxopt.FxCollarTradeCalculationFunction;
 import com.opengamma.strata.measure.fxopt.FxOptionVolatilitiesMarketDataFunction;
 import com.opengamma.strata.measure.fxopt.FxSingleBarrierOptionTradeCalculationFunction;
 import com.opengamma.strata.measure.fxopt.FxVanillaOptionTradeCalculationFunction;
diff --git a/modules/measure/src/main/java/com/opengamma/strata/measure/fxopt/FxCollarMeasureCalculations.java b/modules/measure/src/main/java/com/opengamma/strata/measure/fxopt/FxCollarMeasureCalculations.java
index 2e325d1f0c..400eecdd56 100644
--- a/modules/measure/src/main/java/com/opengamma/strata/measure/fxopt/FxCollarMeasureCalculations.java
+++ b/modules/measure/src/main/java/com/opengamma/strata/measure/fxopt/FxCollarMeasureCalculations.java
@@ -2,6 +2,8 @@
 
 import static com.opengamma.strata.measure.fxopt.FxCalculationUtils.checkBlackVolatilities;
 
+import java.time.LocalDate;
+
 import com.opengamma.strata.basics.currency.CurrencyAmount;
 import com.opengamma.strata.basics.currency.CurrencyPair;
 import com.opengamma.strata.basics.currency.MultiCurrencyAmount;
@@ -18,7 +20,6 @@
 import com.opengamma.strata.pricer.rate.RatesProvider;
 import com.opengamma.strata.pricer.sensitivity.MarketQuoteSensitivityCalculator;
 import com.opengamma.strata.product.fxopt.ResolvedFxCollarTrade;
-import java.time.LocalDate;
 
 /**
  * Multi-scenario measure calculations for FX collar trades.
diff --git a/modules/measure/src/main/java/com/opengamma/strata/measure/fxopt/FxCollarTradeCalculationFunction.java b/modules/measure/src/main/java/com/opengamma/strata/measure/fxopt/FxCollarTradeCalculationFunction.java
index 86841f51e9..af05226ebd 100644
--- a/modules/measure/src/main/java/com/opengamma/strata/measure/fxopt/FxCollarTradeCalculationFunction.java
+++ b/modules/measure/src/main/java/com/opengamma/strata/measure/fxopt/FxCollarTradeCalculationFunction.java
@@ -5,6 +5,11 @@
  */
 package com.opengamma.strata.measure.fxopt;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.opengamma.strata.basics.ReferenceData;
@@ -23,10 +28,6 @@
 import com.opengamma.strata.product.fxopt.FxCollar;
 import com.opengamma.strata.product.fxopt.FxCollarTrade;
 import com.opengamma.strata.product.fxopt.ResolvedFxCollarTrade;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
 
 public class FxCollarTradeCalculationFunction implements CalculationFunction<FxCollarTrade> {
 
diff --git a/modules/pricer/src/main/java/com/opengamma/strata/pricer/fxopt/DiscountingFxCollarTradePricer.java b/modules/pricer/src/main/java/com/opengamma/strata/pricer/fxopt/DiscountingFxCollarTradePricer.java
index 7dcf6bc473..fbb42b2dea 100644
--- a/modules/pricer/src/main/java/com/opengamma/strata/pricer/fxopt/DiscountingFxCollarTradePricer.java
+++ b/modules/pricer/src/main/java/com/opengamma/strata/pricer/fxopt/DiscountingFxCollarTradePricer.java
@@ -5,6 +5,8 @@
  */
 package com.opengamma.strata.pricer.fxopt;
 
+import java.time.LocalDate;
+
 import com.opengamma.strata.basics.currency.CurrencyAmount;
 import com.opengamma.strata.basics.currency.FxRate;
 import com.opengamma.strata.basics.currency.MultiCurrencyAmount;
@@ -16,7 +18,6 @@
 import com.opengamma.strata.product.fxopt.FxCollarTrade;
 import com.opengamma.strata.product.fxopt.ResolvedFxCollar;
 import com.opengamma.strata.product.fxopt.ResolvedFxCollarTrade;
-import java.time.LocalDate;
 
 /**
  * Pricer for FX collar trades with a lognormal model.
diff --git a/modules/product/src/main/java/com/opengamma/strata/product/ProductType.java b/modules/product/src/main/java/com/opengamma/strata/product/ProductType.java
index f5f53ed44a..41666d95d0 100644
--- a/modules/product/src/main/java/com/opengamma/strata/product/ProductType.java
+++ b/modules/product/src/main/java/com/opengamma/strata/product/ProductType.java
@@ -5,6 +5,8 @@
  */
 package com.opengamma.strata.product;
 
+import org.joda.convert.FromString;
+
 import com.opengamma.strata.collect.ArgChecker;
 import com.opengamma.strata.collect.TypedString;
 import com.opengamma.strata.collect.named.Described;
@@ -36,7 +38,6 @@
 import com.opengamma.strata.product.payment.BulletPayment;
 import com.opengamma.strata.product.swap.Swap;
 import com.opengamma.strata.product.swaption.Swaption;
-import org.joda.convert.FromString;
 
 /**
  * The type of a portfolio item.
@@ -211,7 +212,7 @@ public static ProductType of(String name, String description) {
 
   /**
    * Creates an instance.
-   * 
+   *
    * @param name  the name
    * @param description  the description
    */
@@ -222,7 +223,7 @@ private ProductType(String name, String description) {
 
   /**
    * Gets the human-readable description of the type.
-   * 
+   *
    * @return the description
    */
   @Override
diff --git a/modules/product/src/main/java/com/opengamma/strata/product/fxopt/FxCollar.java b/modules/product/src/main/java/com/opengamma/strata/product/fxopt/FxCollar.java
index 94957aa68e..b5c230d89a 100644
--- a/modules/product/src/main/java/com/opengamma/strata/product/fxopt/FxCollar.java
+++ b/modules/product/src/main/java/com/opengamma/strata/product/fxopt/FxCollar.java
@@ -5,17 +5,19 @@
  */
 package com.opengamma.strata.product.fxopt;
 
-import com.opengamma.strata.basics.ReferenceData;
-import com.opengamma.strata.basics.Resolvable;
-import com.opengamma.strata.basics.currency.CurrencyPair;
-import com.opengamma.strata.product.fx.FxProduct;
 import java.io.Serializable;
+
 import org.joda.beans.ImmutableBean;
 import org.joda.beans.JodaBeanUtils;
 import org.joda.beans.MetaBean;
 import org.joda.beans.gen.BeanDefinition;
 import org.joda.beans.gen.PropertyDefinition;
 
+import com.opengamma.strata.basics.ReferenceData;
+import com.opengamma.strata.basics.Resolvable;
+import com.opengamma.strata.basics.currency.CurrencyPair;
+import com.opengamma.strata.product.fx.FxProduct;
+
 /**
  * An FX collar.
  * <p>
diff --git a/modules/product/src/main/java/com/opengamma/strata/product/fxopt/FxCollarTrade.java b/modules/product/src/main/java/com/opengamma/strata/product/fxopt/FxCollarTrade.java
index a718928078..637ac39f94 100644
--- a/modules/product/src/main/java/com/opengamma/strata/product/fxopt/FxCollarTrade.java
+++ b/modules/product/src/main/java/com/opengamma/strata/product/fxopt/FxCollarTrade.java
@@ -5,19 +5,21 @@
  */
 package com.opengamma.strata.product.fxopt;
 
-import com.opengamma.strata.basics.ReferenceData;
-import com.opengamma.strata.basics.currency.AdjustablePayment;
-import com.opengamma.strata.product.PortfolioItemInfo;
-import com.opengamma.strata.product.ResolvableTrade;
-import com.opengamma.strata.product.TradeInfo;
-import com.opengamma.strata.product.fx.FxTrade;
 import java.io.Serializable;
+
 import org.joda.beans.ImmutableBean;
 import org.joda.beans.JodaBeanUtils;
 import org.joda.beans.MetaBean;
 import org.joda.beans.gen.BeanDefinition;
 import org.joda.beans.gen.PropertyDefinition;
 
+import com.opengamma.strata.basics.ReferenceData;
+import com.opengamma.strata.basics.currency.AdjustablePayment;
+import com.opengamma.strata.product.PortfolioItemInfo;
+import com.opengamma.strata.product.ResolvableTrade;
+import com.opengamma.strata.product.TradeInfo;
+import com.opengamma.strata.product.fx.FxTrade;
+
 /**
  * A trade in an FX collar.
  * <p>
diff --git a/modules/product/src/main/java/com/opengamma/strata/product/fxopt/ResolvedFxCollar.java b/modules/product/src/main/java/com/opengamma/strata/product/fxopt/ResolvedFxCollar.java
index 912e18f898..62433457fd 100644
--- a/modules/product/src/main/java/com/opengamma/strata/product/fxopt/ResolvedFxCollar.java
+++ b/modules/product/src/main/java/com/opengamma/strata/product/fxopt/ResolvedFxCollar.java
@@ -5,15 +5,17 @@
  */
 package com.opengamma.strata.product.fxopt;
 
-import com.opengamma.strata.basics.ReferenceData;
-import com.opengamma.strata.product.ResolvedProduct;
 import java.io.Serializable;
+
 import org.joda.beans.ImmutableBean;
 import org.joda.beans.JodaBeanUtils;
 import org.joda.beans.MetaBean;
 import org.joda.beans.gen.BeanDefinition;
 import org.joda.beans.gen.PropertyDefinition;
 
+import com.opengamma.strata.basics.ReferenceData;
+import com.opengamma.strata.product.ResolvedProduct;
+
 /**
  * An FX Collar, resolved for pricing.
  * <p>
diff --git a/modules/product/src/main/java/com/opengamma/strata/product/fxopt/ResolvedFxCollarTrade.java b/modules/product/src/main/java/com/opengamma/strata/product/fxopt/ResolvedFxCollarTrade.java
index b1de0f6e2f..fe5d539a37 100644
--- a/modules/product/src/main/java/com/opengamma/strata/product/fxopt/ResolvedFxCollarTrade.java
+++ b/modules/product/src/main/java/com/opengamma/strata/product/fxopt/ResolvedFxCollarTrade.java
@@ -5,17 +5,19 @@
  */
 package com.opengamma.strata.product.fxopt;
 
-import com.opengamma.strata.basics.ReferenceData;
-import com.opengamma.strata.basics.currency.Payment;
-import com.opengamma.strata.product.ResolvedTrade;
-import com.opengamma.strata.product.TradeInfo;
 import java.io.Serializable;
+
 import org.joda.beans.ImmutableBean;
 import org.joda.beans.JodaBeanUtils;
 import org.joda.beans.MetaBean;
 import org.joda.beans.gen.BeanDefinition;
 import org.joda.beans.gen.PropertyDefinition;
 
+import com.opengamma.strata.basics.ReferenceData;
+import com.opengamma.strata.basics.currency.Payment;
+import com.opengamma.strata.product.ResolvedTrade;
+import com.opengamma.strata.product.TradeInfo;
+
 /**
  * A trade in an FX collar, resolved for pricing.
  * <p>