Merge branch 'release/3.0.0'

Performance verbessert.
Code-Tests eingeführt.

closed #61
closed #87
closed #108
closed #118
closed #127

Author: alex1702

.travis.yml

@@ -18,7 +18,7 @@ env:
   global:
     - secure: pHmSb+3bIvSj1iA5j4MIgRv1ogRH1w7NKlfPxAPDXYq+AQZOyyAhWm/nTMq0mtX9x5RsrM8c7YUN7ds+pTpE5JpcA+rlOSibj+ziDeLhpmDzcBt+YUltTOxP7EVrAAmHBTu7DGjPmTLvfzLfpyGNkv6yuIXNo/oIs6BRMwQ2xHa1QdkQ/gkS6nxgh7UhqtDmNix/idHjX/a5PEX8Qse3ZvKBvt1kgrKcVN1ysOtcHKvhQ5ddMAj+7PM+aLuAPTlysfqMYN1gW+cpWOJrHriV7vGCU6lz34s2yM19wFmRFOo7yht3FhAwH8Rt6aTtwpC3HN5DzwqhcicHQkoyv59KMiBbUBN9w5SGqit+/HtFOQ9vgyV5qo5Il/UkbVGUXXl9WcY+zPV2XTlO3LH5o36Bn+da/HRdmlvveMZT8tJ5137YSQhrQRZdOVEDBWuAZmUiTh94c9u3owU85TFzS97fqWi5bvpbyIU749oGhWGv/zxmOEJmtinnQpUAJqS9fFrXrFFtjdLF6vNYWc1f1y7Xg57pLZYK0NcClWc77QwCX5WHy6VPdj3elIJHyv+3DKQw9VBrfV+bRE4b6uvLuDkllBztYECstYR1uJTOumVnhufc12GrD51m+IRqtzEp4+OlNunKsoInNGsJYyaz3t8VcdAwEN4lTE7Se7ijehIpHRA=
 script:
-  - "./gradlew check build"
+  - "./gradlew check developTest integrationTest build"
   - if [ "$TRAVIS_BRANCH" == "develop" ]; then
       openssl aes-256-cbc -K $encrypted_3a9121b37456_key -iv $encrypted_3a9121b37456_iv 
         -in scripte/deploy/RepoZugang.properties.enc -out scripte/deploy/RepoZugang.properties -d;

README.md

