From 97227d9ea8e351075e8c133d741df3081d7bd2c3 Mon Sep 17 00:00:00 2001
From: Jens Eliasson <jens.eliasson@gmail.com>
Date: Mon, 22 Nov 2021 22:34:29 +0100
Subject: [PATCH 01/10] started with MQTT PubSub client skeleton

---
 application-skeleton-mqtt/pom.xml             |  54 ++++++++++++++
 .../pubsub/PubSubApplicationInitListener.java |  67 ++++++++++++++++++
 .../skeleton/pubsub/PubSubMain.java           |  20 ++++++
 ...itional-spring-configuration-metadata.json |  32 +++++++++
 .../src/main/resources/application.properties |  33 +++++++++
 .../certificates/providerskeleton.p12         | Bin 0 -> 4355 bytes
 .../resources/certificates/truststore.p12     | Bin 0 -> 1162 bytes
 pom.xml                                       |   1 +
 8 files changed, 207 insertions(+)
 create mode 100644 application-skeleton-mqtt/pom.xml
 create mode 100644 application-skeleton-mqtt/src/main/java/eu/arrowhead/application/skeleton/pubsub/PubSubApplicationInitListener.java
 create mode 100644 application-skeleton-mqtt/src/main/java/eu/arrowhead/application/skeleton/pubsub/PubSubMain.java
 create mode 100644 application-skeleton-mqtt/src/main/resources/META-INF/additional-spring-configuration-metadata.json
 create mode 100644 application-skeleton-mqtt/src/main/resources/application.properties
 create mode 100644 application-skeleton-mqtt/src/main/resources/certificates/providerskeleton.p12
 create mode 100644 application-skeleton-mqtt/src/main/resources/certificates/truststore.p12

