added cmd interface for tools and updated mvn build

Author: fquirin

pom.xml

@@ -7,12 +7,54 @@
     <groupId>net.b07z.sepia.server.core</groupId>
     <artifactId>sepia-core-tools</artifactId>
     <version>2.0.0</version>
+    <packaging>jar</packaging>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
+    
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>3.1.0</version>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>
+								${project.build.directory}/libs
+							</outputDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>3.1.0</version>
+				<configuration>
+					<archive>
+						<manifest>
+							<addClasspath>true</addClasspath>
+							<classpathPrefix>libs/</classpathPrefix>
+							<mainClass>
+								net.b07z.sepia.server.core.tools.ToolsRunner
+							</mainClass>
+						</manifest>
+					</archive>
+					<finalName>tools-v${project.version}</finalName>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 
     <dependencies>
 	    <dependency>

src/main/java/net/b07z/sepia/server/core/tools/ToolsRunner.java

@@ -0,0 +1,42 @@
+package net.b07z.sepia.server.core.tools;
+
+import java.util.Arrays;
+
+/**
+ * Command-line interface to run different tools.
+ * 
+ * @author Florian Quirin
+ *
+ */
+public class ToolsRunner {
+
+	/**
+	 * Run tools.
+	 * @param args
+	 */
+	public static void main(String[] args) {
+		//Help
+		if (args[0].equals("-h") || args[0].equals("-help") || args[0].equals("help")){
+			help();
+			return;
+		
+		//Tools to run:
+		}else if (args[0].equals("connection-check")){
+			String[] toolArgs = Arrays.copyOfRange(args, 1, args.length);
+			ConnectionCheck.main(toolArgs);
+			return;
+		}
+	}
+	
+	/**
+	 * Command-line interface help.
+	 */
+	private static void help(){
+		System.out.println("\nUsage:");
+		System.out.println("[tool] [arguments]");
+		System.out.println("\nTools:");
+		System.out.println("connection-check - args: -h");
+		System.out.println("");
+	}
+
+}

src/test/java/microservices/TestMicroservices.java

@@ -28,7 +28,7 @@ public void testDbStationResults() throws IOException {
 			System.out.println("NOTE: JUnit-microservices: skipped dBStationResults testing due to missing test-data!");
 		}
 
-		if (dbApiKey != null){
+		if (dbApiKey != null && !dbApiKey.isEmpty()){
 			DbStationResults.setApiKey(dbApiKey);
 
 			String langCode = Language.DE.toValue();
@@ -46,6 +46,9 @@ public void testDbStationResults() throws IOException {
 			assertThat(dbStationFirst.getId(), is("008011160"));
 			assertThat(dbStationClosest.toString(), is("Berlin Ostbahnhof"));
 			assertThat(dbStationClosest.getId(), is("008010255"));
+		
+		}else{
+			System.out.println("NOTE: JUnit-microservices: skipped dBStationResults testing due to missing API-key!");
 		}
 	}