chore(deps): rebase on moquette 0.17

.gitignore

@@ -1,3 +1,6 @@
+data/
 greengrass-build/
 integration/target/**
+target/
+.gradle/
 *.iml

integration/pom.xml

@@ -88,7 +88,7 @@
         <dependency>
             <groupId>io.moquette</groupId>
             <artifactId>moquette-broker</artifactId>
-            <version>0.16-gg</version>
+            <version>0.17-gg</version>
         </dependency>
     </dependencies>
     <build>

integration/src/main/java/com/aws/greengrass/mqtt/moquette/ClientDeviceAuthorizer.java

@@ -218,6 +218,11 @@ public void onConnectionLost(InterceptConnectionLostMessage msg) {
             closeAuthSession(msg.getClientID(), msg.getUsername());
         }
 
+        @Override
+        public void onSessionLoopError(Throwable error) {
+            LOG.atWarn().log("Moquette session error", error);
+        }
+
         private void closeAuthSession(String clientId, String username) {
             UserSessionPair sessionPair = getSessionForClient(clientId, username);
             if (sessionPair != null) {

integration/src/main/java/com/aws/greengrass/mqtt/moquette/MQTTService.java

@@ -143,8 +143,14 @@ private synchronized void startWithProperties(Properties properties, boolean for
         IConfig config = new MemoryConfig(properties);
         ISslContextCreator sslContextCreator =
             new GreengrassMoquetteSslContextCreator(config, clientDeviceTrustManager);
-        mqttBroker.startServer(config, interceptHandlers, sslContextCreator, clientDeviceAuthorizer,
-            clientDeviceAuthorizer);
+        try {
+            mqttBroker.startServer(config, interceptHandlers, sslContextCreator, clientDeviceAuthorizer,
+                clientDeviceAuthorizer);
+        } catch (IOException e) {
+            // IO Exception can only be thrown from H2 right now and we do not configure moquette to use h2.
+            serviceErrored(e);
+            return;
+        }
         serverRunning = true;
         runningProperties = properties;
     }

moquette-0.17/.editorconfig

@@ -0,0 +1,16 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+indent_style = space
+indent_size = 4
+max_line_length=120
+
+[*.gradle]
+indent_size = 2

moquette-0.17/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,13 @@
+### Expected behavior
+
+### Actual behavior
+
+### Steps to reproduce
+
+### Minimal yet complete reproducer code (or URL to code) or complete log file
+
+### Moquette MQTT version
+
+### JVM version (e.g. `java -version`)
+
+### OS version (e.g. `uname -a`)

moquette-0.17/.github/workflows/maven_build.yml

@@ -0,0 +1,45 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java CI with Maven
+
+on:
+    push:
+        branches: [ main ]
+    pull_request:
+        branches: [ main ]
+
+jobs:
+    test:
+        runs-on: ${{ matrix.os }}
+        strategy:
+            matrix:
+                os: [ubuntu-20.04, ubuntu-latest]
+                java: [11, 17]
+                arch: [x64] # when ARM will be present add aarch64
+            fail-fast: false
+            max-parallel: 4
+        name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
+
+        steps:
+            - name: Check out repository
+              uses: actions/checkout@v2
+
+            - name: Cache maven repository
+              uses: actions/cache@v2
+              with:
+                  path: |
+                      ~/.m2/repository
+                  key: ${{ matrix.arch }}-${{ runner.os }}-maven-${{ matrix.java }}-${{ hashFiles('**/pom.xml') }}
+                  restore-keys: |
+                      ${{ matrix.arch }}-${{ runner.os }}-maven-${{ matrix.java }}
+                      ${{ matrix.arch }}-${{ runner.os }}-maven
+
+            - name: Set up JDK
+              uses: actions/setup-java@v1
+              with:
+                  java-version: ${{ matrix.java }}
+                  architecture: ${{ matrix.arch }}
+            - name: Test with Maven
+              run: mvn verify -B --file pom.xml
+

