Merge Variable and MutableVariable, un-deprecate registerVariable

Signed-off-by: Ryan Nett <rnett@calpoly.edu>

Author: rnett

tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/EagerSession.java

@@ -31,7 +31,7 @@
 import org.tensorflow.internal.c_api.TFE_ContextOptions;
 import org.tensorflow.internal.c_api.TF_Status;
 import org.tensorflow.proto.framework.ConfigProto;
-import org.tensorflow.variable.MutableVariable;
+import org.tensorflow.variable.Variable;
 
 /**
  * An environment for executing TensorFlow operations eagerly.
@@ -302,15 +302,15 @@ void detach(Pointer... resources) {
     }
   }
 
-  private final Map<String, MutableVariable<?>> variables = new LinkedHashMap<>();
+  private final Map<String, Variable<?>> variables = new LinkedHashMap<>();
 
   @Override
-  public void registerVariable(MutableVariable<?> variable) {
+  public void registerVariable(Variable<?> variable) {
     variables.put(variable.getName(), variable);
   }
 
   @Override
-  public Map<String, MutableVariable<?>> variables() {
+  public Map<String, Variable<?>> variables() {
     return Collections.unmodifiableMap(variables);
   }
 

tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/ExecutionEnvironment.java

@@ -16,7 +16,7 @@
 package org.tensorflow;
 
 import java.util.Map;
-import org.tensorflow.variable.MutableVariable;
+import org.tensorflow.variable.Variable;
 
 /** Defines an environment for creating and executing TensorFlow {@link Operation}s. */
 public interface ExecutionEnvironment {
@@ -44,14 +44,12 @@ enum Types {
    */
   Types environmentType();
 
-  Map<String, MutableVariable<?>> variables();
+  Map<String, Variable<?>> variables();
 
   /**
-   * Registers a variable with this execution environment.
-   * @deprecated Done automatically in Variable's constructor, should only be used internally.
+   * Registers a variable with this execution environment.  For internal use only.
    */
-  @Deprecated
-  void registerVariable(MutableVariable<?> variable);
+  void registerVariable(Variable<?> variable);
 
   default boolean isEager() {
     return environmentType() == Types.EAGER;

tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/Graph.java

@@ -57,7 +57,7 @@
 import org.tensorflow.proto.util.SaverDef;
 import org.tensorflow.types.TString;
 import org.tensorflow.types.family.TType;
-import org.tensorflow.variable.MutableVariable;
+import org.tensorflow.variable.Variable;
 
 
 /**
@@ -448,15 +448,15 @@ synchronized SaverDef saverDef() {
 
   private final List<Op> initializers = new ArrayList<>();
 
-  private final Map<String, MutableVariable<?>> variables = new LinkedHashMap<>();
+  private final Map<String, Variable<?>> variables = new LinkedHashMap<>();
 
   @Override
-  public void registerVariable(MutableVariable<?> variable) {
+  public void registerVariable(Variable<?> variable) {
     variables.put(variable.getName(), variable);
   }
 
   @Override
-  public Map<String, MutableVariable<?>> variables() {
+  public Map<String, Variable<?>> variables() {
     return Collections.unmodifiableMap(variables);
   }