Change naming convention on intern string class in runtime library. (#…

…1193)

* Class rename RtIdentifier -> RtString

* Rename namespace with string constants

* Change data type name from 'identifier' to 'internstring'

* Fix codacy issue

* Move all intern string constants into RtString class

source/MaterialXRuntime/Codegen/RtSourceCodeImpl.cpp

@@ -5,7 +5,6 @@
 
 #include <MaterialXRuntime/Codegen/RtSourceCodeImpl.h>
 #include <MaterialXRuntime/RtApi.h>
-#include <MaterialXRuntime/Identifiers.h>
 
 #include <MaterialXRuntime/Private/PvtPath.h>
 #include <MaterialXRuntime/Private/PvtPrim.h>
@@ -18,12 +17,12 @@ namespace MaterialX
 
 DEFINE_TYPED_SCHEMA(RtSourceCodeImpl, "nodeimpl:sourcecodeimpl");
 
-RtPrim RtSourceCodeImpl::createPrim(const RtIdentifier& typeName, const RtIdentifier& name, RtPrim parent)
+RtPrim RtSourceCodeImpl::createPrim(const RtString& typeName, const RtString& name, RtPrim parent)
 {
     PvtPrim::validateCreation(_typeInfo, typeName, name, parent.getPath());
 
-    static const RtIdentifier DEFAULT_NAME("sourcecodeimpl1");
-    const RtIdentifier primName = name == EMPTY_IDENTIFIER ? DEFAULT_NAME : name;
+    static const RtString DEFAULT_NAME("sourcecodeimpl1");
+    const RtString primName = name.empty() ? DEFAULT_NAME : name;
     PvtObjHandle primH = PvtPrim::createNew(&_typeInfo, primName, PvtObject::cast<PvtPrim>(parent));
 
     return primH;
@@ -37,7 +36,7 @@ const RtPrimSpec& RtSourceCodeImpl::getPrimSpec() const
 
 void RtSourceCodeImpl::setFile(const string& file)
 {
-    RtTypedValue* attr = prim()->createAttribute(Identifiers::FILE, RtType::STRING);
+    RtTypedValue* attr = prim()->createAttribute(RtString::FILE, RtType::STRING);
     attr->asString() = file;
 
     const FilePath path = RtApi::get().getSearchPath().find(file);
@@ -52,43 +51,43 @@ void RtSourceCodeImpl::setFile(const string& file)
 
 const string& RtSourceCodeImpl::getFile() const
 {
-    RtTypedValue* attr = prim()->getAttribute(Identifiers::FILE, RtType::STRING);
+    RtTypedValue* attr = prim()->getAttribute(RtString::FILE, RtType::STRING);
     return attr ? attr->asString() : EMPTY_STRING;
 }
 
 void RtSourceCodeImpl::setSourceCode(const string& source)
 {
-    RtTypedValue* attr = prim()->createAttribute(Identifiers::SOURCECODE, RtType::STRING);
+    RtTypedValue* attr = prim()->createAttribute(RtString::SOURCECODE, RtType::STRING);
     attr->asString() = source;
 }
 
 const string& RtSourceCodeImpl::getSourceCode() const
 {
-    RtTypedValue* attr = prim()->getAttribute(Identifiers::SOURCECODE, RtType::STRING);
+    RtTypedValue* attr = prim()->getAttribute(RtString::SOURCECODE, RtType::STRING);
     return attr ? attr->asString() : EMPTY_STRING;
 }
 
-void RtSourceCodeImpl::setFormat(const RtIdentifier& format)
+void RtSourceCodeImpl::setFormat(const RtString& format)
 {
-    RtTypedValue* attr = prim()->createAttribute(Identifiers::FORMAT, RtType::IDENTIFIER);
-    attr->asIdentifier() = format;
+    RtTypedValue* attr = prim()->createAttribute(RtString::FORMAT, RtType::INTERNSTRING);
+    attr->asInternString() = format;
 }
 
-const RtIdentifier& RtSourceCodeImpl::getFormat() const
+const RtString& RtSourceCodeImpl::getFormat() const
 {
-    RtTypedValue* attr = prim()->getAttribute(Identifiers::FORMAT, RtType::IDENTIFIER);
-    return attr ? attr->asIdentifier() : Identifiers::SHADER;
+    RtTypedValue* attr = prim()->getAttribute(RtString::FORMAT, RtType::INTERNSTRING);
+    return attr ? attr->asInternString() : RtString::SHADER;
 }
 
 void RtSourceCodeImpl::setFunction(const string& source)
 {
-    RtTypedValue* attr = prim()->createAttribute(Identifiers::FUNCTION, RtType::STRING);
+    RtTypedValue* attr = prim()->createAttribute(RtString::FUNCTION, RtType::STRING);
     attr->asString() = source;
 }
 
 const string& RtSourceCodeImpl::getFunction() const
 {
-    RtTypedValue* attr = prim()->getAttribute(Identifiers::FUNCTION, RtType::STRING);
+    RtTypedValue* attr = prim()->getAttribute(RtString::FUNCTION, RtType::STRING);
     return attr ? attr->asString() : EMPTY_STRING;
 }
 

source/MaterialXRuntime/Codegen/RtSourceCodeImpl.h

@@ -37,10 +37,10 @@ class RtSourceCodeImpl : public RtCodegenImpl
     const string& getSourceCode() const;
 
     /// Set the format used by the source code in this implementation.
-    void setFormat(const RtIdentifier& format);
+    void setFormat(const RtString& format);
 
     /// Return the format used by the source code in this implementation.
-    const RtIdentifier& getFormat() const;
+    const RtString& getFormat() const;
 
     /// Set the function name to use for this implementation.
     void setFunction(const string& function);

source/MaterialXRuntime/Codegen/RtSubGraphImpl.cpp

@@ -4,7 +4,6 @@
 //
 
 #include <MaterialXRuntime/Codegen/RtSubGraphImpl.h>
-#include <MaterialXRuntime/Identifiers.h>
 
 #include <MaterialXRuntime/Private/PvtPath.h>
 #include <MaterialXRuntime/Private/PvtPrim.h>
@@ -14,16 +13,16 @@ namespace MaterialX
 
 DEFINE_TYPED_SCHEMA(RtSubGraphImpl, "nodeimpl:subgraphimpl");
 
-RtPrim RtSubGraphImpl::createPrim(const RtIdentifier& typeName, const RtIdentifier& name, RtPrim parent)
+RtPrim RtSubGraphImpl::createPrim(const RtString& typeName, const RtString& name, RtPrim parent)
 {
     PvtPrim::validateCreation(_typeInfo, typeName, name, parent.getPath());
 
-    static const RtIdentifier DEFAULT_NAME("subgraphimpl1");
-    const RtIdentifier primName = name == EMPTY_IDENTIFIER ? DEFAULT_NAME : name;
+    static const RtString DEFAULT_NAME("subgraphimpl1");
+    const RtString primName = name.empty() ? DEFAULT_NAME : name;
     PvtObjHandle primH = PvtPrim::createNew(&_typeInfo, primName, PvtObject::cast<PvtPrim>(parent));
 
     PvtPrim* prim = primH->asA<PvtPrim>();
-    prim->createRelationship(Identifiers::NODEIMPL);
+    prim->createRelationship(RtString::NODEIMPL);
 
     return primH;
 }

source/MaterialXRuntime/Commands/AttributeCommands.cpp

@@ -17,7 +17,7 @@ namespace MaterialX
 namespace RtCommand
 {
 
-void setAttributeFromString(const RtObject& obj, const RtIdentifier& name, const string& value, RtCommandResult& result)
+void setAttributeFromString(const RtObject& obj, const RtString& name, const string& value, RtCommandResult& result)
 {
     // Use try/catch since the conversion from string might fail and throw.
     try
@@ -33,7 +33,7 @@ void setAttributeFromString(const RtObject& obj, const RtIdentifier& name, const
     }
 }
 
-void removeAttribute(const RtObject& obj, const RtIdentifier& name, RtCommandResult& result)
+void removeAttribute(const RtObject& obj, const RtString& name, RtCommandResult& result)
 {
     try
     {

source/MaterialXRuntime/Commands/AttributeCommands.h

@@ -10,18 +10,18 @@
 /// Commands for attribute handling.
 
 #include <MaterialXRuntime/RtCommand.h>
-#include <MaterialXRuntime/RtIdentifier.h>
+#include <MaterialXRuntime/RtString.h>
 
 namespace MaterialX
 {
 
 namespace RtCommand
 {
     /// Set an attribute value from data given as a value string. Creates the attribute if it doesn't exist.
-    void setAttributeFromString(const RtObject& obj, const RtIdentifier& name, const string& value, RtCommandResult& result);
+    void setAttributeFromString(const RtObject& obj, const RtString& name, const string& value, RtCommandResult& result);
 
     /// Remove an attribute.
-    void removeAttribute(const RtObject& obj, const RtIdentifier& name, RtCommandResult& result);
+    void removeAttribute(const RtObject& obj, const RtString& name, RtCommandResult& result);
 }
 
 }

source/MaterialXRuntime/Commands/PortCommands.cpp

@@ -88,7 +88,7 @@ void setPortValue(const RtPort& port, const Vector4& value, RtCommandResult& res
     PvtApi::cast(RtApi::get())->getCommandEngine().execute(cmd, result);
 }
 
-void setPortValue(const RtPort& port, const RtIdentifier& value, RtCommandResult& result)
+void setPortValue(const RtPort& port, const RtString& value, RtCommandResult& result)
 {
     RtValue v(value);
     PvtCommandPtr cmd = PvtSetPortValueCmd::create(port, v);

source/MaterialXRuntime/Commands/PortCommands.h

@@ -44,7 +44,7 @@ namespace RtCommand
     void setPortValue(const RtPort& port, const Vector4& value, RtCommandResult& result);
 
     /// Set value on a string port.
-    void setPortValue(const RtPort& port, const RtIdentifier& value, RtCommandResult& result);
+    void setPortValue(const RtPort& port, const RtString& value, RtCommandResult& result);
 
     /// Set value on a pointer port.
     void setPortValue(const RtPort& port, void* value, RtCommandResult& result);

source/MaterialXRuntime/Commands/PrimCommands.cpp

@@ -20,21 +20,21 @@ namespace MaterialX
 namespace RtCommand
 {
 
-void createPrim(RtStagePtr stage, const RtIdentifier& typeName, RtCommandResult& result)
+void createPrim(RtStagePtr stage, const RtString& typeName, RtCommandResult& result)
 {
-    PvtCommandPtr cmd = PvtCreatePrimCmd::create(stage, typeName, RtPath("/"), EMPTY_IDENTIFIER);
+    PvtCommandPtr cmd = PvtCreatePrimCmd::create(stage, typeName, RtPath("/"), RtString::EMPTY);
     PvtApi::cast(RtApi::get())->getCommandEngine().execute(cmd, result);
 }
 
-void createPrim(RtStagePtr stage, const RtIdentifier& typeName, const RtPath& path, RtCommandResult& result)
+void createPrim(RtStagePtr stage, const RtString& typeName, const RtPath& path, RtCommandResult& result)
 {
     RtPath parentPath(path);
     parentPath.pop();
     PvtCommandPtr cmd = PvtCreatePrimCmd::create(stage, typeName, parentPath, path.getName());
     PvtApi::cast(RtApi::get())->getCommandEngine().execute(cmd, result);
 }
 
-void createPrim(RtStagePtr stage, const RtIdentifier& typeName, const RtPath& parentPath, const RtIdentifier& name, RtCommandResult& result)
+void createPrim(RtStagePtr stage, const RtString& typeName, const RtPath& parentPath, const RtString& name, RtCommandResult& result)
 {
     PvtCommandPtr cmd = PvtCreatePrimCmd::create(stage, typeName, parentPath, name);
     PvtApi::cast(RtApi::get())->getCommandEngine().execute(cmd, result);
@@ -58,7 +58,7 @@ void removePrim(RtStagePtr stage, const RtPath& path, RtCommandResult& result)
     PvtApi::cast(RtApi::get())->getCommandEngine().execute(cmd, result);
 }
 
-void renamePrim(RtStagePtr stage, const RtPath& path, const RtIdentifier& newName, RtCommandResult& result)
+void renamePrim(RtStagePtr stage, const RtPath& path, const RtString& newName, RtCommandResult& result)
 {
     PvtCommandPtr cmd = PvtRenamePrimCmd::create(stage, path, newName);
     PvtApi::cast(RtApi::get())->getCommandEngine().execute(cmd, result);

source/MaterialXRuntime/Commands/PrimCommands.h

@@ -19,14 +19,14 @@ namespace MaterialX
 namespace RtCommand
 {
     /// Create a new prim at the root of the stage.
-    void createPrim(RtStagePtr stage, const RtIdentifier& typeName, RtCommandResult& result);
+    void createPrim(RtStagePtr stage, const RtString& typeName, RtCommandResult& result);
 
     /// Create a new prim at the given path.
-    void createPrim(RtStagePtr stage, const RtIdentifier& typeName, const RtPath& path, RtCommandResult& result);
+    void createPrim(RtStagePtr stage, const RtString& typeName, const RtPath& path, RtCommandResult& result);
 
     /// Create a new prim inside the parent given by path.
     /// If an empty name is given a name will be generated.
-    void createPrim(RtStagePtr stage, const RtIdentifier& typeName, const RtPath& parentPath, const RtIdentifier& name, RtCommandResult& result);
+    void createPrim(RtStagePtr stage, const RtString& typeName, const RtPath& parentPath, const RtString& name, RtCommandResult& result);
 
     /// Make a copy of the given prim and place the copy at the same parent path.
     void copyPrim(RtStagePtr stage, const RtPrim& prim, RtCommandResult& result);
@@ -38,7 +38,7 @@ namespace RtCommand
     void removePrim(RtStagePtr stage, const RtPath& path, RtCommandResult& result);
 
     /// Rename a prim.
-    void renamePrim(RtStagePtr stage, const RtPath& path, const RtIdentifier& newName, RtCommandResult& result);
+    void renamePrim(RtStagePtr stage, const RtPath& path, const RtString& newName, RtCommandResult& result);
 
     /// Reparent a prim.
     void reparentPrim(RtStagePtr stage, const RtPath& path, const RtPath& newParentPath, RtCommandResult& result);