Remove debug code, more targeted version pin in getControlledInstances

Author: ehennestad

code/internal/+openminds/+internal/+utility/+string/uriJoin.m

@@ -1,15 +1,10 @@
 function strURI = uriJoin(varargin)
 %uriJoin Join segments of a URI using the forward slash (/)
-    try
     if isa(varargin{1}, 'string')
         listOfStrings = [varargin{:}];
         strURI = join(listOfStrings, "/");
     elseif isa(varargin{1}, 'char')
         listOfStrings = varargin;
         strURI = strjoin(listOfStrings, '/');
     end
-    catch
-        varargin{:}
-        error('Debug')
-    end
 end

code/internal/+openminds/+internal/getControlledInstance.m

@@ -13,6 +13,13 @@
     if ismissing(versionNumber)
         versionNumber = openminds.getModelVersion("VersionNumber");
     end
+
+    % Todo: remove. Pin latest version to v4.0 as instances from v5.0 are not 
+    % supported yet.
+    if versionNumber == "latest"
+        versionNumber = openminds.internal.utility.VersionNumber("4.0");
+        versionNumber.Format = "vX.Y";
+    end
     versionNumber = string(versionNumber);
 
     % Make type name lowercase unless it is an abbreviated typename like
@@ -51,7 +58,7 @@
 
     % assert(size(instanceTable, 1) == 1, 'Expected a single match for instance "%s", but %d was found.', instanceName, size(instanceTable, 1))
     % jsonStr = fileread(instanceTable.Filepath);
-
+    
     filePath = getOfflineFilepath(instanceName, schemaName, moduleName, versionNumber);
 
     if ~isfile(filePath)

code/internal/+openminds/getModelVersion.m

@@ -29,12 +29,6 @@
     end
     versionNum = cachedVersionNumber;
 
-    % Todo: remove. Pin latest version to v4.0 as v5.0 is not supported yet.
-    if versionNum == "latest"
-        versionNum = openminds.internal.utility.VersionNumber("4.0");
-        versionNum.Format = "vX.Y";
-    end
-
     if outputType == "char"
         versionNum = char(versionNum);
     end

tools/tests/+ommtest/+internal/MetaTypeTest.m

@@ -6,8 +6,7 @@ function testRegistrySingleton(testCase)
 
             registry = MetaTypeRegistry.getSingleton();
             testCase.verifyClass(registry, 'openminds.internal.meta.MetaTypeRegistry');
-            % Todo: uncomment. Currently pinned to v4.0 as v5.0 is not supported yet.
-            % testCase.verifyEqual(registry.ModelVersion, "latest")
+            testCase.verifyEqual(registry.ModelVersion, "latest")
 
             % Verify that we get the same handle if we ask for the singleton again
             newRegistry = MetaTypeRegistry.getSingleton();

tools/tests/unitTests/InstanceTest.m

@@ -41,11 +41,7 @@ function testCreateType(testCase, MetadataType)
             end
 
             function dispNoOutput(instance) %#ok<INUSD>
-                try
                 c = evalc('disp(instance)'); %#ok<NASGU>
-                catch
-                    disp(c)
-                end
             end
         end