@@ -3,7 +3,7 @@
 [![Quality Gate](https://sonarqube.com/api/badges/gate?key=mediathekview%3AMServer)](https://sonarqube.com/dashboard/index/mediathekview%3AMServer)
 
 # MServer
-Server zum Steuern des Crawler. Teil von [MediathekView](https://github.com/mediathekview).
+Server zum crawlen der Mediatheken. Teil von [MediathekView](https://github.com/mediathekview).
 
 # Entwicklung
 
@@ -12,7 +12,7 @@ Server zum Steuern des Crawler. Teil von [MediathekView](https://github.com/medi
 mkdir mediathekview
 cd mediathekview
 git clone https://github.com/mediathekview/MServer.git
-git clone https://github.com/mediathekview/MSearch.git
+git clone https://github.com/mediathekview/Mlib.git
 ```
 
 ## Bauen und starten an der Kommandozeile
@@ -22,11 +22,11 @@ cd MServer
 ```
 
 ## Entwicklung mit Netbeans
-* Verzeichnisse `MSearch` und `MServer` mit Netbeans öffnen
+* Verzeichnisse `MLib` und `MServer` mit Netbeans öffnen
 
 ## Entwicklung mit Eclipse
 * Falls noch nicht vorhanden: [Plugin buildship](https://projects.eclipse.org/projects/tools.buildship) installieren
-* Projekt `MServer` als Gradle-Projekt importieren. `MSearch` wird automatisch mit importiert.
+* Projekt `MServer` als Gradle-Projekt importieren. `MLib` wird automatisch mit importiert.
 
 # Autor
 @xaverW

build.gradle

@@ -1,15 +1,21 @@
+import java.nio.file.Files
+import java.nio.file.Paths
+import org.apache.tools.ant.filters.ReplaceTokens
+
+plugins {
+    id "com.github.jk1.dependency-license-report" version "0.3.5"
+}
+
 apply plugin: 'java'
 apply plugin: 'distribution'
 apply plugin: 'maven'
 apply from: "${project.rootDir}/gradle/eclipse.gradle"
-import java.nio.file.Files
-import java.nio.file.Paths
-import org.apache.tools.ant.filters.ReplaceTokens
+
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 group = 'de.mediathekview'
-version = '2.7.9'
+version = '3.0.0'
 
 def jarName = 'MServer.jar'
 def mainClass = 'mServer.Main'
@@ -34,22 +40,111 @@ repositories {
     }
 }
 
+sourceSets {
+    developTest {
+        java {
+            compileClasspath += main.output + test.output
+            runtimeClasspath += main.output + test.output
+            srcDir file('src/test/developTest/java')
+        }
+        resources.srcDir file('src/test/developTest/resources')
+    }
+    integrationTest {
+        java {
+            compileClasspath += main.output + test.output
+            runtimeClasspath += main.output + test.output
+            srcDir file('src/test/integrationTest/java')
+        }
+        resources.srcDir file('src/test/integrationTest/resources')
+    }
+    performanceTest {
+        java {
+            compileClasspath += main.output + test.output
+            runtimeClasspath += main.output + test.output
+            srcDir file('src/test/performanceTest/java')
+        }
+        resources.srcDir file('src/test/performanceTest/resources')
+    }
+}
+
+configurations {
+    developTestCompile.extendsFrom testCompile
+    developTestRuntime.extendsFrom testRuntime
+    integrationTestCompile.extendsFrom testCompile
+    integrationTestRuntime.extendsFrom testRuntime
+    performanceTestCompile.extendsFrom testCompile
+    performanceTestRuntime.extendsFrom testRuntime
+}
+
 test {
-    exclude '**/*PerformanceTest.class'
+}
+
+task developTest(type: Test) {
+    testClassesDir = sourceSets.developTest.output.classesDir
+    classpath = sourceSets.developTest.runtimeClasspath
+    outputs.upToDateWhen { false }
+
+    beforeTest { descriptor ->
+        logger.lifecycle("Running test: " + descriptor)
+    }
+}
+
+task integrationTest(type: Test) {
+    testClassesDir = sourceSets.integrationTest.output.classesDir
+    classpath = sourceSets.integrationTest.runtimeClasspath
+    outputs.upToDateWhen { false }
+
+    beforeTest { descriptor ->
+        logger.lifecycle("Running test: " + descriptor)
+    }
+}
+
+task performanceTest(type: Test) {
+    logger.info("hier")
+    testClassesDir = sourceSets.performanceTest.output.classesDir
+    classpath = sourceSets.performanceTest.runtimeClasspath
+    outputs.upToDateWhen { false }
+    
+    beforeTest { descriptor ->
+        logger.lifecycle("Running test: " + descriptor)
+    }
+}
+
+tasks.withType(Test) {
+    reports.html.destination = file("${reporting.baseDir}/${name}")
 }
 
 dependencies {
-    compile 'de.mediathekview:MSearch:2.2.0'
+    compile 'de.mediathekview:MLib:3.0.0'
     compile 'commons-net:commons-net:3.5'
     compile 'org.apache.commons:commons-compress:1.12'
     compile 'org.apache.commons:commons-lang3:3.5'
     compile 'org.tukaani:xz:1.5'
     compile 'com.google.code.gson:gson:2.8.0'
     compile 'com.sun.jersey:jersey-client:1.8'
+    compile 'com.squareup.okhttp3:okhttp:3.6.0'
+
 
     compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.7'
     compile group: 'fm.void.jetm', name: 'jetm', version: '1.2.3'
-    compile group: 'junit', name: 'junit', version: '4.12'
+
+    testCompile "junit:junit:4.12"
+    testCompile "org.mockito:mockito-core:2.+"
+    testCompile "com.squareup.okhttp3:mockwebserver:3.6.0"
+    testCompile "org.hamcrest:hamcrest-all:1.3"
+}
+
+configurations.compile {
+    resolutionStrategy.dependencySubstitution {
+        def substituteIfExists = { String moduleName, String projectName ->
+            if(findProject(projectName)) {
+               assert !(project.hasProperty('org.gradle.configureondemand') && Boolean.valueOf(project.getProperty('org.gradle.configureondemand'))) : "org.gradle.configureondemand = true will cause problems when substituting a project"
+               logger.lifecycle "$project: Substituting module '$moduleName' with project $projectName"
+               substitute module(moduleName) with project(projectName)
+            }
+        }
+        substituteIfExists('de.mediathekview:MLib', ':MLib')
+    }
 }
 
 ext {
@@ -90,23 +185,33 @@ uploadArchives {
 }
 build.dependsOn(install)
 
-task updateVersion << {
-    Properties props = loadVersionProperties()
-    def oldVersion = props.getProperty('VERSION')
-    String buildDate = new Date().format('dd.MM.yyyy HH:mm:ss')
-    if (!oldVersion.equals(project.version)) {
-        logger.lifecycle "==mserver======================"
-        logger.lifecycle "Version: $project.version"
-        logger.lifecycle "Baudatum: $buildDate"
-        logger.lifecycle "==mserver======================"
-        props.setProperty('VERSION', project.version)
-        props.setProperty('DATE', buildDate)
-        props.store(propsFile.newWriter(), null)
+task updateVersion {
+    doLast {
+        Properties props = loadVersionProperties()
+        def oldVersion = props.getProperty('VERSION')
+        String buildDate = new Date().format('dd.MM.yyyy HH:mm:ss')
+        if (!oldVersion.equals(project.version)) {
+            logger.lifecycle "==mserver======================"
+            logger.lifecycle "Version: $project.version"
+            logger.lifecycle "Baudatum: $buildDate"
+            logger.lifecycle "==mserver======================"
+            props.setProperty('VERSION', project.version)
+            props.setProperty('DATE', buildDate)
+            props.store(propsFile.newWriter(), null)
+        }
     }
 }
 
 processResources.dependsOn updateVersion
 
+licenseReport {
+    outputDir = "build/Copyright/"
+    excludes = [':MSearch', 'MediathekView:MLib']
+    configurations = ['compile']
+}
+
+processResources.dependsOn generateLicenseReport
+
 [distZip, distTar]*.shouldRunAfter compileJava, updateVersion, jar
 distTar.compression = Compression.GZIP
 distTar.extension = 'tar.gz'
@@ -142,6 +247,9 @@ distributions {
             from('build/libs') {
                 include '*.jar'
             }
+            from('build') {
+                include 'Copyright/*'
+            }
         }
     }
 }
@@ -156,7 +264,6 @@ task run(type: JavaExec, dependsOn: classes) {
     if (project.hasProperty('args')) {
         args(project.args.split(','))
     }
-
 }
 
 /**