Merge pull request #121 from ExplorViz/dev-1

Integrate dev-1 for Release Version 1.5.0

Author: Christian Zirkelbach

.gitignore

@@ -1,18 +1,23 @@
 target/
+.idea/
+**/out
 
 build
 .gradle
 
+
 bin
 .classpath
+**/out/
 
 .project
+.idea/
 
 .DS_Store
 
 .gitmodules
 
-.settings/*
+**/.settings/*
 
 */.settings/*
 !*/.settings/edu.umd.cs.findbugs.core.prefs

.travis.yml

@@ -1,77 +1,95 @@
 language: java
 
-env:
-  global:
-    - MONGODB_VERSION=4.0.6
-
 services:
-  - mongodb
   - docker
-  - redis-server
 
 jobs:
   fast_finish: true
   allow_failures:
-    - jdk: oraclejdk8
+    - jdk: oraclejdk11
   include:
-    - jdk: openjdk8
-    - jdk: oraclejdk8
-    
+    - stage: test
+      name: "Unit Testing"
+      jdk: openjdk11
+      script: ./gradlew clean test
+
+    - stage: test
+      name: "Unit Testing (oraclejdk11)"
+      jdk: oraclejdk11
+      script: ./gradlew clean test
+
+    - stage: test
+      name: "Integration Testing"
+      jdk: openjdk11
+      script: ./gradlew clean integrationTest
+
+    - stage: test
+      name: "API Testing"
+      jdk: openjdk11
+      script: ./gradlew clean apiTest
+
+    - stage: test
+      name: "Source Code Analysis"
+      jdk: openjdk11
+      script: ./gradlew checkstyle pmd spotbugs
+
+    - stage: snapshot
+      name: "Snapshot Publishing"
+      if: (type = push) AND ((branch = dev-1) OR (branch = master))
+      jdk: openjdk11
+      script: ./gradlew clean landscape-service:landscape-model:uploadArchives settings-service:settings-model:uploadArchives user-service:user-model:uploadArchives
+
     - stage: deploy
       name: "Docker Image: Analysis Service"
       if: (type = push) AND ((branch = dev-1) OR (branch = master))
-      jdk: openjdk8
+      jdk: openjdk11
       script: cd analysis-service && ../.travis/docker_push.sh
-      
+
     - stage: deploy
       name: "Docker Image: User Service"
       if: (type = push) AND ((branch = dev-1) OR (branch = master))
-      jdk: openjdk8
+      jdk: openjdk11
       script: cd user-service && ../.travis/docker_push.sh
-      
+
     - stage: deploy
       name: "Docker Image: Discovery Service"
       if: (type = push) AND ((branch = dev-1) OR (branch = master))
-      jdk: openjdk8
+      jdk: openjdk11
       script: cd discovery-service && ../.travis/docker_push.sh
-      
+
     - stage: deploy
       name: "Docker Image: Landscape Service"
       if: (type = push) AND ((branch = dev-1) OR (branch = master))
-      jdk: openjdk8
+      jdk: openjdk11
       script: cd landscape-service && ../.travis/docker_push.sh
 
     - stage: deploy
       name: "Docker Image: History Service"
       if: (type = push) AND ((branch = dev-1) OR (branch = master))
-      jdk: openjdk8
+      jdk: openjdk11
       script: cd history-service && ../.travis/docker_push.sh
-    
+
     - stage: deploy
       name: "Docker Image: Broadcast Service"
       if: (type = push) AND ((branch = dev-1) OR (branch = master))
-      jdk: openjdk8
+      jdk: openjdk11
       script: cd broadcast-service && ../.travis/docker_push.sh
 
     - stage: deploy
       name: "Docker Image: Settings Service"
       if: (type = push) AND ((branch = dev-1) OR (branch = master))
-      jdk: openjdk8
+      jdk: openjdk11
       script: cd settings-service && ../.travis/docker_push.sh
-    
+
     - stage: documentation
       name: "Publish documentation"
       if: (type = push) AND (branch = master)
       script: chmod +x .travis/javadoc-push.sh && .travis/javadoc-push.sh
-    
+
 before_script:
   - chmod +x .travis/docker_push.sh
 
-before_install:
-  - chmod +x .travis/mongoDB_setup.sh
-  - .travis/mongoDB_setup.sh
-  
 branches:
   only:
-  - master
-  - dev-1
+    - master
+    - dev-1

