Merge pull request #87 from ExplorViz/dev-1

Update master branch to dev-1

Author: Alexander-Krause-Glau

.gitignore

@@ -22,3 +22,5 @@ bin
 !*/.settings/org.eclipse.jdt.core.prefs
 
 .ruleset
+
+**/\.checkstyle

.travis.yml

@@ -7,6 +7,7 @@ env:
 services:
   - mongodb
   - docker
+  - redis-server
 
 jobs:
   fast_finish: true
@@ -17,28 +18,46 @@ jobs:
     - jdk: oraclejdk8
 
     - stage: deploy
-      name: "Docker Image: Analysis"
+      name: "Docker Image: Analysis Service"
       if: (type = push) AND ((branch = dev-1) OR (branch = master))
       jdk: openjdk8
-      script: cd analysis && ../.travis/docker_push.sh
+      script: cd analysis-service && ../.travis/docker_push.sh
 
     - stage: deploy
-      name: "Docker Image: Authentication"
+      name: "Docker Image: User Service"
       if: (type = push) AND ((branch = dev-1) OR (branch = master))
       jdk: openjdk8
-      script: cd authentication && ../.travis/docker_push.sh
+      script: cd user-service && ../.travis/docker_push.sh
 
     - stage: deploy
-      name: "Docker Image: Discovery"
+      name: "Docker Image: Discovery Service"
       if: (type = push) AND ((branch = dev-1) OR (branch = master))
       jdk: openjdk8
-      script: cd discovery && ../.travis/docker_push.sh
+      script: cd discovery-service && ../.travis/docker_push.sh
 
     - stage: deploy
-      name: "Docker Image: Landscape"
+      name: "Docker Image: Landscape Service"
       if: (type = push) AND ((branch = dev-1) OR (branch = master))
       jdk: openjdk8
-      script: cd landscape && ../.travis/docker_push.sh
+      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
+      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
+      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
+      script: cd settings-service && ../.travis/docker_push.sh
 
     - stage: documentation
       name: "Publish documentation"

.travis/docker_push.sh

@@ -7,11 +7,21 @@ DIRECTORY="$(basename "$PWD")"
 echo $DOCKER_PW | docker login -u $DOCKER_LOGIN --password-stdin
 
 if [[ "$TRAVIS_BRANCH" == 'dev-1' ]]; then
-  docker build -t explorviz/explorviz-backend-$DIRECTORY:dev .
-  docker push explorviz/explorviz-backend-$DIRECTORY:dev
+  docker build -t explorviz-backend-$DIRECTORY .
+
+  docker tag explorviz-backend-$DIRECTORY explorviz/explorviz-backend-$DIRECTORY:dev-$TRAVIS_COMMIT
+
+  docker tag explorviz-backend-$DIRECTORY explorviz/explorviz-backend-$DIRECTORY:dev
+
+  docker push explorviz/explorviz-backend-$DIRECTORY
 elif [[ "$TRAVIS_BRANCH" == 'master' ]]; then
-  docker build -t explorviz/explorviz-backend-$DIRECTORY:latest .
-  docker push explorviz/explorviz-backend-$DIRECTORY:latest
+  docker build -t explorviz-backend-$DIRECTORY .
+
+  docker tag explorviz-backend-$DIRECTORY explorviz/explorviz-backend-$DIRECTORY:latest-$TRAVIS_COMMIT
+
+  docker tag explorviz-backend-$DIRECTORY explorviz/explorviz-backend-$DIRECTORY:latest
+
+  docker push explorviz/explorviz-backend-$DIRECTORY
 else
   echo "Unknown branch for Docker image."
 fi

….settings/edu.umd.cs.findbugs.core.prefs ….settings/edu.umd.cs.findbugs.core.prefsanalysis/.settings/edu.umd.cs.findbugs.core.prefs renamed to analysis-service/.settings/edu.umd.cs.findbugs.core.prefs analysis/.settings/edu.umd.cs.findbugs.core.prefs renamed to analysis-service/.settings/edu.umd.cs.findbugs.core.prefs

@@ -1,5 +1,5 @@
 #SpotBugs User Preferences
-#Tue Sep 25 15:24:25 CEST 2018
+#Tue Apr 30 12:02:15 CEST 2019
 detectorAppendingToAnObjectOutputStream=AppendingToAnObjectOutputStream|true
 detectorAtomicityProblem=AtomicityProblem|true
 detectorBadAppletConstructor=BadAppletConstructor|false
@@ -137,6 +137,6 @@ detectorWrongMapIterator=WrongMapIterator|true
 detectorXMLFactoryBypass=XMLFactoryBypass|true
 detector_threshold=3
 effort=max
