From b4340107f203ff89c86cc1be63b63193f468f2e8 Mon Sep 17 00:00:00 2001 From: Stephen Colebourne Date: Wed, 3 Oct 2018 15:53:20 +0100 Subject: [PATCH] Handle renamed classes Move logic from code to config --- .../META-INF/org/joda/convert/Renamed.ini | 2 ++ .../rate/DefaultRatesMarketDataLookup.java | 15 --------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/modules/calc/src/main/resources/META-INF/org/joda/convert/Renamed.ini b/modules/calc/src/main/resources/META-INF/org/joda/convert/Renamed.ini index e82b931d3d..75ab74a06a 100644 --- a/modules/calc/src/main/resources/META-INF/org/joda/convert/Renamed.ini +++ b/modules/calc/src/main/resources/META-INF/org/joda/convert/Renamed.ini @@ -1,3 +1,5 @@ # Renamed types [types] com.opengamma.strata.measure.rate.FxRateLookup = com.opengamma.strata.calc.runner.FxRateLookup +com.opengamma.strata.measure.rate.DefaultFxRateLookup = com.opengamma.strata.calc.runner.DefaultFxRateLookup +com.opengamma.strata.measure.rate.MatrixFxRateLookup = com.opengamma.strata.calc.runner.MatrixFxRateLookup diff --git a/modules/measure/src/main/java/com/opengamma/strata/measure/rate/DefaultRatesMarketDataLookup.java b/modules/measure/src/main/java/com/opengamma/strata/measure/rate/DefaultRatesMarketDataLookup.java index e90b70fc53..fd7f26c813 100644 --- a/modules/measure/src/main/java/com/opengamma/strata/measure/rate/DefaultRatesMarketDataLookup.java +++ b/modules/measure/src/main/java/com/opengamma/strata/measure/rate/DefaultRatesMarketDataLookup.java @@ -19,7 +19,6 @@ import org.joda.beans.gen.BeanDefinition; import org.joda.beans.gen.PropertyDefinition; import org.joda.beans.impl.light.LightMetaBean; -import org.joda.convert.RenameHandler; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -54,20 +53,6 @@ final class DefaultRatesMarketDataLookup implements RatesMarketDataLookup, ImmutableBean, Serializable { - static { - // these classes have been moved - try { - RenameHandler.INSTANCE.renamedType( - "com.opengamma.strata.measure.rate.DefaultFxRateLookup", - Class.forName("com.opengamma.strata.calc.runner.DefaultFxRateLookup")); - RenameHandler.INSTANCE.renamedType( - "com.opengamma.strata.measure.rate.MatrixFxRateLookup", - Class.forName("com.opengamma.strata.calc.runner.MatrixFxRateLookup")); - } catch (ReflectiveOperationException ex) { - throw new IllegalStateException(ex); - } - } - /** * The discount curves in the group, keyed by currency. */