Use validate instead of assertInstanceOf, see phetsims/axon#226

phetsims · Feb 26, 2019 · 5b8debd · 5b8debd
1 parent ce93653
commit 5b8debd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 15 deletions.
diff --git a/js/common/model/BodyIO.js b/js/common/model/BodyIO.js
@@ -13,29 +13,27 @@ define( function( require ) {
   var massesAndSprings = require( 'MASSES_AND_SPRINGS/massesAndSprings' );
   var ObjectIO = require( 'TANDEM/types/ObjectIO' );
   var phetioInherit = require( 'TANDEM/phetioInherit' );
-
-  // ifphetio
-  var assertInstanceOf = require( 'ifphetio!PHET_IO/assertInstanceOf' );
+  var validate = require( 'AXON/validate' );
 
   /**
    * @param {Body} body
    * @param {string} phetioID
    * @constructor
    */
   function BodyIO( body, phetioID ) {
-    assert && assertInstanceOf( body, Body );
     ObjectIO.call( this, body, phetioID );
   }
 
   phetioInherit( ObjectIO, 'BodyIO', BodyIO, {}, {
+    validator: { valueType: Body },
     /**
      * Encodes a Body instance to a state.
      *
      * @param body
      * @returns {*}
      */
     toStateObject: function( body ) {
-      assert && assertInstanceOf( body, Body );
+      validate( body, this.validator );
       if ( body === null ) {
         return null;
       }

diff --git a/js/common/model/MassIO.js b/js/common/model/MassIO.js
@@ -13,29 +13,27 @@ define( function( require ) {
   var massesAndSprings = require( 'MASSES_AND_SPRINGS/massesAndSprings' );
   var ObjectIO = require( 'TANDEM/types/ObjectIO' );
   var phetioInherit = require( 'TANDEM/phetioInherit' );
-
-  // ifphetio
-  var assertInstanceOf = require( 'ifphetio!PHET_IO/assertInstanceOf' );
+  var validate = require( 'AXON/validate' );
 
   /**
    * @param {Mass} mass
    * @param {string} phetioID
    * @constructor
    */
   function MassIO( mass, phetioID ) {
-    assert && assertInstanceOf( mass, Mass );
     ObjectIO.call( this, mass, phetioID );
   }
 
   phetioInherit( ObjectIO, 'MassIO', MassIO, {}, {
+    validator: { valueType: Mass },
     /**
      * Encodes a Mass instance to a state.
      *
      * @param mass
      * @returns {*}
      */
     toStateObject: function( mass ) {
-      assert && assertInstanceOf( mass, Mass );
+      validate( mass, this.validator );
       if ( mass === null ) {
         return null;
       }

diff --git a/js/common/model/SpringIO.js b/js/common/model/SpringIO.js
@@ -13,29 +13,28 @@ define( function( require ) {
   var ObjectIO = require( 'TANDEM/types/ObjectIO' );
   var phetioInherit = require( 'TANDEM/phetioInherit' );
   var Spring = require( 'MASSES_AND_SPRINGS/common/model/Spring' );
-
-  // ifphetio
-  var assertInstanceOf = require( 'ifphetio!PHET_IO/assertInstanceOf' );
+  var validate = require( 'AXON/validate' );
 
   /**
    * @param {Spring} spring
    * @param {string} phetioID
    * @constructor
    */
   function SpringIO( spring, phetioID ) {
-    assert && assertInstanceOf( spring, Spring );
     ObjectIO.call( this, spring, phetioID );
   }
 
   phetioInherit( ObjectIO, 'SpringIO', SpringIO, {}, {
+
+    validator: { valueType: Spring },
     /**
      * Encodes a Spring instance to a state.
      *
      * @param spring
      * @returns {*}
      */
     toStateObject: function( spring ) {
-      assert && assertInstanceOf( spring, Spring );
+      validate( spring, this.validator );
       if ( spring === null ) {
         return null;
       }