ST6RI-926 Move isLibraryResource to SysMLLibraryUtil

AxelRICHARD · AxelRICHARD · commit fbfbc753abe5 · 2026-06-02T16:22:45.000+02:00
Signed-off-by: Axel RICHARD &lt;axel.richard@obeo.fr&gt;
diff --git a/org.omg.kerml.xtext/src/org/omg/kerml/xtext/validation/KerMLValidator.xtend b/org.omg.kerml.xtext/src/org/omg/kerml/xtext/validation/KerMLValidator.xtend
@@ -3,7 +3,8 @@
  * Copyright (c) 2018 IncQuery Labs Ltd.
  * Copyright (c) 2018-2026 Model Driven Solutions, Inc.
  * Copyright (c) 2020 California Institute of Technology/Jet Propulsion Laboratory
- *    
+ * Copyright (c) 2026 Obeo
+ * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the Eclipse Public License as published by
  * the Eclipse Foundation, version 2 of the License.
@@ -24,6 +25,7 @@
  *  Balazs Grill, IncQuery
  *  Ed Seidewitz, MDS
  *  Miyako Wilson, JPL
+ *  Axel Richard, Obeo
  * 
  *****************************************************************************/
 package org.omg.kerml.xtext.validation
@@ -33,7 +35,6 @@ import java.util.List
 import org.eclipse.emf.ecore.EObject
 import org.eclipse.emf.ecore.EClass
 import org.eclipse.emf.ecore.EStructuralFeature
-import org.eclipse.emf.ecore.resource.Resource
 import org.eclipse.xtext.validation.Check
 
 import org.omg.sysml.lang.sysml.Type
