refact: remove deprecated functions

equinor · Feb 23, 2024 · 2689d9a · 2689d9a
1 parent dcf8d1b
commit 2689d9a
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 307 deletions.
diff --git a/src/main/java/neqsim/chemicalReactions/ChemicalReactionOperations.java b/src/main/java/neqsim/chemicalReactions/ChemicalReactionOperations.java
@@ -278,19 +278,6 @@ public String[] getAllElements() {
     return elementList;
   }
 
-  /**
-   * <p>
-   * hasRections.
-   * </p>
-   *
-   * @return a boolean
-   * @deprecated Replaced by hasReactions()
-   */
-  @Deprecated
-  public boolean hasRections() {
-    return this.hasReactions();
-  }
-
   /**
    * <p>
    * hasRections.

diff --git a/src/main/java/neqsim/chemicalReactions/chemicalReaction/ChemicalReaction.java b/src/main/java/neqsim/chemicalReactions/chemicalReaction/ChemicalReaction.java
@@ -40,20 +40,6 @@ public class ChemicalReaction extends NamedBaseClass
   double lnK = 0;
   int numberOfReactants = 0;
 
-  /**
-   * <p>
-   * Constructor for ChemicalReaction.
-   * </p>
-   *
-   * @deprecated use
-   *             {@link #ChemicalReaction(String, String[], double[], double[], double, double, double)}
-   *             instead
-   */
-  @Deprecated
-  public ChemicalReaction() {
-    super("ChemicalReaction");
-  }
-
   /**
    * <p>
    * Constructor for ChemicalReaction.

diff --git a/...va/neqsim/physicalProperties/interfaceProperties/solidAdsorption/AdsorptionInterface.java b/...va/neqsim/physicalProperties/interfaceProperties/solidAdsorption/AdsorptionInterface.java
@@ -18,19 +18,6 @@ public interface AdsorptionInterface extends neqsim.thermo.ThermodynamicConstant
    */
   public void calcAdsorption(int phase);
 
-  /**
-   * <p>
-   * calcAdsorption.
-   * </p>
-   *
-   * @param phase a int
-   * @deprecated Replaced by {@link calcAdsorption}
-   */
-  @Deprecated
-  public default void calcAdorption(int phase) {
-    calcAdsorption(phase);
-  }
-
   /**
    * <p>
    * getSurfaceExcess.
@@ -41,20 +28,6 @@ public default void calcAdorption(int phase) {
    */
   public double getSurfaceExcess(int component);
 
-  /**
-   * <p>
-   * getSurfaceExess.
-   * </p>
-   *
-   * @param component a int
-   * @return a double
-   * @deprecated Replaced by {@link getSurfaceExcess}
-   */
-  @Deprecated
-  public default double getSurfaceExess(int component) {
-    return getSurfaceExcess(component);
-  }
-
   /**
    * <p>
    * setSolidMaterial.

diff --git a/src/main/java/neqsim/processSimulation/measurementDevice/pHProbe.java b/src/main/java/neqsim/processSimulation/measurementDevice/pHProbe.java
@@ -114,19 +114,6 @@ public double getAlkalinity() {
     return alkalinity;
   }
 
-  /**
-   * <p>
-   * Getter for the field <code>alkalinity</code>.
-   * </p>
-   *
-   * @return the alkalinity
-   * @deprecated Replaced by {@link getAlkalinity}
-   */
-  @Deprecated
-  public double getAlkanility() {
-    return getAlkalinity();
-  }
-
   /**
    * <p>
    * Setter for the field <code>alkalinity</code>.
@@ -137,17 +124,4 @@ public double getAlkanility() {
   public void setAlkalinity(double alkalinity) {
     this.alkalinity = alkalinity;
   }
-
-  /**
-   * <p>
-   * Setter for the field <code>alkalinity</code>.
-   * </p>
-   *
-   * @param alkalinity the alkalinity to set
-   * @deprecated Replaced by {@link setAlkalinity}
-   */
-  @Deprecated
-  public void setAlkanility(double alkalinity) {
-    setAlkalinity(alkalinity);
-  }
 }