moquette-0.17/.github/workflows/maven_central_release_version.yml

@@ -0,0 +1,32 @@
+# This workflow deploy the packages to Maven Central
+
+name: Build and ship to Maven Central
+
+#on:
+#    push:
+#        tags:
+#            - "v*"
+on:
+    release:
+        types: [released]
+
+jobs:
+    publish:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v2
+            - name: Set up Maven Central Repository
+              uses: actions/setup-java@v3
+              with:
+                  java-version: 11
+                  server-id: ossrh
+                  server-username: MAVEN_USERNAME
+                  server-password: MAVEN_PASSWORD
+                  gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
+                  gpg-passphrase: MAVEN_GPG_PASSPHRASE
+            - name: Publish package
+              run: mvn --batch-mode -Prelease-sign-artifacts clean deploy
+              env:
+                  MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+                  MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
+                  MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}

moquette-0.17/.github/workflows/maven_central_snapshot_version.yml

@@ -0,0 +1,30 @@
+# This workflow deploy the snapshot packages to Maven Central
+
+name: Build and ship SNAPSHOT versions to Maven Central
+
+on:
+  push:
+    branches: [ main ]
+
+jobs:
+    publish:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v2
+            - name: Set up Maven Central Repository
+              uses: actions/setup-java@v1
+              with:
+                  java-version: 11
+                  server-id: ossrh
+                  server-username: MAVEN_USERNAME
+                  server-password: MAVEN_PASSWORD
+                  gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
+                  gpg-passphrase: MAVEN_GPG_PASSPHRASE
+            - name: Display settings.xml
+              run: cat /home/runner/.m2/settings.xml
+            - name: Publish package
+              run: mvn --batch-mode -Prelease-sign-artifacts clean deploy
+              env:
+                  MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+                  MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
+                  MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}

moquette-0.17/.mvn/wrapper/MavenWrapperDownloader.java

@@ -0,0 +1,117 @@
+/*
+ * Copyright 2007-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+    private static final String WRAPPER_VERSION = "0.5.6";
+    /**
+     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+     */
+    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+        + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+    /**
+     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+     * use instead of the default one.
+     */
+    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+            ".mvn/wrapper/maven-wrapper.properties";
+
+    /**
+     * Path where the maven-wrapper.jar will be saved to.
+     */
+    private static final String MAVEN_WRAPPER_JAR_PATH =
+            ".mvn/wrapper/maven-wrapper.jar";
+
+    /**
+     * Name of the property which should be used to override the default download url for the wrapper.
+     */
+    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+    public static void main(String args[]) {
+        System.out.println("- Downloader started");
+        File baseDirectory = new File(args[0]);
+        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+        // If the maven-wrapper.properties exists, read it and check if it contains a custom
+        // wrapperUrl parameter.
+        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+        String url = DEFAULT_DOWNLOAD_URL;
+        if(mavenWrapperPropertyFile.exists()) {
+            FileInputStream mavenWrapperPropertyFileInputStream = null;
+            try {
+                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+                Properties mavenWrapperProperties = new Properties();
+                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+            } catch (IOException e) {
+                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+            } finally {
+                try {
+                    if(mavenWrapperPropertyFileInputStream != null) {
+                        mavenWrapperPropertyFileInputStream.close();
+                    }
+                } catch (IOException e) {
+                    // Ignore ...
+                }
+            }
+        }
+        System.out.println("- Downloading from: " + url);
+
+        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+        if(!outputFile.getParentFile().exists()) {
+            if(!outputFile.getParentFile().mkdirs()) {
+                System.out.println(
+                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+            }
+        }
+        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+        try {
+            downloadFileFromURL(url, outputFile);
+            System.out.println("Done");
+            System.exit(0);
+        } catch (Throwable e) {
+            System.out.println("- Error downloading");
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+
+    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+            String username = System.getenv("MVNW_USERNAME");
+            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+            Authenticator.setDefault(new Authenticator() {
+                @Override
+                protected PasswordAuthentication getPasswordAuthentication() {
+                    return new PasswordAuthentication(username, password);
+                }
+            });
+        }
+        URL website = new URL(urlString);
+        ReadableByteChannel rbc;
+        rbc = Channels.newChannel(website.openStream());
+        FileOutputStream fos = new FileOutputStream(destination);
+        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+        fos.close();
+        rbc.close();
+    }
+
+}