@@ -1421,22 +1422,13 @@ class KerMLValidator extends AbstractKerMLValidator {
 	
 	@Check
 	def checkLibraryPackage(LibraryPackage pkg) {
-		if (pkg.isStandard && !pkg.eResource.isModelLibrary) {
+		if (pkg.isStandard && !SysMLLibraryUtil.isLibraryResource(pkg.eResource)) {
 			warning(INVALID_LIBRARY_PACKAGE_NOT_STANDARD_MSG, pkg, SysMLPackage.eINSTANCE.libraryPackage_IsStandard, INVALID_LIBRARY_PACKAGE_NOT_STANDARD)
 		}
 	}
-	
+
 	/* Utility Methods */
-	
-	private def static boolean isModelLibrary(Resource resource) {
-		if (resource === null) {
-			return false;
-		} else {
-			val path = resource.URI.devicePath ?: resource.URI.path;
-			return path !== null && path.contains(SysMLLibraryUtil.modelLibraryPath);
-		}
-	}
-	
+
 	def static boolean isBoolean(Expression condition) {
 		specializesFromLibrary(condition, condition.result, "ScalarValues::Boolean") ||
 		// LiteralBooleans currently don't have an inferred Boolean result type.
diff --git a/org.omg.sysml.logic/src/main/java/org/omg/sysml/logic/ResourceSetModelLibraryProvider.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/logic/ResourceSetModelLibraryProvider.java
@@ -1,7 +1,7 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) Obeo
- *    
+ * Copyright (c) 2026 Obeo
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the Eclipse Public License as published by
  * the Eclipse Foundation, version 2 of the License.
@@ -16,7 +16,7 @@
  * along with this program. If not, see <https://www.eclipse.org/legal/epl-2.0/>.
  *
  * @license EPL-2.0 <http://spdx.org/licenses/EPL-2.0>
- *  
+ *
  *******************************************************************************/
 
 package org.omg.sysml.logic;
@@ -44,8 +44,6 @@
  */
 public class ResourceSetModelLibraryProvider implements IModelLibraryProvider {
 
-	private static final String MODEL_LIBRARY_FOLDER = "sysml.library";
-
 	/**
 	 * Resolves a qualified library name against the resources already loaded in
 	 * the context element's resource set.
@@ -87,7 +85,7 @@ private List<Resource> getCandidateResources(ResourceSet resourceSet) {
 		List<Resource> otherResources = new ArrayList<>();
 
 		for (Resource resource : resourceSet.getResources()) {
-			if (isLibraryResource(resource)) {
+			if (SysMLLibraryUtil.isLibraryResource(resource)) {
 				libraryResources.add(resource);
 			} else {
 				otherResources.add(resource);
@@ -97,31 +95,6 @@ private List<Resource> getCandidateResources(ResourceSet resourceSet) {
 		return libraryResources.isEmpty() ? otherResources : libraryResources;
 	}
 
-	/**
-	 * Identifies resources that should be treated as library candidates based on
-	 * the configured model library path or the conventional {@code sysml.library}
-	 * folder name in the URI.
-	 */
-	private boolean isLibraryResource(Resource resource) {
-		if (resource == null || resource.getURI() == null) {
-			return false;
-		}
-
-		String modelLibraryPath = SysMLLibraryUtil.getModelLibraryPath();
-		String uriString = resource.getURI().toString();
-		String fileString = resource.getURI().toFileString();
-		if (modelLibraryPath != null && !modelLibraryPath.isBlank()) {
-			if (uriString.contains(modelLibraryPath)) {
-				return true;
-			}
-			if (fileString != null && fileString.contains(modelLibraryPath)) {
-				return true;
-			}
-		}
-
-		return resource.getURI().segmentsList().contains(MODEL_LIBRARY_FOLDER);
-	}
-
 	/**
 	 * Attempts to resolve the qualified-name segments against each root element
 	 * contained by a resource.
diff --git a/org.omg.sysml.logic/src/main/java/org/omg/sysml/util/SysMLLibraryUtil.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/util/SysMLLibraryUtil.java
@@ -1,7 +1,7 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) Obeo
- *    
+ * Copyright (c) 2026 Obeo
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the Eclipse Public License as published by
  * the Eclipse Foundation, version 2 of the License.
@@ -16,7 +16,7 @@
  * along with this program. If not, see <https://www.eclipse.org/legal/epl-2.0/>.
  *
  * @license EPL-2.0 <http://spdx.org/licenses/EPL-2.0>
- *  
+ *
  *******************************************************************************/
 
 package org.omg.sysml.util;
@@ -106,6 +106,43 @@ public static String getModelLibraryPath() {
 		return modelLibraryPath;
 	}
 
+	/**
+	 * Identifies whether an EMF resource should be treated as belonging to the
+	 * SysML/KerML model libraries.
+	 *
+	 * <p>A resource is considered a library resource when its URI matches the
+	 * currently configured model-library path, or when its URI contains the
+	 * final segment of {@link #DEFAULT_MODEL_LIBRARY_PATH}. Both the URI string
+	 * and file string forms are checked so this method works across platform,
+	 * file, and standalone EMF resource sets.
+	 *
+	 * @param resource the resource to classify
+	 * @return {@code true} if the resource appears to be a model-library resource;
+	 *         {@code false} otherwise
+	 */
+	public static boolean isLibraryResource(Resource resource) {
+		if (resource == null || resource.getURI() == null) {
+			return false;
+		}
+
+		URI uri = resource.getURI();
+		String currentModelLibraryPath = getModelLibraryPath();
+		if (currentModelLibraryPath != null && !currentModelLibraryPath.isBlank()) {
+			String uriString = uri.toString();
+			if (uriString.contains(currentModelLibraryPath)) {
+				return true;
+			}
+
+			String fileString = uri.toFileString();
+			if (fileString != null && fileString.contains(currentModelLibraryPath)) {
+				return true;
+			}
+		}
+
+		String defaultModelLibrarySegment = URI.createURI(DEFAULT_MODEL_LIBRARY_PATH).lastSegment();
+		return defaultModelLibrarySegment != null && uri.segmentsList().contains(defaultModelLibrarySegment);
+	}
+
 	/**
 	 * Installs the runtime-specific provider lookup used for subsequent library
 	 * resolution requests.
diff --git a/org.omg.sysml.logic/src/test/java/org/omg/sysml/logic/SysMLLibraryUtilTest.java b/org.omg.sysml.logic/src/test/java/org/omg/sysml/logic/SysMLLibraryUtilTest.java
@@ -0,0 +1,74 @@
+/*******************************************************************************
+ * SysML 2 Pilot Implementation
+ * Copyright (c) 2026 Obeo
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the Eclipse Public License as published by
+ * the Eclipse Foundation, version 2 of the License.
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * Eclipse Public License for more details.
+ *
+ * You should have received a copy of theEclipse Public License
+ * along with this program. If not, see <https://www.eclipse.org/legal/epl-2.0/>.
+ *
+ * @license EPL-2.0 <http://spdx.org/licenses/EPL-2.0>
+ *
+ *******************************************************************************/
+
+package org.omg.sysml.logic;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
+import org.junit.Test;
+import org.omg.sysml.util.SysMLLibraryUtil;
+
+/**
+ * Verifies classification of EMF resources as SysML/KerML model-library
+ * resources.
+ */
+public class SysMLLibraryUtilTest {
+
+	@Test
+	public void nullResourceIsNotLibraryResource() {
+		assertFalse(SysMLLibraryUtil.isLibraryResource(null));
+	}
+
+	@Test
+	public void resourceWithoutUriIsNotLibraryResource() {
+		assertFalse(SysMLLibraryUtil.isLibraryResource(new ResourceImpl()));
+	}
+
+	@Test
+	public void configuredModelLibraryDirectoryIsLibraryResource() {
+		SysMLLibraryUtil.setModelLibraryDirectory("/tmp/sysml.library");
+
+		ResourceImpl resource = new ResourceImpl(URI.createFileURI("/tmp/sysml.library/Base.sysml"));
+
+		assertTrue(SysMLLibraryUtil.isLibraryResource(resource));
+	}
+
+	@Test
+	public void conventionalModelLibraryFolderIsLibraryResource() {
+		SysMLLibraryUtil.setModelLibraryDirectory("/tmp/other-library");
+
+		ResourceImpl resource = new ResourceImpl(URI.createURI("platform:/resource/sysml.library/Base.sysml"));
+
+		assertTrue(SysMLLibraryUtil.isLibraryResource(resource));
+	}
+
+	@Test
+	public void ordinaryModelResourceIsNotLibraryResource() {
+		SysMLLibraryUtil.setModelLibraryDirectory("/tmp/sysml.library");
+
+		ResourceImpl resource = new ResourceImpl(URI.createFileURI("/tmp/model/Test.sysml"));
+
+		assertFalse(SysMLLibraryUtil.isLibraryResource(resource));
+	}
+}