diff --git a/src/main/java/neqsim/standards/salesContract/ContractSpecification.java b/src/main/java/neqsim/standards/salesContract/ContractSpecification.java
@@ -25,16 +25,18 @@ public class ContractSpecification extends NamedBaseClass {
   private String terminal = "";
   private double minValue = 0;
   private double maxValue = 0;
-  private double referenceTemperatureMeasurement = 0, referenceTemperatureCombustion = 0;
+  private double referenceTemperatureMeasurement = 0;
+  private double referenceTemperatureCombustion = 0;
   private double referencePressure = 0;
-  private String unit = "", comments = "";
+  private String unit = "";
+  private String comments = "";
 
-  @Deprecated
   /**
    * <p>
    * Constructor for ContractSpecification.
    * </p>
    */
+  @Deprecated
   public ContractSpecification() {
     super("ContractSpecification");
   }

diff --git a/src/main/java/neqsim/thermo/characterization/PlusCharacterize.java b/src/main/java/neqsim/thermo/characterization/PlusCharacterize.java
@@ -36,7 +36,9 @@ public class PlusCharacterize implements java.io.Serializable, CharacteriseInter
   SystemInterface system = null;
 
   /**
-   * <p>Constructor for PlusCharacterize.</p>
+   * <p>
+   * Constructor for PlusCharacterize.
+   * </p>
    */
   public PlusCharacterize() {}
 
@@ -334,17 +336,6 @@ public int getStartPlus() {
     return firstPlusFractionNumber;
   }
 
-  /**
-   * Setter for property firstPlusFractionNumber.
-   *
-   * @param startPlus New value of property firstPlusFractionNumber.
-   * @deprecated use {@link #setFirstPlusFractionNumber(int firstPlusFractionNumber)} instead.
-   */
-  @Deprecated
-  public void setStartPlus(int startPlus) {
-    setFirstPlusFractionNumber(startPlus);
-  }
-
   /** {@inheritDoc} */
   @Override
   public double getMPlus() {

diff --git a/src/main/java/neqsim/thermo/component/ComponentInterface.java b/src/main/java/neqsim/thermo/component/ComponentInterface.java
@@ -605,19 +605,6 @@ public double fugcoefDiffTempNumeric(PhaseInterface phase, int numberOfComponent
    */
   public double getTriplePointDensity();
 
-  /**
-   * <p>
-   * getTripplePointDensity.
-   * </p>
-   *
-   * @return a double
-   * @deprecated Replaced by {@link getTriplePointDensity}
-   */
-  @Deprecated
-  public default double getTripplePointDensity() {
-    return getTriplePointDensity();
-  }
-
   /**
    * <p>
    * getCriticalCompressibilityFactor.
@@ -766,20 +753,7 @@ public default void addMolesChemReac(double dn) {
 
   /**
    * <p>
-   * getIdealGasGibsEnergyOfFormation.
-   * </p>
-   *
-   * @return a double
-   * @deprecated Replaced by {@link getIdealGasGibbsEnergyOfFormation}
-   */
-  @Deprecated
-  public default double getIdealGasGibsEnergyOfFormation() {
-    return getIdealGasGibbsEnergyOfFormation();
-  }
-
-  /**
-   * <p>
-   * getIdealGasGibsEnergyOfFormation.
+   * getIdealGasGibbsEnergyOfFormation.
    * </p>
    *
    * @return a double

diff --git a/src/main/java/neqsim/thermo/phase/Phase.java b/src/main/java/neqsim/thermo/phase/Phase.java
@@ -1207,32 +1207,6 @@ public double getThermalConductivity(String unit) {
     return refConductivity * conversionFactor;
   }
 
-  /** {@inheritDoc} */
-  @Override
-  @Deprecated
-  public double getConductivity() {
-    return getPhysicalProperties().getConductivity();
-  }
-
-  /** {@inheritDoc} */
-  @Override
-  @Deprecated
-  public double getConductivity(String unit) {
-    double refConductivity = getConductivity(); // conductivity in W/m*K
-    double conversionFactor = 1.0;
-    switch (unit) {
-      case "W/mK":
-        conversionFactor = 1.0;
-        break;
-      case "W/cmK":
-        conversionFactor = 0.01;
-        break;
-      default:
-        throw new RuntimeException("unit not supported " + unit);
-    }
-    return refConductivity * conversionFactor;
-  }
-
   /** {@inheritDoc} */
   @Override
   public void initRefPhases(boolean onlyPure) {

diff --git a/src/main/java/neqsim/thermo/phase/PhaseGEInterface.java b/src/main/java/neqsim/thermo/phase/PhaseGEInterface.java
@@ -15,25 +15,6 @@
  * @version $Id: $Id
  */
 public interface PhaseGEInterface {
-  /**
-   * <p>
-   * getExessGibbsEnergy.
-   * </p>
-   *
-   * @param phase a {@link neqsim.thermo.phase.PhaseInterface} object
-   * @param numberOfComponents a int
-   * @param temperature a double
-   * @param pressure a double
-   * @param phasetype a int
-   * @return a double
-   * @deprecated Replaced by {@link getExcessGibbsEnergy}.
-   */
-  @Deprecated
-  public default double getExessGibbsEnergy(PhaseInterface phase, int numberOfComponents,
-      double temperature, double pressure, int phasetype) {
-    return getExcessGibbsEnergy(phase, numberOfComponents, temperature, pressure, phasetype);
-  }
-
   /**
    * <p>
    * getExcessGibbsEnergy.

diff --git a/src/main/java/neqsim/thermo/phase/PhaseInterface.java b/src/main/java/neqsim/thermo/phase/PhaseInterface.java
@@ -31,22 +31,6 @@ public interface PhaseInterface extends ThermodynamicConstantsInterface, Cloneab
    */
   public void addComponent(String name, double moles, double molesInPhase, int compNumber);
 
-  /**
-   * <p>
-   * addcomponent.
-   * </p>
-   *
-   * @param name Name of component.
-   * @param moles a double
-   * @param molesInPhase a double
-   * @param compNumber a int
-   * @deprecated Replaced by {@link addComponent}
-   */
-  @Deprecated
-  public default void addcomponent(String name, double moles, double molesInPhase, int compNumber) {
-    this.addComponent(name, moles, molesInPhase, compNumber);
-  }
-
   /**
    * <p>
    * setMoleFractions.
@@ -535,33 +519,6 @@ public default void init(double totalNumberOfMoles, int numberOfComponents, int
    */
   public double getMixGibbsEnergy();
 
-  /**
-   * <p>
-   * getExessGibbsEnergy.
-   * </p>
-   *
-   * @return a double
-   * @deprecated Replaced by {@link getExcessGibbsEnergy}.
-   */
-  @Deprecated
-  public default double getExessGibbsEnergy() {
-    return getExcessGibbsEnergy();
-  }
-
-  /**
-   * <p>
-   * getExessGibbsEnergySymetric.
-   * </p>
-   *
-   *
-   * @return a double
-   * @deprecated Replace by {@link getExcessGibbsEnergySymetric}.
-   */
-  @Deprecated
-  public default double getExessGibbsEnergySymetric() {
-    return getExcessGibbsEnergySymetric();
-  }
-
   /**
    * <p>
    * getExcessGibbsEnergy.
@@ -1124,25 +1081,6 @@ public default void addMolesChemReac(int component, double dn) {
    */
   public double getViscosity(String unit);
 
-  /**
-   * method to return conductivity of a phase.
-   *
-   * @return conductivity in unit W/m*K
-   * @deprecated use {@link #getThermalConductivity()} instead.
-   */
-  @Deprecated
-  public double getConductivity();
-
-  /**
-   * method to return conductivity in a specified unit.
-   *
-   * @param unit Supported units are W/mK, W/cmK
-   * @return conductivity in specified unit
-   * @deprecated use {@link #getThermalConductivity(String unit)} instead.
-   */
-  @Deprecated
-  public double getConductivity(String unit);
-
   /**
    * method to return conductivity of a phase.
    *