README.MD

@@ -21,14 +21,21 @@ This is only the backend, you will need the [explorviz-frontend](https://github.
 This gradle project includes or installs every necessary dependency.
 
 ## Reference
-How to cite ExplorViz:
+Citing ExplorViz as a tool:
 
 Florian Fittkau, Alexander Krause, Wilhelm Hasselbring (2017): Software landscape and application visualization for system comprehension with ExplorViz. Information and Software Technology, Volume 87. pp. 259-277. DOI https://doi.org/10.1016/j.infsof.2016.07.004.
 
 [[BibTex]](http://eprints.uni-kiel.de/cgi/export/eprint/33464/BibTeX/cau-eprint-33464.bib) | [[Endnote]](http://eprints.uni-kiel.de/cgi/export/eprint/33464/EndNote/cau-eprint-33464.enw)
 
+Citing ExplorViz' collaborative modularization process:
+
+Zirkelbach, Christian, Krause, Alexander and Hasselbring, Wilhelm (2019): Modularization of Research Software for Collaborative Open Source Development. In Proceedings of the Ninth International Conference on Advanced Collaborative Networks, Systems and Applications (COLLA 2019), June 30 - July 04, 2019, Rome, Italy.
+
+[[BibTex]](http://eprints.uni-kiel.de/cgi/export/eprint/46777/BibTeX/cau-eprint-46777.bib) | [[Endnote]](http://eprints.uni-kiel.de/cgi/export/eprint/46777/EndNote/cau-eprint-46777.enw)
+
 ## Documentation
-The API documentation is available [here](https://explorviz.github.io/explorviz-backend/).
+- The API documentation is available [here](https://explorviz.github.io/explorviz-backend/)
+* The documentation for endpoints of services (SwaggerUI) is available [here](http://localhost:8001), once all services are started
 
 ## Eclipse Setup
 1. Download the latest [Eclipse IDE for Java Developers](http://www.eclipse.org/downloads/eclipse-packages/) (ExplorViz requires JDK 8 compliance)
@@ -47,7 +54,6 @@ The API documentation is available [here](https://explorviz.github.io/explorviz-
 * Generating API Documentation: Travis CI automatically builds all Javadoc on successful master-branch builds
 
 ## Quick start with sample (dummy) monitoring
-
 1. Follow the above [Setup Development](#setup-development) procedure
 2. Clone [TestApplication](https://github.com/czirkelbach/kiekerSampleApplication)
 3. Start the [TestApplication](https://github.com/czirkelbach/kiekerSampleApplication) as described [here](https://github.com/czirkelbach/kiekerSampleApplication/blob/master/README.md).

analysis-service/.settings/org.eclipse.jdt.core.prefs

@@ -1,4 +1,7 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.source=11
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

analysis-service/Dockerfile

@@ -1,4 +1,6 @@
-FROM openjdk:8-alpine
+## SWITCH TO JRE AFTER ANALYSIS REBUILD
+
+FROM adoptopenjdk/openjdk11:jdk-11.0.4_11-alpine-slim
 
 RUN mkdir /explorviz
 WORKDIR /explorviz

analysis-service/build.gradle

@@ -1,7 +1,8 @@
 plugins {
 	id "application"
-	id "com.github.johnrengelman.shadow" version "4.0.4"
+	id "com.github.johnrengelman.shadow" version "5.1.0"
 	id "com.github.spotbugs" version "1.6.10"
+	id "maven"
 }
 
 // Force new Dependencies 
@@ -25,6 +26,12 @@ dependencies {
   implementation group: 'net.kieker-monitoring', name: 'kieker', version: '1.14-SNAPSHOT'
 }
 
+// disable integration tests, since there are none
+integrationTest.enabled = false
+
+// disable api tests, since there are none
+apiTest.enabled = false
+
 assemble.dependsOn shadowJar
 jar.enabled = false
 
@@ -41,7 +48,8 @@ application {
 }
 
 shadowJar {
-  archiveName = "explorviz-${project.name}.${extension}"
+  baseName = "explorviz-${project.name}"
+  classifier = null
 }
 
 spotbugs {
@@ -68,8 +76,4 @@ task spotbugs {
 
   dependsOn 'spotbugsMain'
   dependsOn 'spotbugsTest'
-}
-
-artifacts {
-  archives shadowJar
 }

…del/.settings/org.eclipse.jdt.core.prefs …ice/.settings/org.eclipse.jdt.core.prefssettings-service/settings-service-model/.settings/org.eclipse.jdt.core.prefs renamed to broadcast-service/.settings/org.eclipse.jdt.core.prefs settings-service/settings-service-model/.settings/org.eclipse.jdt.core.prefs renamed to broadcast-service/.settings/org.eclipse.jdt.core.prefs

@@ -1,4 +1,7 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.source=11
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
@@ -120,6 +123,8 @@ org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=d
 org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert
 org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
@@ -150,6 +155,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declar
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
 org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
@@ -188,6 +194,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
 org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert
+org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert
 org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
 org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
@@ -234,6 +242,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_decla
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

broadcast-service/.settings/org.eclipse.jdt.ui.prefs

@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+formatter_profile=_CAU-SE-Style
+formatter_settings_version=16

broadcast-service/Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:8-alpine
+FROM openjdk:11-jre-slim
 
 RUN mkdir /explorviz
 WORKDIR /explorviz

broadcast-service/build.gradle

@@ -1,7 +1,8 @@
 plugins {
 	id "application"
-	id "com.github.johnrengelman.shadow" version "4.0.4"
+	id "com.github.johnrengelman.shadow" version "5.1.0"
 	id "com.github.spotbugs" version "1.6.10"
+	id "maven"
 }
 
 // Force new Dependencies 
@@ -12,28 +13,42 @@ configurations.all {
 
 dependencies {
 
+	// Swagger
+  	implementation group: 'io.swagger.core.v3', name: 'swagger-core', version: '2.0.8'
+  	implementation group: 'io.swagger.core.v3', name: 'swagger-jaxrs2', version: '2.0.8'
+  	
+  	implementation project(':landscape-service:landscape-model')
+  	implementation project(':user-service:user-model')
+
+
   // ExplorViz Shared Dependencies
   if(useRemoteSharedProject.toBoolean()) {
-    implementation "com.github.explorviz.explorviz-backend-shared:config-injection:${sharedProjectVersion}"
-    implementation "com.github.explorviz.explorviz-backend-shared:security:${sharedProjectVersion}"
-    implementation "com.github.explorviz.explorviz-backend-shared:exception-handling:${sharedProjectVersion}"
-    implementation "com.github.explorviz.explorviz-backend-shared:common-concerns:${sharedProjectVersion}"
-    implementation "com.github.explorviz.explorviz-backend-shared:landscape-model:${sharedProjectVersion}"
+  	implementation group: 'net.explorviz', name: 'config-injection', version: "${sharedProjectVersion}"
+  	implementation group: 'net.explorviz', name: 'security', version: "${sharedProjectVersion}"
+  	implementation group: 'net.explorviz', name: 'exception-handling', version: "${sharedProjectVersion}"
+  	implementation group: 'net.explorviz', name: 'common-concerns', version: "${sharedProjectVersion}"
   }
   else { 
     implementation project(':config-injection')    
     implementation project(':security')
     implementation project(':exception-handling')
     implementation project(':common-concerns')
-    implementation project(':landscape-model')    
-  } 
-  
+  }
+
+  implementation project(':landscape-service:landscape-model')
+
   // SSE context for injection
   implementation group: 'org.glassfish.jersey.media', name: 'jersey-media-sse', version: '2.27'
 
   implementation group: 'org.apache.kafka', name: 'kafka_2.12', version: '2.2.0'
 }
 
+// disable integration tests, since there are none
+integrationTest.enabled = false
+
+// disable api tests, since there are none
+apiTest.enabled = false
+
 assemble.dependsOn shadowJar
 jar.enabled = false
 
@@ -50,7 +65,8 @@ application {
 }
 
 shadowJar {
-  archiveName = "explorviz-${project.name}.${extension}"
+  baseName = "explorviz-${project.name}"
+  classifier = null
 }
 
 spotbugs {
@@ -79,10 +95,6 @@ task spotbugs {
   dependsOn 'spotbugsTest'
 }
 
-artifacts {
-  archives shadowJar
-}
-
 // START environment task
 task updateEnvPropsInBuildDir {
 
@@ -113,4 +125,4 @@ task updateEnvPropsInBuildDir {
 
 run.dependsOn updateEnvPropsInBuildDir
 updateEnvPropsInBuildDir.shouldRunAfter classes
-// END environment task
+// END environment task