Refactored src out of subfolder

.gitignore

@@ -29,7 +29,6 @@ build/
 
 ### VS Code ###
 .vscode/
-../vscode/
 
 node_modules
 config

chatto/.mvn/wrapper/MavenWrapperDownloader.java

@@ -1,114 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you 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
-
-  https://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.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.URL;
-import java.nio.channels.Channels;
-import java.nio.channels.ReadableByteChannel;
-import java.util.Properties;
-
-public class MavenWrapperDownloader {
-
-    /**
-     * 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/0.4.2/maven-wrapper-0.4.2.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 direcrory '" + 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 {
-        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();
-    }
-
-}

chatto/.mvn/wrapper/maven-wrapper.properties

@@ -1 +0,0 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.zip

chatto/src/main/java/org/ros/chatto/config/CustomCacheEventLogger.java

@@ -1,16 +0,0 @@
-package org.ros.chatto.config;
-
-import org.ehcache.event.CacheEvent;
-import org.ehcache.event.CacheEventListener;
-
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-public class CustomCacheEventLogger implements CacheEventListener<Object, Object> {
-
-	@Override
-	public void onEvent(CacheEvent<? extends Object, ? extends Object> cacheEvent) {
-		log.debug("custom Caching event {} key = {} old {} new {} ", cacheEvent.getType(), cacheEvent.getKey(),
-				cacheEvent.getOldValue(), cacheEvent.getNewValue());
-	}
-}

chatto/src/main/java/org/ros/chatto/config/DBInitializerConfig.java

@@ -1,33 +0,0 @@
-package org.ros.chatto.config;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.stereotype.Component;
-
-import lombok.Getter;
-
-@Component
-@EnableConfigurationProperties
-@PropertySource(value = "classpath:queries.properties")
-@Getter
-public class DBInitializerConfig {
-
-    private final String dbName;
-
-    private final String numTablesQuery;
-
-    private final String resetSessionsQuery;
-
-    private final String clearTokensQuery;
-
-    public DBInitializerConfig(@Value("${chatto.datasource.database-name}") String dbName,
-            @Value("${num-tables}") String numTablesQuery, @Value("${reset-sessions}") String resetSessionsQuery,
-            @Value("${clear-tokens}") String clearTokensQuery) {
-        this.dbName = dbName;
-        this.numTablesQuery = numTablesQuery;
-        this.resetSessionsQuery = resetSessionsQuery;
-        this.clearTokensQuery = clearTokensQuery;
-    }
-
-}

chatto/src/main/java/org/ros/chatto/config/DataSourceConfig.java

@@ -1,46 +0,0 @@
-package org.ros.chatto.config;
-
-import javax.sql.DataSource;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.jdbc.DataSourceBuilder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.stereotype.Component;
-
-import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
-
-@Configuration
-@Component
-
-// @ConfigurationProperties(prefix = "chatto.datasource")
-@Getter
-// @Setter
-@Slf4j
-public class DataSourceConfig {
-
-    // jdbc:mysql://localhost:3306/chatto_db?useSSL=false
-    private final String DATASOURCE_URL = "jdbc:mysql://localhost:3306/%s?useSSL=false";
-
-    private final String username;
-    private final String password;
-    private final String databaseName;
-
-    public DataSourceConfig(@Value("${chatto.datasource.username}") String username,
-            @Value("${chatto.datasource.password}") String password,
-            @Value("${chatto.datasource.database-name}") String databaseName) {
-        this.username = username;
-        this.password = password;
-        this.databaseName = databaseName;
-    }
-
-    @Bean
-    public DataSource getDataSource() {
-        final DataSourceBuilder<?> dataSourceBuilder = DataSourceBuilder.create();
-        dataSourceBuilder.url(String.format(DATASOURCE_URL, databaseName));
-        dataSourceBuilder.username(username);
-        dataSourceBuilder.password(password);
-        return dataSourceBuilder.build();
-    }
-}

chatto/src/main/java/org/ros/chatto/config/EhCacheConfig.java

@@ -1,10 +0,0 @@
-package org.ros.chatto.config;
-
-
-import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.context.annotation.Configuration;
-
-@EnableCaching
-@Configuration
-public class EhCacheConfig {
-}

config/application.properties

@@ -1,7 +0,0 @@
-## chatto DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties)
-chatto.datasource.url = jdbc:mysql://localhost:3306/chatto_db2?useSSL=false
-chatto.datasource.username = chatto_user
-chatto.datasource.password = password
-chatto.datasource.database-name = chatto_db2
-website-url = 192.168.1.13
-test.bindAddress=192.168.1.106