-filter_settings=Low|BAD_PRACTICE,CORRECTNESS,MT_CORRECTNESS,PERFORMANCE,STYLE|false|16
+filter_settings=Low|BAD_PRACTICE,CORRECTNESS,MT_CORRECTNESS,PERFORMANCE,STYLE|false|14
 filter_settings_neg=MALICIOUS_CODE,SECURITY,EXPERIMENTAL,NOISE,I18N|
 run_at_full_build=true

…ion/.settings/org.eclipse.jdt.core.prefs …ice/.settings/org.eclipse.jdt.core.prefsauthentication/.settings/org.eclipse.jdt.core.prefs renamed to analysis-service/.settings/org.eclipse.jdt.core.prefs authentication/.settings/org.eclipse.jdt.core.prefs renamed to analysis-service/.settings/org.eclipse.jdt.core.prefs

@@ -4,28 +4,36 @@ org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false
 org.eclipse.jdt.core.formatter.align_with_spaces=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=80
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_assignment=16
 org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
 org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16
 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0
 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=80
+org.eclipse.jdt.core.formatter.alignment_for_shift_operator=0
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
@@ -43,7 +51,7 @@ org.eclipse.jdt.core.formatter.blank_lines_before_member_type=0
 org.eclipse.jdt.core.formatter.blank_lines_before_method=1
 org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
 org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=0
 org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=2
 org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
@@ -70,6 +78,7 @@ org.eclipse.jdt.core.formatter.comment.format_line_comments=true
 org.eclipse.jdt.core.formatter.comment.format_source_code=true
 org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
 org.eclipse.jdt.core.formatter.comment.line_length=100
@@ -117,11 +126,13 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=do not ins
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=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_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
 org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
@@ -152,6 +163,8 @@ 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
 org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -176,13 +189,18 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
 org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
 org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+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_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_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
@@ -230,6 +248,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do no
 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
 org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -266,9 +286,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser
 org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
 org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
 org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
@@ -280,13 +303,24 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_decla
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
 org.eclipse.jdt.core.formatter.join_lines_in_comments=true
 org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_if_empty
+org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_if_empty
+org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_if_empty
 org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.lineSplit=100
 org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
 org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
@@ -307,9 +341,16 @@ org.eclipse.jdt.core.formatter.tabulation.char=space
 org.eclipse.jdt.core.formatter.tabulation.size=2
 org.eclipse.jdt.core.formatter.use_on_off_tags=true
 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
 org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter

…overy/.settings/org.eclipse.jdt.ui.prefs …rvice/.settings/org.eclipse.jdt.ui.prefsdiscovery/.settings/org.eclipse.jdt.ui.prefs renamed to analysis-service/.settings/org.eclipse.jdt.ui.prefs discovery/.settings/org.eclipse.jdt.ui.prefs renamed to analysis-service/.settings/org.eclipse.jdt.ui.prefs

@@ -35,8 +35,8 @@ cleanup.remove_redundant_modifiers=false
 cleanup.remove_redundant_semicolons=false
 cleanup.remove_redundant_type_arguments=true
 cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_trailing_whitespaces_all=false
+cleanup.remove_trailing_whitespaces_ignore_empty=true
 cleanup.remove_unnecessary_casts=true
 cleanup.remove_unnecessary_nls_tags=true
 cleanup.remove_unused_imports=true
@@ -61,7 +61,7 @@ cleanup_settings_version=2
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=_CAU-SE-Style
-formatter_settings_version=14
+formatter_settings_version=16
 org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=;
 org.eclipse.jdt.ui.ondemandthreshold=99

…tings/qa.eclipse.plugin.checkstyle.prefs …tings/qa.eclipse.plugin.checkstyle.prefsanalysis/.settings/qa.eclipse.plugin.checkstyle.prefs renamed to analysis-service/.settings/qa.eclipse.plugin.checkstyle.prefs analysis/.settings/qa.eclipse.plugin.checkstyle.prefs renamed to analysis-service/.settings/qa.eclipse.plugin.checkstyle.prefs

@@ -2,16 +2,16 @@ FROM openjdk:8-alpine
 
 RUN mkdir /explorviz
 WORKDIR /explorviz
-COPY build/libs/explorviz-analysis.jar .
+COPY build/libs/explorviz-analysis-service.jar .
 
 # workaround due to old analysis properties
-RUN jar xf explorviz-analysis.jar
+RUN jar xf explorviz-analysis-service.jar
 COPY explorviz.docker.live_trace_processing.properties META-INF/explorviz.live_trace_processing.properties
 
 #COPY prod-env-updater.sh .
 #RUN chmod +x ./prod-env-updater.sh
 
-#CMD java -jar explorviz-analysis.jar
+#CMD java -jar explorviz-analysis-service.jar
 
-#CMD java -cp explorviz-analysis.jar:META-INF net.explorviz.analysis.Main
+#CMD java -cp explorviz-analysis-service.jar:META-INF net.explorviz.analysis.Main
 CMD java -cp . net.explorviz.analysis.Main