diff --git a/application-skeleton-mqtt/pom.xml b/application-skeleton-mqtt/pom.xml
new file mode 100644
index 0000000..8d01ed4
--- /dev/null
+++ b/application-skeleton-mqtt/pom.xml
@@ -0,0 +1,54 @@
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+    	<groupId>eu.arrowhead</groupId>	
+		<artifactId>application-skeleton-java-spring</artifactId>
+		<version>4.4.0.0</version>
+  	</parent>
+	
+	<artifactId>arrowhead-application-skeleton-mqtt</artifactId>
+	<name>Arrowhead MQTT PubSub Skeleton</name>
+	
+	<build>
+		<plugins>
+			<plugin>
+    			<groupId>org.springframework.boot</groupId>
+    			<artifactId>spring-boot-maven-plugin</artifactId>
+    			<executions>
+    				<execution>
+    					<goals>
+    						<goal>repackage</goal>
+    					</goals>
+    				</execution>
+    			</executions>
+  			</plugin>
+  			
+  			<plugin>
+	 			<artifactId>maven-resources-plugin</artifactId>
+	        	<version>3.1.0</version>
+	        	<executions>
+	          		<execution>
+	            		<id>copy-resources</id>
+	            		<phase>validate</phase>
+		            	<goals>
+		              		<goal>copy-resources</goal>
+		            	</goals>
+		            	<configuration>
+		              		<outputDirectory>${basedir}/target</outputDirectory>
+		              		<resources>
+		                		<resource>
+		                  			<directory>src/main/resources</directory>
+		                  			<includes>
+		                  				<include>application.properties</include>
+		                  			</includes>
+		                		</resource>
+		              		</resources>
+		            	</configuration>
+	          		</execution>
+	        	</executions>
+	      	</plugin>
+		</plugins>
+	</build>
+	
+</project>
diff --git a/application-skeleton-mqtt/src/main/java/eu/arrowhead/application/skeleton/pubsub/PubSubApplicationInitListener.java b/application-skeleton-mqtt/src/main/java/eu/arrowhead/application/skeleton/pubsub/PubSubApplicationInitListener.java
new file mode 100644
index 0000000..a47ef5e
--- /dev/null
+++ b/application-skeleton-mqtt/src/main/java/eu/arrowhead/application/skeleton/pubsub/PubSubApplicationInitListener.java
@@ -0,0 +1,67 @@
+package eu.arrowhead.application.skeleton.pubsub;
+
+import java.io.IOException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.cert.CertificateException;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.stereotype.Component;
+
+import ai.aitia.arrowhead.application.library.ArrowheadService;
+import ai.aitia.arrowhead.application.library.config.ApplicationInitListener;
+import ai.aitia.arrowhead.application.library.util.ApplicationCommonConstants;
+//import eu.arrowhead.application.skeleton.provider.security.ProviderSecurityConfig;
+import eu.arrowhead.common.CommonConstants;
+import eu.arrowhead.common.Utilities;
+import eu.arrowhead.common.core.CoreSystem;
+import eu.arrowhead.common.exception.ArrowheadException;
+
+@Component
+public class PubSubApplicationInitListener extends ApplicationInitListener {
+	
+	//=================================================================================================
+	// members
+	
+	@Autowired
+	private ArrowheadService arrowheadService;
+	
+	@Value(CommonConstants.$SERVER_SSL_ENABLED_WD)
+	private boolean sslEnabled;
+	
+	private final Logger logger = LogManager.getLogger(PubSubApplicationInitListener.class);
+	
+	//=================================================================================================
+	// methods
+
+	//-------------------------------------------------------------------------------------------------
+	@Override
+	protected void customInit(final ContextRefreshedEvent event) {
+		
+		//Checking the availability of necessary core systems
+		//checkCoreSystemReachability(CoreSystem.SERVICEREGISTRY);
+		//checkCoreSystemReachability(CoreSystem.AUTHORIZATION);			
+
+		//Initialize Arrowhead Context
+		//arrowheadService.updateCoreServiceURIs(CoreSystem.AUTHORIZATION);	
+		
+		//TODO: implement here any custom behavior on application start up
+	}
+	
+	//-------------------------------------------------------------------------------------------------
+	@Override
+	public void customDestroy() {
+		//TODO: implement here any custom behavior on application shout down
+	}
+	
+	//=================================================================================================
+	// assistant methods
+	
+}
diff --git a/application-skeleton-mqtt/src/main/java/eu/arrowhead/application/skeleton/pubsub/PubSubMain.java b/application-skeleton-mqtt/src/main/java/eu/arrowhead/application/skeleton/pubsub/PubSubMain.java
new file mode 100644
index 0000000..487fb17
--- /dev/null
+++ b/application-skeleton-mqtt/src/main/java/eu/arrowhead/application/skeleton/pubsub/PubSubMain.java
@@ -0,0 +1,20 @@
+package eu.arrowhead.application.skeleton.pubsub;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
+
+import eu.arrowhead.common.CommonConstants;
+
+@SpringBootApplication
+@ComponentScan(basePackages = {CommonConstants.BASE_PACKAGE, "ai.aitia"}) //TODO: add custom packages if any
+public class PubSubMain {
+
+	//=================================================================================================
+	// methods
+
+	//-------------------------------------------------------------------------------------------------
+	public static void main(final String[] args) {
+		SpringApplication.run(PubSubMain.class, args);
+	}	
+}
diff --git a/application-skeleton-mqtt/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/application-skeleton-mqtt/src/main/resources/META-INF/additional-spring-configuration-metadata.json
new file mode 100644
index 0000000..d1479ba
--- /dev/null
+++ b/application-skeleton-mqtt/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -0,0 +1,32 @@
+{"properties": [
+  {
+    "name": "client_system_name",
+    "type": "java.lang.String",
+    "description": "A description for 'client_system_name'"
+  },
+  {
+    "name": "broker_address",
+    "type": "java.lang.String",
+    "description": "A description for 'broker_address'"
+  },
+  {
+    "name": "broker_port",
+    "type": "java.lang.String",
+    "description": "A description for 'broker_port'"
+  },
+  {
+    "name": "broker_username",
+    "type": "java.lang.String",
+    "description": "A description for 'broker_username'"
+  },
+  {
+    "name": "broker_password",
+    "type": "java.lang.String",
+    "description": "A description for 'broker_password'"
+  },
+  {
+    "name": "container.max_keep_alive_requests",
+    "type": "java.lang.Integer",
+    "description": "A description for 'container.max_keep_alive_requests'"
+  }
+]}
diff --git a/application-skeleton-mqtt/src/main/resources/application.properties b/application-skeleton-mqtt/src/main/resources/application.properties
new file mode 100644
index 0000000..5fe1f4e
--- /dev/null
+++ b/application-skeleton-mqtt/src/main/resources/application.properties
@@ -0,0 +1,33 @@
+############################################
+###       CUSTOM PARAMETERS              ###
+############################################
+
+# Name of the client system
+application_system_name=PUBSUBSKELETON
+
+# Broker parameters
+broker.address=127.0.0.1
+broker.port=1883
+broker.username=pubsub
+broker.password=badpassword
+
+
+############################################
+###           SECURE MODE                ###
+############################################
+
+# configure secure mode
+
+# Set this to false to disable mqtt(s) mode
+server.ssl.enabled=true
+
+
+server.ssl.key-store-type=PKCS12
+server.ssl.key-store=classpath:certificates/providerskeleton.p12
+server.ssl.key-store-password=123456
+server.ssl.key-alias=providerskeleton
+server.ssl.key-password=123456
+server.ssl.client-auth=need
+server.ssl.trust-store-type=PKCS12
+server.ssl.trust-store=classpath:certificates/truststore.p12
+server.ssl.trust-store-password=123456
diff --git a/application-skeleton-mqtt/src/main/resources/certificates/providerskeleton.p12 b/application-skeleton-mqtt/src/main/resources/certificates/providerskeleton.p12
new file mode 100644
index 0000000000000000000000000000000000000000..c5b579924f83f5fb044c814107ba501a18623b3e
GIT binary patch
literal 4355
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
bouG3U2+H3-XzzK-5boE|5DCHohGzW>^1?5G

literal 0
HcmV?d00001