moquette-0.17/.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.2/apache-maven-3.6.2-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

moquette-0.17/ChangeLog.txt

@@ -1,3 +1,19 @@
+Version 0.17-SNAPSHOT:
+   [feature] Introduced DSL FluentConfig to simplify Server's API instantiation #761.
+   [fix] resolved issue #633 of bad perfomance when adding many subscriptions to few topics, resolved in #758.
+   [fix] resolved issue #629 that originated from subscription trees wide and flat, resolved in #630
+   [dependency] updated Netty to 4.1.93 and tcnative to 2.0.61 (#755)
+   [feature] add saved session expiry configurable through the `persistent_client_expiration` setting (#739).
+   [feature] implemented methods to forcibly disconnects a clients from a Server instance (#744).
+   [refactory] moved code to handle session event loops from PostOffice into separate SessionEventLoopGroup (#742).
+   [feature] added new callback method in interceptor to notify exceptions that happens on SessionEventLoop (#736).
+   [feature] introduce new `buffer_flush_millis` deprecating the old `immediate_buffer_flush` and switch default behavior to flush on every write (#738).
+   [refactory] purge of session state also on disconnect and reused logic (#715).
+   [feature] add `moquette.session_loop.debug` property to enable session loop checking assignments (#714).
+   [break] deprecate `persistent_store` to separate the enablement of persistence with `persistence_enabled` and the path `data_path` (#706).
+   [enhancement] introduced new queue implementation based on segments in memory mapped files. The type of queue implementation
+   could be selected by setting `persistent_queue_type` (#691, #704).
+
 Version 0.16:
    [build] drop generation of broker-test, removed distribution and embedding_moquette modules from deploy phase (#616)
    [fix] introduces sessions event processors to segregate changes to a session in one single thread, simplifying concurrency and code (#631)

moquette-0.17/README.md

@@ -46,13 +46,13 @@ Include dependency in your project:
 <dependency>
       <groupId>io.moquette</groupId>
       <artifactId>moquette-broker</artifactId>
-      <version>0.15</version>
+      <version>0.17</version>
 </dependency>
 ```
 
 ## Build from sources
 
 After a git clone of the repository, cd into the cloned sources and: `./gradlew package`, at the end the distribution 
-package is present at `distribution/target/distribution-0.16-bundle.tar.gz`
+package is present at `distribution/target/distribution-0.17-bundle.tar.gz`
 
 In distribution/target directory will be produced the selfcontained file for the broker with all dependencies and a running script. 

moquette-0.17/broker/pom.xml

@@ -5,7 +5,7 @@
         <relativePath>../pom.xml</relativePath>
         <artifactId>moquette-parent</artifactId>
         <groupId>io.moquette</groupId>
-        <version>0.16-gg</version>
+        <version>0.17-gg</version>
     </parent>
 
     <artifactId>moquette-broker</artifactId>
@@ -16,8 +16,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <netty.version>4.1.94.Final</netty.version>
         <!-- Check Netty pom.xm to know the right version of tcnative, for example
-             https://github.com/netty/netty/blob/netty-4.1.73.Final/pom.xml#L531 -->
-        <netty.tcnative.version>2.0.52.Final</netty.tcnative.version>
+             https://github.com/netty/netty/blob/netty-4.1.93.Final/pom.xml#L625 -->
+        <netty.tcnative.version>2.0.61.Final</netty.tcnative.version>
         <paho.version>1.2.5</paho.version>
         <h2.version>2.2.220</h2.version>
     </properties>
@@ -167,6 +167,12 @@
             <version>${h2.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>RELEASE</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>