diff --git a/build.sh b/build.sh index 3514924..e723654 100755 --- a/build.sh +++ b/build.sh @@ -1,6 +1,5 @@ #!/bin/sh -echo "Edge - Machinery Service" ./mvnw clean package -U -Pnative -Dquarkus.native.container-build=true docker rmi quay.io/qiotmanufacturing/edge-machinery:1.0.0-alpha7 --force docker build -f src/main/docker/Dockerfile.native -t quay.io/qiotmanufacturing/edge-machinery:1.0.0-alpha7 . diff --git a/pom.xml b/pom.xml index 56a4544..d212fe7 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,11 @@ 4.0.0 io.qiot.manufacturing.edge machinery-service - 1.0.0.alpha7-SNAPSHOT + 1.0.0.alpha7 io.qiot.manufacturing parent - 1.0.0.alpha7-SNAPSHOT + 1.0.0.alpha7 scm:git:https://github.com/qiot-project/qiot-manufacturing-edge-machinery.git @@ -46,24 +46,36 @@ io.qiot.manufacturing.all domain-model - 1.0.0.alpha7-SNAPSHOT + 1.0.0.alpha7 io.qiot.manufacturing.factory domain-model - 1.0.0.alpha7-SNAPSHOT + 1.0.0.alpha7 io.qiot.manufacturing.all utilities - 1.0.0.alpha7-SNAPSHOT + 1.0.0.alpha7 io.qiot.manufacturing.factory utilities - 1.0.0.alpha7-SNAPSHOT + 1.0.0.alpha7 + + + + io.quarkus + quarkus-resteasy-jackson + + + io.quarkus + quarkus-smallrye-openapi + + + io.quarkus + quarkus-swagger-ui - io.quarkus quarkus-rest-client-jackson diff --git a/src/main/java/io/qiot/manufacturing/edge/machinery/domain/event/chain/ValidationFailedEvent.java b/src/main/java/io/qiot/manufacturing/edge/machinery/domain/event/chain/ValidationFailedEvent.java index e1259cd..adbd5f8 100644 --- a/src/main/java/io/qiot/manufacturing/edge/machinery/domain/event/chain/ValidationFailedEvent.java +++ b/src/main/java/io/qiot/manufacturing/edge/machinery/domain/event/chain/ValidationFailedEvent.java @@ -1,6 +1,6 @@ package io.qiot.manufacturing.edge.machinery.domain.event.chain; -import io.qiot.manufacturing.commons.domain.productionvalidation.AbstractProductionChainEventDTO; +import io.qiot.manufacturing.factory.commons.domain.productionvalidation.AbstractProductionChainEventDTO; import io.quarkus.runtime.annotations.RegisterForReflection; /** diff --git a/src/main/java/io/qiot/manufacturing/edge/machinery/domain/event/chain/ValidationSuccessfullEvent.java b/src/main/java/io/qiot/manufacturing/edge/machinery/domain/event/chain/ValidationSuccessfullEvent.java index 20a245b..943ccff 100644 --- a/src/main/java/io/qiot/manufacturing/edge/machinery/domain/event/chain/ValidationSuccessfullEvent.java +++ b/src/main/java/io/qiot/manufacturing/edge/machinery/domain/event/chain/ValidationSuccessfullEvent.java @@ -1,6 +1,6 @@ package io.qiot.manufacturing.edge.machinery.domain.event.chain; -import io.qiot.manufacturing.commons.domain.productionvalidation.AbstractProductionChainEventDTO; +import io.qiot.manufacturing.factory.commons.domain.productionvalidation.AbstractProductionChainEventDTO; import io.quarkus.runtime.annotations.RegisterForReflection; /** diff --git a/src/main/java/io/qiot/manufacturing/edge/machinery/rest/CountersResource.java b/src/main/java/io/qiot/manufacturing/edge/machinery/rest/CountersResource.java new file mode 100644 index 0000000..6eccda7 --- /dev/null +++ b/src/main/java/io/qiot/manufacturing/edge/machinery/rest/CountersResource.java @@ -0,0 +1,38 @@ +/** + * + */ +package io.qiot.manufacturing.edge.machinery.rest; + +import java.util.Map; +import java.util.UUID; + +import javax.inject.Inject; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; + +import org.slf4j.Logger; + +import io.qiot.manufacturing.edge.machinery.domain.ProductionCountersDTO; +import io.qiot.manufacturing.edge.machinery.service.production.CountersService; + +/** + * @author andreabattaglia + * + */ +@Path("/counters") +public class CountersResource { + + @Inject + Logger LOGGER; + @Inject + CountersService countersService; + + @GET + @Path("/") + @Produces(MediaType.APPLICATION_JSON) + public Map getFactoryId() { + return countersService.getCounters(); + } +} diff --git a/src/main/java/io/qiot/manufacturing/edge/machinery/rest/package-info.java b/src/main/java/io/qiot/manufacturing/edge/machinery/rest/package-info.java new file mode 100644 index 0000000..2db04fa --- /dev/null +++ b/src/main/java/io/qiot/manufacturing/edge/machinery/rest/package-info.java @@ -0,0 +1 @@ +package io.qiot.manufacturing.edge.machinery.rest; \ No newline at end of file diff --git a/src/main/java/io/qiot/manufacturing/edge/machinery/service/machinery/MachineryServiceImpl.java b/src/main/java/io/qiot/manufacturing/edge/machinery/service/machinery/MachineryServiceImpl.java index 0a24904..38e1bfe 100644 --- a/src/main/java/io/qiot/manufacturing/edge/machinery/service/machinery/MachineryServiceImpl.java +++ b/src/main/java/io/qiot/manufacturing/edge/machinery/service/machinery/MachineryServiceImpl.java @@ -107,8 +107,8 @@ public MachineryDataDTO checkRegistration() // machineryId = UUID.randomUUID().toString(); // } // else - machineryId = registrationService.register(machineryData.serial, - machineryData.name, ksPassword); + machineryId = registrationService.register(MACHINERY_SERIAL, + MACHINERY_NAME, ksPassword); machineryData.id = machineryId.toString(); diff --git a/src/main/java/io/qiot/manufacturing/edge/machinery/service/production/CountersService.java b/src/main/java/io/qiot/manufacturing/edge/machinery/service/production/CountersService.java index a0b8333..af6ca3e 100644 --- a/src/main/java/io/qiot/manufacturing/edge/machinery/service/production/CountersService.java +++ b/src/main/java/io/qiot/manufacturing/edge/machinery/service/production/CountersService.java @@ -1,8 +1,10 @@ package io.qiot.manufacturing.edge.machinery.service.production; +import java.util.Map; import java.util.UUID; import io.qiot.manufacturing.all.commons.domain.production.ProductionChainStageEnum; +import io.qiot.manufacturing.edge.machinery.domain.ProductionCountersDTO; /** * @author andreabattaglia @@ -16,4 +18,6 @@ public interface CountersService { void recordStageSuccess(int itemId, UUID productLineId, ProductionChainStageEnum stage); void recordStageFailure(int itemId, UUID productLineId, ProductionChainStageEnum stage); + + Map getCounters(); } diff --git a/src/main/java/io/qiot/manufacturing/edge/machinery/service/production/CountersServiceImpl.java b/src/main/java/io/qiot/manufacturing/edge/machinery/service/production/CountersServiceImpl.java index 244dec3..4bdcfc9 100644 --- a/src/main/java/io/qiot/manufacturing/edge/machinery/service/production/CountersServiceImpl.java +++ b/src/main/java/io/qiot/manufacturing/edge/machinery/service/production/CountersServiceImpl.java @@ -11,15 +11,21 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ser.std.StdJdkSerializers; import io.qiot.manufacturing.all.commons.domain.production.ProductionChainStageEnum; import io.qiot.manufacturing.edge.machinery.domain.ProductionCountersDTO; +import io.quarkus.runtime.annotations.RegisterForReflection; /** * @author andreabattaglia * */ @ApplicationScoped +@RegisterForReflection(targets = { + StdJdkSerializers.AtomicIntegerSerializer.class, + StdJdkSerializers.AtomicBooleanSerializer.class, + StdJdkSerializers.AtomicLongSerializer.class }) public class CountersServiceImpl implements CountersService { @Inject @@ -34,6 +40,11 @@ public CountersServiceImpl() { productionCounters = new TreeMap(); } + + @Override + public Map getCounters(){ + return productionCounters; + } @Override public int recordNewItem(UUID productLineId) { @@ -101,12 +112,15 @@ public void recordStageFailure(int itemId, UUID productLineId, } void logProductLine() { - try { - String json = MAPPER.writerWithDefaultPrettyPrinter() - .writeValueAsString(productionCounters); - LOGGER.info("Production summary:\n\n{}", json); - } catch (JsonProcessingException e) { - LOGGER.error("an error occurred printing the production summary."); - } + if (LOGGER.isDebugEnabled()) + try { + String json = MAPPER.writerWithDefaultPrettyPrinter() + .writeValueAsString(productionCounters); + LOGGER.info("Production summary:\n\n{}", json); + } catch (JsonProcessingException e) { + LOGGER.error( + "An error occurred printing the production summary.", + e); + } } } diff --git a/src/main/java/io/qiot/manufacturing/edge/machinery/service/registration/FacilityManagerClient.java b/src/main/java/io/qiot/manufacturing/edge/machinery/service/registration/FacilityManagerClient.java index 87a2f37..72a2b93 100644 --- a/src/main/java/io/qiot/manufacturing/edge/machinery/service/registration/FacilityManagerClient.java +++ b/src/main/java/io/qiot/manufacturing/edge/machinery/service/registration/FacilityManagerClient.java @@ -1,6 +1,5 @@ package io.qiot.manufacturing.edge.machinery.service.registration; -import javax.validation.Valid; import javax.ws.rs.Consumes; import javax.ws.rs.PUT; import javax.ws.rs.Path; @@ -10,7 +9,7 @@ import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; import io.qiot.manufacturing.all.commons.domain.landscape.SubscriptionResponse; -import io.qiot.manufacturing.commons.domain.registration.EdgeSubscriptionRequest; +import io.qiot.manufacturing.factory.commons.domain.registration.EdgeSubscriptionRequest; /** * @author andreabattaglia @@ -24,6 +23,6 @@ public interface FacilityManagerClient { @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) public SubscriptionResponse subscribeMachinery( - @Valid EdgeSubscriptionRequest request); + EdgeSubscriptionRequest request); } \ No newline at end of file diff --git a/src/main/java/io/qiot/manufacturing/edge/machinery/service/registration/RegistrationServiceImpl.java b/src/main/java/io/qiot/manufacturing/edge/machinery/service/registration/RegistrationServiceImpl.java index 8b286a2..14d9266 100644 --- a/src/main/java/io/qiot/manufacturing/edge/machinery/service/registration/RegistrationServiceImpl.java +++ b/src/main/java/io/qiot/manufacturing/edge/machinery/service/registration/RegistrationServiceImpl.java @@ -16,15 +16,23 @@ import org.eclipse.microprofile.rest.client.inject.RestClient; import org.slf4j.Logger; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.jsontype.BasicPolymorphicTypeValidator; +import com.fasterxml.jackson.databind.jsontype.PolymorphicTypeValidator; + import io.qiot.manufacturing.all.commons.domain.landscape.SubscriptionResponse; import io.qiot.manufacturing.all.commons.exception.SubscriptionException; -import io.qiot.manufacturing.commons.domain.registration.EdgeSubscriptionRequest; import io.qiot.manufacturing.edge.machinery.service.machinery.MachineryService; +import io.qiot.manufacturing.factory.commons.domain.registration.EdgeSubscriptionRequest; @ApplicationScoped public class RegistrationServiceImpl implements RegistrationService { @Inject Logger LOGGER; + + @Inject + ObjectMapper MAPPER; @ConfigProperty(name = "qiot.runtime.ks.path") String ksPathString; @@ -41,36 +49,64 @@ public class RegistrationServiceImpl implements RegistrationService { @Override public UUID register(String serial, String name, String ksPassword) throws SubscriptionException { - SubscriptionResponse subscriptionResponse = null; EdgeSubscriptionRequest registerRequest = null; + SubscriptionResponse subscriptionResponse = null; + registerRequest = new EdgeSubscriptionRequest(); registerRequest.serial = serial; registerRequest.name = name; registerRequest.keyStorePassword = ksPassword; + + try { + String jsonTest=MAPPER.writeValueAsString(registerRequest); + LOGGER.debug( + "Serialized value: {}", + jsonTest); + EdgeSubscriptionRequest registerRequestTest=MAPPER.readValue(jsonTest, EdgeSubscriptionRequest.class); + LOGGER.debug( + "Deserialized value: {}", + registerRequestTest); + } catch (JsonProcessingException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + + LOGGER.debug( "Attempting subscription process with the following data: {}", registerRequest); - while (subscriptionResponse == null) { - // TODO: put sleep time in application.properties - long sleepTime = 2000; +// while (subscriptionResponse == null) { +// // TODO: put sleep time in application.properties +// long sleepTime = 2000; +// try { +// +// subscriptionResponse = facilityManagerClient +// .subscribeMachinery(registerRequest); +// } catch (Exception e) { +// LOGGER.info( +// "An error occurred registering the machinery. " +// + "Retrying in {} millis.\n Error message: {}", +// sleepTime, e.getMessage()); +// try { +// Thread.sleep(sleepTime); +// } catch (InterruptedException ie) { +// Thread.currentThread().interrupt(); +// } +// } +// } + try { subscriptionResponse = facilityManagerClient .subscribeMachinery(registerRequest); } catch (Exception e) { LOGGER.info( - "An error occurred registering the machinery. " - + "Retrying in {} millis.\n Error message: {}", - sleepTime, e.getMessage()); - try { - Thread.sleep(sleepTime); - } catch (InterruptedException ie) { - Thread.currentThread().interrupt(); - } + "An error occurred registering the machinery. \n Error message: {}", + e.getMessage()); + throw new SubscriptionException(e); } - } LOGGER.debug("Registratior process results: {}", subscriptionResponse); diff --git a/src/main/java/io/qiot/manufacturing/edge/machinery/service/validation/ValidationServiceImpl.java b/src/main/java/io/qiot/manufacturing/edge/machinery/service/validation/ValidationServiceImpl.java index 83bff86..b6b77cb 100644 --- a/src/main/java/io/qiot/manufacturing/edge/machinery/service/validation/ValidationServiceImpl.java +++ b/src/main/java/io/qiot/manufacturing/edge/machinery/service/validation/ValidationServiceImpl.java @@ -5,12 +5,12 @@ import javax.inject.Inject; import io.qiot.manufacturing.all.commons.domain.production.ItemDTO; -import io.qiot.manufacturing.commons.domain.productionvalidation.AbstractValidationRequestEventDTO; -import io.qiot.manufacturing.commons.domain.productionvalidation.ColoringValidationRequestEventDTO; -import io.qiot.manufacturing.commons.domain.productionvalidation.PackagingValidationRequestEventDTO; -import io.qiot.manufacturing.commons.domain.productionvalidation.PrintingValidationRequestEventDTO; -import io.qiot.manufacturing.commons.domain.productionvalidation.WeavingValidationRequestEventDTO; import io.qiot.manufacturing.edge.machinery.service.machinery.MachineryService; +import io.qiot.manufacturing.factory.commons.domain.productionvalidation.AbstractValidationRequestEventDTO; +import io.qiot.manufacturing.factory.commons.domain.productionvalidation.ColoringValidationRequestEventDTO; +import io.qiot.manufacturing.factory.commons.domain.productionvalidation.PackagingValidationRequestEventDTO; +import io.qiot.manufacturing.factory.commons.domain.productionvalidation.PrintingValidationRequestEventDTO; +import io.qiot.manufacturing.factory.commons.domain.productionvalidation.WeavingValidationRequestEventDTO; /** * @author andreabattaglia diff --git a/src/main/java/io/qiot/manufacturing/edge/machinery/service/validation/consumer/ValidationMessageConsumer.java b/src/main/java/io/qiot/manufacturing/edge/machinery/service/validation/consumer/ValidationMessageConsumer.java index 4102dfc..6213989 100644 --- a/src/main/java/io/qiot/manufacturing/edge/machinery/service/validation/consumer/ValidationMessageConsumer.java +++ b/src/main/java/io/qiot/manufacturing/edge/machinery/service/validation/consumer/ValidationMessageConsumer.java @@ -23,10 +23,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; import io.qiot.manufacturing.all.commons.domain.cdi.BootstrapCompletedEventDTO; -import io.qiot.manufacturing.commons.domain.productionvalidation.ValidationResponseDTO; import io.qiot.manufacturing.edge.machinery.domain.event.chain.ValidationFailedEvent; import io.qiot.manufacturing.edge.machinery.domain.event.chain.ValidationSuccessfullEvent; import io.qiot.manufacturing.edge.machinery.service.machinery.MachineryService; +import io.qiot.manufacturing.factory.commons.domain.productionvalidation.ValidationResponseDTO; import io.qiot.manufacturing.factory.commons.util.producer.ValidationReplyToQueueNameProducer; /** diff --git a/src/main/java/io/qiot/manufacturing/edge/machinery/service/validation/producer/AbstractValidationMessageProducer.java b/src/main/java/io/qiot/manufacturing/edge/machinery/service/validation/producer/AbstractValidationMessageProducer.java index a3f63c5..0b2ae56 100644 --- a/src/main/java/io/qiot/manufacturing/edge/machinery/service/validation/producer/AbstractValidationMessageProducer.java +++ b/src/main/java/io/qiot/manufacturing/edge/machinery/service/validation/producer/AbstractValidationMessageProducer.java @@ -21,8 +21,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import io.qiot.manufacturing.all.commons.domain.production.ProductionChainStageEnum; -import io.qiot.manufacturing.commons.domain.productionvalidation.AbstractValidationRequestEventDTO; import io.qiot.manufacturing.edge.machinery.service.machinery.MachineryService; +import io.qiot.manufacturing.factory.commons.domain.productionvalidation.AbstractValidationRequestEventDTO; import io.qiot.manufacturing.factory.commons.util.producer.ValidationReplyToQueueNameProducer; /** diff --git a/src/main/java/io/qiot/manufacturing/edge/machinery/service/validation/producer/ColoringValidationMessageProducer.java b/src/main/java/io/qiot/manufacturing/edge/machinery/service/validation/producer/ColoringValidationMessageProducer.java index fe52020..fc3ae62 100644 --- a/src/main/java/io/qiot/manufacturing/edge/machinery/service/validation/producer/ColoringValidationMessageProducer.java +++ b/src/main/java/io/qiot/manufacturing/edge/machinery/service/validation/producer/ColoringValidationMessageProducer.java @@ -10,7 +10,7 @@ import org.slf4j.Logger; import io.qiot.manufacturing.all.commons.domain.production.ProductionChainStageEnum; -import io.qiot.manufacturing.commons.domain.productionvalidation.ColoringValidationRequestEventDTO; +import io.qiot.manufacturing.factory.commons.domain.productionvalidation.ColoringValidationRequestEventDTO; /** * @author andreabattaglia diff --git a/src/main/java/io/qiot/manufacturing/edge/machinery/service/validation/producer/PackagingValidationMessageProducer.java b/src/main/java/io/qiot/manufacturing/edge/machinery/service/validation/producer/PackagingValidationMessageProducer.java index 8dbcfcb..b458bc2 100644 --- a/src/main/java/io/qiot/manufacturing/edge/machinery/service/validation/producer/PackagingValidationMessageProducer.java +++ b/src/main/java/io/qiot/manufacturing/edge/machinery/service/validation/producer/PackagingValidationMessageProducer.java @@ -10,7 +10,7 @@ import org.slf4j.Logger; import io.qiot.manufacturing.all.commons.domain.production.ProductionChainStageEnum; -import io.qiot.manufacturing.commons.domain.productionvalidation.PackagingValidationRequestEventDTO; +import io.qiot.manufacturing.factory.commons.domain.productionvalidation.PackagingValidationRequestEventDTO; /** * @author andreabattaglia diff --git a/src/main/java/io/qiot/manufacturing/edge/machinery/service/validation/producer/PrintingValidationMessageProducer.java b/src/main/java/io/qiot/manufacturing/edge/machinery/service/validation/producer/PrintingValidationMessageProducer.java index a2982fa..c4e8df3 100644 --- a/src/main/java/io/qiot/manufacturing/edge/machinery/service/validation/producer/PrintingValidationMessageProducer.java +++ b/src/main/java/io/qiot/manufacturing/edge/machinery/service/validation/producer/PrintingValidationMessageProducer.java @@ -10,7 +10,7 @@ import org.slf4j.Logger; import io.qiot.manufacturing.all.commons.domain.production.ProductionChainStageEnum; -import io.qiot.manufacturing.commons.domain.productionvalidation.PrintingValidationRequestEventDTO; +import io.qiot.manufacturing.factory.commons.domain.productionvalidation.PrintingValidationRequestEventDTO; /** * @author andreabattaglia diff --git a/src/main/java/io/qiot/manufacturing/edge/machinery/service/validation/producer/WeavingValidationMessageProducer.java b/src/main/java/io/qiot/manufacturing/edge/machinery/service/validation/producer/WeavingValidationMessageProducer.java index 89e72ea..2b9cf23 100644 --- a/src/main/java/io/qiot/manufacturing/edge/machinery/service/validation/producer/WeavingValidationMessageProducer.java +++ b/src/main/java/io/qiot/manufacturing/edge/machinery/service/validation/producer/WeavingValidationMessageProducer.java @@ -12,7 +12,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import io.qiot.manufacturing.all.commons.domain.production.ProductionChainStageEnum; -import io.qiot.manufacturing.commons.domain.productionvalidation.WeavingValidationRequestEventDTO; +import io.qiot.manufacturing.factory.commons.domain.productionvalidation.WeavingValidationRequestEventDTO; /** * @author andreabattaglia diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index ff025dd..06a9d22 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -50,27 +50,13 @@ qiot.machinery.name=${MACHINERY_NAME} facility-manager-api/mp-rest/url=${FACILITY_MANAGER_SERVICE_URL:http://localhost:5100} facility-manager-api/mp-rest/scope=javax.inject.Singleton -%dev.facility-manager-api/mp-rest/hostnameVerifier=io.quarkus.restclient.NoopHostnameVerifier -%staging.facility-manager-api/mp-rest/hostnameVerifier=io.quarkus.restclient.NoopHostnameVerifier +#%dev.facility-manager-api/mp-rest/hostnameVerifier=io.quarkus.restclient.NoopHostnameVerifier +#%staging.facility-manager-api/mp-rest/hostnameVerifier=io.quarkus.restclient.NoopHostnameVerifier -facility-manager-api/mp-rest/keyStore=classpath:/certs/bootstrap/machineryfactory/client.ks -facility-manager-api/mp-rest/keyStorePassword=123456 -facility-manager-api/mp-rest/trustStore=classpath:/certs/bootstrap/machineryfactory/client.ts -facility-manager-api/mp-rest/trustStorePassword=123456 - - -########## REST CLIENT - PRODUCT LINE ########## -#factoryproductline-api/mp-rest/url=${FACTORY_PRODUCTLINE_SERVICE_URL:http://localhost:5101} -#factoryproductline-api/mp-rest/scope=javax.inject.Singleton - -%dev.facility-manager-api/mp-rest/hostnameVerifier=io.quarkus.restclient.NoopHostnameVerifier -%staging.facility-manager-api/mp-rest/hostnameVerifier=io.quarkus.restclient.NoopHostnameVerifier - -# TODO: find workaround for Certificate file: /var/data/qiot/machinery/data/runtime/client.ts not found for MicroProfile Rest Client SSL configuration -#facility-manager-api/mp-rest/keyStore=${qiot.runtime.ks.path} -#facility-manager-api/mp-rest/keyStorePassword=${qiot.runtime.ks.password} -#facility-manager-api/mp-rest/trustStore=${qiot.runtime.ts.path} -#facility-manager-api/mp-rest/trustStorePassword=${qiot.runtime.ts.password} +#facility-manager-api/mp-rest/keyStore=classpath:/certs/bootstrap/machineryfactory/client.ks +#facility-manager-api/mp-rest/keyStorePassword=123456 +#facility-manager-api/mp-rest/trustStore=classpath:/certs/bootstrap/machineryfactory/client.ts +#facility-manager-api/mp-rest/trustStorePassword=123456 ########## MESSAGING ##########