Development

software/core/oqm-core-api/build.gradle

@@ -8,7 +8,7 @@ plugins {
 }
 
 group 'com.ebp.openQuarterMaster'
-version '4.4.7'
+version '5.0.0-SNAPSHOT'
 
 repositories {
 	mavenCentral()
@@ -44,7 +44,7 @@ dependencies {
 
 	// https://mvnrepository.com/artifact/tech.units/indriya
 	//     https://unitsofmeasurement.gitbook.io/uom-guide/getting-started/getting-started-with-indriya
-	implementation 'tech.units:indriya:2.2.3'
+	implementation 'tech.units:indriya:2.2.4'
 	implementation 'systems.uom:systems-common:2.2'
 	// https://mvnrepository.com/artifact/tech.uom.lib/uom-lib-jackson
 	implementation 'tech.uom.lib:uom-lib-jackson:2.1'

software/core/oqm-core-api/src/main/java/tech/ebp/oqm/core/api/config/MutexConfig.java

@@ -0,0 +1,29 @@
+package tech.ebp.oqm.core.api.config;
+
+import io.smallrye.config.ConfigMapping;
+import io.smallrye.config.WithDefault;
+
+import java.time.Duration;
+
+@ConfigMapping(prefix = "service.mutex", namingStrategy = ConfigMapping.NamingStrategy.VERBATIM)
+public interface MutexConfig {
+
+	@WithDefault("${quarkus.uuid}")
+	String instanceId();
+
+	@WithDefault("10m")
+	Duration lockExpireDuration();
+
+	AwaitConfig await();
+
+	interface AwaitConfig {
+		@WithDefault("30s")
+		Duration timeout();
+
+		@WithDefault("0ms")
+		Duration loopPauseMin();
+
+		@WithDefault("50ms")
+		Duration loopPauseMax();
+	}
+}

software/core/oqm-core-api/src/main/java/tech/ebp/oqm/core/api/exception/mutex/MutexNotRegisteredException.java

@@ -0,0 +1,10 @@
+package tech.ebp.oqm.core.api.exception.mutex;
+
+/**
+ * Exception to use when a lock is attempted on a non registered mutex.
+ */
+public class MutexNotRegisteredException extends IllegalStateException {
+	public MutexNotRegisteredException(String mutexId) {
+		super("Mutex with id " + mutexId + " was not registered when lock attempt made.");
+	}
+}

software/core/oqm-core-api/src/main/java/tech/ebp/oqm/core/api/exception/mutex/MutexWaitInterruptedException.java

@@ -0,0 +1,10 @@
+package tech.ebp.oqm.core.api.exception.mutex;
+
+/**
+ * Exception to use when a wait for a mutex lock has been interrupted.
+ */
+public class MutexWaitInterruptedException extends IllegalStateException {
+	public MutexWaitInterruptedException(InterruptedException e) {
+		super("Mutex wait interrupted.", e);
+	}
+}

software/core/oqm-core-api/src/main/java/tech/ebp/oqm/core/api/exception/MutexWaitTimeoutException.java → software/core/oqm-core-api/src/main/java/tech/ebp/oqm/core/api/exception/mutex/MutexWaitTimeoutException.java

@@ -1,4 +1,4 @@
-package tech.ebp.oqm.core.api.exception;
+package tech.ebp.oqm.core.api.exception.mutex;
 
 /**
  * Exception to use when a wait for a mutex lock has timed out.
@@ -7,6 +7,7 @@
  */
 public class MutexWaitTimeoutException extends IllegalStateException {
 	public MutexWaitTimeoutException() {
+		super("Mutex wait timed out. Could not acquire lock before timeout.");
 	}
 
 	public MutexWaitTimeoutException(String s) {

software/core/oqm-core-api/src/main/java/tech/ebp/oqm/core/api/health/ConfigHealthCheck.java

@@ -2,13 +2,16 @@
 
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
+import lombok.AccessLevel;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.microprofile.config.ConfigProvider;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.eclipse.microprofile.health.HealthCheck;
 import org.eclipse.microprofile.health.HealthCheckResponse;
 import org.eclipse.microprofile.health.HealthCheckResponseBuilder;
 import org.eclipse.microprofile.health.Startup;
+import tech.ebp.oqm.core.api.config.MutexConfig;
 import tech.ebp.oqm.core.api.exception.InvalidConfigException;
 import tech.ebp.oqm.core.api.service.TempFileService;
 
@@ -25,42 +28,50 @@
 @Startup
 @ApplicationScoped
 public class ConfigHealthCheck implements HealthCheck {
-	
+
 	private static final String HEALTH_CHECK_NAME = "Config Sanity health check";
-
+
+	@Inject
+	@Getter(AccessLevel.PRIVATE)
+	MutexConfig mutexConfig;
+
 	@ConfigProperty(name = "service.tempDir")
 	Path tempDir;
-	
+
 	private Map<String, String> checkRunningInfoConfig() {
 		Map<String, String> invalidConfigs = new HashMap<>();
-		
+
 		try{
 			TempFileService.checkDir(tempDir);
 		} catch (InvalidConfigException e){
 			invalidConfigs.put("service.tempDir", "Specified temporary directory not suitable for temp file usage: " + e.getMessage());
 		}
-
+
+		if(mutexConfig.await().loopPauseMin().compareTo(mutexConfig.await().loopPauseMax()) > 0){
+			invalidConfigs.put("service.mutex.await.loopPauseMin", "loopPauseMin must be less than loopPauseMax");
+		}
+
 		return invalidConfigs;
 	}
-	
-	
+
+
 	@Override
 	public HealthCheckResponse call() {
 		Map<String, String> invalidConfigs = new HashMap<>();
-		
+
 		invalidConfigs.putAll(checkRunningInfoConfig());
-		
+
 		if (invalidConfigs.isEmpty()) {
 			return HealthCheckResponse.up(HEALTH_CHECK_NAME);
 		}
 		HealthCheckResponseBuilder builder = HealthCheckResponse.named(HEALTH_CHECK_NAME);
-		
+
 		builder.down();
-		
+
 		for (Map.Entry<String, String> curInv : invalidConfigs.entrySet()) {
 			builder.withData(curInv.getKey(), curInv.getValue());
 		}
-		
+
 		return builder.build();
 	}
-}
+}

software/core/oqm-core-api/src/main/java/tech/ebp/oqm/core/api/interfaces/endpoints/inventory/items/StoredEndpoints.java

@@ -131,42 +131,6 @@ public Stored get(@PathParam("storedItemId") ObjectId id) {
 		return this.applyDefaults(super.get(id));
 	}
 
-	@PUT
-	@Path("{storedItemId}")
-	@Operation(
-		summary = "Updates a particular stored item. If applicable, amounts are disregarded. Use the transact endpoint to modify amounts, or add/remove stored items",
-		description = "Partial update to a object. Do not need to supply all fields, just the one(s) you wish to update."
-	)
-	@APIResponse(
-		responseCode = "200",
-		description = "Object updated."
-	)
-	@APIResponse(
-		responseCode = "400",
-		description = "Bad request given. Data given could not pass validation.",
-		content = @Content(mediaType = "text/plain")
-	)
-	@APIResponse(
-		responseCode = "404",
-		description = "Bad request given, could not find object at given id.",
-		content = @Content(mediaType = "text/plain")
-	)
-	@APIResponse(
-		responseCode = "410",
-		description = "Object requested has been deleted.",
-		content = @Content(mediaType = "text/plain")
-	)
-	@RolesAllowed(Roles.INVENTORY_EDIT)
-	@Produces(MediaType.APPLICATION_JSON)
-	public Stored update(
-		@PathParam("storedItemId")
-		ObjectId id,
-		@Schema(type = SchemaType.OBJECT, implementation = Stored.class, description = "Partial object updates; supply all or some of values to update.")
-		ObjectNode updates
-	) {
-		return this.applyDefaults(super.update(id, updates));
-	}
-
 	@GET
 	@Path("{storedItemId}/history")
 	@Operation(

software/core/oqm-core-api/src/main/java/tech/ebp/oqm/core/api/interfaces/endpoints/inventory/items/StoredInItemEndpoints.java

@@ -154,7 +154,13 @@ public Stored update(
 		@Schema(type = SchemaType.OBJECT, implementation = Stored.class, description = "Partial object updates; supply all or some of values to update.")
 		ObjectNode updates
 	) {
-		return this.applyDefaults(super.update(id, updates));
+		log.info("Updating {} from REST interface with id {}", this.getObjectClass().getSimpleName(), id);
+
+		Stored updated = this.getObjectService().update(this.getOqmDbIdOrName(), null, id, updates, this.getInteractingEntity());
+
+		log.info("Updated {} with id {}", updated.getClass().getSimpleName(), id);
+
+		return this.applyDefaults(updated);
 	}
 
 	@GET

software/core/oqm-core-api/src/main/java/tech/ebp/oqm/core/api/model/object/AttKeywordMainObject.java

@@ -1,5 +1,7 @@
 package tech.ebp.oqm.core.api.model.object;
 
+import com.fasterxml.jackson.annotation.JsonMerge;
+import com.fasterxml.jackson.annotation.OptBoolean;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
@@ -39,6 +41,7 @@ public AttKeywordMainObject(ObjectId id, Map<@NotBlank @NotNull String, String>
 	 */
 	@NotNull
 	@NonNull
+//	@JsonMerge TODO:: #1261 figure out how to merge these; without, the whole map gets written on merge. With, partial updates are possible, but can't remove entries.
 	@lombok.Builder.Default
 	@Schema(required = false, description = "Attribute key/value (string) pairs to associate with the object.", examples = {"{}", "{\"key\": \"value\"}"})
 	private Map<@NotBlank @NotNull String, String> attributes = new HashMap<>();