diff --git a/application-skeleton-mqtt/src/main/resources/certificates/truststore.p12 b/application-skeleton-mqtt/src/main/resources/certificates/truststore.p12
new file mode 100644
index 0000000000000000000000000000000000000000..6da7cd2d032a7f5616eb0fa1cb6af7757b79f6ae
GIT binary patch
literal 1162
zcmV;51a<o`f&_*F0Ru3C1V07|Duzgg_YDCD0ic2eFa&}GEHHuuC@_KqBnAm8hDe6@
z4FLxRpn?PyFoFaT0s#Opf&>Z%2`Yw2hW8Bt2LUiC1_~;MNQU<f0So~KFdGCE^%V*h
zZUk!8!PCD8R&CWj&OEEX0s{cUP=JC1&^g~6J3CXqwH3NY51P+BW!+M1eK<lz-N7LB
zF-EJyI}oSQ|NIr0`PW9(6aVl<e5oE<z;}jdT9fah;(|fqTitsGga(WTd7|G+kH=PP
z-sV;hb3f<reN*<In+=%oP%+lO5u=s4ctZpeh2qVp3PgM}a+E<gV^U^VJ1+m-@AgkM
z!uAlTJfab*1s$j!(}GUY3)kuSGOV5&iEWfo&iY}i=cO7C><pg{_KMfSmVO|+D}q(w
z+%5FkT8)a7$EK!h&u(v>Vie#xIu!wo#Sa)KD-Xk4QB8AcV}aBK<<cPy)X8N}-Tt+q
z2@{%kHW}O7{W2o7f{%P2@Hrr0hX1qi|8=#8ynRR>6W{yG=*Ik4y&-y->U2_4Q$Dnr
zCauJ3Ukce$1d)$#|5fB8D1^syty5TRV#<selx}`3FhL|b+|H`V?)zBS_l?+@o+@3V
zi}__KvX%xEpTHz6+dZy&OZ=Oui-nlf3HA#|C<&&*wcqhC8&@ujGIq`EwbRD_iu{1(
z|H%lx)Io*f2Fsjf2#jZ+`CIL7l^PTJ#hewnQ^JAZPiGV)|DTlusnKZbnby{Xv*IIT
z;S0trfPX<Gp6>|}`VMuuACkKRJ-P3~KRD&PD-<LY$S5fmHlunCNv-#11QfQkb3;`V
z6($Dj$FQUdQzF3iLRt8mWK`>nW{6(#Z0+vGBy7WYOz<<;gEL0Ovq_P`EuN*=#rIPy
z;I+Tm!-5FcSb=yyU#vT7wJ&SzhAgXseVzLnq0kV4POCKg1!l@PQ3Jy=H1Y?zVv6rU
zt115AxuG=lwv78#zc<7JYP=nL{o#XCWEOieJ~N$cABq@<B>EcPmO?xv;xEQMaL!>$
zV$TK3AiN$@(omV_ioYE^;ks5rqv@ae3CHDG>5pvz0t%a=+3CSU<b^)JrsJCJ9vT(?
zTJGB>EU$A)n#!u$S|)x}*)IxGFH=r(=OdixR&9U#O|bHhZwlBH4hwER5riuq$dgEB
z%_A%V=s!KvT1PgWCspA&^+T9*#pXgP>3+uK{{$Y{i8?Aqd$9(x3!-U)kN?q-H;)+<
z$Ayj5@5rvON*`*#NqLk3Zw5>##r&X|LRpm@m^a2BRJwvK={E+x8<QI3nmo-LN8IKg
z3gm;xC<-}K&QhBG%zatl3XWQHM-$ihl5C1tEjr{CpD|4n-1icuKoqBV((52xOnqFA
zWL`gJ2_t`rn-g-(fiq@WmsI5p`QhRn-%gA?!N?G#<VEEB%3qz9TCwD$jLHjp-z@d~
z0VRH3uNWwGg{93vM=(AxAutIB1uG5%0vZJX1QZdL^}Ol6<w99h9f5Uf8+(8nTJHoD
cz$1YHxgj<(M(FbIiG<)nGAb3M0s{etpi#XUtN;K2

literal 0
HcmV?d00001

diff --git a/pom.xml b/pom.xml
index 01304cb..9f79c0f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,6 +28,7 @@
 	    <module>application-skeleton-provider</module>
 	    <module>application-skeleton-subscriber</module>
 	    <module>application-skeleton-publisher</module>
+	    <module>application-skeleton-mqtt</module>
   	</modules>
 	
 	<dependencies>

From e906fd3932cc1e06700556e404ff9cdd4c684eb1 Mon Sep 17 00:00:00 2001
From: Jens Eliasson <jens.eliasson@gmail.com>
Date: Tue, 23 Nov 2021 22:25:24 +0100
Subject: [PATCH 02/10] created MQTT skelenton that connects to a Broker and
 subscribes to a test topic

---
 .../pubsub/PubSubApplicationInitListener.java | 53 +++++++++++++++++--
 1 file changed, 49 insertions(+), 4 deletions(-)

diff --git a/application-skeleton-mqtt/src/main/java/eu/arrowhead/application/skeleton/pubsub/PubSubApplicationInitListener.java b/application-skeleton-mqtt/src/main/java/eu/arrowhead/application/skeleton/pubsub/PubSubApplicationInitListener.java
index a47ef5e..0a3f611 100644
--- a/application-skeleton-mqtt/src/main/java/eu/arrowhead/application/skeleton/pubsub/PubSubApplicationInitListener.java
+++ b/application-skeleton-mqtt/src/main/java/eu/arrowhead/application/skeleton/pubsub/PubSubApplicationInitListener.java
@@ -18,14 +18,22 @@
 import ai.aitia.arrowhead.application.library.ArrowheadService;
 import ai.aitia.arrowhead.application.library.config.ApplicationInitListener;
 import ai.aitia.arrowhead.application.library.util.ApplicationCommonConstants;
-//import eu.arrowhead.application.skeleton.provider.security.ProviderSecurityConfig;
 import eu.arrowhead.common.CommonConstants;
 import eu.arrowhead.common.Utilities;
 import eu.arrowhead.common.core.CoreSystem;
 import eu.arrowhead.common.exception.ArrowheadException;
 
+import org.eclipse.paho.client.mqttv3.MqttCallback;
+import org.eclipse.paho.client.mqttv3.MqttClient;
+import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
+import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
+import org.eclipse.paho.client.mqttv3.internal.security.SSLSocketFactoryFactory;
+import org.eclipse.paho.client.mqttv3.MqttMessage;
+import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
+import org.eclipse.paho.client.mqttv3.MqttException;
+
 @Component
-public class PubSubApplicationInitListener extends ApplicationInitListener {
+public class PubSubApplicationInitListener extends ApplicationInitListener implements MqttCallback {
 	
 	//=================================================================================================
 	// members
@@ -36,6 +44,7 @@ public class PubSubApplicationInitListener extends ApplicationInitListener {
 	@Value(CommonConstants.$SERVER_SSL_ENABLED_WD)
 	private boolean sslEnabled;
 	
+  MqttClient client = null;
 	private final Logger logger = LogManager.getLogger(PubSubApplicationInitListener.class);
 	
 	//=================================================================================================
@@ -47,20 +56,56 @@ protected void customInit(final ContextRefreshedEvent event) {
 		
 		//Checking the availability of necessary core systems
 		//checkCoreSystemReachability(CoreSystem.SERVICEREGISTRY);
-		//checkCoreSystemReachability(CoreSystem.AUTHORIZATION);			
+		//checkCoreSystemReachability(CoreSystem.AUTHORIZATION);
 
 		//Initialize Arrowhead Context
 		//arrowheadService.updateCoreServiceURIs(CoreSystem.AUTHORIZATION);	
 		
 		//TODO: implement here any custom behavior on application start up
+    try {
+      client = arrowheadService.connectMQTTBroker(this, "127.0.0.1", 1883, "pubsub", "badpassword", "pubsub01");
+      client.subscribe("ah/pubsub/messages");
+    } catch (Exception e) {
+      throw new ArrowheadException("Could not connect to MQTT broker!\n" + e.toString());
+    }
 	}
-	
+
 	//-------------------------------------------------------------------------------------------------
 	@Override
 	public void customDestroy() {
 		//TODO: implement here any custom behavior on application shout down
+    if (client != null) {
+      try {
+        arrowheadService.disconnectMQTTBroker(client);
+        arrowheadService.closeMQTTBroker(client);
+      } catch(Exception e) {
+      }
+
+      client = null;
+    }
 	}
 	
+	//=================================================================================================
+	// MQTT callback methods
+
+  @Override
+  public void connectionLost(Throwable t) {
+    System.out.println("connectionLost: " + t.toString());
+
+		//TODO: implement here any custom behavior on broker disconnect, typically a reconnect after a short timeout
+  }
+
+  @Override
+  public void messageArrived(String topic, MqttMessage message) throws Exception {
+    System.out.println("topic - " + topic + ": " + new String(message.getPayload()));
+
+		//TODO: implement here any custom behavior on incoming messages, filtered in topic
+  }
+
+  @Override
+  public void deliveryComplete(IMqttDeliveryToken token) {
+  }
+
 	//=================================================================================================
 	// assistant methods
 	

From dd66090892fdc061abae9ecf6780ea3ae7b44992 Mon Sep 17 00:00:00 2001
From: Jens Eliasson <jens.eliasson@gmail.com>
Date: Tue, 23 Nov 2021 22:35:32 +0100
Subject: [PATCH 03/10] minor code improvements

---
 .../skeleton/pubsub/PubSubApplicationInitListener.java           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application-skeleton-mqtt/src/main/java/eu/arrowhead/application/skeleton/pubsub/PubSubApplicationInitListener.java b/application-skeleton-mqtt/src/main/java/eu/arrowhead/application/skeleton/pubsub/PubSubApplicationInitListener.java
index 0a3f611..1db3eb0 100644
--- a/application-skeleton-mqtt/src/main/java/eu/arrowhead/application/skeleton/pubsub/PubSubApplicationInitListener.java
+++ b/application-skeleton-mqtt/src/main/java/eu/arrowhead/application/skeleton/pubsub/PubSubApplicationInitListener.java
@@ -66,6 +66,7 @@ protected void customInit(final ContextRefreshedEvent event) {
       client = arrowheadService.connectMQTTBroker(this, "127.0.0.1", 1883, "pubsub", "badpassword", "pubsub01");
       client.subscribe("ah/pubsub/messages");
     } catch (Exception e) {
+      client = null;
       throw new ArrowheadException("Could not connect to MQTT broker!\n" + e.toString());
     }
 	}

From fbdde9446ebcb74382fd77114a4e8b22c5d6c39c Mon Sep 17 00:00:00 2001
From: Jens Eliasson <jens.eliasson@gmail.com>
Date: Tue, 23 Nov 2021 23:05:23 +0100
Subject: [PATCH 04/10] MQTT over TCP and TLS works! code is ok, but there are
 methods that should be implemeneted

---
 .../pubsub/PubSubApplicationInitListener.java | 33 ++++++++++++++-----
 .../src/main/resources/application.properties | 10 +++---
 2 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/application-skeleton-mqtt/src/main/java/eu/arrowhead/application/skeleton/pubsub/PubSubApplicationInitListener.java b/application-skeleton-mqtt/src/main/java/eu/arrowhead/application/skeleton/pubsub/PubSubApplicationInitListener.java
index 1db3eb0..cfe2997 100644
--- a/application-skeleton-mqtt/src/main/java/eu/arrowhead/application/skeleton/pubsub/PubSubApplicationInitListener.java
+++ b/application-skeleton-mqtt/src/main/java/eu/arrowhead/application/skeleton/pubsub/PubSubApplicationInitListener.java
@@ -40,7 +40,27 @@ public class PubSubApplicationInitListener extends ApplicationInitListener imple
 	
 	@Autowired
 	private ArrowheadService arrowheadService;
+
+  //@Value(CommonConstants.$APPLICATION_SYSTEM_NAME)
+  @Value("${application_system_name}")
+	private String systemName;
+
+  //@Value(CommonConstants.$MQTT_BROKER_ADDRES)
+  @Value("${mqtt.broker.address}")
+	private String brokerAddress;
+
+  //@Value(CommonConstants.$MQTT_BROKER_PORT)
+  @Value("${mqtt.broker.port}")
+	private int brokerPort;
+
+  //@Value(CommonConstants.$MQTT_BROKER_USERNAME)
+  @Value("${mqtt.broker.username}")
+	private String brokerUsername;
 	
+  //@Value(CommonConstants.$MQTT_BROKER_PASSWORD)
+  @Value("${mqtt.broker.password}")
+	private String brokerPassword;
+
 	@Value(CommonConstants.$SERVER_SSL_ENABLED_WD)
 	private boolean sslEnabled;
 	
@@ -54,16 +74,13 @@ public class PubSubApplicationInitListener extends ApplicationInitListener imple
 	@Override
 	protected void customInit(final ContextRefreshedEvent event) {
 		
-		//Checking the availability of necessary core systems
-		//checkCoreSystemReachability(CoreSystem.SERVICEREGISTRY);
-		//checkCoreSystemReachability(CoreSystem.AUTHORIZATION);
-
-		//Initialize Arrowhead Context
-		//arrowheadService.updateCoreServiceURIs(CoreSystem.AUTHORIZATION);	
-		
 		//TODO: implement here any custom behavior on application start up
     try {
-      client = arrowheadService.connectMQTTBroker(this, "127.0.0.1", 1883, "pubsub", "badpassword", "pubsub01");
+      client = arrowheadService.connectMQTTBroker(this, brokerAddress, brokerPort, brokerUsername, brokerPassword, systemName);
+		
+      //Checking the availability of necessary core systems  add MQTT support here as well 
+  		//checkCoreSystemReachability(CoreSystem.SERVICEREGISTRY); add MQTT support here as well
+	  	//checkCoreSystemReachability(CoreSystem.AUTHORIZATION); add MQTT support here as well
       client.subscribe("ah/pubsub/messages");
     } catch (Exception e) {
       client = null;
diff --git a/application-skeleton-mqtt/src/main/resources/application.properties b/application-skeleton-mqtt/src/main/resources/application.properties
index 5fe1f4e..4aecdd4 100644
--- a/application-skeleton-mqtt/src/main/resources/application.properties
+++ b/application-skeleton-mqtt/src/main/resources/application.properties
@@ -5,11 +5,11 @@
 # Name of the client system
 application_system_name=PUBSUBSKELETON
 
-# Broker parameters
-broker.address=127.0.0.1
-broker.port=1883
-broker.username=pubsub
-broker.password=badpassword
+# MQTT Broker parameters
+mqtt.broker.address=127.0.0.1
+mqtt.broker.port=1883
+mqtt.broker.username=pubsub
+mqtt.broker.password=badpassword
 
 
 ############################################

From 7df1181659a8b79604a9ce36d2854535911d9408 Mon Sep 17 00:00:00 2001
From: Jens Eliasson <jens.eliasson@gmail.com>
Date: Tue, 23 Nov 2021 23:10:00 +0100
Subject: [PATCH 05/10] updated to TLS port by default

---
 .../pubsub/PubSubApplicationInitListener.java        | 12 ++++++------
 .../src/main/resources/application.properties        |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/application-skeleton-mqtt/src/main/java/eu/arrowhead/application/skeleton/pubsub/PubSubApplicationInitListener.java b/application-skeleton-mqtt/src/main/java/eu/arrowhead/application/skeleton/pubsub/PubSubApplicationInitListener.java
index cfe2997..918e59f 100644
--- a/application-skeleton-mqtt/src/main/java/eu/arrowhead/application/skeleton/pubsub/PubSubApplicationInitListener.java
+++ b/application-skeleton-mqtt/src/main/java/eu/arrowhead/application/skeleton/pubsub/PubSubApplicationInitListener.java
@@ -45,7 +45,7 @@ public class PubSubApplicationInitListener extends ApplicationInitListener imple
   @Value("${application_system_name}")
 	private String systemName;
 
-  //@Value(CommonConstants.$MQTT_BROKER_ADDRES)
+  //@Value(CommonConstants.$MQTT_BROKER_ADDRESS)
   @Value("${mqtt.broker.address}")
 	private String brokerAddress;
 
@@ -78,9 +78,9 @@ protected void customInit(final ContextRefreshedEvent event) {
     try {
       client = arrowheadService.connectMQTTBroker(this, brokerAddress, brokerPort, brokerUsername, brokerPassword, systemName);
 		
-      //Checking the availability of necessary core systems  add MQTT support here as well 
-  		//checkCoreSystemReachability(CoreSystem.SERVICEREGISTRY); add MQTT support here as well
-	  	//checkCoreSystemReachability(CoreSystem.AUTHORIZATION); add MQTT support here as well
+      //Checking the availability of necessary core systems  add MQTT support here as well?
+  		//checkCoreSystemReachability(CoreSystem.SERVICEREGISTRY); add MQTT support here as well?
+	  	//checkCoreSystemReachability(CoreSystem.AUTHORIZATION); add MQTT support here as well?
       client.subscribe("ah/pubsub/messages");
     } catch (Exception e) {
       client = null;
@@ -91,7 +91,7 @@ protected void customInit(final ContextRefreshedEvent event) {
 	//-------------------------------------------------------------------------------------------------
 	@Override
 	public void customDestroy() {
-		//TODO: implement here any custom behavior on application shout down
+		//TODO: implement here any custom behavior on application shut down
     if (client != null) {
       try {
         arrowheadService.disconnectMQTTBroker(client);
@@ -117,7 +117,7 @@ public void connectionLost(Throwable t) {
   public void messageArrived(String topic, MqttMessage message) throws Exception {
     System.out.println("topic - " + topic + ": " + new String(message.getPayload()));
 
-		//TODO: implement here any custom behavior on incoming messages, filtered in topic
+		//TODO: implement here any custom behavior on incoming messages, such as filtering in topics etc
   }
 
   @Override
diff --git a/application-skeleton-mqtt/src/main/resources/application.properties b/application-skeleton-mqtt/src/main/resources/application.properties
index 4aecdd4..d7c8e17 100644
--- a/application-skeleton-mqtt/src/main/resources/application.properties
+++ b/application-skeleton-mqtt/src/main/resources/application.properties
@@ -7,7 +7,7 @@ application_system_name=PUBSUBSKELETON
 
 # MQTT Broker parameters
 mqtt.broker.address=127.0.0.1
-mqtt.broker.port=1883
+mqtt.broker.port=8883
 mqtt.broker.username=pubsub
 mqtt.broker.password=badpassword
 

From 50b9281f8cfadc148c091e85af6c0af01e38ce53 Mon Sep 17 00:00:00 2001
From: Jens Eliasson <jens.eliasson@gmail.com>
Date: Tue, 23 Nov 2021 23:27:23 +0100
Subject: [PATCH 06/10] Tomcat is disabled by default in MQTT mode

---
 .../src/main/resources/application.properties                  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/application-skeleton-mqtt/src/main/resources/application.properties b/application-skeleton-mqtt/src/main/resources/application.properties
index d7c8e17..e4caadb 100644
--- a/application-skeleton-mqtt/src/main/resources/application.properties
+++ b/application-skeleton-mqtt/src/main/resources/application.properties
@@ -5,6 +5,9 @@
 # Name of the client system
 application_system_name=PUBSUBSKELETON
 
+# Disable Tomcat for MQTT only applications
+spring.main.web-application-type=none
+
 # MQTT Broker parameters
 mqtt.broker.address=127.0.0.1
 mqtt.broker.port=8883

From 3e4c4f190fca5579751808c315dc7df02fa56729 Mon Sep 17 00:00:00 2001
From: Jens Eliasson <jens.eliasson@gmail.com>
Date: Wed, 24 Nov 2021 13:40:48 +0100
Subject: [PATCH 07/10] changed certificate

---
 .../src/main/resources/application.properties    |   2 +-
 .../resources/certificates/providerskeleton.p12  | Bin 4355 -> 0 bytes
 .../src/main/resources/certificates/pubsub.p12   | Bin 0 -> 4457 bytes
 3 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 application-skeleton-mqtt/src/main/resources/certificates/providerskeleton.p12
 create mode 100644 application-skeleton-mqtt/src/main/resources/certificates/pubsub.p12

diff --git a/application-skeleton-mqtt/src/main/resources/application.properties b/application-skeleton-mqtt/src/main/resources/application.properties
index e4caadb..eebba8a 100644
--- a/application-skeleton-mqtt/src/main/resources/application.properties
+++ b/application-skeleton-mqtt/src/main/resources/application.properties
@@ -26,7 +26,7 @@ server.ssl.enabled=true
 
 
 server.ssl.key-store-type=PKCS12
-server.ssl.key-store=classpath:certificates/providerskeleton.p12
+server.ssl.key-store=classpath:certificates/pubsub.p12
 server.ssl.key-store-password=123456
 server.ssl.key-alias=providerskeleton
 server.ssl.key-password=123456
diff --git a/application-skeleton-mqtt/src/main/resources/certificates/providerskeleton.p12 b/application-skeleton-mqtt/src/main/resources/certificates/providerskeleton.p12
deleted file mode 100644
index c5b579924f83f5fb044c814107ba501a18623b3e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4355
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
bouG3U2+H3-XzzK-5boE|5DCHohGzW>^1?5G

diff --git a/application-skeleton-mqtt/src/main/resources/certificates/pubsub.p12 b/application-skeleton-mqtt/src/main/resources/certificates/pubsub.p12
new file mode 100644
index 0000000000000000000000000000000000000000..603e7919d253ee09e6b3bbfe2b1fa4ef452a5eb1
GIT binary patch
literal 4457
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
YZ!d`T2%NEF^FDv@<qsbr5D<~~AA@{1vj6}9

literal 0
HcmV?d00001


From 46a7a0f53ce41d563a83cf60c943195aa61cc2a8 Mon Sep 17 00:00:00 2001
From: Jens Eliasson <jens.eliasson@gmail.com>
Date: Wed, 24 Nov 2021 13:52:13 +0100
Subject: [PATCH 08/10] fixed indentation

---
 .../pubsub/PubSubApplicationInitListener.java | 89 +++++++++----------
 1 file changed, 43 insertions(+), 46 deletions(-)

diff --git a/application-skeleton-mqtt/src/main/java/eu/arrowhead/application/skeleton/pubsub/PubSubApplicationInitListener.java b/application-skeleton-mqtt/src/main/java/eu/arrowhead/application/skeleton/pubsub/PubSubApplicationInitListener.java
index 918e59f..8b9f701 100644
--- a/application-skeleton-mqtt/src/main/java/eu/arrowhead/application/skeleton/pubsub/PubSubApplicationInitListener.java
+++ b/application-skeleton-mqtt/src/main/java/eu/arrowhead/application/skeleton/pubsub/PubSubApplicationInitListener.java
@@ -41,30 +41,30 @@ public class PubSubApplicationInitListener extends ApplicationInitListener imple
 	@Autowired
 	private ArrowheadService arrowheadService;
 
-  //@Value(CommonConstants.$APPLICATION_SYSTEM_NAME)
-  @Value("${application_system_name}")
+	//@Value(CommonConstants.$APPLICATION_SYSTEM_NAME)
+	@Value("${application_system_name}")
 	private String systemName;
 
-  //@Value(CommonConstants.$MQTT_BROKER_ADDRESS)
-  @Value("${mqtt.broker.address}")
+	//@Value(CommonConstants.$MQTT_BROKER_ADDRESS)
+	@Value("${mqtt.broker.address}")
 	private String brokerAddress;
 
-  //@Value(CommonConstants.$MQTT_BROKER_PORT)
-  @Value("${mqtt.broker.port}")
+	//@Value(CommonConstants.$MQTT_BROKER_PORT)
+	@Value("${mqtt.broker.port}")
 	private int brokerPort;
 
-  //@Value(CommonConstants.$MQTT_BROKER_USERNAME)
-  @Value("${mqtt.broker.username}")
+	//@Value(CommonConstants.$MQTT_BROKER_USERNAME)
+	@Value("${mqtt.broker.username}")
 	private String brokerUsername;
 	
-  //@Value(CommonConstants.$MQTT_BROKER_PASSWORD)
-  @Value("${mqtt.broker.password}")
+	//@Value(CommonConstants.$MQTT_BROKER_PASSWORD)
+	@Value("${mqtt.broker.password}")
 	private String brokerPassword;
 
 	@Value(CommonConstants.$SERVER_SSL_ENABLED_WD)
 	private boolean sslEnabled;
 	
-  MqttClient client = null;
+	MqttClient client = null;
 	private final Logger logger = LogManager.getLogger(PubSubApplicationInitListener.class);
 	
 	//=================================================================================================
@@ -74,55 +74,52 @@ public class PubSubApplicationInitListener extends ApplicationInitListener imple
 	@Override
 	protected void customInit(final ContextRefreshedEvent event) {
 		
-		//TODO: implement here any custom behavior on application start up
-    try {
-      client = arrowheadService.connectMQTTBroker(this, brokerAddress, brokerPort, brokerUsername, brokerPassword, systemName);
-		
-      //Checking the availability of necessary core systems  add MQTT support here as well?
-  		//checkCoreSystemReachability(CoreSystem.SERVICEREGISTRY); add MQTT support here as well?
-	  	//checkCoreSystemReachability(CoreSystem.AUTHORIZATION); add MQTT support here as well?
-      client.subscribe("ah/pubsub/messages");
-    } catch (Exception e) {
-      client = null;
-      throw new ArrowheadException("Could not connect to MQTT broker!\n" + e.toString());
-    }
+        //TODO: implement here any custom behavior on application start up
+        try {
+            client = arrowheadService.connectMQTTBroker(this, brokerAddress, brokerPort, brokerUsername, brokerPassword, systemName);
+
+            //Checking the availability of necessary core systems  add MQTT support here as well?
+            //checkCoreSystemReachability(CoreSystem.SERVICEREGISTRY); add MQTT support here as well?
+            //checkCoreSystemReachability(CoreSystem.AUTHORIZATION); add MQTT support here as well?
+            client.subscribe("ah/pubsub/messages");
+        } catch (Exception e) {
+            client = null;
+            throw new ArrowheadException("Could not connect to MQTT broker!\n" + e.toString());
+        }
 	}
 
 	//-------------------------------------------------------------------------------------------------
 	@Override
 	public void customDestroy() {
-		//TODO: implement here any custom behavior on application shut down
-    if (client != null) {
-      try {
-        arrowheadService.disconnectMQTTBroker(client);
-        arrowheadService.closeMQTTBroker(client);
-      } catch(Exception e) {
-      }
-
-      client = null;
+        //TODO: implement here any custom behavior on application shut down
+        if (client != null) {
+            try {
+                arrowheadService.disconnectMQTTBroker(client);
+                arrowheadService.closeMQTTBroker(client);
+            } catch(Exception e) {
+            }
+            client = null;
+        }
     }
-	}
 	
 	//=================================================================================================
 	// MQTT callback methods
 
-  @Override
-  public void connectionLost(Throwable t) {
-    System.out.println("connectionLost: " + t.toString());
+    @Override
+    public void connectionLost(Throwable t) {
 
-		//TODO: implement here any custom behavior on broker disconnect, typically a reconnect after a short timeout
-  }
+        //TODO: implement here any custom behavior on broker disconnect, typically a reconnect after a short timeout
+    }
 
-  @Override
-  public void messageArrived(String topic, MqttMessage message) throws Exception {
-    System.out.println("topic - " + topic + ": " + new String(message.getPayload()));
+    @Override
+    public void messageArrived(String topic, MqttMessage message) throws Exception {
 
-		//TODO: implement here any custom behavior on incoming messages, such as filtering in topics etc
-  }
+        //TODO: implement here any custom behavior on incoming messages, such as filtering in topics etc
+    }
 
-  @Override
-  public void deliveryComplete(IMqttDeliveryToken token) {
-  }
+    @Override
+    public void deliveryComplete(IMqttDeliveryToken token) {
+    }
 
 	//=================================================================================================
 	// assistant methods

From 73100defc0a9bfa59437a15607faefe844137702 Mon Sep 17 00:00:00 2001
From: Jens Eliasson <jens.eliasson@gmail.com>
Date: Mon, 29 Nov 2021 09:19:02 +0100
Subject: [PATCH 09/10] updated meta description

---
 ...itional-spring-configuration-metadata.json | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/application-skeleton-mqtt/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/application-skeleton-mqtt/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index d1479ba..97b8897 100644
--- a/application-skeleton-mqtt/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/application-skeleton-mqtt/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -1,28 +1,28 @@
 {"properties": [
   {
-    "name": "client_system_name",
+    "name": "application_system_name",
     "type": "java.lang.String",
-    "description": "A description for 'client_system_name'"
+    "description": "A description for 'application_system_name'"
   },
   {
-    "name": "broker_address",
+    "name": "broker.address",
     "type": "java.lang.String",
-    "description": "A description for 'broker_address'"
+    "description": "A description for 'broker.address'"
   },
   {
-    "name": "broker_port",
-    "type": "java.lang.String",
-    "description": "A description for 'broker_port'"
+    "name": "broker.port",
+    "type": "java.lang.Integer",
+    "description": "A description for 'broker.port'"
   },
   {
-    "name": "broker_username",
+    "name": "broker.username",
     "type": "java.lang.String",
-    "description": "A description for 'broker_username'"
+    "description": "A description for 'broker.username'"
   },
   {
-    "name": "broker_password",
+    "name": "broker.password",
     "type": "java.lang.String",
-    "description": "A description for 'broker_password'"
+    "description": "A description for 'broker.password'"
   },
   {
     "name": "container.max_keep_alive_requests",

From e7067884956b86f1f7322809204384483af5942b Mon Sep 17 00:00:00 2001
From: Jens Eliasson <jens.eliasson@gmail.com>
Date: Mon, 29 Nov 2021 11:36:35 +0100
Subject: [PATCH 10/10] removed unused imports

---
 .../skeleton/pubsub/PubSubApplicationInitListener.java    | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/application-skeleton-mqtt/src/main/java/eu/arrowhead/application/skeleton/pubsub/PubSubApplicationInitListener.java b/application-skeleton-mqtt/src/main/java/eu/arrowhead/application/skeleton/pubsub/PubSubApplicationInitListener.java
index 8b9f701..f2b257b 100644
--- a/application-skeleton-mqtt/src/main/java/eu/arrowhead/application/skeleton/pubsub/PubSubApplicationInitListener.java
+++ b/application-skeleton-mqtt/src/main/java/eu/arrowhead/application/skeleton/pubsub/PubSubApplicationInitListener.java
@@ -1,13 +1,5 @@
 package eu.arrowhead.application.skeleton.pubsub;
 
-import java.io.IOException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.cert.CertificateException;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;