Repository: hyperskill/hyperstyle (language: python)

Issue:
Possibly misspelt words
Add these words into the flake8 whitelist:
- metaclass
- stdlib
- coroutine
- throwable
- nullable
- lateinit
- unary
- destructuring
Make tests compatible with production Docker environment
We run Hyperstyle in Docker (based on https://github.com/hyperskill/hyperstyle/blob/main/Dockerfile) on Stepik. Currently, tests do not pass within the production environment since you run tests in a different environment for GitHub Actions (https://github.com/hyperskill/hyperstyle/blob/main/.github/workflows/build.yml). 

Please do the following:
1. Use the same Docker environment to run tests.
2. Fix all failing test cases (some for eslint and flake8) in `main` and `main-upd` branches.
Change production configuration
We use `numpy` and `pandas` modules only in the `evaluation` module in the tests. We can ignore the installation of them in production if we don't run evaluation tests (see open PRs #44 & #46 for issue #43, alpine requires to add an additional step for it). Finally, instead of running all tests (`review/test/python`) we can run only `review/test/python/functional_tests` and `review/test/python/inspectors`. But `functional_tests` is used only for checking if the tool runs correctly for different CLI configurations. Tests affecting the tool correctness only are in `review/test/python/inspectors`.

Please, change the production configuration for tests running.


Discussion / hints:

Fix patch:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 912f8a92..91efc8bf 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,11 +7,23 @@ jobs:
   build:
     runs-on: ubuntu-latest
     # Consistent with base image in Dockerfile
-    container: stepik/hyperstyle-base:py3.8.11-java11.0.11-node14.17.3
+    # container: stepik/hyperstyle-base:py3.8.11-java11.0.11-node14.17.3
+    container: nastyabirillo/hyperstyle:1.2.1
 
     steps:
+      - name: Install git
+        run: |
+            apt-get update
+            apt-get -y install git
+
+      - name: Check env variables
+        run: |
+            echo $DETEKT_DIRECTORY && echo $DETEKT_VERSION
+            echo $CHECKSTYLE_DIRECTORY && echo CHECKSTYLE_VERSION
+            echo $PMD_DIRECTORY && echo PMD_VERSION
+
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
 
       - name: Install requirements
         run: |
@@ -22,8 +34,22 @@ jobs:
           # stop the build if there are Python syntax errors or undefined names
           flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics --exclude=.git,__pycache__,docs/source/conf.py,old,build,dist,venv,test/resources,.eggs,review.egg-info,.pytest_cache,node_modules
           # TODO: change max-complexity into 10 after refactoring
+          # TODO: remove R504, A003, E800, E402, WPS1, WPS2, WPS3, WPS4, WPS5, WPS6, H601
           flake8 . --count --max-complexity=11 --max-line-length=120 --max-doc-length=120 --ignore=R504,A003,E800,E402,W503,WPS,H601 --statistics --exclude=.git,__pycache__,docs/source/conf.py,old,build,dist,venv,test/resources,.eggs,review.egg-info,.pytest_cache,node_modules
 
+      - name: Sort whitelists
+        run: |
+            for file in "whitelist.txt" "src/python/review/inspectors/flake8/whitelist.txt"
+            do
+            LC_ALL=C sort $file -o $file
+            done
+
+      - name: Commit sorted whitelists
+        uses: EndBug/add-and-commit@v7.2.1
+        with:
+          add: "['whitelist.txt', 'src/python/review/inspectors/flake8/whitelist.txt']"
+          message: 'Sort whitelists (Github Actions)'
+
       - name: Set up Eslint
         run: |
           # Consistent with eslint version in Dockerfile
diff --git a/Dockerfile b/Dockerfile
index b33c5f72..0a1ac5ba 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,4 +9,34 @@ RUN pip install --no-cache-dir \
     -r review/requirements.txt \
     ./review
 
+ENV LINTERS_DIRECTORY      /opt/linters
+
+ENV CHECKSTYLE_VERSION  8.44
+ENV CHECKSTYLE_DIRECTORY  ${LINTERS_DIRECTORY}/checkstyle
+
+ENV DETEKT_VERSION  1.14.2
+ENV DETEKT_DIRECTORY  ${LINTERS_DIRECTORY}/detekt
+
+ENV PMD_VERSION  6.36.0
+ENV PMD_DIRECTORY  ${LINTERS_DIRECTORY}/pmd
+
+RUN mkdir -p ${CHECKSTYLE_DIRECTORY} && mkdir -p ${DETEKT_DIRECTORY} && mkdir -p ${PMD_DIRECTORY}
+
+RUN apt -y update && apt -y upgrade
+
+# Install Curl and Unzip
+RUN apt -y install curl unzip
+
+# Install Detekt and Detekt-formatting
+RUN curl -sSLO https://github.com/detekt/detekt/releases/download/v${DETEKT_VERSION}/detekt-cli-${DETEKT_VERSION}.zip \
+    && unzip detekt-cli-${DETEKT_VERSION}.zip -d ${DETEKT_DIRECTORY} \
+    &&  curl -H "Accept: application/zip" https://repo.maven.apache.org/maven2/io/gitlab/arturbosch/detekt/detekt-formatting/${DETEKT_VERSION}/detekt-formatting-${DETEKT_VERSION}.jar -o ${DETEKT_DIRECTORY}/detekt-formatting-${DETEKT_VERSION}.jar
+
+# Install Checkstyle
+RUN curl -L https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${CHECKSTYLE_VERSION}/checkstyle-${CHECKSTYLE_VERSION}-all.jar > ${CHECKSTYLE_DIRECTORY}/checkstyle-${CHECKSTYLE_VERSION}-all.jar
+
+# Install PMD
+RUN curl -sSLO https://github.com/pmd/pmd/releases/download/pmd_releases/${PMD_VERSION}/pmd-bin-${PMD_VERSION}.zip \
+    && unzip pmd-bin-${PMD_VERSION}.zip -d ${PMD_DIRECTORY}
+
 CMD ["/bin/bash"]
diff --git a/README.md b/README.md
index 24db74c0..c8b7bbb6 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ The source code of **hyperstyle** is distributed under the Apache 2.0 License.
 
 The 3rd party software we use in this project has its own licenses.
 
-Python language:
+Python language (all versions can be found in the (requirements.txt)[requirements.txt] file):
 
 - [x]  flake8 [MIT]
     * [Site and docs](https://flake8.pycqa.org/en/latest/)
@@ -40,26 +40,19 @@ Python language:
 
 Java language:
 
-- [x]  PMD [BSD]
+- [x]  PMD [BSD] (Version: 6.36.0)
     * [Site and docs](https://pmd.github.io/)
     * [Repository](https://github.com/pmd/pmd)
   
-- [x]  Checkstyle [GNU LGPL v2.1]
+- [x]  Checkstyle [GNU LGPL v2.1] (Version: 8.44)
     * [Site and docs](https://checkstyle.sourceforge.io/)
     * [Repository](https://github.com/checkstyle/checkstyle)
-  
-- [ ]  SpotBugs [GNU LGPL v2.1]
-    * [Site and docs](https://spotbugs.github.io/)
-    * [Repository](https://github.com/spotbugs/spotbugs)
-  
-- [ ]  SpringLint
-    * [Repository](https://github.com/mauricioaniche/springlint)
 
 
 
 Kotlin language:
 
-- [x]  Detekt [Apache 2.0]
+- [x]  Detekt [Apache 2.0] (Version: 1.14.2)
     * [Site and docs](https://detekt.github.io/detekt/)
     * [Repository](https://github.com/detekt/detekt)
 
@@ -67,7 +60,7 @@ Kotlin language:
 
 JavaScript language:
 
-- [x]  ESlint [MIT]
+- [x]  ESlint [MIT] (Version: 7.5.0)
     * [Site and docs](https://eslint.org/)
     * [Repository](https://github.com/eslint/eslint)
   
@@ -80,6 +73,37 @@ Simply clone the repository and run the following commands:
 1. `pip install -r requirements.txt`
 2. `pip install -r requirements-test.txt` for tests
 
+Also, you should set up the environment with Java and Kotlin linters sources.
+You have to create set of environment variables:
+- `CHECKSTYLE_VERSION` (the value of the variable must be the same with its value in [Dockerfile](Dockerfile))
+- `CHECKSTYLE_DIRECTORY` (the directory with `CHECKSTYLE` linter sources)
+- `DETEKT_VERSION` (the value of the variable must be the same with its value in [Dockerfile](Dockerfile))
+- `DETEKT_DIRECTORY` (the directory with `DETEKT` linter sources)
+- `PMD_VERSION` (the value of the variable must be the same with its value in [Dockerfile](Dockerfile))
+- `PMD_DIRECTORY` (the directory with `PMD` linter sources)
+
+You can download all sources manually or by the following commands:
+- `CHECKSTYLE`: 
+```bash
+curl -L https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${CHECKSTYLE_VERSION}/checkstyle-${CHECKSTYLE_VERSION}-all.jar > ${CHECKSTYLE_DIRECTORY}/checkstyle-${CHECKSTYLE_VERSION}-all.jar
+```
+- `DETEKT`: 
+```bash
+curl -sSLO https://github.com/detekt/detekt/releases/download/v${DETEKT_VERSION}/detekt-cli-${DETEKT_VERSION}.zip \
+&& unzip detekt-cli-${DETEKT_VERSION}.zip -d ${DETEKT_DIRECTORY} \
+&&  curl -H "Accept: application/zip" https://repo.maven.apache.org/maven2/io/gitlab/arturbosch/detekt/detekt-formatting/${DETEKT_VERSION}/detekt-formatting-${DETEKT_VERSION}.jar -o ${DETEKT_DIRECTORY}/detekt-formatting-${DETEKT_VERSION}.jar
+```
+- `PMD`: 
+```bash
+curl -sSLO https://github.com/pmd/pmd/releases/download/pmd_releases/${PMD_VERSION}/pmd-bin-${PMD_VERSION}.zip \
+&& unzip pmd-bin-${PMD_VERSION}.zip -d ${PMD_DIRECTORY}
+```
+
+_In the future we will add a bash script that will do it automatically._ 
+
+**Alternatively**, you can build a docker image by [Dockerfile](Dockerfile) and run the tool inside this image.
+Or use the public docker image, that we use in the [build.yml](.github/workflows/build.yml) file.
+
 ## Usage
 
 Run the [run_tool.py](./src/python/review/run_tool.py) with the arguments.
@@ -97,12 +121,15 @@ Argument | Description
 **&#8209;v**, **&#8209;&#8209;verbosity** |  choose logging level according [this](https://docs.python.org/3/library/logging.html#levels) list: `1` - **ERROR**; `2` - **INFO**; `3` - **DEBUG**; `0` - disable logging (**CRITICAL** value); default value is `0` (**CRITICAL**).
 **&#8209;d**, **&#8209;&#8209;disable**   |  disable inspectors. Available values: for **Python** language: `pylint` for [Pylint](https://github.com/PyCQA/pylint), `flake8` for [flake8](https://flake8.pycqa.org/en/latest/), `radon` for [Radon](https://radon.readthedocs.io/en/latest/), `python_ast` to check different measures providing by AST; for **Java** language: `checkstyle` for the [Checkstyle](https://checkstyle.sourceforge.io/), `pmd` for [PMD](https://pmd.github.io/); for `Kotlin` language: detekt for [Detekt](https://detekt.github.io/detekt/); for **JavaScript** language: `eslint` for [ESlint](https://eslint.org/). Example: `-d pylint,flake8`.
 **&#8209;&#8209;allow-duplicates**        |  allow duplicate issues found by different linters. By default, duplicates are skipped.
-**&#8209;&#8209;language-version**, **&#8209;&#8209;language_version**  |  specify the language version for JAVA inspectors. Available values: `java7`, `java8`, `java9`, `java11`. **Note**: **&#8209;&#8209;language_version** is deprecated. Will be deleted in the future.
+**&#8209;&#8209;language-version**, **&#8209;&#8209;language_version**  |  specify the language version for JAVA inspectors. Available values: `java7`, `java8`, `java9`, `java11`, `java15`. **Note**: **&#8209;&#8209;language_version** is deprecated and will be deleted in the future.
 **&#8209;&#8209;n-cpu**, **&#8209;&#8209;n_cpu**  |  specify number of _cpu_ that can be used to run inspectors. **Note**: **&#8209;&#8209;n_cpu** is deprecated. Will be deleted in the future.
 **&#8209;f**, **&#8209;&#8209;format**    |  the output format. Available values: `json`, `text`. Default value is `json`.
 **&#8209;s**, **&#8209;&#8209;start-line**|  the first line to be analyzed. By default it starts from `1`.
 **&#8209;e**, **&#8209;&#8209;end-line**  |  the end line to be analyzed. The default value is `None`, which meant to handle file by the end.
 **&#8209;&#8209;new-format**              |  the argument determines whether the tool should use the _new format_. _New format_ means separating the result by the files to allow getting quality and observed issues for each file separately. The default value is `False`.
+**&#8209;&#8209;history**                 |  JSON string with a list of issues for each language. For each issue its class and quantity are specified. Example: `--history "{\"python\": [{\"origin_class\": \"SC200\", \"number\": 20}, {\"origin_class\": \"WPS314\", \"number\": 3}]}"`
+**&#8209;&#8209;with&#8209;all&#8209;categories** | Without this flag, all issues will be categorized into 5 main categories: `CODE_STYLE`, `BEST_PRACTICES`, `ERROR_PRONE`, `COMPLEXITY`, `INFO`.
+**&#8209;&#8209;group&#8209;by&#8209;difficulty** | With this flag, the final grade and influence on penalty will be grouped by the issue difficulty.
 
 The output examples:
 
@@ -123,7 +150,9 @@ The output examples:
       "line": "<the code line>",
       "line_number": 54,
       "column_number": 0,
-      "category": "FUNC_LEN"
+      "category": "FUNC_LEN",
+      "difficulty": "EASY",
+      "influence_on_penalty": 0 
     },
     ...
   ]
@@ -152,7 +181,104 @@ The output examples:
           "line": "<the code line>",
           "line_number": 174,
           "column_number": 12,
-          "category": "BEST_PRACTICES"
+          "category": "BEST_PRACTICES", 
+          "difficulty": "MEDIUM",
+          "influence_on_penalty": 0 
+        },
+        ...
+      ]
+    }
+  ]
+}
+```
+
+3. Json `old format` (with **&#8209;&#8209;group&#8209;by&#8209;difficulty** argument):
+
+```json
+{
+  "quality": {
+    "EASY": {
+      "code": "BAD",
+      "text": "Code quality (beta): BAD"
+    },
+    "MEDIUM": {
+      "code": "BAD",
+      "text": "Code quality (beta): BAD"
+    },
+    "HARD": {
+      "code": "BAD",
+      "text": "Code quality (beta): BAD"
+    }
+  },
+  "issues": [
+    {
+      "code": "C002",
+      "text": "Too long function. Try to split it into smaller functions / methods.It will make your code easy to understand and less error prone.",
+      "line": "<the code line>",
+      "line_number": 54,
+      "column_number": 0,
+      "category": "FUNC_LEN",
+      "difficulty": "EASY",
+      "influence_on_penalty": {
+        "EASY": 0,
+        "MEDIUM": 0,
+        "HARD": 0
+      }
+    },
+    ...
+  ]
+}
+```
+
+4. Json `new format` (with **&#8209;&#8209;group&#8209;by&#8209;difficulty** argument)
+
+```json
+{
+  "quality": {
+    "EASY": {
+      "code": "BAD",
+      "text": "Code quality (beta): BAD"
+    },
+    "MEDIUM": {
+      "code": "BAD",
+      "text": "Code quality (beta): BAD"
+    },
+    "HARD": {
+      "code": "BAD",
+      "text": "Code quality (beta): BAD"
+    }
+  },
+  "file_review_results": [
+    {
+      "file_name": "<your file>",
+      "quality": {
+        "EASY": {
+          "code": "BAD",
+          "text": "Code quality (beta): BAD"
+        },
+        "MEDIUM": {
+          "code": "BAD",
+          "text": "Code quality (beta): BAD"
+        },
+        "HARD": {
+          "code": "BAD",
+          "text": "Code quality (beta): BAD"
+        }
+      },
+      "issues": [
+        {
+          "code": "W0703",
+          "text": "Catching too general exception Exception",
+          "line": "<the code line>",
+          "line_number": 174,
+          "column_number": 12,
+          "category": "BEST_PRACTICES",
+          "difficulty": "MEDIUM",
+          "influence_on_penalty": {
+            "EASY": 0,
+            "MEDIUM": 0,
+            "HARD": 0
+          }
         },
         ...
       ]
@@ -161,7 +287,7 @@ The output examples:
 }
 ```
 
-3. Text format:
+5. Text format:
 
 ```text
 Review of <path to your file or project> (N violations)
diff --git a/VERSION.md b/VERSION.md
index 26aaba0e..6085e946 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1,1 +1,1 @@
-1.2.0
+1.2.1
diff --git a/setup.py b/setup.py
index 8b23d17a..7a119b2e 100644
--- a/setup.py
+++ b/setup.py
@@ -28,10 +28,15 @@ def get_inspectors_additional_files() -> List[str]:
     return result
 
 
+def get_requires() -> List[str]:
+    with open(current_dir / 'requirements.txt') as requirements_file:
+        return requirements_file.read().split('\n')
+
+
 setup(
-    name='review',
+    name='hyperstyle',
     version=get_version(),
-    description='review',
+    description='A tool for running a set of pre-configured linters and evaluating code quality.',
     long_description=get_long_description(),
     long_description_content_type='text/markdown',
     url='https://github.com/hyperskill/hyperstyle',
@@ -47,7 +52,7 @@ def get_inspectors_additional_files() -> List[str]:
     ],
     keywords='code review',
     python_requires='>=3.8, <4',
-    install_requires=['upsourceapi'],
+    install_requires=get_requires(),
     packages=find_packages(exclude=[
         '*.unit_tests',
         '*.unit_tests.*',
diff --git a/src/python/common/tool_arguments.py b/src/python/common/tool_arguments.py
index db0c77da..025a1006 100644
--- a/src/python/common/tool_arguments.py
+++ b/src/python/common/tool_arguments.py
@@ -72,3 +72,14 @@ class RunToolArgument(Enum):
     NEW_FORMAT = ArgumentsInfo(None, '--new-format',
                                'The argument determines whether the tool '
                                'should use the new format')
+
+    HISTORY = ArgumentsInfo(None, '--history',
+                            'Json string, which contains lists of issues in the previous submissions '
+                            'for other tasks for one user.')
+
+    WITH_ALL_CATEGORIES = ArgumentsInfo(None, '--with-all-categories',
+                                        'Without this flag, all issues will be categorized into 5 main categories: '
+                                        'CODE_STYLE, BEST_PRACTICES, ERROR_PRONE, COMPLEXITY, INFO.')
+
+    GROUP_BY_DIFFICULTY = ArgumentsInfo(None, '--group-by-difficulty',
+                                        'With this flag, the final grade will be grouped by the issue difficulty.')
diff --git a/src/python/review/application_config.py b/src/python/review/application_config.py
index 6032aef3..07a72780 100644
--- a/src/python/review/application_config.py
+++ b/src/python/review/application_config.py
@@ -1,6 +1,6 @@
 from dataclasses import dataclass
 from enum import Enum, unique
-from typing import List, Optional, Set
+from typing import Dict, List, Optional, Set
 
 from src.python.review.common.file_system import Extension
 from src.python.review.inspectors.inspector_type import InspectorType
@@ -12,9 +12,12 @@ class ApplicationConfig:
     allow_duplicates: bool
     n_cpu: int
     inspectors_config: dict
+    with_all_categories: bool
     start_line: int = 1
     end_line: Optional[int] = None
     new_format: bool = False
+    history: Optional[str] = None
+    group_by_difficulty: bool = False
 
 
 @unique
@@ -23,25 +26,30 @@ class LanguageVersion(Enum):
     JAVA_8 = 'java8'
     JAVA_9 = 'java9'
     JAVA_11 = 'java11'
+    JAVA_15 = 'java15'
     PYTHON_3 = 'python3'
     KOTLIN = 'kotlin'
+    JS = 'javascript'
 
     @classmethod
     def values(cls) -> List[str]:
         return [member.value for member in cls.__members__.values()]
 
     @classmethod
-    def language_to_extension_dict(cls) -> dict:
-        return {cls.PYTHON_3.value: Extension.PY.value,
-                cls.JAVA_7.value: Extension.JAVA.value,
-                cls.JAVA_8.value: Extension.JAVA.value,
-                cls.JAVA_9.value: Extension.JAVA.value,
-                cls.JAVA_11.value: Extension.JAVA.value,
-                cls.KOTLIN.value: Extension.KT.value}
+    def language_to_extension_dict(cls) -> Dict['LanguageVersion', Extension]:
+        return {
+            cls.JAVA_7: Extension.JAVA,
+            cls.JAVA_8: Extension.JAVA,
+            cls.JAVA_9: Extension.JAVA,
+            cls.JAVA_11: Extension.JAVA,
+            cls.JAVA_15: Extension.JAVA,
+            cls.PYTHON_3: Extension.PY,
+            cls.KOTLIN: Extension.KT,
+            cls.JS: Extension.JS,
+        }
 
-    @classmethod
-    def language_by_extension(cls, lang: str) -> str:
-        return cls.language_to_extension_dict()[lang]
+    def extension_by_language(self) -> Extension:
+        return self.language_to_extension_dict()[self]
 
     def is_java(self) -> bool:
         return (
@@ -49,4 +57,12 @@ def is_java(self) -> bool:
             or self == LanguageVersion.JAVA_8
             or self == LanguageVersion.JAVA_9
             or self == LanguageVersion.JAVA_11
+            or self == LanguageVersion.JAVA_15
         )
+
+    @classmethod
+    def from_value(cls, value: str, default=None):
+        try:
+            return LanguageVersion(value)
+        except ValueError:
+            return default
diff --git a/src/python/review/common/file_system.py b/src/python/review/common/file_system.py
index 5c53d9d4..0232d723 100644
--- a/src/python/review/common/file_system.py
+++ b/src/python/review/common/file_system.py
@@ -4,7 +4,7 @@
 from contextlib import contextmanager
 from enum import Enum, unique
 from pathlib import Path
-from typing import Callable, List, Union
+from typing import Callable, List, Tuple, Union
 
 
 @unique
@@ -30,6 +30,12 @@ class Extension(Enum):
     JS = '.js'
     KTS = '.kts'
 
+    # Not empty extensions are returned with a dot, for example, '.txt'
+    # If file has no extensions, an empty one ('') is returned
+    @classmethod
+    def get_extension_from_file(cls, file: Union[Path, str]) -> 'Extension':
+        return Extension(os.path.splitext(file)[1])
+
 
 ItemCondition = Callable[[str], bool]
 
@@ -40,8 +46,12 @@ def all_items_condition(name: str) -> bool:
 
 # To get all files or subdirs (depends on the last parameter) from root that match item_condition
 # Note that all subdirs or files already contain the full path for them
-def get_all_file_system_items(root: Path, item_condition: ItemCondition = all_items_condition,
-                              item_type: FileSystemItem = FileSystemItem.FILE) -> List[Path]:
+def get_all_file_system_items(
+    root: Path,
+    item_condition: ItemCondition = all_items_condition,
+    item_type: FileSystemItem = FileSystemItem.FILE,
+    without_subdirs: bool = False,
+) -> List[Path]:
     if not root.is_dir():
         raise ValueError(f'The {root} is not a directory')
 
@@ -50,6 +60,10 @@ def get_all_file_system_items(root: Path, item_condition: ItemCondition = all_it
         for item in fs_tuple[item_type.value]:
             if item_condition(item):
                 items.append(Path(os.path.join(fs_tuple[FileSystemItem.PATH.value], item)))
+
+        if without_subdirs:
+            break
+
     return items
 
 
@@ -60,15 +74,8 @@ def new_temp_dir() -> Path:
         yield Path(temp_dir)
 
 
-# File should contain the full path and its extension.
-# Create all parents if necessary
-def create_file(file_path: Union[str, Path], content: str):
-    file_path = Path(file_path)
-
-    os.makedirs(os.path.dirname(file_path), exist_ok=True)
-    with open(file_path, 'w+') as f:
-        f.writelines(content)
-        yield Path(file_path)
+def new_temp_file(suffix: Extension = Extension.EMPTY) -> Tuple[str, str]:
+    yield tempfile.mkstemp(suffix=suffix.value)
 
 
 def get_file_line(path: Path, line_number: int):
@@ -85,7 +92,25 @@ def get_content_from_file(file_path: Path, encoding: str = Encoding.ISO_ENCODING
         return content if not to_strip_nl else content.rstrip('\n')
 
 
-# Not empty extensions are returned with a dot, for example, '.txt'
-# If file has no extensions, an empty one ('') is returned
-def get_extension_from_file(file: Path) -> Extension:
-    return Extension(os.path.splitext(file)[1])
+# Before using it, check that there are no line breaks in the string
+def __is_line_empty(line: str) -> bool:
+    return len(line.strip()) == 0
+
+
+def __is_comment(line: str) -> bool:
+    return line.strip().startswith(('#', '//'))
+
+
+def get_total_code_lines_from_file(path: Path) -> int:
+    code = get_content_from_file(path, to_strip_nl=False)
+    return get_total_code_lines_from_code(code)
+
+
+def get_total_code_lines_from_code(code: str) -> int:
+    lines = code.splitlines()
+    return len(list(filter(lambda line: not __is_line_empty(line) and not __is_comment(line), lines)))
+
+
+def check_set_up_env_variable(variable_name: str):
+    if variable_name not in os.environ:
+        raise KeyError(f'{variable_name} was not set up!')
diff --git a/src/python/review/common/language.py b/src/python/review/common/language.py
index 48780467..46851ce3 100644
--- a/src/python/review/common/language.py
+++ b/src/python/review/common/language.py
@@ -2,7 +2,8 @@
 from pathlib import Path
 from typing import List
 
-from src.python.review.common.file_system import Extension, get_extension_from_file
+from src.python.review.application_config import LanguageVersion
+from src.python.review.common.file_system import Extension
 
 
 @unique
@@ -13,6 +14,32 @@ class Language(Enum):
     JS = 'JAVASCRIPT'
     UNKNOWN = 'UNKNOWN'
 
+    @staticmethod
+    def from_language_version(language_version: LanguageVersion) -> 'Language':
+        version_to_lang = {
+            LanguageVersion.JAVA_7: Language.JAVA,
+            LanguageVersion.JAVA_8: Language.JAVA,
+            LanguageVersion.JAVA_9: Language.JAVA,
+            LanguageVersion.JAVA_11: Language.JAVA,
+            LanguageVersion.JAVA_15: Language.JAVA,
+            LanguageVersion.PYTHON_3: Language.PYTHON,
+            LanguageVersion.KOTLIN: Language.KOTLIN,
+            LanguageVersion.JS: Language.JS,
+        }
+
+        return version_to_lang.get(language_version, Language.UNKNOWN)
+
+    @classmethod
+    def values(cls) -> List[str]:
+        return [member.value for member in Language]
+
+    @classmethod
+    def from_value(cls, value: str, default=None):
+        try:
+            return Language(value)
+        except ValueError:
+            return default
+
 
 EXTENSION_TO_LANGUAGE = {
     Extension.JAVA: Language.JAVA,
@@ -24,7 +51,7 @@ class Language(Enum):
 
 
 def guess_file_language(file_path: Path) -> Language:
-    return EXTENSION_TO_LANGUAGE.get(get_extension_from_file(file_path), Language.UNKNOWN)
+    return EXTENSION_TO_LANGUAGE.get(Extension.get_extension_from_file(file_path), Language.UNKNOWN)
 
 
 def filter_paths_by_language(file_paths: List[Path], language: Language) -> List[Path]:
diff --git a/src/python/review/inspectors/base_inspector.py b/src/python/review/inspectors/base_inspector.py
index 2fc92e93..032f6f60 100644
--- a/src/python/review/inspectors/base_inspector.py
+++ b/src/python/review/inspectors/base_inspector.py
@@ -1,6 +1,6 @@
 import abc
 from pathlib import Path
-from typing import List
+from typing import Any, Dict, List
 
 from src.python.review.inspectors.inspector_type import InspectorType
 from src.python.review.inspectors.issue import BaseIssue
@@ -30,5 +30,5 @@ def inspector_type(self) -> InspectorType:
         raise NotImplementedError('inspector_type property not implemented yet')
 
     @abc.abstractmethod
-    def inspect(self, path: Path, config: dict) -> List[BaseIssue]:
+    def inspect(self, path: Path, config: Dict[str, Any]) -> List[BaseIssue]:
         raise NotImplementedError('inspect method not implemented yet')
diff --git a/src/python/review/inspectors/checkstyle/checkstyle.py b/src/python/review/inspectors/checkstyle/checkstyle.py
index c796fbf9..bc841676 100644
--- a/src/python/review/inspectors/checkstyle/checkstyle.py
+++ b/src/python/review/inspectors/checkstyle/checkstyle.py
@@ -1,29 +1,32 @@
 import logging
+import os
 from pathlib import Path
-from typing import List
+from typing import Any, Dict, List
 
-from src.python.review.common.file_system import new_temp_dir
+from src.python.review.common.file_system import check_set_up_env_variable, new_temp_dir
 from src.python.review.common.subprocess_runner import run_in_subprocess
 from src.python.review.inspectors.base_inspector import BaseInspector
 from src.python.review.inspectors.checkstyle.issue_types import CHECK_CLASS_NAME_TO_ISSUE_TYPE
 from src.python.review.inspectors.inspector_type import InspectorType
-from src.python.review.inspectors.issue import BaseIssue, IssueType
-from src.python.review.inspectors.parsers.checkstyle_parser import parse_checkstyle_file_result
+from src.python.review.inspectors.issue import BaseIssue, IssueDifficulty, IssueType
+from src.python.review.inspectors.parsers.xml_parser import parse_xml_file_result
 
 logger = logging.getLogger(__name__)
 
+CHECKSTYLE_DIRECTORY_ENV = 'CHECKSTYLE_DIRECTORY'
+check_set_up_env_variable(CHECKSTYLE_DIRECTORY_ENV)
+CHECKSTYLE_VERSION_ENV = 'CHECKSTYLE_VERSION'
+check_set_up_env_variable(CHECKSTYLE_VERSION_ENV)
+
+PATH_CHECKSTYLE_JAR = f'{os.environ[CHECKSTYLE_DIRECTORY_ENV]}/checkstyle-{os.environ[CHECKSTYLE_VERSION_ENV]}-all.jar'
+
 PATH_TOOLS_PMD_FILES = Path(__file__).parent / 'files'
-PATH_TOOLS_CHECKSTYLE_JAR = PATH_TOOLS_PMD_FILES / 'checkstyle.jar'
 PATH_TOOLS_CHECKSTYLE_CONFIG = PATH_TOOLS_PMD_FILES / 'config.xml'
 
 
 class CheckstyleInspector(BaseInspector):
     inspector_type = InspectorType.CHECKSTYLE
 
-    skipped_issues = [
-        'EmptyLineSeparatorCheck',
-    ]
-
     origin_class_to_pattern = {
         'CyclomaticComplexityCheck':
             r'Cyclomatic Complexity is (\d+)',
@@ -41,28 +44,30 @@ class CheckstyleInspector(BaseInspector):
     @classmethod
     def _create_command(cls, path: Path, output_path: Path) -> List[str]:
         return [
-            'java', '-jar', PATH_TOOLS_CHECKSTYLE_JAR,
+            'java', '-jar', PATH_CHECKSTYLE_JAR,
             '-c', PATH_TOOLS_CHECKSTYLE_CONFIG,
             '-f', 'xml', '-o', output_path, str(path),
         ]
 
-    def inspect(self, path: Path, config: dict) -> List[BaseIssue]:
+    def inspect(self, path: Path, config: Dict[str, Any]) -> List[BaseIssue]:
         with new_temp_dir() as temp_dir:
             output_path = temp_dir / 'output.xml'
             command = self._create_command(path, output_path)
             run_in_subprocess(command)
 
-            issues = parse_checkstyle_file_result(Path(output_path),
-                                                  self.inspector_type,
-                                                  self.choose_issue_type,
-                                                  self.origin_class_to_pattern)
-            return [
-                issue for issue in issues
-                if issue.origin_class not in self.skipped_issues
-            ]
+            return parse_xml_file_result(Path(output_path),
+                                         self.inspector_type,
+                                         self.choose_issue_type,
+                                         IssueDifficulty.get_by_issue_type,
+                                         self.origin_class_to_pattern)
 
     @classmethod
     def choose_issue_type(cls, check_class: str) -> IssueType:
+        """
+        Defines IssueType by Checkstyle check class using config.
+        """
+
+        # Example: com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck -> LineLengthCheck
         check_class_name = check_class.split('.')[-1]
         issue_type = CHECK_CLASS_NAME_TO_ISSUE_TYPE.get(check_class_name)
         if not issue_type:
diff --git a/src/python/review/inspectors/checkstyle/files/checkstyle.jar b/src/python/review/inspectors/checkstyle/files/checkstyle.jar
deleted file mode 100644
index f1f720eb..00000000
Binary files a/src/python/review/inspectors/checkstyle/files/checkstyle.jar and /dev/null differ
diff --git a/src/python/review/inspectors/checkstyle/files/config.xml b/src/python/review/inspectors/checkstyle/files/config.xml
index 81fbc370..f49b5267 100644
--- a/src/python/review/inspectors/checkstyle/files/config.xml
+++ b/src/python/review/inspectors/checkstyle/files/config.xml
@@ -4,26 +4,17 @@
         "https://checkstyle.org/dtds/configuration_1_3.dtd">
 
 <module name="Checker">
-    <property name="fileExtensions" value="java, properties, xml"/>
+    <property name="fileExtensions" value="java"/>
 
-    <!-- Checks whether files end with a new line.                        -->
-    <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
-    <!--    <module name="NewlineAtEndOfFile"/>-->
+    <!-- This config was created using the following table: https://bit.ly/3BbxmD5 -->
 
-    <!-- Miscellaneous other checks.                   -->
-    <!-- See http://checkstyle.sf.net/config_misc.html -->
-<!--    <module name="RegexpSingleline">-->
-<!--        <property name="format" value="\s+$"/>-->
-<!--        <property name="minimum" value="0"/>-->
-<!--        <property name="maximum" value="0"/>-->
-<!--        <property name="message" value="Line has trailing spaces."/>-->
-<!--    </module>-->
+    <!-- Size Violations -->
+    <module name="LineLength">
+        <property name="max" value="120"/>
+    </module>
 
     <module name="TreeWalker">
-<!--        <module name="SuppressionCommentFilter"/>-->
-
-        <!-- Checks for blocks. You know, those {}'s         -->
-        <!-- See http://checkstyle.sf.net/config_blocks.html -->
+        <!-- Block Checks -->
         <module name="AvoidNestedBlocks">
             <property name="allowInSwitchCase" value="true"/>
         </module>
@@ -33,14 +24,15 @@
         <module name="NeedBraces"/>
         <module name="RightCurly"/>
 
-        <!-- Checks for common coding problems               -->
-        <!-- See http://checkstyle.sf.net/config_coding.html -->
+        <!-- Coding -->
+        <module name="ArrayTrailingComma"/>
         <module name="CovariantEquals"/>
         <module name="DefaultComesLast"/>
         <module name="EmptyStatement"/>
         <module name="EqualsAvoidNull"/>
         <module name="EqualsHashCode"/>
         <module name="FallThrough"/>
+        <module name="MagicNumber"/>
         <module name="MissingSwitchDefault"/>
         <module name="ModifiedControlVariable"/>
         <module name="MultipleStringLiterals">
@@ -58,34 +50,35 @@
         <module name="StringLiteralEquality"/>
         <module name="UnnecessaryParentheses"/>
 
-<!--        <module name="UnnecessarySemicolonAfterTypeMemberDeclaration"/> Since Checkstyle 8.24 -->
-<!--        <module name="VariableDeclarationUsageDistance"/>-->
-
-        <!-- Checks for imports                              -->
-        <!-- See http://checkstyle.sf.net/config_import.html -->
-        <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
+        <!-- Imports  -->
         <module name="RedundantImport"/>
         <module name="UnusedImports">
             <property name="processJavadoc" value="false"/>
         </module>
 
-        <!-- Miscellaneous other checks                    -->
-        <!-- See http://checkstyle.sf.net/config_misc.html -->
+        <!-- Metrics -->
+        <module name="BooleanExpressionComplexity">
+            <property name="max" value="0"/>
+        </module>
+        <module name="CyclomaticComplexity">
+            <property name="max" value="0"/>
+            <property name="switchBlockAsSingleDecisionPoint" value="true"/>
+        </module>
+        <module name="JavaNCSS">
+            <property name="methodMaximum" value="0"/>
+        </module>
+
+        <!-- Miscellaneous -->
         <module name="ArrayTypeStyle"/>
-        <module name="TodoComment"/>
-        <module name="UpperEll"/>
+        <module name="CommentsIndentation"/>
         <module name="Indentation"/>
+        <module name="UpperEll"/>
 
-        <!-- Modifier Checks                                    -->
-        <!-- See http://checkstyle.sf.net/config_modifiers.html -->
+        <!-- Modifiers -->
         <module name="ModifierOrder"/>
-<!--        <module name="RedundantModifier"/>-->
 
-        <!-- Checks for Naming Conventions.                  -->
-        <!-- See http://checkstyle.sf.net/config_naming.html -->
-        <module name="AbbreviationAsWordInName">
-            <property name="allowedAbbreviationLength" value="3"/>
-        </module>
+        <!-- Naming Conventions -->
+        <module name="AbbreviationAsWordInName"/>
         <module name="ConstantName">
             <property name="format" value="^log(ger)?$|^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$"/>
             <message key="name.invalidPattern"
@@ -125,16 +118,13 @@
                      value="Name ''{0}'' must use PascalCase (checked pattern ''{1}'')."/>
         </module>
 
-        <!-- Checks for Size Violations.                    -->
-        <!-- See http://checkstyle.sf.net/config_sizes.html -->
-        <module name="LineLength">
-            <property name="max" value="120"/>
+        <!-- Size Violations -->
+        <module name="ParameterNumber">
+            <!-- Consistent with the ExcessiveParameterList rule from PMD config -->
+            <property name="max" value="9"/>
         </module>
-<!--        <module name="MethodLength"/>-->
-        <module name="ParameterNumber"/>
 
-        <!-- Checks for whitespace                               -->
-        <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+        <!-- Whitespaces -->
         <module name="EmptyForIteratorPad"/>
         <module name="EmptyLineSeparator">
             <property name="allowNoEmptyLineBetweenFields" value="true"/>
@@ -145,27 +135,14 @@
         <module name="NoWhitespaceBefore"/>
         <module name="OperatorWrap">
             <property name="tokens"
-                value="ASSIGN,DIV_ASSIGN,PLUS_ASSIGN,MINUS_ASSIGN,STAR_ASSIGN,MOD_ASSIGN,
+                      value="ASSIGN,DIV_ASSIGN,PLUS_ASSIGN,MINUS_ASSIGN,STAR_ASSIGN,MOD_ASSIGN,
                 SR_ASSIGN,BSR_ASSIGN,SL_ASSIGN,BXOR_ASSIGN,BOR_ASSIGN,BAND_ASSIGN"/>
             <property name="option" value="eol"/>
         </module>
-
         <module name="ParenPad"/>
         <module name="TypecastParenPad"/>
         <module name="WhitespaceAfter"/>
         <module name="WhitespaceAround"/>
 
-        <!-- Metrics -->
-        <module name="BooleanExpressionComplexity">
-            <property name="max" value="0"/>
-        </module>
-        <module name="JavaNCSS">
-            <property name="methodMaximum" value="0"/>
-        </module>
-        <module name="CyclomaticComplexity">
-            <property name="max" value="0"/>
-            <property name="switchBlockAsSingleDecisionPoint" value="true"/>
-        </module>
-
     </module>
 </module>
diff --git a/src/python/review/inspectors/checkstyle/issue_types.py b/src/python/review/inspectors/checkstyle/issue_types.py
index f89f56b7..faa92701 100644
--- a/src/python/review/inspectors/checkstyle/issue_types.py
+++ b/src/python/review/inspectors/checkstyle/issue_types.py
@@ -3,158 +3,214 @@
 from src.python.review.inspectors.issue import IssueType
 
 CHECK_CLASS_NAME_TO_ISSUE_TYPE: Dict[str, IssueType] = {
-    'AbbreviationAsWordInNameCheck': IssueType.CODE_STYLE,
-    'AbstractClassNameCheck': IssueType.CODE_STYLE,
-    'AnnotationLocationCheck': IssueType.CODE_STYLE,
-    'AnnotationOnSameLineCheck': IssueType.CODE_STYLE,
-    'AnnotationUseStyleCheck': IssueType.CODE_STYLE,
-    'AnonInnerLengthCheck': IssueType.CODE_STYLE,
-    'ArrayTrailingCommaCheck': IssueType.CODE_STYLE,
-    'ArrayTypeStyleCheck': IssueType.CODE_STYLE,
-    'AtclauseOrderCheck': IssueType.CODE_STYLE,
-    'AvoidInlineConditionalsCheck': IssueType.BEST_PRACTICES,
+    # ---- Annotations ----
+    # 'AnnotationLocationCheck': IssueType.CODE_STYLE,
+    # 'AnnotationOnSameLineCheck': IssueType.CODE_STYLE,
+    # 'AnnotationUseStyleCheck': IssueType.CODE_STYLE,
+    # 'MissingDeprecatedCheck': IssueType.CODE_STYLE,
+    # 'MissingOverrideCheck': IssueType.CODE_STYLE,
+    # 'PackageAnnotationCheck': IssueType.CODE_STYLE,
+    # 'SuppressWarningsCheck': IssueType.BEST_PRACTICES,
+    # 'SuppressWarningsHolderCheck': IssueType.BEST_PRACTICES,
+
+    # ---- Block Checks ----
     'AvoidNestedBlocksCheck': IssueType.BEST_PRACTICES,
-    'AvoidStarImportCheck': IssueType.BEST_PRACTICES,
-    'AvoidStaticImportCheck': IssueType.BEST_PRACTICES,
-    'BooleanExpressionComplexityCheck': IssueType.BOOL_EXPR_LEN,
-    'CatchParameterNameCheck': IssueType.CODE_STYLE,
-    'ClassFanOutComplexityCheck': IssueType.CODE_STYLE,
-    'ClassTypeParameterNameCheck': IssueType.CODE_STYLE,
-    'CommentsIndentationCheck': IssueType.CODE_STYLE,
-    'ConstantNameCheck': IssueType.CODE_STYLE,
-    'CovariantEqualsCheck': IssueType.ERROR_PRONE,
-    'CustomImportOrderCheck': IssueType.CODE_STYLE,
-    'CyclomaticComplexityCheck': IssueType.CYCLOMATIC_COMPLEXITY,
-    'DeclarationOrderCheck': IssueType.CODE_STYLE,
-    'DefaultComesLastCheck': IssueType.BEST_PRACTICES,
-    'DescendantTokenCheck': IssueType.CODE_STYLE,
-    'DesignForExtensionCheck': IssueType.CODE_STYLE,
     'EmptyBlockCheck': IssueType.BEST_PRACTICES,
     'EmptyCatchBlockCheck': IssueType.BEST_PRACTICES,
-    'EmptyForInitializerPadCheck': IssueType.BEST_PRACTICES,
-    'EmptyForIteratorPadCheck': IssueType.BEST_PRACTICES,
-    'EmptyLineSeparatorCheck': IssueType.BEST_PRACTICES,
-    'EmptyStatementCheck': IssueType.BEST_PRACTICES,
+    'LeftCurlyCheck': IssueType.CODE_STYLE,
+    'NeedBracesCheck': IssueType.CODE_STYLE,
+    'RightCurlyCheck': IssueType.CODE_STYLE,
+
+    # ---- Class Design ----
+    # 'DesignForExtensionCheck': IssueType.CODE_STYLE,
+    # 'FinalClassCheck': IssueType.CODE_STYLE,
+    # 'HideUtilityClassConstructorCheck': IssueType.CODE_STYLE,
+    # 'InnerTypeLastCheck': IssueType.CODE_STYLE,
+    # 'InterfaceIsTypeCheck': IssueType.CODE_STYLE,
+    # 'MutableExceptionCheck': IssueType.BEST_PRACTICES,
+    # 'OneTopLevelClassCheck': IssueType.BEST_PRACTICES,
+    # 'ThrowsCountCheck': IssueType.BEST_PRACTICES,
+    # 'VisibilityModifierCheck': IssueType.BEST_PRACTICES,
+
+    # ---- Coding ----
+    'ArrayTrailingCommaCheck': IssueType.INFO,
+    'CovariantEqualsCheck': IssueType.ERROR_PRONE,
+    'DefaultComesLastCheck': IssueType.BEST_PRACTICES,
+    'EmptyStatementCheck': IssueType.ERROR_PRONE,
     'EqualsAvoidNullCheck': IssueType.BEST_PRACTICES,
     'EqualsHashCodeCheck': IssueType.ERROR_PRONE,
-    'ExecutableStatementCountCheck': IssueType.BEST_PRACTICES,
-    'ExplicitInitializationCheck': IssueType.BEST_PRACTICES,
     'FallThroughCheck': IssueType.ERROR_PRONE,
-    'FileLengthCheck': IssueType.CODE_STYLE,
-    'FileTabCharacterCheck': IssueType.CODE_STYLE,
-    'FinalClassCheck': IssueType.CODE_STYLE,
-    'FinalLocalVariableCheck': IssueType.CODE_STYLE,
-    'FinalParametersCheck': IssueType.CODE_STYLE,
-    'GenericWhitespaceCheck': IssueType.CODE_STYLE,
-    'HeaderCheck': IssueType.CODE_STYLE,
-    'HiddenFieldCheck': IssueType.CODE_STYLE,
-    'IllegalCatchCheck': IssueType.ERROR_PRONE,
-    'IllegalImportCheck': IssueType.ERROR_PRONE,
-    'IllegalInstantiationCheck': IssueType.ERROR_PRONE,
-    'IllegalThrowsCheck': IssueType.ERROR_PRONE,
-    'IllegalTokenCheck': IssueType.ERROR_PRONE,
-    'IllegalTokenTextCheck': IssueType.ERROR_PRONE,
-    'IllegalTypeCheck': IssueType.ERROR_PRONE,
-    'ImportControlCheck': IssueType.CODE_STYLE,
-    'ImportOrderCheck': IssueType.CODE_STYLE,
-    'IndentationCheck': IssueType.CODE_STYLE,
-    'InnerAssignmentCheck': IssueType.CODE_STYLE,
-    'InnerTypeLastCheck': IssueType.CODE_STYLE,
-    'InterfaceIsTypeCheck': IssueType.CODE_STYLE,
-    'JavadocBlockTagLocationCheck': IssueType.CODE_STYLE,
-    'JavadocMethodCheck': IssueType.CODE_STYLE,
-    'JavadocPackageCheck': IssueType.CODE_STYLE,
-    'JavadocParagraphCheck': IssueType.CODE_STYLE,
-    'JavadocStyleCheck': IssueType.CODE_STYLE,
-    'JavadocTypeCheck': IssueType.CODE_STYLE,
-    'JavadocVariableCheck': IssueType.CODE_STYLE,
-    'JavaNCSSCheck': IssueType.FUNC_LEN,
-    'LambdaParameterNameCheck': IssueType.CODE_STYLE,
-    'LeftCurlyCheck': IssueType.CODE_STYLE,
-    'LineLengthCheck': IssueType.LINE_LEN,
-    'LocalFinalVariableNameCheck': IssueType.CODE_STYLE,
-    'LocalVariableNameCheck': IssueType.CODE_STYLE,
-    'MagicNumberCheck': IssueType.BEST_PRACTICES,
-    'MemberNameCheck': IssueType.CODE_STYLE,
-    'MethodCountCheck': IssueType.CODE_STYLE,
-    'MethodLengthCheck': IssueType.BEST_PRACTICES,
-    'MethodNameCheck': IssueType.CODE_STYLE,
-    'MethodParamPadCheck': IssueType.CODE_STYLE,
-    'MethodTypeParameterNameCheck': IssueType.CODE_STYLE,
-    'MissingCtorCheck': IssueType.ERROR_PRONE,
-    'MissingDeprecatedCheck': IssueType.CODE_STYLE,
-    'MissingJavadocMethodCheck': IssueType.CODE_STYLE,
-    'MissingJavadocPackageCheck': IssueType.CODE_STYLE,
-    'MissingJavadocTypeCheck': IssueType.CODE_STYLE,
-    'MissingOverrideCheck': IssueType.CODE_STYLE,
+    'MagicNumberCheck': IssueType.INFO,
     'MissingSwitchDefaultCheck': IssueType.ERROR_PRONE,
     'ModifiedControlVariableCheck': IssueType.BEST_PRACTICES,
-    'ModifierOrderCheck': IssueType.CODE_STYLE,
     'MultipleStringLiteralsCheck': IssueType.BEST_PRACTICES,
     'MultipleVariableDeclarationsCheck': IssueType.CODE_STYLE,
-    'MutableExceptionCheck': IssueType.BEST_PRACTICES,
-    'NeedBracesCheck': IssueType.CODE_STYLE,
-    'NestedForDepthCheck': IssueType.BEST_PRACTICES,
-    'NestedIfDepthCheck': IssueType.BEST_PRACTICES,
-    'NestedTryDepthCheck': IssueType.BEST_PRACTICES,
-    'NewlineAtEndOfFileCheck': IssueType.CODE_STYLE,
-    'NoCloneCheck': IssueType.ERROR_PRONE,
     'NoFinalizerCheck': IssueType.ERROR_PRONE,
-    'NoLineWrapCheck': IssueType.CODE_STYLE,
-    'NoWhitespaceAfterCheck': IssueType.CODE_STYLE,
-    'NoWhitespaceBeforeCheck': IssueType.CODE_STYLE,
-    'NPathComplexityCheck': IssueType.COMPLEXITY,
     'OneStatementPerLineCheck': IssueType.CODE_STYLE,
-    'OneTopLevelClassCheck': IssueType.BEST_PRACTICES,
-    'OperatorWrapCheck': IssueType.CODE_STYLE,
-    'OrderedPropertiesCheck': IssueType.CODE_STYLE,
-    'OuterTypeFilenameCheck': IssueType.CODE_STYLE,
-    'OuterTypeNumberCheck': IssueType.CODE_STYLE,
     'OverloadMethodsDeclarationOrderCheck': IssueType.BEST_PRACTICES,
-    'PackageAnnotationCheck': IssueType.CODE_STYLE,
-    'PackageDeclarationCheck': IssueType.CODE_STYLE,
-    'PackageNameCheck': IssueType.CODE_STYLE,
     'ParameterAssignmentCheck': IssueType.BEST_PRACTICES,
-    'ParameterNameCheck': IssueType.CODE_STYLE,
-    'ParameterNumberCheck': IssueType.BEST_PRACTICES,
-    'ParenPadCheck': IssueType.CODE_STYLE,
-    'RedundantImportCheck': IssueType.BEST_PRACTICES,
-    'RedundantModifierCheck': IssueType.BEST_PRACTICES,
-    'RegexpCheck': IssueType.ERROR_PRONE,
-    'RegexpHeaderCheck': IssueType.ERROR_PRONE,
-    'RegexpMultilineCheck': IssueType.ERROR_PRONE,
-    'RegexpOnFilenameCheck': IssueType.ERROR_PRONE,
-    'RegexpSinglelineCheck': IssueType.BEST_PRACTICES,
-    'RegexpSinglelineJavaCheck': IssueType.ERROR_PRONE,
-    'RequireThisCheck': IssueType.ERROR_PRONE,
-    'ReturnCountCheck': IssueType.BEST_PRACTICES,
-    'RightCurlyCheck': IssueType.CODE_STYLE,
-    'SeparatorWrapCheck': IssueType.CODE_STYLE,
-    'SimplifyBooleanReturnCheck': IssueType.BEST_PRACTICES,
     'SimplifyBooleanExpressionCheck': IssueType.BEST_PRACTICES,
-    'SingleLineJavadocCheck': IssueType.CODE_STYLE,
-    'SingleSpaceSeparatorCheck': IssueType.CODE_STYLE,
-    'StaticVariableNameCheck': IssueType.CODE_STYLE,
+    'SimplifyBooleanReturnCheck': IssueType.BEST_PRACTICES,
     'StringLiteralEqualityCheck': IssueType.ERROR_PRONE,
-    'SummaryJavadocCheck': IssueType.CODE_STYLE,
-    'SuperCloneCheck': IssueType.ERROR_PRONE,
-    'SuperFinalizeCheck': IssueType.ERROR_PRONE,
-    'SuppressWarningsCheck': IssueType.BEST_PRACTICES,
-    'ThrowsCountCheck': IssueType.BEST_PRACTICES,
-    'TodoCommentCheck': IssueType.BEST_PRACTICES,
-    'TrailingCommentCheck': IssueType.CODE_STYLE,
-    'TranslationCheck': IssueType.BEST_PRACTICES,
-    'TypecastParenPadCheck': IssueType.CODE_STYLE,
-    'TypeNameCheck': IssueType.CODE_STYLE,
-    'UncommentedMainCheck': IssueType.BEST_PRACTICES,
-    'UniquePropertiesCheck': IssueType.ERROR_PRONE,
     'UnnecessaryParenthesesCheck': IssueType.CODE_STYLE,
-    'UnnecessarySemicolonAfterTypeMemberDeclarationCheck': IssueType.CODE_STYLE,
+    # 'AvoidDoubleBraceInitializationCheck': IssueType.BEST_PRACTICES,
+    # 'AvoidInlineConditionalsCheck': IssueType.BEST_PRACTICES,
+    # 'AvoidNoArgumentSuperConstructorCallCheck': IssueType.BEST_PRACTICES,
+    # 'DeclarationOrderCheck': IssueType.CODE_STYLE,
+    # 'ExplicitInitializationCheck': IssueType.BEST_PRACTICES,
+    # 'FinalLocalVariableCheck': IssueType.CODE_STYLE,
+    # 'HiddenFieldCheck': IssueType.CODE_STYLE,
+    # 'IllegalCatchCheck': IssueType.ERROR_PRONE,
+    # 'IllegalInstantiationCheck': IssueType.ERROR_PRONE,
+    # 'IllegalThrowsCheck': IssueType.ERROR_PRONE,
+    # 'IllegalTokenCheck': IssueType.ERROR_PRONE,
+    # 'IllegalTokenTextCheck': IssueType.ERROR_PRONE,
+    # 'IllegalTypeCheck': IssueType.ERROR_PRONE,
+    # 'InnerAssignmentCheck': IssueType.CODE_STYLE,
+    # 'MatchXpathCheck': IssueType.BEST_PRACTICES,
+    # 'MissingCtorCheck': IssueType.ERROR_PRONE,
+    # 'NestedForDepthCheck': IssueType.BEST_PRACTICES,
+    # 'NestedIfDepthCheck': IssueType.BEST_PRACTICES,
+    # 'NestedTryDepthCheck': IssueType.BEST_PRACTICES,
+    # 'NoArrayTrailingCommaCheck': IssueType.CODE_STYLE,
+    # 'NoCloneCheck': IssueType.ERROR_PRONE,
+    # 'NoEnumTrailingCommaCheck': IssueType.CODE_STYLE,
+    # 'PackageDeclarationCheck': IssueType.CODE_STYLE,
+    # 'RequireThisCheck': IssueType.ERROR_PRONE,
+    # 'ReturnCountCheck': IssueType.BEST_PRACTICES,
+    # 'SuperCloneCheck': IssueType.ERROR_PRONE,
+    # 'SuperFinalizeCheck': IssueType.ERROR_PRONE,
+    # 'UnnecessarySemicolonAfterOuterTypeDeclarationCheck': IssueType.CODE_STYLE,
+    # 'UnnecessarySemicolonAfterTypeMemberDeclarationCheck': IssueType.CODE_STYLE,
+    # 'UnnecessarySemicolonInEnumerationCheck': IssueType.CODE_STYLE,
+    # 'UnnecessarySemicolonInTryWithResourcesCheck': IssueType.CODE_STYLE,
+    # 'VariableDeclarationUsageDistanceCheck': IssueType.CODE_STYLE,
+
+    # ---- Headers ----
+    # 'HeaderCheck': IssueType.CODE_STYLE,
+    # 'RegexpHeaderCheck': IssueType.ERROR_PRONE,
+
+    # ---- Imports ----
+    'RedundantImportCheck': IssueType.BEST_PRACTICES,
     'UnusedImportsCheck': IssueType.BEST_PRACTICES,
+    # 'AvoidStarImportCheck': IssueType.BEST_PRACTICES,
+    # 'AvoidStaticImportCheck': IssueType.BEST_PRACTICES,
+    # 'CustomImportOrderCheck': IssueType.CODE_STYLE,
+    # 'IllegalImportCheck': IssueType.ERROR_PRONE,
+    # 'ImportControlCheck': IssueType.CODE_STYLE,
+    # 'ImportOrderCheck': IssueType.CODE_STYLE,
+
+    # ---- Javadoc Comments ----
+    # 'AtclauseOrderCheck': IssueType.CODE_STYLE,
+    # 'InvalidJavadocPositionCheck': IssueType.CODE_STYLE,
+    # 'JavadocBlockTagLocationCheck': IssueType.CODE_STYLE,
+    # 'JavadocContentLocationCheck': IssueType.CODE_STYLE,
+    # 'JavadocMethodCheck': IssueType.CODE_STYLE,
+    # 'JavadocMissingLeadingAsteriskCheck': IssueType.CODE_STYLE,
+    # 'JavadocMissingWhitespaceAfterAsteriskCheck': IssueType.CODE_STYLE,
+    # 'JavadocPackageCheck': IssueType.CODE_STYLE,
+    # 'JavadocParagraphCheck': IssueType.CODE_STYLE,
+    # 'JavadocStyleCheck': IssueType.CODE_STYLE,
+    # 'JavadocTagContinuationIndentationCheck': IssueType.CODE_STYLE,
+    # 'JavadocTypeCheck': IssueType.CODE_STYLE,
+    # 'JavadocVariableCheck': IssueType.CODE_STYLE,
+    # 'MissingJavadocMethodCheck': IssueType.CODE_STYLE,
+    # 'MissingJavadocPackageCheck': IssueType.CODE_STYLE,
+    # 'MissingJavadocTypeCheck': IssueType.CODE_STYLE,
+    # 'NonEmptyAtclauseDescriptionCheck': IssueType.CODE_STYLE,
+    # 'RequireEmptyLineBeforeBlockTagGroupCheck': IssueType.CODE_STYLE,
+    # 'SingleLineJavadocCheck': IssueType.CODE_STYLE,
+    # 'SummaryJavadocCheck': IssueType.CODE_STYLE,
+    # 'WriteTagCheck': IssueType.CODE_STYLE,
+
+    # ---- Metrics ----
+    'BooleanExpressionComplexityCheck': IssueType.BOOL_EXPR_LEN,
+    'CyclomaticComplexityCheck': IssueType.CYCLOMATIC_COMPLEXITY,
+    'JavaNCSSCheck': IssueType.FUNC_LEN,
+    # 'ClassDataAbstractionCouplingCheck': IssueType.COUPLING,
+    # 'ClassFanOutComplexityCheck': IssueType.CODE_STYLE,
+    # 'NPathComplexityCheck': IssueType.COMPLEXITY,
+
+    # ---- Miscellaneous ----
+    'ArrayTypeStyleCheck': IssueType.CODE_STYLE,
+    'CommentsIndentationCheck': IssueType.CODE_STYLE,
+    'IndentationCheck': IssueType.CODE_STYLE,
     'UpperEllCheck': IssueType.BEST_PRACTICES,
-    'VisibilityModifierCheck': IssueType.BEST_PRACTICES,
+    # 'AvoidEscapedUnicodeCharactersCheck': IssueType.CODE_STYLE,
+    # 'DescendantTokenCheck': IssueType.CODE_STYLE,
+    # 'FinalParametersCheck': IssueType.CODE_STYLE,
+    # 'NewlineAtEndOfFileCheck': IssueType.CODE_STYLE,
+    # 'NoCodeInFileCheck': IssueType.BEST_PRACTICES,
+    # 'OrderedPropertiesCheck': IssueType.CODE_STYLE,
+    # 'OuterTypeFilenameCheck': IssueType.CODE_STYLE,
+    # 'TodoCommentCheck': IssueType.BEST_PRACTICES,
+    # 'TrailingCommentCheck': IssueType.CODE_STYLE,
+    # 'TranslationCheck': IssueType.BEST_PRACTICES,
+    # 'UncommentedMainCheck': IssueType.BEST_PRACTICES,
+    # 'UniquePropertiesCheck': IssueType.ERROR_PRONE,
+
+    # ---- Modifiers ----
+    'ModifierOrderCheck': IssueType.CODE_STYLE,
+    # 'ClassMemberImpliedModifierCheck': IssueType.BEST_PRACTICES,
+    # 'InterfaceMemberImpliedModifierCheck': IssueType.BEST_PRACTICES,
+    # 'RedundantModifierCheck': IssueType.BEST_PRACTICES,
+
+    # ---- Naming Conventions ----
+    'AbbreviationAsWordInNameCheck': IssueType.CODE_STYLE,
+    'ConstantNameCheck': IssueType.CODE_STYLE,
+    'LambdaParameterNameCheck': IssueType.CODE_STYLE,
+    'LocalFinalVariableNameCheck': IssueType.CODE_STYLE,
+    'LocalVariableNameCheck': IssueType.CODE_STYLE,
+    'MemberNameCheck': IssueType.CODE_STYLE,
+    'MethodNameCheck': IssueType.CODE_STYLE,
+    'PackageNameCheck': IssueType.CODE_STYLE,
+    'ParameterNameCheck': IssueType.CODE_STYLE,
+    'StaticVariableNameCheck': IssueType.CODE_STYLE,
+    'TypeNameCheck': IssueType.CODE_STYLE,
+    # 'AbstractClassNameCheck': IssueType.CODE_STYLE,
+    # 'CatchParameterNameCheck': IssueType.CODE_STYLE,
+    # 'ClassTypeParameterNameCheck': IssueType.CODE_STYLE,
+    # 'IllegalIdentifierNameCheck': IssueType.CODE_STYLE,
+    # 'InterfaceTypeParameterNameCheck': IssueType.CODE_STYLE,
+    # 'MethodTypeParameterNameCheck': IssueType.CODE_STYLE,
+    # 'PatternVariableNameCheck': IssueType.CODE_STYLE,
+    # 'RecordComponentNameCheck': IssueType.CODE_STYLE,
+    # 'RecordTypeParameterNameCheck': IssueType.CODE_STYLE,
+
+    # ---- Regexp ----
+    # 'RegexpCheck': IssueType.ERROR_PRONE,
+    # 'RegexpMultilineCheck': IssueType.ERROR_PRONE,
+    # 'RegexpOnFilenameCheck': IssueType.ERROR_PRONE,
+    # 'RegexpSinglelineCheck': IssueType.BEST_PRACTICES,
+    # 'RegexpSinglelineJavaCheck': IssueType.ERROR_PRONE,
+
+    # ---- Size Violations ----
+    # 'AnonInnerLengthCheck': IssueType.CODE_STYLE,
+    # 'ExecutableStatementCountCheck': IssueType.BEST_PRACTICES,
+    # 'FileLengthCheck': IssueType.CODE_STYLE,
+    # 'LambdaBodyLengthCheck': IssueType.BEST_PRACTICES,
+    'LineLengthCheck': IssueType.LINE_LEN,
+    # 'MethodCountCheck': IssueType.CODE_STYLE,
+    # 'MethodLengthCheck': IssueType.BEST_PRACTICES,
+    # 'OuterTypeNumberCheck': IssueType.CODE_STYLE,
+    'ParameterNumberCheck': IssueType.COMPLEXITY,
+    # 'RecordComponentNumberCheck': IssueType.BEST_PRACTICES,
+
+    # ---- Whitespace ----
+    'EmptyForIteratorPadCheck': IssueType.CODE_STYLE,
+    'EmptyLineSeparatorCheck': IssueType.CODE_STYLE,
+    'GenericWhitespaceCheck': IssueType.CODE_STYLE,
+    'MethodParamPadCheck': IssueType.CODE_STYLE,
+    'NoWhitespaceAfterCheck': IssueType.CODE_STYLE,
+    'NoWhitespaceBeforeCheck': IssueType.CODE_STYLE,
+    'OperatorWrapCheck': IssueType.CODE_STYLE,
+    'ParenPadCheck': IssueType.CODE_STYLE,
+    'TypecastParenPadCheck': IssueType.CODE_STYLE,
     'WhitespaceAfterCheck': IssueType.CODE_STYLE,
     'WhitespaceAroundCheck': IssueType.CODE_STYLE,
-    'WriteTagCheck': IssueType.CODE_STYLE,
-    'SuppressWarningsHolderCheck': IssueType.BEST_PRACTICES,
+    # 'EmptyForInitializerPadCheck': IssueType.BEST_PRACTICES,
+    # 'FileTabCharacterCheck': IssueType.CODE_STYLE,
+    # 'NoLineWrapCheck': IssueType.CODE_STYLE,
+    # 'SeparatorWrapCheck': IssueType.CODE_STYLE,
+    # 'SingleSpaceSeparatorCheck': IssueType.CODE_STYLE,
 }
diff --git a/src/python/review/inspectors/detekt/detekt.py b/src/python/review/inspectors/detekt/detekt.py
index 041c6b2d..75d86431 100644
--- a/src/python/review/inspectors/detekt/detekt.py
+++ b/src/python/review/inspectors/detekt/detekt.py
@@ -1,21 +1,28 @@
 import logging
+import os
 from pathlib import Path
-from typing import List
+from typing import Any, Dict, List
 
-from src.python.review.common.file_system import new_temp_dir
+from src.python.review.common.file_system import check_set_up_env_variable, new_temp_dir
 from src.python.review.common.subprocess_runner import run_in_subprocess
 from src.python.review.inspectors.base_inspector import BaseInspector
-from src.python.review.inspectors.detekt.issue_types import DETECT_CLASS_NAME_TO_ISSUE_TYPE
+from src.python.review.inspectors.detekt.issue_types import DETEKT_CLASS_NAME_TO_ISSUE_TYPE
 from src.python.review.inspectors.inspector_type import InspectorType
-from src.python.review.inspectors.issue import BaseIssue, IssueType
-from src.python.review.inspectors.parsers.checkstyle_parser import parse_checkstyle_file_result
+from src.python.review.inspectors.issue import BaseIssue, IssueDifficulty, IssueType
+from src.python.review.inspectors.parsers.xml_parser import parse_xml_file_result
 
 logger = logging.getLogger(__name__)
 
+DETEKT_DIRECTORY_ENV = 'DETEKT_DIRECTORY'
+check_set_up_env_variable(DETEKT_DIRECTORY_ENV)
+DETEKT_VERSION_ENV = 'DETEKT_VERSION'
+check_set_up_env_variable(DETEKT_VERSION_ENV)
+
+PATH_TO_DETEKT_CLI = f'{os.environ[DETEKT_DIRECTORY_ENV]}/detekt-cli-{os.environ[DETEKT_VERSION_ENV]}/bin/detekt-cli'
+PATH_DETEKT_PLUGIN = f'{os.environ[DETEKT_DIRECTORY_ENV]}/detekt-formatting-{os.environ[DETEKT_VERSION_ENV]}.jar'
+
 PATH_TOOLS_PMD_FILES = Path(__file__).parent / 'files'
-PATH_DETEKT_JAR = PATH_TOOLS_PMD_FILES / 'detekt-cli-1.8.0-all.jar'
 PATH_DETEKT_CONFIG = PATH_TOOLS_PMD_FILES / 'detekt-config.yml'
-PATH_DETEKT_PLUGIN = PATH_TOOLS_PMD_FILES / 'detekt-formatting-1.5.1.jar'
 
 
 class DetektInspector(BaseInspector):
@@ -32,29 +39,30 @@ class DetektInspector(BaseInspector):
 
     @classmethod
     def _create_command(cls, path: Path, output_path: Path):
-        return [
-            'java', '-jar',
-            PATH_DETEKT_JAR,
+        command = [
+            PATH_TO_DETEKT_CLI,
             '--config', PATH_DETEKT_CONFIG,
             '--plugins', PATH_DETEKT_PLUGIN,
             '--report', f'xml:{output_path}',
             '--input', str(path),
         ]
+        return command
 
-    def inspect(self, path: Path, config: dict) -> List[BaseIssue]:
+    def inspect(self, path: Path, config: Dict[str, Any]) -> List[BaseIssue]:
         with new_temp_dir() as temp_dir:
             output_path = temp_dir / 'output.xml'
             command = self._create_command(path, output_path)
 
             run_in_subprocess(command)
-            return parse_checkstyle_file_result(output_path,
-                                                self.inspector_type,
-                                                self.choose_issue_type,
-                                                self.origin_class_to_pattern)
+            return parse_xml_file_result(output_path,
+                                         self.inspector_type,
+                                         self.choose_issue_type,
+                                         IssueDifficulty.get_by_issue_type,
+                                         self.origin_class_to_pattern)
 
     @classmethod
     def choose_issue_type(cls, issue_class: str) -> IssueType:
-        issue_type = DETECT_CLASS_NAME_TO_ISSUE_TYPE.get(issue_class)
+        issue_type = DETEKT_CLASS_NAME_TO_ISSUE_TYPE.get(issue_class)
         if not issue_type:
             logger.info(f'{cls.inspector_type.value}: {issue_class} - unknown origin class')
             return IssueType.BEST_PRACTICES
diff --git a/src/python/review/inspectors/detekt/files/detekt-cli-1.8.0-all.jar b/src/python/review/inspectors/detekt/files/detekt-cli-1.8.0-all.jar
deleted file mode 100644
index bdf8d3f1..00000000
Binary files a/src/python/review/inspectors/detekt/files/detekt-cli-1.8.0-all.jar and /dev/null differ
diff --git a/src/python/review/inspectors/detekt/files/detekt-config.yml b/src/python/review/inspectors/detekt/files/detekt-config.yml
index fec64e95..950bc7b4 100644
--- a/src/python/review/inspectors/detekt/files/detekt-config.yml
+++ b/src/python/review/inspectors/detekt/files/detekt-config.yml
@@ -1,52 +1,59 @@
+# This config was created based on the default config for Detekt 1.18.0
+# using the following table: https://bit.ly/2V2kCyi
+
+# Some inspections have been commented out due to problems with upgrading to version 1.18.0.
+# The current config contains only those inspections that work on version 1.14.2.
+
 build:
   maxIssues: 0
   excludeCorrectable: false
   weights:
-    # complexity: 2
-    # LongParameterList: 1
-    # style: 1
-    # comments: 1
+  # complexity: 2
+  # LongParameterList: 1
+  # style: 1
+  # comments: 1
 
 config:
   validation: true
-  # when writing own rules with new properties, exclude the property path e.g.: "my_rule_set,.*>.*>[my_property]"
-  excludes: ""
+  warningsAsErrors: false
+  # when writing own rules with new properties, exclude the property path e.g.: 'my_rule_set,.*>.*>[my_property]'
+  excludes: ''
 
 processors:
   active: true
   exclude:
     - 'DetektProgressListener'
+  # - 'KtFileCountProcessor'
+  # - 'PackageCountProcessor'
+  # - 'ClassCountProcessor'
   # - 'FunctionCountProcessor'
   # - 'PropertyCountProcessor'
-  # - 'ClassCountProcessor'
-  # - 'PackageCountProcessor'
-  # - 'KtFileCountProcessor'
 
 console-reports:
   active: true
   exclude:
-     - 'ProjectStatisticsReport'
-     - 'ComplexityReport'
-     - 'NotificationReport'
-  #  - 'FindingsReport'
-     - 'FileBasedFindingsReport'
+    - 'ProjectStatisticsReport'
+    - 'ComplexityReport'
+    - 'NotificationReport'
+  # - 'FindingsReport'
+    - 'FileBasedFindingsReport'
+
+# TODO: Uncomment inspections when upgrading Detekt to version 1.18.0+. Don't forget to uncomment them in issue_types.
 
 comments:
-  active: true
-  excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
+  active: false
+  AbsentOrWrongFileLicense:
+    active: false
   CommentOverPrivateFunction:
     active: false
   CommentOverPrivateProperty:
     active: false
+#  DeprecatedBlockTag:
+#    active: false
   EndOfSentenceFormat:
     active: false
-    endOfSentenceFormat: ([.?!][ \t\n\r\f<])|([.?!:]$)
   UndocumentedPublicClass:
     active: false
-    searchInNestedClass: true
-    searchInInnerClass: true
-    searchInInnerObject: true
-    searchInInnerInterface: true
   UndocumentedPublicFunction:
     active: false
   UndocumentedPublicProperty:
@@ -59,18 +66,14 @@ complexity:
     threshold: 0
   ComplexInterface:
     active: false
-    threshold: 10
-    includeStaticDeclarations: false
   ComplexMethod:
     active: true
     threshold: 0
     ignoreSingleWhenExpression: true
     ignoreSimpleWhenEntries: true
     ignoreNestingFunctions: false
-    nestingFunctions: run,let,apply,with,also,use,forEach,isNotNull,ifNull
   LabeledExpression:
     active: false
-    ignoredLabels: ""
   LargeClass:
     active: true
     threshold: 600
@@ -79,45 +82,38 @@ complexity:
     threshold: 0
   LongParameterList:
     active: true
-    threshold: 6
-    ignoreDefaultParameters: false
   MethodOverloading:
     active: false
-    threshold: 6
+#  NamedArguments:
+#    active: false
   NestedBlockDepth:
     active: true
     threshold: 4
+  ReplaceSafeCallChainWithRun:
+    active: false
   StringLiteralDuplication:
     active: true
-    excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
-    threshold: 3
-    ignoreAnnotation: true
-    excludeStringsWithLessThan5Characters: true
-    ignoreStringsRegex: '$^'
   TooManyFunctions:
     active: true
-    excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
     thresholdInFiles: 21
     thresholdInClasses: 21
-    thresholdInInterfaces: 11
     thresholdInObjects: 21
-    thresholdInEnums: 11
-    ignoreDeprecated: false
-    ignorePrivate: false
-    ignoreOverridden: false
 
 coroutines:
-  active: true
+  active: false
   GlobalCoroutineUsage:
     active: false
   RedundantSuspendModifier:
     active: false
+#  SleepInsteadOfDelay:
+#    active: false
+  SuspendFunWithFlowReturnType:
+    active: false
 
 empty-blocks:
   active: true
   EmptyCatchBlock:
     active: true
-    allowedExceptionNameRegex: "^(_|(ignore|expected).*)"
   EmptyClassBlock:
     active: true
   EmptyDefaultConstructor:
@@ -132,7 +128,6 @@ empty-blocks:
     active: true
   EmptyFunctionBlock:
     active: true
-    ignoreOverridden: false
   EmptyIfBlock:
     active: true
   EmptyInitBlock:
@@ -141,6 +136,8 @@ empty-blocks:
     active: true
   EmptySecondaryConstructor:
     active: true
+  EmptyTryBlock:
+    active: true
   EmptyWhenBlock:
     active: true
   EmptyWhileBlock:
@@ -149,53 +146,33 @@ empty-blocks:
 exceptions:
   active: true
   ExceptionRaisedInUnexpectedLocation:
-    active: false
-    methodNames: 'toString,hashCode,equals,finalize'
+    active: true
   InstanceOfCheckForException:
     active: false
-    excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
   NotImplementedDeclaration:
     active: false
+#  ObjectExtendsThrowable:
+#    active: false
   PrintStackTrace:
     active: false
   RethrowCaughtException:
-    active: false
+    active: true
   ReturnFromFinally:
     active: true
-    ignoreLabeled: false
   SwallowedException:
     active: false
-    ignoredExceptionTypes: 'InterruptedException,NumberFormatException,ParseException,MalformedURLException'
-    allowedExceptionNameRegex: "^(_|(ignore|expected).*)"
   ThrowingExceptionFromFinally:
     active: true
   ThrowingExceptionInMain:
     active: false
   ThrowingExceptionsWithoutMessageOrCause:
     active: true
-    exceptions: 'IllegalArgumentException,IllegalStateException,IOException'
   ThrowingNewInstanceOfSameException:
     active: false
   TooGenericExceptionCaught:
     active: false
-    excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
-    exceptionNames:
-     - ArrayIndexOutOfBoundsException
-     - Error
-     - Exception
-     - IllegalMonitorStateException
-     - NullPointerException
-     - IndexOutOfBoundsException
-     - RuntimeException
-     - Throwable
-    allowedExceptionNameRegex: "^(_|(ignore|expected).*)"
   TooGenericExceptionThrown:
     active: false
-    exceptionNames:
-     - Error
-     - Exception
-     - Throwable
-     - RuntimeException
 
 formatting:
   active: true
@@ -203,197 +180,138 @@ formatting:
   autoCorrect: false
   AnnotationOnSeparateLine:
     active: false
-    autoCorrect: true
+  AnnotationSpacing:
+    active: false
+  ArgumentListWrapping:
+    active: false
   ChainWrapping:
     active: true
-    autoCorrect: true
   CommentSpacing:
     active: true
-    autoCorrect: true
   EnumEntryNameCase:
     active: true
-    autoCorrect: true
   Filename:
     active: false
-  # duplicated by NewLineAtEndOfFile
+  # Duplicated by NewLineAtEndOfFile
   FinalNewline:
     active: false
-    autoCorrect: true
   ImportOrdering:
     active: true
-    autoCorrect: true
   Indentation:
     active: true
-    autoCorrect: true
-    indentSize: 4
-    continuationIndentSize: 4
-  # duplicated by MaxLineLength
+  # Duplicated by MaxLineLength
   MaximumLineLength:
     active: false
-    maxLineLength: 120
-  # duplicated by ModifierOrder
+  # Duplicated by ModifierOrder
   ModifierOrdering:
     active: false
-    autoCorrect: true
   MultiLineIfElse:
     active: true
-    autoCorrect: true
   NoBlankLineBeforeRbrace:
     active: false
-    autoCorrect: true
   NoConsecutiveBlankLines:
     active: true
-    autoCorrect: true
-  # duplicated by EmptyClassBlock
+  # Duplicated by EmptyClassBlock
   NoEmptyClassBody:
     active: false
-    autoCorrect: true
   NoEmptyFirstLineInMethodBlock:
     active: false
-    autoCorrect: true
   NoLineBreakAfterElse:
     active: true
-    autoCorrect: true
   NoLineBreakBeforeAssignment:
     active: true
-    autoCorrect: true
   NoMultipleSpaces:
     active: true
-    autoCorrect: true
   NoSemicolons:
     active: true
-    autoCorrect: true
-  # duplicated by TrailingWhitespace
+  # Duplicated by TrailingWhitespace
   NoTrailingSpaces:
     active: false
-    autoCorrect: true
-  # duplicated by OptionalUnit
+  # Duplicated by OptionalUnit
   NoUnitReturn:
     active: false
-    autoCorrect: true
-  # duplicated by UnusedImports
+  # Duplicated by UnusedImports
   NoUnusedImports:
     active: false
-    autoCorrect: true
-  # duplicated by WildcardImport
+  # Duplicated by WildcardImport
   NoWildcardImports:
     active: false
-  # duplicated by PackageNaming
+  # Duplicated by PackageNaming
   PackageName:
     active: false
-    autoCorrect: true
   ParameterListWrapping:
     active: true
-    autoCorrect: true
-    indentSize: 4
+#  SpacingAroundAngleBrackets:
+#    active: false
   SpacingAroundColon:
     active: true
-    autoCorrect: true
   SpacingAroundComma:
     active: true
-    autoCorrect: true
   SpacingAroundCurly:
     active: true
-    autoCorrect: true
   SpacingAroundDot:
     active: true
-    autoCorrect: true
+  SpacingAroundDoubleColon:
+    active: false
   SpacingAroundKeyword:
     active: true
-    autoCorrect: true
   SpacingAroundOperators:
     active: true
-    autoCorrect: true
   SpacingAroundParens:
     active: true
-    autoCorrect: true
   SpacingAroundRangeOperator:
     active: true
-    autoCorrect: true
+#  SpacingAroundUnaryOperator:
+#    active: false
+  SpacingBetweenDeclarationsWithAnnotations:
+    active: false
+  SpacingBetweenDeclarationsWithComments:
+    active: false
   StringTemplate:
     active: true
-    autoCorrect: true
 
 naming:
   active: true
+#  BooleanPropertyNaming:
+#    active: true
   ClassNaming:
     active: true
-    excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
-    classPattern: '[A-Z$][a-zA-Z0-9$]*'
   ConstructorParameterNaming:
     active: true
-    excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
-    parameterPattern: '[a-z][A-Za-z0-9]*'
-    privateParameterPattern: '[a-z][A-Za-z0-9]*'
-    excludeClassPattern: '$^'
-    ignoreOverridden: true
   EnumNaming:
     active: true
-    excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
-    enumEntryPattern: '^[A-Z][_a-zA-Z0-9]*'
   ForbiddenClassName:
     active: false
-    excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
-    forbiddenName: ''
   FunctionMaxLength:
     active: false
-    excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
-    maximumFunctionNameLength: 30
   FunctionMinLength:
     active: false
-    excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
-    minimumFunctionNameLength: 3
   FunctionNaming:
     active: true
-    excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
-    functionPattern: '^([a-z$][a-zA-Z$0-9]*)|(`.*`)$'
-    excludeClassPattern: '$^'
-    ignoreOverridden: true
   FunctionParameterNaming:
     active: true
-    excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
-    parameterPattern: '[a-z][A-Za-z0-9]*'
-    excludeClassPattern: '$^'
-    ignoreOverridden: true
   InvalidPackageDeclaration:
     active: false
-    rootPackage: ''
   MatchingDeclarationName:
     active: false
   MemberNameEqualsClassName:
     active: false
-    ignoreOverridden: true
+#  NoNameShadowing:
+#    active: false
+  NonBooleanPropertyPrefixedWithIs:
+    active: true
   ObjectPropertyNaming:
     active: true
-    excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
-    constantPattern: '[A-Za-z][_A-Za-z0-9]*'
-    propertyPattern: '[A-Za-z][_A-Za-z0-9]*'
-    privatePropertyPattern: '(_)?[A-Za-z][_A-Za-z0-9]*'
   PackageNaming:
     active: true
-    excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
-    packagePattern: '^[a-z]+(\.[a-z][A-Za-z0-9]*)*$'
   TopLevelPropertyNaming:
     active: true
-    excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
-    constantPattern: '[A-Z][_A-Z0-9]*'
-    propertyPattern: '[A-Za-z][_A-Za-z0-9]*'
-    privatePropertyPattern: '_?[A-Za-z][_A-Za-z0-9]*'
   VariableMaxLength:
     active: false
-    excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
-    maximumVariableNameLength: 64
   VariableMinLength:
     active: false
-    excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
-    minimumVariableNameLength: 1
   VariableNaming:
     active: true
-    excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
-    variablePattern: '[a-z][A-Za-z0-9]*'
-    privateVariablePattern: '(_)?[a-z][A-Za-z0-9]*'
-    excludeClassPattern: '$^'
-    ignoreOverridden: true
 
 performance:
   active: true
@@ -401,29 +319,41 @@ performance:
     active: true
   ForEachOnRange:
     active: true
-    excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
   SpreadOperator:
     active: true
-    excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
   UnnecessaryTemporaryInstantiation:
     active: true
 
 potential-bugs:
   active: true
+#  AvoidReferentialEquality:
+#    active: false
+#  CastToNullableType:
+#    active: false
   Deprecation:
     active: false
+#  DontDowncastCollectionTypes:
+#    active: false
+#  DoubleMutabilityForCollection:
+#    active: false
   DuplicateCaseInWhenExpression:
     active: true
   EqualsAlwaysReturnsTrueOrFalse:
     active: true
   EqualsWithHashCodeExist:
     active: true
+#  ExitOutsideMain:
+#    active: false
   ExplicitGarbageCollectionCall:
     active: true
   HasPlatformType:
     active: false
+  IgnoredReturnValue:
+    active: false
   ImplicitDefaultLocale:
     active: false
+  ImplicitUnitReturnType:
+    active: false
   InvalidRange:
     active: true
   IteratorHasNextCallsNextMethod:
@@ -432,37 +362,47 @@ potential-bugs:
     active: true
   LateinitUsage:
     active: false
-    excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
-    excludeAnnotatedProperties: ""
-    ignoreOnClassesPattern: ""
   MapGetWithNotNullAssertionOperator:
     active: true
   MissingWhenCase:
     active: true
+  NullableToStringCall:
+    active: true
   RedundantElseInWhen:
     active: true
   UnconditionalJumpStatementInLoop:
-    active: false
+    active: true
+  UnnecessaryNotNullOperator:
+    active: true
+  UnnecessarySafeCall:
+    active: true
+#  UnreachableCatchBlock:
+#    active: true
   UnreachableCode:
     active: true
   UnsafeCallOnNullableType:
     active: true
   UnsafeCast:
-    active: false
+    active: true
+#  UnusedUnaryOperator:
+#    active: true
   UselessPostfixExpression:
-    active: false
+    active: true
   WrongEqualsTypeParameter:
     active: true
 
 style:
   active: true
-  CollapsibleIfStatements:
+  ClassOrdering:
     active: false
+  CollapsibleIfStatements:
+    active: true
   DataClassContainsFunctions:
     active: false
-    conversionFunctionPrefix: 'to'
   DataClassShouldBeImmutable:
     active: false
+#  DestructuringDeclarationWithTooManyEntries:
+#    active: false
   EqualsNullCall:
     active: true
   EqualsOnSignatureLine:
@@ -473,87 +413,65 @@ style:
     active: false
   ExpressionBodySyntax:
     active: false
-    includeLineWrapping: false
   ForbiddenComment:
     active: false
-    values: 'TODO:,FIXME:,STOPSHIP:'
-    allowedPatterns: ""
   ForbiddenImport:
     active: false
-    imports: ''
-    forbiddenPatterns: ""
   ForbiddenMethodCall:
     active: false
-    methods: ''
   ForbiddenPublicDataClass:
     active: false
-    ignorePackages: '*.internal,*.internal.*'
   ForbiddenVoid:
     active: false
-    ignoreOverridden: false
-    ignoreUsageInGenerics: false
   FunctionOnlyReturningConstant:
     active: false
-    ignoreOverridableFunction: true
-    excludedFunctions: 'describeContents'
-    excludeAnnotatedFunction: "dagger.Provides"
   LibraryCodeMustSpecifyReturnType:
     active: true
+  LibraryEntitiesShouldNotBePublic:
+    active: false
   LoopWithTooManyJumpStatements:
     active: false
-    maxJumpCount: 1
   MagicNumber:
-    active: false
-    excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
-    ignoreNumbers: '-1,0,1,2'
-    ignoreHashCodeFunction: true
-    ignorePropertyDeclaration: false
-    ignoreLocalVariableDeclaration: false
-    ignoreConstantDeclaration: true
-    ignoreCompanionObjectPropertyDeclaration: true
-    ignoreAnnotation: false
-    ignoreNamedArgument: true
-    ignoreEnums: false
-    ignoreRanges: false
+    active: true
   MandatoryBracesIfStatements:
     active: true
+  MandatoryBracesLoops:
+    active: true
   MaxLineLength:
     active: true
     maxLineLength: 120
-    excludePackageStatements: true
-    excludeImportStatements: true
-    excludeCommentStatements: false
   MayBeConst:
     active: true
   ModifierOrder:
     active: true
+#  MultilineLambdaItParameter:
+#    active: false
   NestedClassesVisibility:
     active: false
   NewLineAtEndOfFile:
     active: false
   NoTabs:
     active: false
+#  ObjectLiteralToLambda:
+#    active: false
   OptionalAbstractKeyword:
     active: true
   OptionalUnit:
     active: true
   OptionalWhenBraces:
-    active: false
+    active: true
   PreferToOverPairSyntax:
     active: false
   ProtectedMemberInFinalClass:
     active: true
   RedundantExplicitType:
     active: true
+#  RedundantHigherOrderMapUsage:
+#    active: true
   RedundantVisibilityModifierRule:
     active: true
   ReturnCount:
     active: false
-    max: 2
-    excludedFunctions: "equals"
-    excludeLabeled: false
-    excludeReturnFromLambda: true
-    excludeGuardClauses: false
   SafeCast:
     active: true
   SerialVersionUIDInSerializableClass:
@@ -562,19 +480,18 @@ style:
     active: true
   ThrowsCount:
     active: false
-    max: 2
   TrailingWhitespace:
     active: false
   UnderscoresInNumericLiterals:
-    active: true
-    acceptableDecimalLength: 5
+    active: false
   UnnecessaryAbstractClass:
     active: true
-    excludeAnnotatedClasses: "dagger.Module"
   UnnecessaryAnnotationUseSiteTarget:
     active: false
   UnnecessaryApply:
     active: true
+#  UnnecessaryFilter:
+#    active: true
   UnnecessaryInheritance:
     active: true
   UnnecessaryLet:
@@ -587,21 +504,31 @@ style:
     active: true
   UnusedPrivateClass:
     active: true
+  # TODO: Maybe we should activate it.
   UnusedPrivateMember:
     active: false
-    allowedNames: "(_|ignored|expected|serialVersionUID)"
   UseArrayLiteralsInAnnotations:
     active: false
+  UseCheckNotNull:
+    active: true
   UseCheckOrError:
     active: true
   UseDataClass:
     active: true
-    excludeAnnotatedClasses: ""
-    allowVars: false
+  UseEmptyCounterpart:
+    active: true
+#  UseIfEmptyOrIfBlank:
+#    active: true
   UseIfInsteadOfWhen:
     active: true
+#  UseIsNullOrEmpty:
+#    active: true
+#  UseOrEmpty:
+#    active: true
   UseRequire:
     active: true
+  UseRequireNotNull:
+    active: true
   UselessCallOnNotNull:
     active: true
   UtilityClassWithPublicConstructor:
@@ -610,5 +537,3 @@ style:
     active: true
   WildcardImport:
     active: true
-    excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
-    excludeImports: 'java.util.*,kotlinx.android.synthetic.*'
diff --git a/src/python/review/inspectors/detekt/files/detekt-formatting-1.5.1.jar b/src/python/review/inspectors/detekt/files/detekt-formatting-1.5.1.jar
deleted file mode 100644
index 633f282a..00000000
Binary files a/src/python/review/inspectors/detekt/files/detekt-formatting-1.5.1.jar and /dev/null differ
diff --git a/src/python/review/inspectors/detekt/issue_types.py b/src/python/review/inspectors/detekt/issue_types.py
index 2379bba8..06a4ef46 100644
--- a/src/python/review/inspectors/detekt/issue_types.py
+++ b/src/python/review/inspectors/detekt/issue_types.py
@@ -2,36 +2,41 @@
 
 from src.python.review.inspectors.issue import IssueType
 
-DETECT_CLASS_NAME_TO_ISSUE_TYPE: Dict[str, IssueType] = {
-    # comments
-    'CommentOverPrivateFunction': IssueType.BEST_PRACTICES,
-    'CommentOverPrivateProperty': IssueType.BEST_PRACTICES,
-    'CommentSpacing': IssueType.CODE_STYLE,
-    'EndOfSentenceFormat': IssueType.CODE_STYLE,
-    'UndocumentedPublicClass': IssueType.BEST_PRACTICES,
-    'UndocumentedPublicFunction': IssueType.BEST_PRACTICES,
-    'UndocumentedPublicProperty': IssueType.BEST_PRACTICES,
+DETEKT_CLASS_NAME_TO_ISSUE_TYPE: Dict[str, IssueType] = {
+    # Comments
+    # 'AbsentOrWrongFileLicense': IssueType.BEST_PRACTICES,
+    # 'CommentOverPrivateFunction': IssueType.BEST_PRACTICES,
+    # 'CommentOverPrivateProperty': IssueType.BEST_PRACTICES,
+    # 'DeprecatedBlockTag': IssueType.BEST_PRACTICES,
+    # 'EndOfSentenceFormat': IssueType.CODE_STYLE,
+    # 'UndocumentedPublicClass': IssueType.BEST_PRACTICES,
+    # 'UndocumentedPublicFunction': IssueType.BEST_PRACTICES,
+    # 'UndocumentedPublicProperty': IssueType.BEST_PRACTICES,
 
-    # complexity:
+    # Complexity
     'ComplexCondition': IssueType.BOOL_EXPR_LEN,
-    'ComplexInterface': IssueType.COMPLEXITY,
+    # 'ComplexInterface': IssueType.COMPLEXITY,
     'ComplexMethod': IssueType.CYCLOMATIC_COMPLEXITY,
-    'LabeledExpression': IssueType.COMPLEXITY,
+    # 'LabeledExpression': IssueType.COMPLEXITY,
     'LargeClass': IssueType.COMPLEXITY,
     'LongMethod': IssueType.FUNC_LEN,
     'LongParameterList': IssueType.COMPLEXITY,
-    'MethodOverloading': IssueType.COMPLEXITY,
+    # 'MethodOverloading': IssueType.COMPLEXITY,
+    # 'NamedArguments': IssueType.COMPLEXITY,
     'NestedBlockDepth': IssueType.COMPLEXITY,
-    'StringLiteralDuplication': IssueType.COMPLEXITY,
+    # 'ReplaceSafeCallChainWithRun': IssueType.BEST_PRACTICES,
+    'StringLiteralDuplication': IssueType.BEST_PRACTICES,
     'TooManyFunctions': IssueType.COMPLEXITY,
 
-    # coroutines:
-    'GlobalCoroutineUsage': IssueType.BEST_PRACTICES,
-    'RedundantSuspendModifier': IssueType.BEST_PRACTICES,
+    # Coroutines
+    # 'GlobalCoroutineUsage': IssueType.BEST_PRACTICES,
+    # 'RedundantSuspendModifier': IssueType.BEST_PRACTICES,
+    # 'SleepInsteadOfDelay': IssueType.BEST_PRACTICES,
+    # 'SuspendFunWithFlowReturnType': IssueType.BEST_PRACTICES,
 
-    # empty-blocks:
+    # Empty-blocks
     'EmptyCatchBlock': IssueType.BEST_PRACTICES,
-    'EmptyClassBlock': IssueType.CODE_STYLE,
+    'EmptyClassBlock': IssueType.BEST_PRACTICES,
     'EmptyDefaultConstructor': IssueType.BEST_PRACTICES,
     'EmptyDoWhileBlock': IssueType.BEST_PRACTICES,
     'EmptyElseBlock': IssueType.BEST_PRACTICES,
@@ -42,162 +47,202 @@
     'EmptyInitBlock': IssueType.BEST_PRACTICES,
     'EmptyKtFile': IssueType.BEST_PRACTICES,
     'EmptySecondaryConstructor': IssueType.BEST_PRACTICES,
+    'EmptyTryBlock': IssueType.BEST_PRACTICES,
     'EmptyWhenBlock': IssueType.BEST_PRACTICES,
     'EmptyWhileBlock': IssueType.BEST_PRACTICES,
 
-    # exceptions:
+    # Exceptions
     'ExceptionRaisedInUnexpectedLocation': IssueType.BEST_PRACTICES,
-    'InstanceOfCheckForException': IssueType.BEST_PRACTICES,
-    'NotImplementedDeclaration': IssueType.BEST_PRACTICES,
-    'PrintStackTrace': IssueType.BEST_PRACTICES,
+    # 'InstanceOfCheckForException': IssueType.BEST_PRACTICES,
+    # 'NotImplementedDeclaration': IssueType.BEST_PRACTICES,
+    # 'ObjectExtendsThrowable': IssueType.BEST_PRACTICES,
+    # 'PrintStackTrace': IssueType.BEST_PRACTICES,
     'RethrowCaughtException': IssueType.BEST_PRACTICES,
     'ReturnFromFinally': IssueType.BEST_PRACTICES,
-    'SwallowedException': IssueType.BEST_PRACTICES,
+    # 'SwallowedException': IssueType.BEST_PRACTICES,
     'ThrowingExceptionFromFinally': IssueType.BEST_PRACTICES,
-    'ThrowingExceptionInMain': IssueType.BEST_PRACTICES,
+    # 'ThrowingExceptionInMain': IssueType.BEST_PRACTICES,
     'ThrowingExceptionsWithoutMessageOrCause': IssueType.BEST_PRACTICES,
-    'ThrowingNewInstanceOfSameException': IssueType.BEST_PRACTICES,
-    'TooGenericExceptionCaught': IssueType.BEST_PRACTICES,
-    'TooGenericExceptionThrown': IssueType.BEST_PRACTICES,
+    # 'ThrowingNewInstanceOfSameException': IssueType.BEST_PRACTICES,
+    # 'TooGenericExceptionCaught': IssueType.BEST_PRACTICES,
+    # 'TooGenericExceptionThrown': IssueType.BEST_PRACTICES,
 
-    # naming:
+    # Naming
+    # 'BooleanPropertyNaming': IssueType.INFO,
     'ClassNaming': IssueType.CODE_STYLE,
     'ConstructorParameterNaming': IssueType.CODE_STYLE,
     'EnumNaming': IssueType.CODE_STYLE,
-    'ForbiddenClassName': IssueType.CODE_STYLE,
-    'FunctionMaxLength': IssueType.CODE_STYLE,
-    'FunctionMinLength': IssueType.CODE_STYLE,
+    # 'ForbiddenClassName': IssueType.CODE_STYLE,
+    # 'FunctionMaxLength': IssueType.CODE_STYLE,
+    # 'FunctionMinLength': IssueType.CODE_STYLE,
     'FunctionNaming': IssueType.CODE_STYLE,
     'FunctionParameterNaming': IssueType.CODE_STYLE,
-    'InvalidPackageDeclaration': IssueType.ERROR_PRONE,
-    'MatchingDeclarationName': IssueType.CODE_STYLE,
-    'MemberNameEqualsClassName': IssueType.BEST_PRACTICES,
+    # 'InvalidPackageDeclaration': IssueType.ERROR_PRONE,
+    # 'MatchingDeclarationName': IssueType.CODE_STYLE,
+    # 'MemberNameEqualsClassName': IssueType.BEST_PRACTICES,
+    # 'NoNameShadowing': IssueType.ERROR_PRONE,
+    'NonBooleanPropertyPrefixedWithIs': IssueType.INFO,
     'ObjectPropertyNaming': IssueType.CODE_STYLE,
     'PackageNaming': IssueType.CODE_STYLE,
     'TopLevelPropertyNaming': IssueType.CODE_STYLE,
-    'VariableMaxLength': IssueType.CODE_STYLE,
-    'VariableMinLength': IssueType.CODE_STYLE,
+    # 'VariableMaxLength': IssueType.CODE_STYLE,
+    # 'VariableMinLength': IssueType.CODE_STYLE,
     'VariableNaming': IssueType.CODE_STYLE,
 
-    # performance:
+    # Performance
     'ArrayPrimitive': IssueType.BEST_PRACTICES,
     'ForEachOnRange': IssueType.BEST_PRACTICES,
     'SpreadOperator': IssueType.BEST_PRACTICES,
     'UnnecessaryTemporaryInstantiation': IssueType.BEST_PRACTICES,
 
-    # potential-bugs:
-    'Deprecation': IssueType.ERROR_PRONE,
+    # Potential bugs
+    # 'AvoidReferentialEquality': IssueType.ERROR_PRONE,
+    # 'CastToNullableType': IssueType.ERROR_PRONE,
+    # 'Deprecation': IssueType.ERROR_PRONE,
+    # 'DontDowncastCollectionTypes': IssueType.ERROR_PRONE,
+    # 'DoubleMutabilityForCollection': IssueType.BEST_PRACTICES,
     'DuplicateCaseInWhenExpression': IssueType.ERROR_PRONE,
     'EqualsAlwaysReturnsTrueOrFalse': IssueType.ERROR_PRONE,
     'EqualsWithHashCodeExist': IssueType.ERROR_PRONE,
+    # 'ExitOutsideMain': IssueType.BEST_PRACTICES,
     'ExplicitGarbageCollectionCall': IssueType.ERROR_PRONE,
-    'HasPlatformType': IssueType.ERROR_PRONE,
-    'ImplicitDefaultLocale': IssueType.ERROR_PRONE,
+    # 'HasPlatformType': IssueType.ERROR_PRONE,
+    # 'IgnoredReturnValue': IssueType.ERROR_PRONE,
+    # 'ImplicitDefaultLocale': IssueType.ERROR_PRONE,
+    # 'ImplicitUnitReturnType': IssueType.ERROR_PRONE,
     'InvalidRange': IssueType.ERROR_PRONE,
     'IteratorHasNextCallsNextMethod': IssueType.ERROR_PRONE,
     'IteratorNotThrowingNoSuchElementException': IssueType.ERROR_PRONE,
-    'LateinitUsage': IssueType.ERROR_PRONE,
+    # 'LateinitUsage': IssueType.ERROR_PRONE,
     'MapGetWithNotNullAssertionOperator': IssueType.ERROR_PRONE,
     'MissingWhenCase': IssueType.ERROR_PRONE,
+    'NullableToStringCall': IssueType.BEST_PRACTICES,
     'RedundantElseInWhen': IssueType.ERROR_PRONE,
     'UnconditionalJumpStatementInLoop': IssueType.ERROR_PRONE,
+    'UnnecessaryNotNullOperator': IssueType.ERROR_PRONE,
+    'UnnecessarySafeCall': IssueType.ERROR_PRONE,
+    # 'UnreachableCatchBlock': IssueType.ERROR_PRONE,
     'UnreachableCode': IssueType.ERROR_PRONE,
     'UnsafeCallOnNullableType': IssueType.ERROR_PRONE,
+    # 'UnusedUnaryOperator': IssueType.ERROR_PRONE,
     'UnsafeCast': IssueType.ERROR_PRONE,
     'UselessPostfixExpression': IssueType.ERROR_PRONE,
     'WrongEqualsTypeParameter': IssueType.ERROR_PRONE,
 
-    # style:
-    'AnnotationOnSeparateLine': IssueType.CODE_STYLE,
+    # Formatting
+    # 'AnnotationOnSeparateLine': IssueType.CODE_STYLE,
+    # 'AnnotationSpacing': IssueType.CODE_STYLE,
+    # 'ArgumentListWrapping': IssueType.CODE_STYLE,
     'ChainWrapping': IssueType.CODE_STYLE,
+    'CommentSpacing': IssueType.CODE_STYLE,
     'EnumEntryNameCase': IssueType.CODE_STYLE,
-    'Filename': IssueType.CODE_STYLE,
-    'FinalNewline': IssueType.CODE_STYLE,
+    # 'Filename': IssueType.CODE_STYLE,
+    # 'FinalNewline': IssueType.CODE_STYLE,
     'ImportOrdering': IssueType.CODE_STYLE,
     'Indentation': IssueType.CODE_STYLE,
-    'MaximumLineLength': IssueType.CODE_STYLE,
-    'ModifierOrdering': IssueType.CODE_STYLE,
+    # 'MaximumLineLength': IssueType.CODE_STYLE,
+    # 'ModifierOrdering': IssueType.CODE_STYLE,
     'MultiLineIfElse': IssueType.CODE_STYLE,
-    'NoBlankLineBeforeRbrace': IssueType.CODE_STYLE,
+    # 'NoBlankLineBeforeRbrace': IssueType.CODE_STYLE,
     'NoConsecutiveBlankLines': IssueType.CODE_STYLE,
-    'NoEmptyClassBody': IssueType.CODE_STYLE,
-    'NoEmptyFirstLineInMethodBlock': IssueType.CODE_STYLE,
+    # 'NoEmptyClassBody': IssueType.CODE_STYLE,
+    # 'NoEmptyFirstLineInMethodBlock': IssueType.CODE_STYLE,
     'NoLineBreakAfterElse': IssueType.CODE_STYLE,
     'NoLineBreakBeforeAssignment': IssueType.CODE_STYLE,
     'NoMultipleSpaces': IssueType.CODE_STYLE,
     'NoSemicolons': IssueType.CODE_STYLE,
-    'NoTrailingSpaces': IssueType.CODE_STYLE,
-    'NoUnitReturn': IssueType.CODE_STYLE,
-    'NoUnusedImports': IssueType.CODE_STYLE,
-    'NoWildcardImports': IssueType.CODE_STYLE,
-    'PackageName': IssueType.CODE_STYLE,
+    # 'NoTrailingSpaces': IssueType.CODE_STYLE,
+    # 'NoUnitReturn': IssueType.CODE_STYLE,
+    # 'NoUnusedImports': IssueType.CODE_STYLE,
+    # 'NoWildcardImports': IssueType.CODE_STYLE,
+    # 'PackageName': IssueType.CODE_STYLE,
     'ParameterListWrapping': IssueType.CODE_STYLE,
+    # 'SpacingAroundAngleBrackets': IssueType.CODE_STYLE,
     'SpacingAroundColon': IssueType.CODE_STYLE,
     'SpacingAroundComma': IssueType.CODE_STYLE,
     'SpacingAroundCurly': IssueType.CODE_STYLE,
     'SpacingAroundDot': IssueType.CODE_STYLE,
+    # 'SpacingAroundDoubleColon': IssueType.CODE_STYLE,
     'SpacingAroundKeyword': IssueType.CODE_STYLE,
     'SpacingAroundOperators': IssueType.CODE_STYLE,
     'SpacingAroundParens': IssueType.CODE_STYLE,
     'SpacingAroundRangeOperator': IssueType.CODE_STYLE,
+    # 'SpacingAroundUnaryOperator': IssueType.CODE_STYLE,
+    # 'SpacingBetweenDeclarationsWithAnnotations': IssueType.CODE_STYLE,
+    # 'SpacingBetweenDeclarationsWithComments': IssueType.CODE_STYLE,
     'StringTemplate': IssueType.CODE_STYLE,
 
-    # best practices:
+    # Style
+    # 'ClassOrdering': IssueType.BEST_PRACTICES,
     'CollapsibleIfStatements': IssueType.BEST_PRACTICES,
-    'DataClassContainsFunctions': IssueType.BEST_PRACTICES,
-    'DataClassShouldBeImmutable': IssueType.BEST_PRACTICES,
+    # 'DataClassContainsFunctions': IssueType.BEST_PRACTICES,
+    # 'DataClassShouldBeImmutable': IssueType.BEST_PRACTICES,
+    # 'DestructuringDeclarationWithTooManyEntries': IssueType.BEST_PRACTICES,
     'EqualsNullCall': IssueType.BEST_PRACTICES,
-    'EqualsOnSignatureLine': IssueType.CODE_STYLE,
-    'ExplicitCollectionElementAccessMethod': IssueType.BEST_PRACTICES,
-    'ExplicitItLambdaParameter': IssueType.BEST_PRACTICES,
-    'ExpressionBodySyntax': IssueType.BEST_PRACTICES,
-    'ForbiddenComment': IssueType.BEST_PRACTICES,
-    'ForbiddenImport': IssueType.BEST_PRACTICES,
-    'ForbiddenMethodCall': IssueType.BEST_PRACTICES,
-    'ForbiddenPublicDataClass': IssueType.BEST_PRACTICES,
-    'ForbiddenVoid': IssueType.BEST_PRACTICES,
-    'FunctionOnlyReturningConstant': IssueType.BEST_PRACTICES,
+    # 'EqualsOnSignatureLine': IssueType.CODE_STYLE,
+    # 'ExplicitCollectionElementAccessMethod': IssueType.BEST_PRACTICES,
+    # 'ExplicitItLambdaParameter': IssueType.BEST_PRACTICES,
+    # 'ExpressionBodySyntax': IssueType.BEST_PRACTICES,
+    # 'ForbiddenComment': IssueType.BEST_PRACTICES,
+    # 'ForbiddenImport': IssueType.BEST_PRACTICES,
+    # 'ForbiddenMethodCall': IssueType.BEST_PRACTICES,
+    # 'ForbiddenPublicDataClass': IssueType.BEST_PRACTICES,
+    # 'ForbiddenVoid': IssueType.BEST_PRACTICES,
+    # 'FunctionOnlyReturningConstant': IssueType.BEST_PRACTICES,
     'LibraryCodeMustSpecifyReturnType': IssueType.BEST_PRACTICES,
-    'LoopWithTooManyJumpStatements': IssueType.COMPLEXITY,
-    'MagicNumber': IssueType.CODE_STYLE,
+    # 'LibraryEntitiesShouldNotBePublic': IssueType.BEST_PRACTICES,
+    # 'LoopWithTooManyJumpStatements': IssueType.COMPLEXITY,
+    'MagicNumber': IssueType.INFO,
     'MandatoryBracesIfStatements': IssueType.CODE_STYLE,
+    'MandatoryBracesLoops': IssueType.CODE_STYLE,
+    # TODO: Change to LINE_LEN when Detekt is able to display the line length in the message to this inspection
     'MaxLineLength': IssueType.CODE_STYLE,
     'MayBeConst': IssueType.BEST_PRACTICES,
     'ModifierOrder': IssueType.CODE_STYLE,
-    'NestedClassesVisibility': IssueType.BEST_PRACTICES,
-    'NewLineAtEndOfFile': IssueType.CODE_STYLE,
-    'NoTabs': IssueType.CODE_STYLE,
+    # 'MultilineLambdaItParameter': IssueType.BEST_PRACTICES,
+    # 'NestedClassesVisibility': IssueType.BEST_PRACTICES,
+    # 'NewLineAtEndOfFile': IssueType.CODE_STYLE,
+    # 'NoTabs': IssueType.CODE_STYLE,
+    # 'ObjectLiteralToLambda': IssueType.BEST_PRACTICES,
     'OptionalAbstractKeyword': IssueType.CODE_STYLE,
     'OptionalUnit': IssueType.CODE_STYLE,
     'OptionalWhenBraces': IssueType.CODE_STYLE,
-    'PreferToOverPairSyntax': IssueType.BEST_PRACTICES,
+    # 'PreferToOverPairSyntax': IssueType.BEST_PRACTICES,
     'ProtectedMemberInFinalClass': IssueType.BEST_PRACTICES,
     'RedundantExplicitType': IssueType.CODE_STYLE,
+    # 'RedundantHigherOrderMapUsage': IssueType.BEST_PRACTICES,
     'RedundantVisibilityModifierRule': IssueType.CODE_STYLE,
-    'ReturnCount': IssueType.COMPLEXITY,
+    # 'ReturnCount': IssueType.COMPLEXITY,
     'SafeCast': IssueType.BEST_PRACTICES,
-    'SerialVersionUIDInSerializableClass': IssueType.BEST_PRACTICES,
+    # 'SerialVersionUIDInSerializableClass': IssueType.BEST_PRACTICES,
     'SpacingBetweenPackageAndImports': IssueType.CODE_STYLE,
-    'ThrowsCount': IssueType.COMPLEXITY,
-    'TrailingWhitespace': IssueType.CODE_STYLE,
-    'UnderscoresInNumericLiterals': IssueType.CODE_STYLE,
+    # 'ThrowsCount': IssueType.COMPLEXITY,
+    # 'TrailingWhitespace': IssueType.CODE_STYLE,
+    # 'UnderscoresInNumericLiterals': IssueType.CODE_STYLE,
     'UnnecessaryAbstractClass': IssueType.BEST_PRACTICES,
-    'UnnecessaryAnnotationUseSiteTarget': IssueType.BEST_PRACTICES,
-    'UnnecessaryApply': IssueType.CODE_STYLE,
+    # 'UnnecessaryAnnotationUseSiteTarget': IssueType.BEST_PRACTICES,
+    'UnnecessaryApply': IssueType.BEST_PRACTICES,
+    # 'UnnecessaryFilter': IssueType.BEST_PRACTICES,
     'UnnecessaryInheritance': IssueType.BEST_PRACTICES,
-    'UnnecessaryLet': IssueType.CODE_STYLE,
+    'UnnecessaryLet': IssueType.BEST_PRACTICES,
     'UnnecessaryParentheses': IssueType.CODE_STYLE,
-    'UntilInsteadOfRangeTo': IssueType.BEST_PRACTICES,
+    # 'UntilInsteadOfRangeTo': IssueType.BEST_PRACTICES,
     'UnusedImports': IssueType.BEST_PRACTICES,
     'UnusedPrivateClass': IssueType.BEST_PRACTICES,
-    'UnusedPrivateMember': IssueType.BEST_PRACTICES,
-    'UseArrayLiteralsInAnnotations': IssueType.CODE_STYLE,
+    # 'UnusedPrivateMember': IssueType.BEST_PRACTICES,
+    # 'UseArrayLiteralsInAnnotations': IssueType.BEST_PRACTICES,
+    'UseCheckNotNull': IssueType.BEST_PRACTICES,
     'UseCheckOrError': IssueType.BEST_PRACTICES,
     'UseDataClass': IssueType.BEST_PRACTICES,
+    'UseEmptyCounterpart': IssueType.BEST_PRACTICES,
+    # 'UseIfEmptyOrIfBlank': IssueType.BEST_PRACTICES,
     'UseIfInsteadOfWhen': IssueType.BEST_PRACTICES,
+    # 'UseIsNullOrEmpty': IssueType.BEST_PRACTICES,
+    # 'UseOrEmpty': IssueType.BEST_PRACTICES,
     'UseRequire': IssueType.BEST_PRACTICES,
+    'UseRequireNotNull': IssueType.BEST_PRACTICES,
     'UselessCallOnNotNull': IssueType.BEST_PRACTICES,
-    'UtilityClassWithPublicConstructor': IssueType.BEST_PRACTICES,
+    # 'UtilityClassWithPublicConstructor': IssueType.BEST_PRACTICES,
     'VarCouldBeVal': IssueType.BEST_PRACTICES,
     'WildcardImport': IssueType.BEST_PRACTICES,
 }
diff --git a/src/python/review/inspectors/eslint/eslint.py b/src/python/review/inspectors/eslint/eslint.py
index c7d0b1b4..b586fa6e 100644
--- a/src/python/review/inspectors/eslint/eslint.py
+++ b/src/python/review/inspectors/eslint/eslint.py
@@ -1,13 +1,13 @@
 from pathlib import Path
-from typing import List
+from typing import Any, Dict, List
 
 from src.python.review.common.file_system import new_temp_dir
 from src.python.review.common.subprocess_runner import run_in_subprocess
 from src.python.review.inspectors.base_inspector import BaseInspector
 from src.python.review.inspectors.eslint.issue_types import ESLINT_CLASS_NAME_TO_ISSUE_TYPE
 from src.python.review.inspectors.inspector_type import InspectorType
-from src.python.review.inspectors.issue import BaseIssue, IssueType
-from src.python.review.inspectors.parsers.checkstyle_parser import parse_checkstyle_file_result
+from src.python.review.inspectors.issue import BaseIssue, IssueDifficulty, IssueType
+from src.python.review.inspectors.parsers.xml_parser import parse_xml_file_result
 
 PATH_ESLINT_CONFIG = Path(__file__).parent / '.eslintrc'
 
@@ -32,16 +32,17 @@ def _create_command(cls, path: Path, output_path: Path) -> List[str]:
             path,
         ]
 
-    def inspect(self, path: Path, config: dict) -> List[BaseIssue]:
+    def inspect(self, path: Path, config: Dict[str, Any]) -> List[BaseIssue]:
         with new_temp_dir() as temp_dir:
             output_path = temp_dir / 'output.xml'
             command = self._create_command(path, output_path)
             run_in_subprocess(command)
 
-            issues = parse_checkstyle_file_result(output_path,
-                                                  self.inspector_type,
-                                                  self.choose_issue_type,
-                                                  self.origin_class_to_pattern)
+            issues = parse_xml_file_result(output_path,
+                                           self.inspector_type,
+                                           self.choose_issue_type,
+                                           IssueDifficulty.get_by_issue_type,
+                                           self.origin_class_to_pattern)
 
             output_path.unlink()
 
diff --git a/src/python/review/inspectors/flake8/.flake8 b/src/python/review/inspectors/flake8/.flake8
index f0452e5a..4d379e05 100644
--- a/src/python/review/inspectors/flake8/.flake8
+++ b/src/python/review/inspectors/flake8/.flake8
@@ -1,6 +1,8 @@
 [flake8]
 disable_noqa=True
 
+max-line-length=120
+
 dictionaries=en_US,python,technical,django
 
 ignore=W291,  # trailing whitespaces
@@ -8,7 +10,6 @@ ignore=W291,  # trailing whitespaces
        W293,  # blank line contains whitespaces
        W503,  # line break before binary operator
        C408,  # unnecessary (dict/list/tuple) call - rewrite as a literal
-       E501,  # line too long
        E800,  # commented out code
        I101,  # order of imports within a line
        I202,  # additional new line
@@ -22,6 +23,9 @@ ignore=W291,  # trailing whitespaces
        WPS112, # Forbid private name pattern.
        WPS114, # Forbid names with underscored numbers pattern.
        WPS125, # Forbid variable or module names which shadow builtin names. TODO: Collision with flake8-builtins
+       # WPS: Complexity
+       WPS200, # Forbid modules with complex lines. (Jones Complexity)
+       WPS221, # Forbid complex lines. (Jones Complexity)
        # WPS: Consistency
        WPS303, # Forbid underscores in numbers.
        WPS305, # Forbid f strings.
@@ -38,6 +42,7 @@ ignore=W291,  # trailing whitespaces
        WPS362, # Forbid assignment to a subscript slice.
        # WPS: Best practices
        WPS404, # Forbid complex defaults. TODO: Collision with "B006"
+       WPS414, # Forbid tuple unpacking with side-effects. (controversial)
        WPS420, # Forbid some python keywords.
        WPS421, # Forbid calling some built-in functions.(e.g., print)
        WPS429, # Forbid multiple assignments on the same line.
diff --git a/src/python/review/inspectors/flake8/flake8.py b/src/python/review/inspectors/flake8/flake8.py
index c5dfd274..a4b19e32 100644
--- a/src/python/review/inspectors/flake8/flake8.py
+++ b/src/python/review/inspectors/flake8/flake8.py
@@ -1,7 +1,7 @@
 import logging
 import re
 from pathlib import Path
-from typing import List
+from typing import Any, Dict, List
 
 from src.python.review.common.subprocess_runner import run_in_subprocess
 from src.python.review.inspectors.base_inspector import BaseInspector
@@ -14,9 +14,11 @@
     CohesionIssue,
     CyclomaticComplexityIssue,
     IssueData,
+    IssueDifficulty,
     IssueType,
+    LineLenIssue,
 )
-from src.python.review.inspectors.tips import get_cyclomatic_complexity_tip
+from src.python.review.inspectors.tips import get_cyclomatic_complexity_tip, get_line_len_tip
 
 logger = logging.getLogger(__name__)
 
@@ -33,7 +35,7 @@ class Flake8Inspector(BaseInspector):
     inspector_type = InspectorType.FLAKE8
 
     @classmethod
-    def inspect(cls, path: Path, config: dict) -> List[BaseIssue]:
+    def inspect(cls, path: Path, config: Dict[str, Any]) -> List[BaseIssue]:
         command = [
             'flake8',
             f'--format={FORMAT}',
@@ -51,6 +53,7 @@ def parse(cls, output: str) -> List[BaseIssue]:
         row_re = re.compile(r'^(.*):(\d+):(\d+):([A-Z]+\d{3}):(.*)$', re.M)
         cc_description_re = re.compile(r"'(.+)' is too complex \((\d+)\)")
         cohesion_description_re = re.compile(r"class has low \((\d*\.?\d*)%\) cohesion")
+        line_len_description_re = re.compile(r"line too long \((\d+) > \d+ characters\)")
 
         issues: List[BaseIssue] = []
         for groups in row_re.findall(output):
@@ -58,6 +61,7 @@ def parse(cls, output: str) -> List[BaseIssue]:
             origin_class = groups[3]
             cc_match = cc_description_re.match(description)
             cohesion_match = cohesion_description_re.match(description)
+            line_len_match = line_len_description_re.match(description)
             file_path = Path(groups[0])
             line_no = int(groups[1])
 
@@ -68,20 +72,32 @@ def parse(cls, output: str) -> List[BaseIssue]:
                                                             column_number=column_number,
                                                             origin_class=origin_class)
             if cc_match is not None:  # mccabe: cyclomatic complexity
+                issue_type = IssueType.CYCLOMATIC_COMPLEXITY
                 issue_data[IssueData.DESCRIPTION.value] = get_cyclomatic_complexity_tip()
                 issue_data[IssueData.CYCLOMATIC_COMPLEXITY.value] = int(cc_match.groups()[1])
-                issue_data[IssueData.ISSUE_TYPE.value] = IssueType.CYCLOMATIC_COMPLEXITY
+                issue_data[IssueData.ISSUE_TYPE.value] = issue_type
+                issue_data[IssueData.DIFFICULTY.value] = IssueDifficulty.get_by_issue_type(issue_type)
                 issues.append(CyclomaticComplexityIssue(**issue_data))
             elif cohesion_match is not None:  # flake8-cohesion
+                issue_type = IssueType.COHESION
                 issue_data[IssueData.DESCRIPTION.value] = description  # TODO: Add tip
                 issue_data[IssueData.COHESION_LACK.value] = convert_percentage_of_value_to_lack_of_value(
                     float(cohesion_match.group(1)),
                 )
-                issue_data[IssueData.ISSUE_TYPE.value] = IssueType.COHESION
+                issue_data[IssueData.ISSUE_TYPE.value] = issue_type
+                issue_data[IssueData.DIFFICULTY.value] = IssueDifficulty.get_by_issue_type(issue_type)
                 issues.append(CohesionIssue(**issue_data))
+            elif line_len_match is not None:
+                issue_type = IssueType.LINE_LEN
+                issue_data[IssueData.DESCRIPTION.value] = get_line_len_tip()
+                issue_data[IssueData.LINE_LEN.value] = int(line_len_match.groups()[0])
+                issue_data[IssueData.ISSUE_TYPE.value] = IssueType.LINE_LEN
+                issue_data[IssueData.DIFFICULTY.value] = IssueDifficulty.get_by_issue_type(issue_type)
+                issues.append(LineLenIssue(**issue_data))
             else:
                 issue_type = cls.choose_issue_type(origin_class)
                 issue_data[IssueData.ISSUE_TYPE.value] = issue_type
+                issue_data[IssueData.DIFFICULTY.value] = IssueDifficulty.get_by_issue_type(issue_type)
                 issue_data[IssueData.DESCRIPTION.value] = description
                 issues.append(CodeIssue(**issue_data))
 
diff --git a/src/python/review/inspectors/flake8/issue_types.py b/src/python/review/inspectors/flake8/issue_types.py
index b1074b52..a57031ba 100644
--- a/src/python/review/inspectors/flake8/issue_types.py
+++ b/src/python/review/inspectors/flake8/issue_types.py
@@ -73,6 +73,7 @@
     'WPS419': IssueType.ERROR_PRONE,  # Forbid multiple returning paths with try / except case.
     'WPS424': IssueType.ERROR_PRONE,  # Forbid BaseException exception.
     'WPS426': IssueType.ERROR_PRONE,  # Forbid lambda inside loops.
+    'WPS428': IssueType.ERROR_PRONE,  # Forbid statements that do nothing.
     'WPS432': IssueType.INFO,  # Forbid magic numbers.
     'WPS433': IssueType.CODE_STYLE,  # Forbid imports nested in functions.
     'WPS439': IssueType.ERROR_PRONE,  # Forbid Unicode escape sequences in binary strings.
diff --git a/src/python/review/inspectors/flake8/whitelist.txt b/src/python/review/inspectors/flake8/whitelist.txt
index 38715032..a7f838c1 100644
--- a/src/python/review/inspectors/flake8/whitelist.txt
+++ b/src/python/review/inspectors/flake8/whitelist.txt
@@ -21,6 +21,7 @@ configs
 consts
 coord
 copysign
+coroutine
 csgraph
 ctime
 dataframe
@@ -31,6 +32,7 @@ decrypted
 dedent
 deque
 desc
+destructuring
 devs
 df
 dicts
@@ -74,6 +76,7 @@ iterrows
 kcal
 kcals
 lastname
+lateinit
 lemmatize
 lemmatizer
 lifes
@@ -86,6 +89,7 @@ lowercased
 lvl
 lxml
 matmul
+metaclass
 minsize
 multiline
 nbins
@@ -94,6 +98,7 @@ ndigits
 ndim
 nltk
 nrows
+nullable
 numpy
 nums
 ost
@@ -114,6 +119,7 @@ showline
 sigmoid
 sqrt
 src
+stdlib
 stemmer
 stepik
 subdicts
@@ -123,6 +129,7 @@ substr
 substring
 textposition
 textwrap
+throwable
 todos
 tokenize
 tokenized
@@ -132,6 +139,7 @@ toplevel
 tracklist
 truediv
 truthy
+unary
 uniformtext
 unpickled
 upd
diff --git a/src/python/review/inspectors/inspector_type.py b/src/python/review/inspectors/inspector_type.py
index 15482a8b..9ece1949 100644
--- a/src/python/review/inspectors/inspector_type.py
+++ b/src/python/review/inspectors/inspector_type.py
@@ -13,16 +13,16 @@ class InspectorType(Enum):
     # Java language
     PMD = 'PMD'
     CHECKSTYLE = 'CHECKSTYLE'
-    SPOTBUGS = 'SPOTBUGS'
-    SPRINGLINT = 'SPRINGLINT'
 
     # Kotlin language
     DETEKT = 'DETEKT'
-    INTELLIJ = 'INTELLIJ'
 
     # JavaScript language
     ESLINT = 'ESLINT'
 
+    UNDEFINED = 'UNDEFINED'
+    QODANA = 'QODANA'
+
     @classmethod
     def available_values(cls) -> List[str]:
         return [
diff --git a/src/python/review/inspectors/intellij/intellij.py b/src/python/review/inspectors/intellij/intellij.py
deleted file mode 100644
index b50dc0ca..00000000
--- a/src/python/review/inspectors/intellij/intellij.py
+++ /dev/null
@@ -1,177 +0,0 @@
-import logging
-import os
-import re
-from pathlib import Path
-from typing import Dict, List, Optional, Union
-from xml.etree import ElementTree
-
-from src.python.review.common.file_system import get_all_file_system_items, new_temp_dir
-from src.python.review.common.subprocess_runner import run_in_subprocess
-from src.python.review.inspectors.base_inspector import BaseInspector
-from src.python.review.inspectors.inspector_type import InspectorType
-from src.python.review.inspectors.intellij.issue_types import ISSUE_CLASS_TO_ISSUE_TYPE
-from src.python.review.inspectors.issue import BaseIssue, CodeIssue, IssueType
-
-logger = logging.getLogger(__name__)
-
-INTELLIJ_INSPECTOR_EXECUTABLE = os.environ.get('INTELLIJ_INSPECTOR_EXECUTABLE')
-INTELLIJ_INSPECTOR_PROJECT = Path(__file__).parent / 'project'
-INTELLIJ_INSPECTOR_SETTINGS = (INTELLIJ_INSPECTOR_PROJECT / '.idea' / 'inspectionProfiles' / 'custom_profiles.xml')
-
-PYTHON_FOLDER = 'python_sources'
-JAVA_FOLDER = 'java_sources/src'
-KOTLIN_FOLDER = 'kotlin_sources/src'
-
-PYTHON_SOURCES = INTELLIJ_INSPECTOR_PROJECT / PYTHON_FOLDER
-JAVA_SOURCES = INTELLIJ_INSPECTOR_PROJECT / JAVA_FOLDER
-KOTLIN_SOURCES = INTELLIJ_INSPECTOR_PROJECT / KOTLIN_FOLDER
-
-SUPPORTED_EXTENSIONS = ('.java', '.py', '.kt', '.kts')
-
-
-class IntelliJInspector(BaseInspector):
-    inspector_type = InspectorType.INTELLIJ
-
-    skipped_issues = [
-        'Unresolved references',
-    ]
-
-    def __init__(self):
-        if not JAVA_SOURCES.exists():
-            JAVA_SOURCES.mkdir(parents=True)
-        if not PYTHON_SOURCES.exists():
-            PYTHON_SOURCES.mkdir(parents=True)
-        if not KOTLIN_SOURCES.exists():
-            KOTLIN_SOURCES.mkdir(parents=True)
-
-    @staticmethod
-    def create_command(output_dir_path) -> List[Union[str, Path]]:
-        return [
-            INTELLIJ_INSPECTOR_EXECUTABLE, INTELLIJ_INSPECTOR_PROJECT,
-            INTELLIJ_INSPECTOR_SETTINGS, output_dir_path, '-v2',
-        ]
-
-    def inspect(self, path: Path, config: dict) -> List[BaseIssue]:
-
-        path_in_project_to_origin_path = self.copy_files_to_project(path)
-        try:
-            with new_temp_dir() as temp_dir:
-                command = self.create_command(temp_dir)
-                run_in_subprocess(command)
-                issues = self.parse(temp_dir, path_in_project_to_origin_path)
-        finally:
-            for file_path_in_project in path_in_project_to_origin_path:
-                file_path_in_project.unlink()
-
-        return issues
-
-    def copy_files_to_project(self, path: Path) -> Dict[Path, Path]:
-        if path.is_file():
-            root_path = path.parent
-            file_paths = [path]
-        elif path.is_dir():
-            root_path = path
-            file_paths = get_all_file_system_items(root_path)
-        else:
-            raise ValueError
-
-        path_in_project_to_origin_path = {}
-        for file_path in file_paths:
-            if not self.check_supported_extension(file_path):
-                continue
-
-            relative_file_path = file_path.relative_to(root_path)
-            file_path_in_project = self._get_file_path_in_project(relative_file_path)
-
-            text = file_path.read_text()
-            file_path_in_project.write_text(text)
-
-            path_in_project_to_origin_path[file_path_in_project] = file_path
-
-        return path_in_project_to_origin_path
-
-    @staticmethod
-    def check_supported_extension(file_path: Path) -> bool:
-        return file_path.suffix.endswith(SUPPORTED_EXTENSIONS)
-
-    @classmethod
-    def _get_file_path_in_project(cls, relative_file_path: Path) -> Path:
-
-        if relative_file_path.suffix.endswith('.java'):
-            return JAVA_SOURCES / relative_file_path
-
-        elif relative_file_path.suffix.endswith(('.kt', '.kts')):
-            return KOTLIN_SOURCES / relative_file_path
-
-        elif relative_file_path.suffix.endswith('.py'):
-            return PYTHON_SOURCES / relative_file_path
-
-        else:
-            raise ValueError
-
-    @classmethod
-    def parse(cls, out_dir_path: Path,
-              path_in_project_to_origin_path: Dict[Path, Path]) -> List[BaseIssue]:
-        out_file_paths = [
-            file_path for file_path in get_all_file_system_items(out_dir_path)
-            if file_path.suffix.endswith('.xml') and not file_path.name.startswith('.')
-        ]
-
-        issues: List[BaseIssue] = []
-        for file_path in out_file_paths:
-            tree = ElementTree.parse(file_path)
-            root = tree.getroot()
-            for child in root:
-                file_path: Optional[Path] = None
-                line_no: Optional[int] = None
-                issue_class: Optional[str] = None
-                description: Optional[str] = None
-
-                for element in child:
-                    tag = element.tag
-                    text = element.text
-                    if tag == 'file':
-                        file_path = Path(
-                            text.replace(
-                                'file://$PROJECT_DIR$',
-                                str(INTELLIJ_INSPECTOR_PROJECT),
-                            ),
-                        )
-                    elif tag == 'line':
-                        line_no = int(text)
-                    elif tag == 'problem_class':
-                        issue_class = text
-                    elif tag == 'description':
-                        description = (re.compile(r'<[^<]+>')
-                                       .sub('', text)
-                                       .replace('#loc', ''))
-
-                if not file_path or not line_no or not issue_class or not description:
-                    continue
-                else:
-                    issue_type = cls.choose_issue_type(issue_class)
-                    file_path = path_in_project_to_origin_path[file_path]
-
-                    if issue_type and issue_class not in cls.skipped_issues:
-                        issues.append(CodeIssue(
-                            file_path=file_path,
-                            line_no=line_no,
-                            column_no=1,
-                            description=description,
-                            origin_class=issue_class,
-                            inspector_type=cls.inspector_type,
-                            type=issue_type,
-                        ))
-
-        return issues
-
-    @classmethod
-    def choose_issue_type(cls, issue_class: str) -> IssueType:
-
-        issue_type = ISSUE_CLASS_TO_ISSUE_TYPE.get(issue_class)
-        if not issue_type:
-            logger.warning('%s: %s - unknown error code' %
-                           (cls.inspector_type.value, issue_class))
-            issue_type = None
-
-        return issue_type
diff --git a/src/python/review/inspectors/intellij/issue_types/__init__.py b/src/python/review/inspectors/intellij/issue_types/__init__.py
deleted file mode 100644
index 97b8d31e..00000000
--- a/src/python/review/inspectors/intellij/issue_types/__init__.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from typing import Dict
-
-from src.python.review.inspectors.intellij.issue_types.java import (
-    ISSUE_CLASS_TO_ISSUE_TYPE as JAVA_ISSUE_CLASS_TO_ISSUE_TYPE,
-)
-from src.python.review.inspectors.intellij.issue_types.kotlin import (
-    ISSUE_CLASS_TO_ISSUE_TYPE as KOTLIN_ISSUE_CLASS_TO_ISSUE_TYPE,
-)
-from src.python.review.inspectors.intellij.issue_types.python import (
-    ISSUE_CLASS_TO_ISSUE_TYPE as PYTHON_ISSUE_CLASS_TO_ISSUE_TYPE,
-)
-from src.python.review.inspectors.issue import IssueType
-
-ISSUE_CLASS_TO_ISSUE_TYPE: Dict[str, IssueType] = {
-    **JAVA_ISSUE_CLASS_TO_ISSUE_TYPE,
-    **PYTHON_ISSUE_CLASS_TO_ISSUE_TYPE,
-    **KOTLIN_ISSUE_CLASS_TO_ISSUE_TYPE,
-}
diff --git a/src/python/review/inspectors/intellij/issue_types/java.py b/src/python/review/inspectors/intellij/issue_types/java.py
deleted file mode 100644
index 3019b353..00000000
--- a/src/python/review/inspectors/intellij/issue_types/java.py
+++ /dev/null
@@ -1,1671 +0,0 @@
-from typing import Dict
-
-from src.python.review.inspectors.issue import IssueType
-
-ISSUE_CLASS_TO_ISSUE_TYPE: Dict[str, IssueType] = {
-    'Interface method clashes with method in \'java.lang.Object\'':
-        IssueType.BEST_PRACTICES,
-
-    '\'Optional\' used as field or parameter type':
-        IssueType.BEST_PRACTICES,
-
-    'Incompatible bitwise mask operation':
-        IssueType.ERROR_PRONE,
-
-    'Pointless bitwise expression':
-        IssueType.BEST_PRACTICES,
-
-    'Shift operation by inappropriate constant':
-        IssueType.ERROR_PRONE,
-
-    'Abstract class may be interface':
-        IssueType.BEST_PRACTICES,
-
-    'Field can be local':
-        IssueType.BEST_PRACTICES,
-
-    'Parameter can be local':
-        IssueType.BEST_PRACTICES,
-
-    '\'private\' method declared \'final\'':
-        IssueType.BEST_PRACTICES,
-
-    '\'static\' method declared \'final\'':
-        IssueType.BEST_PRACTICES,
-
-    'Deprecated API usage':
-        IssueType.BEST_PRACTICES,
-
-    'Usage of API marked for removal':
-        IssueType.ERROR_PRONE,
-
-    'Deprecated member is still used':
-        IssueType.BEST_PRACTICES,
-
-    'Deprecated method is still used':
-        IssueType.BEST_PRACTICES,
-
-    'Javac quirks':
-        IssueType.ERROR_PRONE,
-
-    'Unchecked warning':
-        IssueType.ERROR_PRONE,
-
-    # Java language level migration aids
-    '\'compare()\' method can be used to compare numbers':
-        IssueType.BEST_PRACTICES,
-
-    '\'if\' replaceable with \'switch\'':
-        IssueType.BEST_PRACTICES,
-
-    'Usages of API which isn\'t available at the configured language level':
-        IssueType.ERROR_PRONE,
-
-    # To Java 5
-    'Raw use of parameterized class': IssueType.BEST_PRACTICES,
-    'Unnecessary boxing': IssueType.BEST_PRACTICES,
-    'Unnecessary unboxing': IssueType.BEST_PRACTICES,
-
-    # To Java 7
-    '\'equals()\' expression replaceable by \'Objects.equals()\' expression':
-        IssueType.BEST_PRACTICES,
-
-    'Explicit type can be replaced with <>':
-        IssueType.BEST_PRACTICES,
-
-    'Identical \'catch\' branches in \'try\' statement':
-        IssueType.BEST_PRACTICES,
-
-    '\'try finally\' replaceable with \'try\' with resources':
-        IssueType.BEST_PRACTICES,
-
-    # To Java 8
-    'Anonymous type can be replaced with lambda':
-        IssueType.BEST_PRACTICES,
-
-    'Anonymous type can be replaced with method reference':
-        IssueType.BEST_PRACTICES,
-
-    'Anonymous type has shorter lambda alternative':
-        IssueType.BEST_PRACTICES,
-
-    'Comparator combinator can be used':
-        IssueType.BEST_PRACTICES,
-
-    'Loop can be replaced with Collection.removeIf()':
-        IssueType.BEST_PRACTICES,
-
-    # To Java 9
-    'Immutable collection creation can be replaced with collection factory call':
-        IssueType.BEST_PRACTICES,
-
-    'Null check can be replaced with method call':
-        IssueType.BEST_PRACTICES,
-
-    # Java | Abstraction issues
-    'Cast to a concrete class':
-        IssueType.BEST_PRACTICES,
-    'Chain of \'instanceof\' checks':
-        IssueType.BEST_PRACTICES,
-    'Class references one of its subclasses':
-        IssueType.BEST_PRACTICES,
-    'Collection declared by class, not interface':
-        IssueType.BEST_PRACTICES,
-    'Feature envy':
-        IssueType.BEST_PRACTICES,
-    '\'instanceof\' a concrete class':
-        IssueType.BEST_PRACTICES,
-    '\'instanceof\' check for \'this\'':
-        IssueType.BEST_PRACTICES,
-    'Local variable of concrete class':
-        IssueType.BEST_PRACTICES,
-    'Magic number':
-        IssueType.BEST_PRACTICES,
-    'Method parameter of concrete class':
-        IssueType.BEST_PRACTICES,
-    'Method return of concrete class':
-        IssueType.BEST_PRACTICES,
-    'Overly strong type cast':
-        IssueType.BEST_PRACTICES,
-    'Private method only used from inner class':
-        IssueType.BEST_PRACTICES,
-    '\'public\' method not exposed in interface':
-        IssueType.BEST_PRACTICES,
-    '\'public\' method with \'boolean\' parameter':
-        IssueType.BEST_PRACTICES,
-    'Static field of concrete class':
-        IssueType.BEST_PRACTICES,
-    'Static method only used from one other class':
-        IssueType.BEST_PRACTICES,
-    'Type may be weakened':
-        IssueType.BEST_PRACTICES,
-    'Type of instance field is concrete class':
-        IssueType.BEST_PRACTICES,
-
-    # Java | Assignment issues
-    'Assignment replaceable with operator assignment':
-        IssueType.BEST_PRACTICES,
-    'Assignment to \'for\' loop parameter':
-        IssueType.ERROR_PRONE,
-    'Assignment to catch block parameter':
-        IssueType.ERROR_PRONE,
-    'Assignment to lambda parameter':
-        IssueType.ERROR_PRONE,
-    'Assignment to method parameter':
-        IssueType.ERROR_PRONE,
-    'Assignment to static field from instance context':
-        IssueType.ERROR_PRONE,
-    'Assignment used as condition':
-        IssueType.ERROR_PRONE,
-    'Constructor assigns value to field defined in superclass':
-        IssueType.ERROR_PRONE,
-    '\'null\' assignment':
-        IssueType.BEST_PRACTICES,
-    'Result of assignment used':
-        IssueType.BEST_PRACTICES,
-    'Value of ++ or -- used':
-        IssueType.BEST_PRACTICES,
-
-    # Java | Class metric
-    'Anonymous inner class with too many methods':
-        IssueType.BEST_PRACTICES,
-    'Class too deep in inheritance tree':
-        IssueType.BEST_PRACTICES,
-    'Class with too many constructors':
-        IssueType.BEST_PRACTICES,
-    'Class with too many fields':
-        IssueType.BEST_PRACTICES,
-    'Class with too many methods':
-        IssueType.BEST_PRACTICES,
-    'Inner class too deeply nested':
-        IssueType.BEST_PRACTICES,
-    'Overly complex anonymous class':
-        IssueType.BEST_PRACTICES,
-    'Overly complex class':
-        IssueType.BEST_PRACTICES,
-    'Overly coupled class':
-        IssueType.BEST_PRACTICES,
-
-    # Java | Class structure
-    'Anonymous inner class':
-        IssueType.BEST_PRACTICES,
-    'Class may extend adapter instead of implementing listener':
-        IssueType.BEST_PRACTICES,
-    'Class name differs from file name':
-        IssueType.BEST_PRACTICES,
-    'Class with only \'private\' constructors should be declared \'final\'':
-        IssueType.BEST_PRACTICES,
-    'Constant declared in abstract class':
-        IssueType.BEST_PRACTICES,
-    'Constant declared in interface':
-        IssueType.BEST_PRACTICES,
-    'Empty class':
-        IssueType.BEST_PRACTICES,
-    '\'final\' class':
-        IssueType.BEST_PRACTICES,
-    '\'final\' method':
-        IssueType.BEST_PRACTICES,
-    '\'final\' method in \'final\' class':
-        IssueType.BEST_PRACTICES,
-    'Inner class of interface':
-        IssueType.BEST_PRACTICES,
-    'Interface may be annotated @FunctionalInterface':
-        IssueType.BEST_PRACTICES,
-    'Limited-scope inner class':
-        IssueType.BEST_PRACTICES,
-    'Marker interface':
-        IssueType.BEST_PRACTICES,
-    'Method returns per-class constant':
-        IssueType.BEST_PRACTICES,
-    'Multiple top level classes in single file':
-        IssueType.BEST_PRACTICES,
-    'No-op method in abstract class':
-        IssueType.BEST_PRACTICES,
-    'Non-\'final\' field in enum':
-        IssueType.BEST_PRACTICES,
-    'Non-\'static\' initializer':
-        IssueType.BEST_PRACTICES,
-    '\'protected\' member in \'final\' class':
-        IssueType.BEST_PRACTICES,
-    '\'public\' constructor':
-        IssueType.BEST_PRACTICES,
-    '\'public\' constructor in non-public class':
-        IssueType.BEST_PRACTICES,
-    'Singleton':
-        IssueType.BEST_PRACTICES,
-    '\'static\', non-\'final\' field':
-        IssueType.BEST_PRACTICES,
-
-    'Utility class':
-        IssueType.BEST_PRACTICES,
-    'Utility class can be \'enum\'':
-        IssueType.BEST_PRACTICES,
-    'Utility class is not \'final\'':
-        IssueType.BEST_PRACTICES,
-    'Utility class with \'public\' constructor':
-        IssueType.BEST_PRACTICES,
-    'Utility class without \'private\' constructor':
-        IssueType.BEST_PRACTICES,
-
-    # Java | Cloning issues
-    '\'clone()\' does not declare \'CloneNotSupportedException\'':
-        IssueType.ERROR_PRONE,
-    '\'clone()\' instantiates objects with constructor':
-        IssueType.ERROR_PRONE,
-    '\'clone()\' method in non-Cloneable class':
-        IssueType.ERROR_PRONE,
-    '\'clone()\' method not \'public\'':
-        IssueType.ERROR_PRONE,
-    '\'clone()\' should have return type equal to the class it contains':
-        IssueType.ERROR_PRONE,
-    'Cloneable class without \'clone()\' method':
-        IssueType.ERROR_PRONE,
-    'Use of \'clone()\' or \'Cloneable\'':
-        IssueType.BEST_PRACTICES,
-
-    # Java | Code maturity
-    'Call to \'printStackTrace()\'':
-        IssueType.BEST_PRACTICES,
-    'Call to \'Thread.dumpStack()\'':
-        IssueType.BEST_PRACTICES,
-    'Inspection suppression annotation':
-        IssueType.BEST_PRACTICES,
-    '\'Throwable\' printed to \'System.out\'':
-        IssueType.BEST_PRACTICES,
-    'Use of obsolete collection type':
-        IssueType.BEST_PRACTICES,
-    'Use of obsolete date-time API':
-        IssueType.BEST_PRACTICES,
-    'Use of System.out or System.err':
-        IssueType.BEST_PRACTICES,
-
-    # Java | Code style issues
-    'Array can be replaced with enum values':
-        IssueType.CODE_STYLE,
-    'Array creation without \'new\' expression':
-        IssueType.CODE_STYLE,
-    '\'assert\' message is not a String':
-        IssueType.CODE_STYLE,
-    'Assignment can be joined with declaration':
-        IssueType.CODE_STYLE,
-    'Block marker comment':
-        IssueType.CODE_STYLE,
-    'C-style array declaration':
-        IssueType.CODE_STYLE,
-    'Call to \'String.concat()\' can be replaced with \'+\'':
-        IssueType.CODE_STYLE,
-    'Can use bounded wildcard':
-        IssueType.CODE_STYLE,
-    'Chained equality comparisons':
-        IssueType.CODE_STYLE,
-    'Chained method calls':
-        IssueType.CODE_STYLE,
-    'Class explicitly extends \'java.lang.Object\'':
-        IssueType.CODE_STYLE,
-    'Code block contains single statement':
-        IssueType.CODE_STYLE,
-    'Conditional can be replaced with Optional':
-        IssueType.CODE_STYLE,
-    'Confusing octal escape sequence':
-        IssueType.CODE_STYLE,
-    'Constant expression can be evaluated':
-        IssueType.CODE_STYLE,
-    'Constant on the wrong side of comparison':
-        IssueType.CODE_STYLE,
-    'Control flow statement without braces':
-        IssueType.CODE_STYLE,
-    'Diamond can be replaced with explicit type arguments':
-        IssueType.CODE_STYLE,
-    '\'equals()\' called on Enum value':
-        IssueType.CODE_STYLE,
-    '\'expression.equals(\'literal\')\' rather '
-    'than \'\'literal\'.equals(expression)\'':
-        IssueType.CODE_STYLE,
-    'Field assignment can be moved to initializer':
-        IssueType.CODE_STYLE,
-    'Field may be \'final\'':
-        IssueType.CODE_STYLE,
-    'If statement can be replaced with ?:, && or || expression':
-        IssueType.CODE_STYLE,
-    'Implicit call to \'super()\'':
-        IssueType.CODE_STYLE,
-    '\'indexOf()\' expression is replaceable with \'contains()\'':
-        IssueType.CODE_STYLE,
-    'Instance field access not qualified with \'this\'':
-        IssueType.CODE_STYLE,
-    'Instance method call not qualified with \'this\'':
-        IssueType.CODE_STYLE,
-    'Labeled switch rule can have code block':
-        IssueType.CODE_STYLE,
-    'Labeled switch rule has redundant code block':
-        IssueType.CODE_STYLE,
-    'Lambda body can be code block':
-        IssueType.CODE_STYLE,
-    'Lambda can be replaced with anonymous class':
-        IssueType.CODE_STYLE,
-    'Lambda parameter type can be specified':
-        IssueType.CODE_STYLE,
-    'Local variable or parameter can be final':
-        IssueType.CODE_STYLE,
-    'Method reference can be replaced with lambda':
-        IssueType.CODE_STYLE,
-    'Missorted modifiers':
-        IssueType.CODE_STYLE,
-    'Multi-catch can be split into separate catch blocks':
-        IssueType.CODE_STYLE,
-    'Multiple variables in one declaration':
-        IssueType.CODE_STYLE,
-    'Nested method call':
-        IssueType.CODE_STYLE,
-    'Null value for Optional type':
-        IssueType.CODE_STYLE,
-    'Objects.equals() can be replaced with equals()':
-        IssueType.CODE_STYLE,
-    '\'Optional\' contains array or collection':
-        IssueType.CODE_STYLE,
-    'Optional.isPresent() can be replaced with functional-style expression':
-        IssueType.CODE_STYLE,
-    'Raw type can be generic':
-        IssueType.CODE_STYLE,
-    'Redundant \'new\' expression in constant array creation':
-        IssueType.CODE_STYLE,
-    'Redundant field initialization':
-        IssueType.CODE_STYLE,
-    'Redundant interface declaration':
-        IssueType.CODE_STYLE,
-    'Redundant no-arg constructor':
-        IssueType.CODE_STYLE,
-    '\'return\' separated from the result computation':
-        IssueType.CODE_STYLE,
-    'Return of \'this\'':
-        IssueType.CODE_STYLE,
-    'Simplifiable annotation':
-        IssueType.CODE_STYLE,
-    'Single-element annotation':
-        IssueType.CODE_STYLE,
-    '\'size() == 0\' replaceable with \'isEmpty()\'':
-        IssueType.CODE_STYLE,
-    'Standard Charset object can be used':
-        IssueType.CODE_STYLE,
-    'Stream API call chain can be replaced with loop':
-        IssueType.CODE_STYLE,
-    'Subsequent steps can be fused into Stream API chain':
-        IssueType.CODE_STYLE,
-    '\'try\' statement with multiple resources can be split':
-        IssueType.CODE_STYLE,
-    'Type parameter explicitly extends \'java.lang.Object\'':
-        IssueType.CODE_STYLE,
-    'Unclear expression':
-        IssueType.CODE_STYLE,
-    'Unnecessarily qualified inner class access':
-        IssueType.CODE_STYLE,
-    'Unnecessarily qualified static access':
-        IssueType.CODE_STYLE,
-    'Unnecessarily qualified statically imported element':
-        IssueType.CODE_STYLE,
-    'Unnecessary \'final\' on local variable or parameter':
-        IssueType.CODE_STYLE,
-    'Unnecessary \'null\' check before \'equals()\' call':
-        IssueType.CODE_STYLE,
-    'Unnecessary \'super\' qualifier':
-        IssueType.CODE_STYLE,
-    'Unnecessary \'this\' qualifier':
-        IssueType.CODE_STYLE,
-    'Unnecessary call to \'super()\'':
-        IssueType.CODE_STYLE,
-    'Unnecessary call to \'toString()\'':
-        IssueType.CODE_STYLE,
-    'Unnecessary code block':
-        IssueType.CODE_STYLE,
-    'Unnecessary conversion to String':
-        IssueType.CODE_STYLE,
-    'Unnecessary enum modifier':
-        IssueType.CODE_STYLE,
-    'Unnecessary fully qualified name':
-        IssueType.CODE_STYLE,
-    'Unnecessary interface modifier':
-        IssueType.CODE_STYLE,
-    'Unnecessary parentheses':
-        IssueType.CODE_STYLE,
-    'Unnecessary qualifier for \'this\' or \'super\'':
-        IssueType.CODE_STYLE,
-    'Unnecessary semicolon':
-        IssueType.CODE_STYLE,
-    'Unqualified inner class access':
-        IssueType.CODE_STYLE,
-    'Unqualified static access':
-        IssueType.CODE_STYLE,
-
-    # Java | Control flow issues
-    'Assertion can be replaced with if statement':
-        IssueType.ERROR_PRONE,
-    'Boolean expression could be replaced with conditional expression':
-        IssueType.BEST_PRACTICES,
-    '\'break\' statement':
-        IssueType.BEST_PRACTICES,
-    '\'break\' statement with label':
-        IssueType.BEST_PRACTICES,
-    'Conditional break inside infinite loop':
-        IssueType.BEST_PRACTICES,
-    'Conditional can be pushed inside branch expression':
-        IssueType.BEST_PRACTICES,
-    'Conditional expression (?:)':
-        IssueType.BEST_PRACTICES,
-    'Conditional expression with identical branches':
-        IssueType.BEST_PRACTICES,
-    'Conditional expression with negated condition':
-        IssueType.BEST_PRACTICES,
-    'Constant conditional expression':
-        IssueType.BEST_PRACTICES,
-    '\'continue\' statement':
-        IssueType.BEST_PRACTICES,
-    '\'continue\' statement with label':
-        IssueType.BEST_PRACTICES,
-    '\'default\' not last case in \'switch\' statement':
-        IssueType.BEST_PRACTICES,
-    'Double negation':
-        IssueType.BEST_PRACTICES,
-    'Duplicate condition in \'if\' statement':
-        IssueType.BEST_PRACTICES,
-    'Duplicate condition on \'&&\' or \'||\'':
-        IssueType.BEST_PRACTICES,
-    'Enum \'switch\' statement that misses case':
-        IssueType.BEST_PRACTICES,
-    'Fallthrough in \'switch\' statement':
-        IssueType.BEST_PRACTICES,
-    '\'for\' loop may be replaced with \'while\' loop':
-        IssueType.BEST_PRACTICES,
-    '\'for\' loop with missing components':
-        IssueType.BEST_PRACTICES,
-    'Idempotent loop body':
-        IssueType.BEST_PRACTICES,
-    '\'if\' statement could be replaced with conditional expression':
-        IssueType.BEST_PRACTICES,
-    '\'if\' statement with common parts':
-        IssueType.BEST_PRACTICES,
-    '\'if\' statement with negated condition':
-        IssueType.BEST_PRACTICES,
-    '\'if\' statement with too many branches':
-        IssueType.BEST_PRACTICES,
-    'Infinite loop statement':
-        IssueType.BEST_PRACTICES,
-    'Labeled statement':
-        IssueType.BEST_PRACTICES,
-    'Local variable used and declared in different \'switch\' branches':
-        IssueType.BEST_PRACTICES,
-    'Loop statement that does not loop':
-        IssueType.BEST_PRACTICES,
-    'Loop variable not updated inside loop':
-        IssueType.ERROR_PRONE,
-    'Loop with implicit termination condition':
-        IssueType.BEST_PRACTICES,
-    'Negated conditional expression':
-        IssueType.BEST_PRACTICES,
-    'Negated equality expression':
-        IssueType.BEST_PRACTICES,
-    'Nested \'switch\'':
-        IssueType.BEST_PRACTICES,
-    'Nested conditional expression':
-        IssueType.BEST_PRACTICES,
-    'Overly complex boolean expression':
-        IssueType.BEST_PRACTICES,
-    'Pointless \'indexOf()\' comparison':
-        IssueType.BEST_PRACTICES,
-    'Pointless boolean expression':
-        IssueType.BEST_PRACTICES,
-    'Redundant \'else\'':
-        IssueType.BEST_PRACTICES,
-    'Redundant \'if\' statement':
-        IssueType.BEST_PRACTICES,
-    'Redundant conditional expression':
-        IssueType.BEST_PRACTICES,
-    'Simplifiable boolean expression':
-        IssueType.BEST_PRACTICES,
-    'Simplifiable conditional expression':
-        IssueType.BEST_PRACTICES,
-    'Statement can be replaced with \'assert\' or \'Objects.requireNonNull\'':
-        IssueType.BEST_PRACTICES,
-    '\'switch\' statement':
-        IssueType.BEST_PRACTICES,
-    '\'switch\' statement with too few branches':
-        IssueType.BEST_PRACTICES,
-    '\'switch\' statement with too low of a branch density':
-        IssueType.BEST_PRACTICES,
-    '\'switch\' statement with too many branches':
-        IssueType.BEST_PRACTICES,
-    '\'switch\' statement without \'default\' branch':
-        IssueType.BEST_PRACTICES,
-    'Unnecessary \'null\' check before method call':
-        IssueType.BEST_PRACTICES,
-
-    # Java | Data flow
-    'Boolean method is always inverted':
-        IssueType.BEST_PRACTICES,
-    'Boolean variable is always inverted':
-        IssueType.BEST_PRACTICES,
-    'Method call violates Law of Demeter':
-        IssueType.BEST_PRACTICES,
-    'Negatively named boolean variable':
-        IssueType.BEST_PRACTICES,
-    'Redundant local variable':
-        IssueType.BEST_PRACTICES,
-    'Reuse of local variable':
-        IssueType.BEST_PRACTICES,
-    'Scope of variable is too broad':
-        IssueType.BEST_PRACTICES,
-    'Use of variable whose value is known to be constant':
-        IssueType.BEST_PRACTICES,
-
-    # Java | Declaration redundancy
-    'Access static member via instance reference':
-        IssueType.BEST_PRACTICES,
-    'Actual method parameter is the same constant':
-        IssueType.BEST_PRACTICES,
-    'Collector can be simplified':
-        IssueType.BEST_PRACTICES,
-    'Declaration access can be weaker':
-        IssueType.BEST_PRACTICES,
-    'Declaration can have final modifier':
-        IssueType.BEST_PRACTICES,
-    'Default annotation parameter value':
-        IssueType.BEST_PRACTICES,
-    'Duplicate throws':
-        IssueType.BEST_PRACTICES,
-    'Empty method':
-        IssueType.BEST_PRACTICES,
-    'Functional expression can be folded':
-        IssueType.BEST_PRACTICES,
-    'Method can be void':
-        IssueType.BEST_PRACTICES,
-    'Method returns the same value':
-        IssueType.BEST_PRACTICES,
-    'Null-check method is called with obviously non-null argument':
-        IssueType.BEST_PRACTICES,
-    'Optional call chain can be simplified':
-        IssueType.BEST_PRACTICES,
-    'Redundant \'close()\'':
-        IssueType.BEST_PRACTICES,
-    'Redundant \'requires\' statement in module-info':
-        IssueType.BEST_PRACTICES,
-    'Redundant \'throws\' clause':
-        IssueType.BEST_PRACTICES,
-    'Redundant lambda parameter types':
-        IssueType.BEST_PRACTICES,
-    'Redundant operation on empty container':
-        IssueType.BEST_PRACTICES,
-    'Redundant step in Stream or Optional call chain':
-        IssueType.BEST_PRACTICES,
-    'Stream API call chain can be simplified':
-        IssueType.BEST_PRACTICES,
-    'Trivial usage of functional expression':
-        IssueType.BEST_PRACTICES,
-    'Unnecessary module dependency':
-        IssueType.BEST_PRACTICES,
-    'Unused declaration':
-        IssueType.BEST_PRACTICES,
-    'Unused label':
-        IssueType.BEST_PRACTICES,
-    'Unused library':
-        IssueType.BEST_PRACTICES,
-    'Variable is assigned to itself':
-        IssueType.BEST_PRACTICES,
-    'Wrapper type may be primitive':
-        IssueType.BEST_PRACTICES,
-
-    # Java | Dependency issues
-    'Class with too many dependencies':
-        IssueType.BEST_PRACTICES,
-    'Class with too many dependents':
-        IssueType.BEST_PRACTICES,
-    'Class with too many transitive dependencies':
-        IssueType.BEST_PRACTICES,
-    'Class with too many transitive dependents':
-        IssueType.BEST_PRACTICES,
-    'Cyclic class dependency':
-        IssueType.BEST_PRACTICES,
-    'Cyclic package dependency':
-        IssueType.BEST_PRACTICES,
-    'Illegal package dependencies':
-        IssueType.ERROR_PRONE,
-
-    # Java | Encapsulation
-    'Accessing a non-public field of another object':
-        IssueType.BEST_PRACTICES,
-    'Assignment or return of field with mutable type':
-        IssueType.BEST_PRACTICES,
-    'Package-visible field':
-        IssueType.BEST_PRACTICES,
-    'Package-visible nested class':
-        IssueType.BEST_PRACTICES,
-    'Protected field':
-        IssueType.BEST_PRACTICES,
-    'Protected nested class':
-        IssueType.BEST_PRACTICES,
-    '\'public\' field':
-        IssueType.BEST_PRACTICES,
-    '\'public\' nested class':
-        IssueType.BEST_PRACTICES,
-
-    # Java | Error handling
-    'Catch block may ignore exception':
-        IssueType.ERROR_PRONE,
-    'Caught exception is immediately rethrown':
-        IssueType.BEST_PRACTICES,
-    'Checked exception class':
-        IssueType.BEST_PRACTICES,
-    'Class directly extends \'java.lang.Throwable\'':
-        IssueType.BEST_PRACTICES,
-    '\'continue\' or \'break\' inside \'finally\' block':
-        IssueType.ERROR_PRONE,
-    'Empty \'finally\' block':
-        IssueType.BEST_PRACTICES,
-    'Empty \'try\' block':
-        IssueType.BEST_PRACTICES,
-    'Exception constructor called without arguments':
-        IssueType.BEST_PRACTICES,
-    '\'finally\' block which can not complete normally':
-        IssueType.ERROR_PRONE,
-    '\'instanceof\' on \'catch\' parameter':
-        IssueType.BEST_PRACTICES,
-    '\'java.lang.Error\' not rethrown':
-        IssueType.ERROR_PRONE,
-    '\'java.lang.ThreadDeath\' not rethrown':
-        IssueType.ERROR_PRONE,
-    'Nested \'try\' statement':
-        IssueType.BEST_PRACTICES,
-    'Non-final field of exception class':
-        IssueType.BEST_PRACTICES,
-    '\'null\' thrown':
-        IssueType.ERROR_PRONE,
-    'Overly broad \'catch\' block':
-        IssueType.BEST_PRACTICES,
-    'Overly broad \'throws\' clause':
-        IssueType.BEST_PRACTICES,
-    'Prohibited exception caught':
-        IssueType.ERROR_PRONE,
-    'Prohibited exception declared':
-        IssueType.ERROR_PRONE,
-    'Prohibited exception thrown':
-        IssueType.ERROR_PRONE,
-    '\'return\' inside \'finally\' block':
-        IssueType.BEST_PRACTICES,
-    '\'throw\' caught by containing \'try\' statement':
-        IssueType.ERROR_PRONE,
-    '\'throw\' inside \'catch\' block which ignores the caught exception':
-        IssueType.ERROR_PRONE,
-    '\'throw\' inside \'finally\' block':
-        IssueType.ERROR_PRONE,
-    'Unchecked exception class':
-        IssueType.BEST_PRACTICES,
-    'Unchecked exception declared in \'throws\' clause':
-        IssueType.BEST_PRACTICES,
-    'Unnecessary call to \'Throwable.initCause()\'':
-        IssueType.BEST_PRACTICES,
-
-    # Java | Finalization
-    '\'finalize()\' called explicitly':
-        IssueType.BEST_PRACTICES,
-    '\'finalize()\' declaration':
-        IssueType.BEST_PRACTICES,
-    '\'finalize()\' not declared \'protected\'':
-        IssueType.BEST_PRACTICES,
-
-    # Java | General
-    'Test-only class or method call in production code':
-        IssueType.BEST_PRACTICES,
-
-    # Java | Imports
-    '\'*\' import':
-        IssueType.BEST_PRACTICES,
-    'Import from same package':
-        IssueType.BEST_PRACTICES,
-    '\'java.lang\' import':
-        IssueType.BEST_PRACTICES,
-    'Single class import':
-        IssueType.BEST_PRACTICES,
-    'Static import':
-        IssueType.BEST_PRACTICES,
-    'Unused import':
-        IssueType.BEST_PRACTICES,
-
-    # Java | Inheritance issues
-    'Abstract class extends concrete class':
-        IssueType.BEST_PRACTICES,
-    'Abstract class which has no concrete subclass':
-        IssueType.BEST_PRACTICES,
-    'Abstract class without abstract methods':
-        IssueType.BEST_PRACTICES,
-    'Abstract method overrides abstract method':
-        IssueType.BEST_PRACTICES,
-    'Abstract method overrides concrete method':
-        IssueType.BEST_PRACTICES,
-    'Abstract method with missing implementations':
-        IssueType.BEST_PRACTICES,
-    'Class explicitly extends a Collection class':
-        IssueType.BEST_PRACTICES,
-    'Class extends annotation interface':
-        IssueType.BEST_PRACTICES,
-    'Class extends utility class':
-        IssueType.BEST_PRACTICES,
-    'Class may extend a commonly used base class':
-        IssueType.BEST_PRACTICES,
-    'Final declaration can\'t be overridden at runtime':
-        IssueType.ERROR_PRONE,
-    'Interface which has no concrete subclass':
-        IssueType.BEST_PRACTICES,
-    'Method does not call super method':
-        IssueType.BEST_PRACTICES,
-    'Method is identical to its super method':
-        IssueType.BEST_PRACTICES,
-    'Missing @Override annotation':
-        IssueType.BEST_PRACTICES,
-    'Non-varargs method overrides varargs method':
-        IssueType.BEST_PRACTICES,
-    'Parameter type prevents overriding':
-        IssueType.BEST_PRACTICES,
-    '\'public\' constructor in \'abstract\' class':
-        IssueType.BEST_PRACTICES,
-    'Static inheritance':
-        IssueType.BEST_PRACTICES,
-    'Type parameter extends final class':
-        IssueType.BEST_PRACTICES,
-
-    # Java | Initialization
-    'Abstract method called during object construction':
-        IssueType.ERROR_PRONE,
-    'Double brace initialization':
-        IssueType.ERROR_PRONE,
-    'Instance field may not be initialized':
-        IssueType.ERROR_PRONE,
-    'Instance field used before initialization':
-        IssueType.ERROR_PRONE,
-    'Non-final static field is used during class initialization':
-        IssueType.ERROR_PRONE,
-    'Overridable method called during object construction':
-        IssueType.ERROR_PRONE,
-    'Overridden method called during object construction':
-        IssueType.ERROR_PRONE,
-    'Static field may not be initialized':
-        IssueType.ERROR_PRONE,
-    'Static field used before initialization':
-        IssueType.ERROR_PRONE,
-    '\'this\' reference escaped in object construction':
-        IssueType.ERROR_PRONE,
-    'Unsafe lazy initialization of \'static\' field':
-        IssueType.ERROR_PRONE,
-
-    # Java | JUnit
-    '\'assertEquals()\' between objects of inconvertible types':
-        IssueType.ERROR_PRONE,
-    '\'assertEquals()\' called on array':
-        IssueType.ERROR_PRONE,
-    '\'assertEquals()\' may be \'assertSame()\'':
-        IssueType.BEST_PRACTICES,
-    'Assertion expression can be replaced with \'assertThat\' method call':
-        IssueType.BEST_PRACTICES,
-    'Constant JUnit assert argument':
-        IssueType.ERROR_PRONE,
-    'Expected exception never thrown in test method body':
-        IssueType.ERROR_PRONE,
-    'Highlight problem line in test':
-        IssueType.BEST_PRACTICES,
-    'JUnit test annotated with \'@Ignore\'/\'@Disabled\'':
-        IssueType.BEST_PRACTICES,
-    'JUnit test method in product source':
-        IssueType.BEST_PRACTICES,
-    'JUnit test method without any assertions':
-        IssueType.ERROR_PRONE,
-    'JUnit TestCase in product source':
-        IssueType.BEST_PRACTICES,
-    'JUnit TestCase with non-trivial constructors':
-        IssueType.BEST_PRACTICES,
-    'JUnit 4 test can be JUnit 5':
-        IssueType.BEST_PRACTICES,
-    'JUnit 4 test method in class extending JUnit 3 TestCase':
-        IssueType.BEST_PRACTICES,
-    'JUnit 5 malformed @Nested class':
-        IssueType.BEST_PRACTICES,
-    'JUnit 5 malformed parameterized test':
-        IssueType.BEST_PRACTICES,
-    'JUnit 5 malformed repeated test':
-        IssueType.BEST_PRACTICES,
-    'Malformed \'setUp()\' or \'tearDown()\' method':
-        IssueType.BEST_PRACTICES,
-    'Malformed @Before or @After method':
-        IssueType.BEST_PRACTICES,
-    'Malformed @BeforeClass/@BeforeAll or @AfterClass/@AfterAll method':
-        IssueType.BEST_PRACTICES,
-    'Malformed @DataPoint field':
-        IssueType.BEST_PRACTICES,
-    'Malformed @Rule/@ClassRule field':
-        IssueType.BEST_PRACTICES,
-    'Malformed test method':
-        IssueType.BEST_PRACTICES,
-    'Message missing on JUnit assertion':
-        IssueType.BEST_PRACTICES,
-    'Misordered \'assertEquals()\' arguments':
-        IssueType.BEST_PRACTICES,
-    'Multiple exceptions declared on test method':
-        IssueType.BEST_PRACTICES,
-    'Obsolete assertions in JUnit 5 test':
-        IssueType.BEST_PRACTICES,
-    'Old style JUnit test method in JUnit 4 class':
-        IssueType.BEST_PRACTICES,
-    '@RunWith(JUnitPlatform.class) without test methods':
-        IssueType.BEST_PRACTICES,
-    '@RunWith(Parameterized.class) without data provider':
-        IssueType.BEST_PRACTICES,
-    'Simplifiable JUnit assertion':
-        IssueType.BEST_PRACTICES,
-    '\'suite()\' method not declared \'static\'':
-        IssueType.ERROR_PRONE,
-    '\'super.tearDown()\' not called from \'finally\' block':
-        IssueType.ERROR_PRONE,
-    'Test class with no test':
-        IssueType.ERROR_PRONE,
-    'Unconstructable JUnit TestCase':
-        IssueType.ERROR_PRONE,
-    'Usage of obsolete \'junit.framework.Assert\' method':
-        IssueType.BEST_PRACTICES,
-
-    # Java | Logging
-    'Class with multiple loggers':
-        IssueType.ERROR_PRONE,
-    'Class without logger':
-        IssueType.BEST_PRACTICES,
-    'Log condition does not match logging call':
-        IssueType.BEST_PRACTICES,
-    'Logger initialized with foreign class':
-        IssueType.BEST_PRACTICES,
-    'Logging call not guarded by log condition':
-        IssueType.BEST_PRACTICES,
-    'Non-constant logger':
-        IssueType.BEST_PRACTICES,
-    'Non-constant string concatenation as argument to logging call':
-        IssueType.BEST_PRACTICES,
-    'Number of placeholders does not match number of arguments in logging call':
-        IssueType.BEST_PRACTICES,
-    '\'public\' method without logging':
-        IssueType.BEST_PRACTICES,
-
-    # Java | Memory
-    'Anonymous class may be a named \'static\' inner class':
-        IssueType.BEST_PRACTICES,
-    'Calls to \'System.gc()\' or \'Runtime.gc()\'':
-        IssueType.BEST_PRACTICES,
-    'Inner class may be \'static\'':
-        IssueType.BEST_PRACTICES,
-    'Return of instance of anonymous, local or inner class':
-        IssueType.BEST_PRACTICES,
-    'Static collection':
-        IssueType.BEST_PRACTICES,
-    'StringBuilder field':
-        IssueType.BEST_PRACTICES,
-    'Unnecessary zero length array usage':
-        IssueType.BEST_PRACTICES,
-    'Zero-length array allocation':
-        IssueType.BEST_PRACTICES,
-
-    # Java | Method metrics
-    'Constructor with too many parameters':
-        IssueType.BEST_PRACTICES,
-    'Method with more than three negations':
-        IssueType.BEST_PRACTICES,
-    'Method with multiple loops':
-        IssueType.BEST_PRACTICES,
-    'Method with multiple return points':
-        IssueType.BEST_PRACTICES,
-    'Method with too many exceptions declared':
-        IssueType.BEST_PRACTICES,
-    'Method with too many parameters':
-        IssueType.BEST_PRACTICES,
-    'Overly complex method':
-        IssueType.BEST_PRACTICES,
-    'Overly coupled method':
-        IssueType.BEST_PRACTICES,
-    'Overly long lambda expression':
-        IssueType.BEST_PRACTICES,
-    'Overly long method':
-        IssueType.BEST_PRACTICES,
-    'Overly nested method':
-        IssueType.BEST_PRACTICES,
-    'Class independent of its module':
-        IssueType.BEST_PRACTICES,
-    'Class only used from one other module':
-        IssueType.BEST_PRACTICES,
-    'Inconsistent language level settings':
-        IssueType.BEST_PRACTICES,
-    'Module with too few classes':
-        IssueType.BEST_PRACTICES,
-    'Module with too many classes':
-        IssueType.BEST_PRACTICES,
-
-    # Java | Naming conventions
-    'Boolean method name must start with question word':
-        IssueType.CODE_STYLE,
-    'Class name prefixed with package name':
-        IssueType.CODE_STYLE,
-    'Class name same as ancestor name':
-        IssueType.CODE_STYLE,
-    'Class naming convention':
-        IssueType.CODE_STYLE,
-    'Confusing \'main()\' method':
-        IssueType.CODE_STYLE,
-    'Exception class name does not end with \'Exception\'':
-        IssueType.CODE_STYLE,
-    'Field naming convention':
-        IssueType.CODE_STYLE,
-    'Java module naming conventions':
-        IssueType.CODE_STYLE,
-    'Lambda-unfriendly method overload':
-        IssueType.CODE_STYLE,
-    'Lambda parameter naming convention':
-        IssueType.CODE_STYLE,
-    'Local variable naming convention':
-        IssueType.CODE_STYLE,
-    'Method name same as class name':
-        IssueType.CODE_STYLE,
-    'Method name same as parent class name':
-        IssueType.CODE_STYLE,
-    'Method names differing only by case':
-        IssueType.CODE_STYLE,
-    'Method naming convention':
-        IssueType.CODE_STYLE,
-    'Method parameter naming convention':
-        IssueType.CODE_STYLE,
-    'Non-boolean method name must not start with question word':
-        IssueType.CODE_STYLE,
-    'Non-constant field with upper-case name':
-        IssueType.CODE_STYLE,
-    'Non-exception class name ends with \'Exception\'':
-        IssueType.CODE_STYLE,
-    'Overloaded methods with same number of parameters':
-        IssueType.CODE_STYLE,
-    'Overloaded varargs method':
-        IssueType.CODE_STYLE,
-    'Package naming convention':
-        IssueType.CODE_STYLE,
-    'Parameter name differs from parameter in overridden method':
-        IssueType.CODE_STYLE,
-    'Questionable name':
-        IssueType.CODE_STYLE,
-    'Standard variable names':
-        IssueType.CODE_STYLE,
-    'Use of \'$\' in identifier':
-        IssueType.CODE_STYLE,
-
-    # Java | Numeric issues
-    'Call to \'BigDecimal\' method without a rounding mode argument':
-        IssueType.ERROR_PRONE,
-    '\'char\' expression used in arithmetic context':
-        IssueType.ERROR_PRONE,
-    'Comparison of \'short\' and \'char\' values':
-        IssueType.ERROR_PRONE,
-    'Comparison to Double.NaN or Float.NaN':
-        IssueType.ERROR_PRONE,
-    'Confusing floating-point literal':
-        IssueType.ERROR_PRONE,
-    'Constant call to \'java.lang.Math\'':
-        IssueType.ERROR_PRONE,
-    'Divide by zero':
-        IssueType.ERROR_PRONE,
-    '\'double\' literal cast to \'float\' could be \'float\' literal':
-        IssueType.ERROR_PRONE,
-    '\'equals()\' called on \'java.math.BigDecimal\'':
-        IssueType.ERROR_PRONE,
-    'Floating point equality comparison':
-        IssueType.ERROR_PRONE,
-    'Implicit numeric conversion':
-        IssueType.ERROR_PRONE,
-    '\'int\' literal cast to \'long\' could be \'long\' literal':
-        IssueType.ERROR_PRONE,
-    'Integer division in floating point context':
-        IssueType.ERROR_PRONE,
-    'Integer multiplication or shift implicitly cast to long':
-        IssueType.ERROR_PRONE,
-    '\'long\' literal ending with \'l\' instead of \'L\'':
-        IssueType.ERROR_PRONE,
-    'Non-reproducible call to \'java.lang.Math\'':
-        IssueType.BEST_PRACTICES,
-    'Number constructor call with primitive argument':
-        IssueType.ERROR_PRONE,
-    'Numeric cast that loses precision':
-        IssueType.ERROR_PRONE,
-    'Numeric overflow':
-        IssueType.ERROR_PRONE,
-    'Octal and decimal integers in same array':
-        IssueType.ERROR_PRONE,
-    'Octal integer':
-        IssueType.ERROR_PRONE,
-    'Overly complex arithmetic expression':
-        IssueType.ERROR_PRONE,
-    'Pointless arithmetic expression':
-        IssueType.BEST_PRACTICES,
-    'Suspicious test for oddness':
-        IssueType.ERROR_PRONE,
-    'Suspicious underscore in number literal':
-        IssueType.ERROR_PRONE,
-    'Unary plus':
-        IssueType.ERROR_PRONE,
-    'Unnecessary explicit numeric cast':
-        IssueType.ERROR_PRONE,
-    'Unnecessary unary minus':
-        IssueType.ERROR_PRONE,
-    'Unpredictable BigDecimal constructor call':
-        IssueType.ERROR_PRONE,
-
-    # Java | Packaging issues
-    'Class independent of its package':
-        IssueType.BEST_PRACTICES,
-    'Class only used from one other package':
-        IssueType.BEST_PRACTICES,
-    'Empty directory':
-        IssueType.BEST_PRACTICES,
-    'Exception package':
-        IssueType.BEST_PRACTICES,
-    'Package with classes in multiple modules':
-        IssueType.BEST_PRACTICES,
-    'Package with disjoint dependency graph':
-        IssueType.BEST_PRACTICES,
-    'Package with too few classes':
-        IssueType.BEST_PRACTICES,
-    'Package with too many classes':
-        IssueType.BEST_PRACTICES,
-
-    # Java | Performance
-    'Boolean constructor call':
-        IssueType.BEST_PRACTICES,
-    'Boxing of already boxed value':
-        IssueType.BEST_PRACTICES,
-    'Bulk operation can be used instead of iteration':
-        IssueType.BEST_PRACTICES,
-    'Call to \'Arrays.asList()\' with too few arguments':
-        IssueType.BEST_PRACTICES,
-    'Call to simple getter from within class':
-        IssueType.BEST_PRACTICES,
-    'Call to simple setter from within class':
-        IssueType.BEST_PRACTICES,
-    'Class initializer may be \'static\'':
-        IssueType.BEST_PRACTICES,
-    '\'Collection.toArray()\' call style':
-        IssueType.BEST_PRACTICES,
-    'Collection without initial capacity':
-        IssueType.BEST_PRACTICES,
-    'Concatenation with empty string':
-        IssueType.BEST_PRACTICES,
-    'Dynamic regular expression could be replaced by compiled Pattern':
-        IssueType.BEST_PRACTICES,
-    '\'equals()\' call can be replaced with \'==\'':
-        IssueType.BEST_PRACTICES,
-    '\'equals()\' or \'hashCode()\' called on \'java.net.URL\' object':
-        IssueType.BEST_PRACTICES,
-    'Explicit argument can be lambda':
-        IssueType.BEST_PRACTICES,
-    'Field may be \'static\'':
-        IssueType.BEST_PRACTICES,
-    'Inefficient Stream API call chains ending with count()':
-        IssueType.BEST_PRACTICES,
-    'Instantiating object to get Class object':
-        IssueType.BEST_PRACTICES,
-    'Iteration over \'keySet()\' may be optimized':
-        IssueType.BEST_PRACTICES,
-    '\'List.remove()\' called in loop':
-        IssueType.BEST_PRACTICES,
-    'Loop can be terminated after condition is met':
-        IssueType.BEST_PRACTICES,
-    'Manual array copy':
-        IssueType.BEST_PRACTICES,
-    'Manual array to collection copy':
-        IssueType.BEST_PRACTICES,
-    'Map or Set may contain \'java.net.URL\' objects':
-        IssueType.BEST_PRACTICES,
-    'Map replaceable with EnumMap':
-        IssueType.BEST_PRACTICES,
-    'Method may be \'static\'':
-        IssueType.BEST_PRACTICES,
-    'Non-constant String should be StringBuilder':
-        IssueType.BEST_PRACTICES,
-    'Object allocation in loop':
-        IssueType.BEST_PRACTICES,
-    'Object instantiation inside \'equals()\' or \'hashCode()\'':
-        IssueType.BEST_PRACTICES,
-    'Redundant \'Collection.addAll()\' call':
-        IssueType.BEST_PRACTICES,
-    'Redundant call to \'String.format()\'':
-        IssueType.BEST_PRACTICES,
-    'Set replaceable with EnumSet':
-        IssueType.BEST_PRACTICES,
-    'Single character string argument in \'String.indexOf()\' call':
-        IssueType.BEST_PRACTICES,
-    'Single character string concatenation':
-        IssueType.BEST_PRACTICES,
-    '\'String.equals('')\'':
-        IssueType.BEST_PRACTICES,
-    'String concatenation as argument to \'StringBuilder.append()\' call':
-        IssueType.BEST_PRACTICES,
-    'String concatenation in loop':
-        IssueType.BEST_PRACTICES,
-    '\'StringBuilder.toString()\' in concatenation':
-        IssueType.BEST_PRACTICES,
-    'StringBuilder without initial capacity':
-        IssueType.BEST_PRACTICES,
-    'Tail recursion':
-        IssueType.BEST_PRACTICES,
-    'Unnecessary temporary object in conversion from String':
-        IssueType.BEST_PRACTICES,
-    'Unnecessary temporary object in conversion to String':
-        IssueType.BEST_PRACTICES,
-    'Using \'Random.nextDouble()\' to get random integer':
-        IssueType.BEST_PRACTICES,
-
-    # Java | Portability
-    'Call to \'Runtime.exec()\'':
-        IssueType.ERROR_PRONE,
-    'Call to \'System.exit()\' or related methods':
-        IssueType.ERROR_PRONE,
-    'Call to \'System.getenv()\'':
-        IssueType.ERROR_PRONE,
-    'Hardcoded file separator':
-        IssueType.ERROR_PRONE,
-    'Hardcoded line separator':
-        IssueType.ERROR_PRONE,
-    'Native method':
-        IssueType.ERROR_PRONE,
-    'Use of \'java.lang.ProcessBuilder\' class':
-        IssueType.ERROR_PRONE,
-    'Use of AWT peer class':
-        IssueType.ERROR_PRONE,
-    'Use of concrete JDBC driver class':
-        IssueType.ERROR_PRONE,
-    'Use of sun.* classes':
-        IssueType.ERROR_PRONE,
-
-    # Java | Probable bugs
-    'Array comparison using \'==\', instead of \'Arrays.equals()\'':
-        IssueType.ERROR_PRONE,
-    '\'assert\' statement condition is constant':
-        IssueType.ERROR_PRONE,
-    '\'assert\' statement with side effects':
-        IssueType.ERROR_PRONE,
-    'Call to \'toString()\' on array':
-        IssueType.ERROR_PRONE,
-    'Call to default \'toString()\'':
-        IssueType.ERROR_PRONE,
-    'Call to String.replaceAll(\'.\', ...)':
-        IssueType.ERROR_PRONE,
-    'Cast conflicts with \'instanceof\'':
-        IssueType.ERROR_PRONE,
-    'Casting to incompatible interface':
-        IssueType.ERROR_PRONE,
-    'Class.getClass() call':
-        IssueType.ERROR_PRONE,
-    'Cleaner captures object reference':
-        IssueType.ERROR_PRONE,
-    'Collection added to self':
-        IssueType.ERROR_PRONE,
-    'Comparable implemented but \'equals()\' not overridden':
-        IssueType.ERROR_PRONE,
-    'Confusing argument to varargs method':
-        IssueType.ERROR_PRONE,
-    'Confusing primitive array argument to varargs method':
-        IssueType.ERROR_PRONE,
-    'Constant conditions & exceptions':
-        IssueType.ERROR_PRONE,
-    'Contract issues':
-        IssueType.ERROR_PRONE,
-    'Copy constructor misses field':
-        IssueType.ERROR_PRONE,
-    'Covariant \'equals()\'':
-        IssueType.ERROR_PRONE,
-    'Duplicated delimiters in java.util.StringTokenizer':
-        IssueType.ERROR_PRONE,
-    'Empty class initializer':
-        IssueType.ERROR_PRONE,
-    '\'equal()\' instead of \'equals()\'':
-        IssueType.ERROR_PRONE,
-    '\'equals()\' and \'hashCode()\' not paired':
-        IssueType.ERROR_PRONE,
-    '\'equals()\' between objects of inconvertible types':
-        IssueType.ERROR_PRONE,
-    '\'equals()\' called on array':
-        IssueType.ERROR_PRONE,
-    '\'equals()\' called on itself':
-        IssueType.ERROR_PRONE,
-    '\'equals()\' called on StringBuilder':
-        IssueType.ERROR_PRONE,
-    '\'equals()\' method which does not check class of parameter':
-        IssueType.ERROR_PRONE,
-    '\'hashCode()\' called on array':
-        IssueType.ERROR_PRONE,
-    'Infinite recursion':
-        IssueType.ERROR_PRONE,
-    'Inner class referenced via subclass':
-        IssueType.ERROR_PRONE,
-    '\'instanceof\' with incompatible interface':
-        IssueType.ERROR_PRONE,
-    'Instantiation of utility class':
-        IssueType.ERROR_PRONE,
-    'Invalid method reference used for Comparator':
-        IssueType.ERROR_PRONE,
-    'Iterable is used as vararg':
-        IssueType.ERROR_PRONE,
-    '\'Iterator.hasNext()\' which calls \'next()\'':
-        IssueType.ERROR_PRONE,
-    '\'Iterator.next()\' which can\'t throw \'NoSuchElementException\'':
-        IssueType.ERROR_PRONE,
-    'Loop executes zero or billions times':
-        IssueType.ERROR_PRONE,
-    'Magic Constant':
-        IssueType.ERROR_PRONE,
-    'Malformed format string':
-        IssueType.ERROR_PRONE,
-    'Malformed regular expression':
-        IssueType.ERROR_PRONE,
-    'Malformed XPath expression':
-        IssueType.ERROR_PRONE,
-    '\'Math.random()\' cast to \'int\'':
-        IssueType.ERROR_PRONE,
-    'Mismatched query and update of collection':
-        IssueType.ERROR_PRONE,
-    'Mismatched query and update of StringBuilder':
-        IssueType.ERROR_PRONE,
-    'Mismatched read and write of array':
-        IssueType.ERROR_PRONE,
-    'New object is compared using \'==\'':
-        IssueType.ERROR_PRONE,
-    'Non-final field referenced in \'compareTo()\'':
-        IssueType.ERROR_PRONE,
-    'Non-final field referenced in \'equals()\'':
-        IssueType.ERROR_PRONE,
-    'Non-final field referenced in \'hashCode()\'':
-        IssueType.ERROR_PRONE,
-    'Non-short-circuit boolean expression':
-        IssueType.ERROR_PRONE,
-    'Non-short-circuit operation consumes the infinite stream':
-        IssueType.ERROR_PRONE,
-    '@NotNull/@Nullable problems':
-        IssueType.ERROR_PRONE,
-    'Number comparison using \'==\', instead of \'equals()\'':
-        IssueType.ERROR_PRONE,
-    'Object comparison using \'==\', instead of \'equals()\'':
-        IssueType.ERROR_PRONE,
-    '\'Objects.equals()\' called on arrays':
-        IssueType.ERROR_PRONE,
-    'Optional.get() is called without isPresent() check':
-        IssueType.ERROR_PRONE,
-    'Overwritten Map key or Set element':
-        IssueType.ERROR_PRONE,
-    'Reference checked for \'null\' is not used inside \'if\'':
-        IssueType.ERROR_PRONE,
-    'Reflective access to a source-only annotation':
-        IssueType.ERROR_PRONE,
-    'Result of method call ignored':
-        IssueType.ERROR_PRONE,
-    'Result of object allocation ignored':
-        IssueType.ERROR_PRONE,
-    'Return of \'null\'':
-        IssueType.ERROR_PRONE,
-    'Sorted collection with non-comparable elements':
-        IssueType.ERROR_PRONE,
-    'Statement with empty body':
-        IssueType.ERROR_PRONE,
-    'Static field referenced via subclass':
-        IssueType.ERROR_PRONE,
-    'Static method referenced via subclass':
-        IssueType.ERROR_PRONE,
-    '\'String.equals()\' called with \'CharSequence\' argument':
-        IssueType.ERROR_PRONE,
-    'String comparison using \'==\', instead of \'equals()\'':
-        IssueType.ERROR_PRONE,
-    'String concatenation as argument to \'format()\' call':
-        IssueType.ERROR_PRONE,
-    'String concatenation as argument to \'MessageFormat.format()\' call':
-        IssueType.ERROR_PRONE,
-    'String literal concatenation missing whitespace':
-        IssueType.ERROR_PRONE,
-    'StringBuilder constructor call with \'char\' argument':
-        IssueType.ERROR_PRONE,
-    'Subtraction in \'compareTo()\'':
-        IssueType.ERROR_PRONE,
-    'Suspicious \'Collection.toArray()\' call':
-        IssueType.ERROR_PRONE,
-    'Suspicious \'Comparator.compare()\' implementation':
-        IssueType.ERROR_PRONE,
-    'Suspicious \'List.remove()\' in the loop':
-        IssueType.ERROR_PRONE,
-    'Suspicious \'System.arraycopy()\' call':
-        IssueType.ERROR_PRONE,
-    'Suspicious array cast':
-        IssueType.ERROR_PRONE,
-    'Suspicious Arrays method calls':
-        IssueType.ERROR_PRONE,
-    'Suspicious collections method calls':
-        IssueType.ERROR_PRONE,
-    'Suspicious indentation after control statement without braces':
-        IssueType.ERROR_PRONE,
-    'Suspicious integer division assignment':
-        IssueType.ERROR_PRONE,
-    'Suspicious usage of compare method':
-        IssueType.ERROR_PRONE,
-    'Suspicious variable/parameter name combination':
-        IssueType.ERROR_PRONE,
-    'Text label in \'switch\' statement':
-        IssueType.ERROR_PRONE,
-    'Throwable not thrown':
-        IssueType.ERROR_PRONE,
-    'Unsafe call to \'Class.newInstance()\'':
-        IssueType.ERROR_PRONE,
-    'Unused assignment':
-        IssueType.BEST_PRACTICES,
-    'Use of index 0 in JDBC ResultSet':
-        IssueType.ERROR_PRONE,
-    'Use of Properties object as a Hashtable':
-        IssueType.ERROR_PRONE,
-    'Wrong package statement':
-        IssueType.ERROR_PRONE,
-
-    # Java | Reflective access
-    'MethodHandle/VarHandle type mismatch':
-        IssueType.ERROR_PRONE,
-    'Non-runtime annotation to be used by reflection':
-        IssueType.ERROR_PRONE,
-    'Reflective access across modules issues':
-        IssueType.ERROR_PRONE,
-    'Reflective access to nonexistent/not visible class member':
-        IssueType.ERROR_PRONE,
-    'Reflective invocation arguments mismatch':
-        IssueType.ERROR_PRONE,
-
-    # Java | Resource management
-    'AutoCloseable used without \'try\'-with-resources':
-        IssueType.BEST_PRACTICES,
-    'Channel opened but not safely closed':
-        IssueType.ERROR_PRONE,
-    'Hibernate resource opened but not safely closed':
-        IssueType.ERROR_PRONE,
-    'I/O resource opened but not safely closed':
-        IssueType.ERROR_PRONE,
-    'JDBC resource opened but not safely closed':
-        IssueType.ERROR_PRONE,
-    'JNDI resource opened but not safely closed':
-        IssueType.ERROR_PRONE,
-    'Socket opened but not safely closed':
-        IssueType.ERROR_PRONE,
-    'Use of DriverManager to get JDBC connection':
-        IssueType.ERROR_PRONE,
-
-    # Java | Security
-    'Access of system properties':
-        IssueType.BEST_PRACTICES,
-    'Call to \'Connection.prepare*()\' with non-constant string':
-        IssueType.BEST_PRACTICES,
-    'Call to \'Runtime.exec()\' with non-constant string':
-        IssueType.BEST_PRACTICES,
-    'Call to \'Statement.execute()\' with non-constant string':
-        IssueType.BEST_PRACTICES,
-    'Call to \'System.loadLibrary()\' with non-constant string':
-        IssueType.BEST_PRACTICES,
-    'Call to \'System.setSecurityManager()\'':
-        IssueType.BEST_PRACTICES,
-    'ClassLoader instantiation':
-        IssueType.BEST_PRACTICES,
-    'Cloneable class in secure context':
-        IssueType.BEST_PRACTICES,
-    'Custom ClassLoader':
-        IssueType.BEST_PRACTICES,
-    'Custom SecurityManager':
-        IssueType.BEST_PRACTICES,
-    'Design for extension':
-        IssueType.BEST_PRACTICES,
-    'Insecure random number generation':
-        IssueType.BEST_PRACTICES,
-    'Non-\'static\' inner class in secure context':
-        IssueType.BEST_PRACTICES,
-    'Non-final \'clone()\' in secure context':
-        IssueType.BEST_PRACTICES,
-    '\'public static\' array field':
-        IssueType.BEST_PRACTICES,
-    '\'public static\' collection field':
-        IssueType.BEST_PRACTICES,
-    'Serializable class in secure context':
-        IssueType.BEST_PRACTICES,
-
-    # Java | Serialization issues
-    'Comparator class not declared Serializable':
-        IssueType.ERROR_PRONE,
-    'Externalizable class with \'readObject()\' or \'writeObject()\'':
-        IssueType.ERROR_PRONE,
-    'Externalizable class without \'public\' no-arg constructor':
-        IssueType.ERROR_PRONE,
-    'Instance field may not be initialized by \'readObject()\'':
-        IssueType.ERROR_PRONE,
-    'Non-serializable class with \'readObject()\' or \'writeObject()\'':
-        IssueType.ERROR_PRONE,
-    'Non-serializable class with \'serialVersionUID\'':
-        IssueType.ERROR_PRONE,
-    'Non-serializable field in a Serializable class':
-        IssueType.ERROR_PRONE,
-    'Non-serializable object bound to HttpSession':
-        IssueType.ERROR_PRONE,
-    'Non-serializable object passed to ObjectOutputStream':
-        IssueType.ERROR_PRONE,
-    '\'readObject()\' or \'writeObject()\' not declared \'private\'':
-        IssueType.ERROR_PRONE,
-    '\'readResolve()\' or \'writeReplace()\' not declared \'protected\'':
-        IssueType.ERROR_PRONE,
-    'Serializable class with unconstructable ancestor':
-        IssueType.ERROR_PRONE,
-    'Serializable class without \'readObject()\' and \'writeObject()\'':
-        IssueType.ERROR_PRONE,
-    'Serializable class without \'serialVersionUID\'':
-        IssueType.ERROR_PRONE,
-    'Serializable non-\'static\' inner class with non-Serializable outer class':
-        IssueType.ERROR_PRONE,
-    'Serializable non-\'static\' inner class without \'serialVersionUID\'':
-        IssueType.ERROR_PRONE,
-    'Serializable object implicitly stores non-Serializable object':
-        IssueType.ERROR_PRONE,
-    '\'serialPersistentFields\' field not declared \'private static final '
-    'ObjectStreamField[]\'':
-        IssueType.ERROR_PRONE,
-    '\'serialVersionUID\' field not declared \'private static final long\'':
-        IssueType.ERROR_PRONE,
-    'Transient field in non-serializable class':
-        IssueType.ERROR_PRONE,
-    'Transient field is not initialized on deserialization':
-        IssueType.ERROR_PRONE,
-
-    # Java | Threading issues
-    'Access to static field locked on instance data':
-        IssueType.ERROR_PRONE,
-    'AtomicFieldUpdater field not declared \'static final\'':
-        IssueType.ERROR_PRONE,
-    'AtomicFieldUpdater issues':
-        IssueType.ERROR_PRONE,
-    '\'await()\' not in loop':
-        IssueType.ERROR_PRONE,
-    '\'await()\' without corresponding \'signal()\'':
-        IssueType.ERROR_PRONE,
-    'Busy wait':
-        IssueType.ERROR_PRONE,
-    'Call to \'notify()\' instead of \'notifyAll()\'':
-        IssueType.ERROR_PRONE,
-    'Call to \'signal()\' instead of \'signalAll()\'':
-        IssueType.ERROR_PRONE,
-    'Call to \'System.runFinalizersOnExit()\'':
-        IssueType.ERROR_PRONE,
-    'Call to \'Thread.run()\'':
-        IssueType.ERROR_PRONE,
-    'Call to \'Thread.setPriority()\'':
-        IssueType.ERROR_PRONE,
-    'Call to \'Thread.sleep()\' while synchronized':
-        IssueType.ERROR_PRONE,
-    'Call to \'Thread.start()\' during object construction':
-        IssueType.ERROR_PRONE,
-    'Call to \'Thread.stop()\', \'suspend()\' or \'resume()\'':
-        IssueType.ERROR_PRONE,
-    'Call to \'Thread.yield()\'':
-        IssueType.ERROR_PRONE,
-    'Call to a native method while locked':
-        IssueType.ERROR_PRONE,
-    'Class directly extends \'java.lang.Thread\'':
-        IssueType.ERROR_PRONE,
-    'Double-checked locking':
-        IssueType.ERROR_PRONE,
-    'Empty \'synchronized\' statement':
-        IssueType.ERROR_PRONE,
-    'Field accessed in both synchronized and unsynchronized contexts':
-        IssueType.ERROR_PRONE,
-    'Instantiating a Thread with default \'run()\' method':
-        IssueType.ERROR_PRONE,
-    'Lock acquired but not safely unlocked':
-        IssueType.ERROR_PRONE,
-    'Method with synchronized block could be synchronized method':
-        IssueType.ERROR_PRONE,
-    'Nested \'synchronized\' statement':
-        IssueType.ERROR_PRONE,
-    'Non-atomic operation on volatile field':
-        IssueType.ERROR_PRONE,
-    'Non-private field accessed in synchronized context':
-        IssueType.ERROR_PRONE,
-    'Non thread-safe static field access':
-        IssueType.ERROR_PRONE,
-    '\'notify()\' or \'notifyAll()\' called on '
-    '\'java.util.concurrent.locks.Condition\' object':
-        IssueType.ERROR_PRONE,
-    '\'notify()\' or \'notifyAll()\' without corresponding state change':
-        IssueType.ERROR_PRONE,
-    '\'notify()\' without corresponding \'wait()\'':
-        IssueType.ERROR_PRONE,
-    '\'signal()\' without corresponding \'await()\'':
-        IssueType.ERROR_PRONE,
-    'Static initializer references subclass':
-        IssueType.ERROR_PRONE,
-    'Synchronization on \'getClass()\'':
-        IssueType.ERROR_PRONE,
-    'Synchronization on \'static\' field':
-        IssueType.ERROR_PRONE,
-    'Synchronization on \'this\'':
-        IssueType.ERROR_PRONE,
-    'Synchronization on a Lock object':
-        IssueType.ERROR_PRONE,
-    'Synchronization on a non-final field':
-        IssueType.ERROR_PRONE,
-    'Synchronization on an object initialized with a literal':
-        IssueType.ERROR_PRONE,
-    'Synchronization on local variable or method parameter':
-        IssueType.ERROR_PRONE,
-    '\'synchronized\' method':
-        IssueType.ERROR_PRONE,
-    'ThreadLocal field not declared static final':
-        IssueType.ERROR_PRONE,
-    '\'ThreadLocalRandom\' instance might be shared':
-        IssueType.ERROR_PRONE,
-    'Unconditional \'wait()\' call':
-        IssueType.ERROR_PRONE,
-    'Unsynchronized method overrides synchronized method':
-        IssueType.ERROR_PRONE,
-    'Volatile array field':
-        IssueType.ERROR_PRONE,
-    '\'wait()\' called on \'java.util.concurrent.locks.Condition\' object':
-        IssueType.ERROR_PRONE,
-    '\'wait()\' not in loop':
-        IssueType.ERROR_PRONE,
-    '\'wait()\' or \'await()\' without timeout':
-        IssueType.ERROR_PRONE,
-    '\'wait()\' or \'notify()\' while not synchronized':
-        IssueType.ERROR_PRONE,
-    '\'wait()\' while holding two locks':
-        IssueType.ERROR_PRONE,
-    '\'wait()\' without corresponding \'notify()\'':
-        IssueType.ERROR_PRONE,
-    '\'while\' loop spins on field':
-        IssueType.ERROR_PRONE,
-
-    # Java | toString() issues
-    'Class does not override \'toString()\' method':
-        IssueType.ERROR_PRONE,
-    'Field not used in \'toString()\' method':
-        IssueType.ERROR_PRONE,
-
-    # Java | Verbose or redundant code constructs
-    'Comparator can be simplified':
-        IssueType.BEST_PRACTICES,
-    'Condition is covered by further condition':
-        IssueType.BEST_PRACTICES,
-    'Duplicate branches in \'switch\'':
-        IssueType.BEST_PRACTICES,
-    'Excessive lambda usage':
-        IssueType.BEST_PRACTICES,
-    'Excessive range check':
-        IssueType.BEST_PRACTICES,
-    'Explicit array filling':
-        IssueType.BEST_PRACTICES,
-    'Manual min/max calculation':
-        IssueType.BEST_PRACTICES,
-    'Multiple occurrences of the same expression':
-        IssueType.BEST_PRACTICES,
-    'Redundant \'compare\' method call':
-        IssueType.BEST_PRACTICES,
-    'Redundant \'isInstance\' or \'cast\' call':
-        IssueType.BEST_PRACTICES,
-    'Redundant array creation':
-        IssueType.BEST_PRACTICES,
-    'Redundant Collection operation':
-        IssueType.BEST_PRACTICES,
-    'Redundant String operation':
-        IssueType.BEST_PRACTICES,
-    'Redundant type arguments':
-        IssueType.BEST_PRACTICES,
-    'Redundant type cast':
-        IssueType.BEST_PRACTICES,
-    '\'StringBuilder\' can be replaced with \'String\'':
-        IssueType.BEST_PRACTICES,
-    'Too weak variable type leads to unnecessary cast':
-        IssueType.BEST_PRACTICES,
-    'Unnecessary \'break\' statement':
-        IssueType.BEST_PRACTICES,
-    'Unnecessary \'continue\' statement':
-        IssueType.BEST_PRACTICES,
-    'Unnecessary \'default\' for enum \'switch\' statement':
-        IssueType.BEST_PRACTICES,
-    'Unnecessary \'return\' statement':
-        IssueType.BEST_PRACTICES,
-    'Unnecessary label on \'break\' statement':
-        IssueType.BEST_PRACTICES,
-    'Unnecessary label on \'continue\' statement':
-        IssueType.BEST_PRACTICES,
-
-    # Java | Visibility
-    'Access of inherited field looks like access of element in surrounding '
-    'code':
-        IssueType.BEST_PRACTICES,
-    'Anonymous class variable hides variable in containing method':
-        IssueType.BEST_PRACTICES,
-    'Call to inherited method looks like call to local method':
-        IssueType.BEST_PRACTICES,
-    'Field name hides field in superclass':
-        IssueType.BEST_PRACTICES,
-    'Inner class field hides outer class field':
-        IssueType.BEST_PRACTICES,
-    'Lambda parameter hides field':
-        IssueType.BEST_PRACTICES,
-    'Local variable hides field':
-        IssueType.BEST_PRACTICES,
-    'Method overloads method of superclass':
-        IssueType.BEST_PRACTICES,
-    'Method overrides inaccessible method of superclass':
-        IssueType.BEST_PRACTICES,
-    'Method tries to override static method of superclass':
-        IssueType.BEST_PRACTICES,
-    'Module exports/opens package to itself':
-        IssueType.BEST_PRACTICES,
-    'Non-accessible class is exposed':
-        IssueType.BEST_PRACTICES,
-    'Parameter hides field':
-        IssueType.BEST_PRACTICES,
-    'Type parameter hides visible type':
-        IssueType.BEST_PRACTICES,
-    'Usage of service not declared in \'module-info\'':
-        IssueType.BEST_PRACTICES,
-}
diff --git a/src/python/review/inspectors/intellij/issue_types/kotlin.py b/src/python/review/inspectors/intellij/issue_types/kotlin.py
deleted file mode 100644
index cb692510..00000000
--- a/src/python/review/inspectors/intellij/issue_types/kotlin.py
+++ /dev/null
@@ -1,382 +0,0 @@
-from typing import Dict
-
-from src.python.review.inspectors.issue import IssueType
-
-ISSUE_CLASS_TO_ISSUE_TYPE: Dict[str, IssueType] = {
-    # Kotlin | Java interop issues
-    'Call of Java mutator method on immutable Kotlin collection':
-        IssueType.ERROR_PRONE,
-    'Function or property has platform type':
-        IssueType.ERROR_PRONE,
-    'Kotlin non-const property used as Java constant':
-        IssueType.ERROR_PRONE,
-    'Not-null extension receiver of inline function can be made nullable':
-        IssueType.ERROR_PRONE,
-    'Package name does not match containing directory':
-        IssueType.ERROR_PRONE,
-    'Unsafe call of inline function with nullable extension receiver':
-        IssueType.ERROR_PRONE,
-    'Usage of Kotlin internal declarations from Java':
-        IssueType.ERROR_PRONE,
-
-    # Kotlin | Naming conventions
-    'Class naming convention':
-        IssueType.CODE_STYLE,
-    'Const property naming convention':
-        IssueType.CODE_STYLE,
-    'Enum entry naming convention':
-        IssueType.CODE_STYLE,
-    'Function naming convention':
-        IssueType.CODE_STYLE,
-    'Local variable naming convention':
-        IssueType.CODE_STYLE,
-    'Object property naming convention':
-        IssueType.CODE_STYLE,
-    'Package naming convention':
-        IssueType.CODE_STYLE,
-    'Private property naming convention':
-        IssueType.CODE_STYLE,
-    'Property naming convention':
-        IssueType.CODE_STYLE,
-    'Test function naming convention':
-        IssueType.CODE_STYLE,
-
-    # Kotlin | Other issues
-    '@Deprecated annotation without \'replaceWith\' argument':
-        IssueType.BEST_PRACTICES,
-    'Diagnostic name should be replaced':
-        IssueType.BEST_PRACTICES,
-    'Missing KDoc comments for public declarations':
-        IssueType.BEST_PRACTICES,
-    'Overriding deprecated member':
-        IssueType.BEST_PRACTICES,
-    'Public API declaration has implicit return type':
-        IssueType.BEST_PRACTICES,
-    'Replace with EnumMap':
-        IssueType.BEST_PRACTICES,
-
-    # Kotlin | Probable bugs
-    'Ambiguous coroutineContext due to CoroutineScope receiver of suspend '
-    'function':
-        IssueType.ERROR_PRONE,
-    'Ambiguous unary operator use with number constant':
-        IssueType.ERROR_PRONE,
-    'Array property in data class':
-        IssueType.ERROR_PRONE,
-    'Assignment of variable to itself':
-        IssueType.ERROR_PRONE,
-    'Augmented assignment creates a new collection under the hood':
-        IssueType.ERROR_PRONE,
-    'Constructor has non-null self reference parameter':
-        IssueType.ERROR_PRONE,
-    'Convert equality check with \'NaN\' to \'isNaN\' call':
-        IssueType.ERROR_PRONE,
-    'Covariant \'equals()\'':
-        IssueType.ERROR_PRONE,
-    'Deferred result is never used':
-        IssueType.ERROR_PRONE,
-    'Delegating to \'var\' property':
-        IssueType.ERROR_PRONE,
-    'Entry point function should return Unit':
-        IssueType.ERROR_PRONE,
-    'equals() and hashCode() not paired':
-        IssueType.ERROR_PRONE,
-    'Existing backing field is not assigned by the setter':
-        IssueType.ERROR_PRONE,
-    'Extension property conflicting with synthetic one':
-        IssueType.ERROR_PRONE,
-    'Implicit (unsafe) cast from dynamic type':
-        IssueType.ERROR_PRONE,
-    'Implicit `Nothing?` type':
-        IssueType.ERROR_PRONE,
-    'Iterated elements are not used in forEach':
-        IssueType.ERROR_PRONE,
-    'Leaking \'this\' in constructor':
-        IssueType.ERROR_PRONE,
-    'Private data class constructor is exposed via the \'copy\' method':
-        IssueType.ERROR_PRONE,
-    'Range with start greater than endInclusive is empty':
-        IssueType.ERROR_PRONE,
-    'Recursive equals call':
-        IssueType.ERROR_PRONE,
-    'Recursive property accessor':
-        IssueType.ERROR_PRONE,
-    'Replace \'==\' with \'Arrays.equals\'':
-        IssueType.ERROR_PRONE,
-    'Sealed sub-class without state and overridden equals':
-        IssueType.ERROR_PRONE,
-    'Suspicious \'var\' property: its setter does not influence its '
-    'getter result':
-        IssueType.ERROR_PRONE,
-    'Suspicious callable reference used as lambda result':
-        IssueType.ERROR_PRONE,
-    'Suspicious combination of == and ===':
-        IssueType.ERROR_PRONE,
-    'Throwable not thrown':
-        IssueType.ERROR_PRONE,
-    'Unresolved reference in KDoc':
-        IssueType.ERROR_PRONE,
-    'Unused return value of a function with lambda expression body':
-        IssueType.ERROR_PRONE,
-    'Useless call on collection type':
-        IssueType.ERROR_PRONE,
-    'Useless call on not-null type':
-        IssueType.ERROR_PRONE,
-    'Variable in destructuring declaration uses name of a wrong data class '
-    'property':
-        IssueType.ERROR_PRONE,
-
-    # Kotlin | Redundant constructs
-    'Condition of \'if\' expression is constant':
-        IssueType.BEST_PRACTICES,
-    'Constructor parameter is never used as a property':
-        IssueType.BEST_PRACTICES,
-    'Explicitly given type is redundant here':
-        IssueType.CODE_STYLE,
-    'Null-checks replaceable with safe-calls':
-        IssueType.BEST_PRACTICES,
-    'Property is explicitly assigned to constructor parameter':
-        IssueType.BEST_PRACTICES,
-    'Redundant \'if\' statement':
-        IssueType.BEST_PRACTICES,
-    'Redundant \'requireNotNull\' or \'checkNotNull\' call':
-        IssueType.BEST_PRACTICES,
-    'Redundant \'return\' label':
-        IssueType.BEST_PRACTICES,
-    'Redundant \'suspend\' modifier':
-        IssueType.BEST_PRACTICES,
-    'Redundant \'Unit\'':
-        IssueType.CODE_STYLE,
-    'Redundant \'Unit\' return type':
-        IssueType.CODE_STYLE,
-    'Redundant \'with\' call':
-        IssueType.BEST_PRACTICES,
-    'Redundant Companion reference':
-        IssueType.BEST_PRACTICES,
-    'Redundant curly braces in string template':
-        IssueType.CODE_STYLE,
-    'Redundant double negation':
-        IssueType.BEST_PRACTICES,
-    'Redundant enum constructor invocation':
-        IssueType.BEST_PRACTICES,
-    'Redundant explicit \'this\'':
-        IssueType.BEST_PRACTICES,
-    'Redundant lambda arrow':
-        IssueType.BEST_PRACTICES,
-    'Redundant modality modifier':
-        IssueType.BEST_PRACTICES,
-    'Redundant overriding method':
-        IssueType.BEST_PRACTICES,
-    'Redundant property getter':
-        IssueType.BEST_PRACTICES,
-    'Redundant property setter':
-        IssueType.BEST_PRACTICES,
-    'Redundant SAM constructor':
-        IssueType.BEST_PRACTICES,
-    'Redundant semicolon':
-        IssueType.CODE_STYLE,
-    'Redundant setter parameter type':
-        IssueType.BEST_PRACTICES,
-    'Redundant spread operator':
-        IssueType.BEST_PRACTICES,
-    'Redundant visibility modifier':
-        IssueType.BEST_PRACTICES,
-    'Remove empty constructor body':
-        IssueType.BEST_PRACTICES,
-    'Remove empty primary constructor':
-        IssueType.BEST_PRACTICES,
-    'Remove redundant backticks':
-        IssueType.BEST_PRACTICES,
-    'Remove redundant call to \'toString()\' in string template':
-        IssueType.BEST_PRACTICES,
-    'Remove redundant calls of conversion methods':
-        IssueType.BEST_PRACTICES,
-    'Remove redundant qualifier name':
-        IssueType.BEST_PRACTICES,
-    'Remove redundant string template':
-        IssueType.BEST_PRACTICES,
-    'Remove unnecessary parentheses from function call with lambda':
-        IssueType.BEST_PRACTICES,
-    'Replace empty class body':
-        IssueType.CODE_STYLE,
-    'Replace single line .let':
-        IssueType.BEST_PRACTICES,
-    'Simplifiable \'when\'':
-        IssueType.BEST_PRACTICES,
-    'Unnecessary local variable':
-        IssueType.BEST_PRACTICES,
-    'Unnecessary supertype qualification':
-        IssueType.BEST_PRACTICES,
-    'Unnecessary type argument':
-        IssueType.BEST_PRACTICES,
-    'Unused equals expression':
-        IssueType.BEST_PRACTICES,
-    'Unused import directive':
-        IssueType.BEST_PRACTICES,
-    'Unused loop index':
-        IssueType.BEST_PRACTICES,
-    'Unused receiver parameter':
-        IssueType.BEST_PRACTICES,
-    'Unused symbol':
-        IssueType.BEST_PRACTICES,
-    '\'when\' has only \'else\' branch and can be simplified':
-        IssueType.BEST_PRACTICES,
-
-    # Kotlin | Style issues
-    'Accessor call that can be replaced with property access syntax':
-        IssueType.CODE_STYLE,
-    '\'arrayOf\' call can be replaced with array literal [...]':
-        IssueType.CODE_STYLE,
-    '‘assert’ call can be replaced with ‘!!’ or ‘?:\'':
-        IssueType.CODE_STYLE,
-    'Assignment that can be replaced with operator assignment':
-        IssueType.CODE_STYLE,
-    'Boolean expression that can be simplified':
-        IssueType.CODE_STYLE,
-    'Boolean literal argument without parameter name':
-        IssueType.CODE_STYLE,
-    'Call chain on collection could be converted into \'Sequence\' to improve '
-    'performance':
-        IssueType.CODE_STYLE,
-    'Call chain on collection type can be simplified':
-        IssueType.CODE_STYLE,
-    'Can be replaced with binary operator':
-        IssueType.CODE_STYLE,
-    'Can be replaced with function reference':
-        IssueType.CODE_STYLE,
-    'Can be replaced with lambda':
-        IssueType.CODE_STYLE,
-    'Cascade if can be replaced with when':
-        IssueType.CODE_STYLE,
-    'Class member can have \'private\' visibility':
-        IssueType.BEST_PRACTICES,
-    'Collection count can be converted to size':
-        IssueType.CODE_STYLE,
-    'Control flow with empty body':
-        IssueType.BEST_PRACTICES,
-    'Convert Pair constructor to \'to\' function':
-        IssueType.CODE_STYLE,
-    'Convert to primary constructor':
-        IssueType.CODE_STYLE,
-    'Convert try / finally to use() call':
-        IssueType.CODE_STYLE,
-    'Convert two comparisons to \'in\'':
-        IssueType.CODE_STYLE,
-    '\'copy\' method of data class is called without named arguments':
-        IssueType.CODE_STYLE,
-    'Equality check can be used instead of elvis for nullable boolean check':
-        IssueType.CODE_STYLE,
-    'Explicit \'get\' or \'set\' call':
-        IssueType.CODE_STYLE,
-    'Expression body syntax is preferable here':
-        IssueType.CODE_STYLE,
-    'File is not formatted according to project settings':
-        IssueType.CODE_STYLE,
-    'Function returning Deferred directly':
-        IssueType.CODE_STYLE,
-    'Function returning Result directly':
-        IssueType.CODE_STYLE,
-    'Function with `= { ... }` and inferred return type':
-        IssueType.CODE_STYLE,
-    'If-Null return/break/... foldable to \'?:\'':
-        IssueType.CODE_STYLE,
-    'If-Then foldable to \'?.\'':
-        IssueType.CODE_STYLE,
-    'If-Then foldable to \'?:\'':
-        IssueType.CODE_STYLE,
-    'Implicit \'this\'':
-        IssueType.CODE_STYLE,
-    'Java Collections static method call can be replaced with Kotlin stdlib':
-        IssueType.CODE_STYLE,
-    'Java Map.forEach method call should be replaced with Kotlin\'s forEach':
-        IssueType.CODE_STYLE,
-    'Join declaration and assignment':
-        IssueType.CODE_STYLE,
-    'Lambda argument inside parentheses':
-        IssueType.CODE_STYLE,
-    'Library function call could be simplified':
-        IssueType.CODE_STYLE,
-    'Local \'var\' is never modified and can be declared as \'val\'':
-        IssueType.CODE_STYLE,
-    'Loop can be replaced with stdlib operations':
-        IssueType.CODE_STYLE,
-    'Main parameter is not necessary':
-        IssueType.CODE_STYLE,
-    'Manually incremented index variable can be replaced with use of '
-    '\'withIndex()\'':
-        IssueType.CODE_STYLE,
-    'map.get() with not-null assertion operator (!!)':
-        IssueType.CODE_STYLE,
-    'map.put() can be converted to assignment':
-        IssueType.CODE_STYLE,
-    'Might be \'const\'':
-        IssueType.CODE_STYLE,
-    'Negated boolean expression that can be simplified':
-        IssueType.CODE_STYLE,
-    'Nested lambda has shadowed implicit parameter':
-        IssueType.CODE_STYLE,
-    'Non-canonical modifier order':
-        IssueType.CODE_STYLE,
-    'Object literal can be converted to lambda':
-        IssueType.CODE_STYLE,
-    'Optionally expected annotation has no actual annotation':
-        IssueType.CODE_STYLE,
-    '\'protected\' visibility is effectively \'private\' in a final class':
-        IssueType.CODE_STYLE,
-    '\'rangeTo\' or the \'..\' call can be replaced with \'until\'':
-        IssueType.CODE_STYLE,
-    'Redundant \'async\' call':
-        IssueType.CODE_STYLE,
-    'Redundant \'else\' in \'if\'':
-        IssueType.CODE_STYLE,
-    'Redundant \'runCatching\' call':
-        IssueType.CODE_STYLE,
-    'Redundant type checks for object':
-        IssueType.CODE_STYLE,
-    'Remove unnecessary parentheses':
-        IssueType.CODE_STYLE,
-    'Replace \'!!\' with \'?:return \'':
-        IssueType.CODE_STYLE,
-    'Replace \'associate\' with \'associateBy\' or \'associateWith\'':
-        IssueType.CODE_STYLE,
-    'Replace \'toString\' with string template':
-        IssueType.CODE_STYLE,
-    'Replace assert boolean with assert equality':
-        IssueType.CODE_STYLE,
-    'Replace Java static method with Kotlin analog':
-        IssueType.CODE_STYLE,
-    'Replace negated \'isEmpty\' with \'isNotEmpty\'':
-        IssueType.CODE_STYLE,
-    'Replace Range \'start\' or \'endInclusive\' with \'first\' or \'last\'':
-        IssueType.CODE_STYLE,
-    'Replace size check with \'isNotEmpty()\'':
-        IssueType.CODE_STYLE,
-    'Replace size zero check with \'isEmpty()\'':
-        IssueType.CODE_STYLE,
-    'Replace with string templates':
-        IssueType.CODE_STYLE,
-    'Replace ’to’ with infix form':
-        IssueType.CODE_STYLE,
-    'Return or assignment can be lifted out':
-        IssueType.CODE_STYLE,
-    'Safe cast with \'return\' should be replaced with \'if\' type check':
-        IssueType.CODE_STYLE,
-    'Scope function can be converted to another one':
-        IssueType.CODE_STYLE,
-    'String concatenation that can be converted to string template':
-        IssueType.CODE_STYLE,
-    'Suspicious \'asDynamic\' member invocation':
-        IssueType.CODE_STYLE,
-    'Type parameter can have \'in\' or \'out\' variance':
-        IssueType.CODE_STYLE,
-    'Unlabeled return inside lambda':
-        IssueType.CODE_STYLE,
-    'Use destructuring declaration':
-        IssueType.CODE_STYLE,
-    'Variable declaration could be moved inside `when`':
-        IssueType.CODE_STYLE,
-    '\'when\' that can be simplified by introducing an argument':
-        IssueType.CODE_STYLE,
-
-    'Annotator': IssueType.ERROR_PRONE,
-}
diff --git a/src/python/review/inspectors/intellij/issue_types/python.py b/src/python/review/inspectors/intellij/issue_types/python.py
deleted file mode 100644
index 792a7551..00000000
--- a/src/python/review/inspectors/intellij/issue_types/python.py
+++ /dev/null
@@ -1,253 +0,0 @@
-from typing import Dict
-
-from src.python.review.inspectors.issue import IssueType
-
-ISSUE_CLASS_TO_ISSUE_TYPE: Dict[str, IssueType] = {
-    'Access to a protected member of a class or a module':
-        IssueType.BEST_PRACTICES,
-
-    'Access to properties':
-        IssueType.ERROR_PRONE,
-
-    'Argument passed to function is equal to default parameter value':
-        IssueType.BEST_PRACTICES,
-
-    'Assigning function call that doesn\'t return anything':
-        IssueType.BEST_PRACTICES,
-
-    'Assignment can be replaced with augmented assignment':
-        IssueType.BEST_PRACTICES,
-
-    'Assignment to \'for\' loop or \'with\' statement parameter':
-        IssueType.BEST_PRACTICES,
-
-    'Bad except clauses order':
-        IssueType.ERROR_PRONE,
-
-    'Boolean variable check can be simplified':
-        IssueType.BEST_PRACTICES,
-
-    'Byte literal contains characters > 255':
-        IssueType.ERROR_PRONE,
-
-    'Calling a method by class using an instance of a different class':
-        IssueType.BEST_PRACTICES,
-
-    'Chained comparisons can be simplified':
-        IssueType.BEST_PRACTICES,
-
-    'Checks that functions decorated by pytest parametrize have correct arguments':
-        IssueType.ERROR_PRONE,
-
-    'Class has no __init__ method':
-        IssueType.BEST_PRACTICES,
-
-    'Class must implement all abstract methods':
-        IssueType.ERROR_PRONE,
-
-    'Class specific decorator on method outside class':
-        IssueType.BEST_PRACTICES,
-
-    'Classic style class usage':
-        IssueType.BEST_PRACTICES,
-
-    'Code compatibility inspection':
-        IssueType.ERROR_PRONE,
-
-    'Command-line inspection':
-        IssueType.ERROR_PRONE,
-
-    'Comparison with None performed with equality operators':
-        IssueType.BEST_PRACTICES,
-
-    'Coroutine is not awaited':
-        IssueType.ERROR_PRONE,
-
-    'Cython variable usage before declaration':
-        IssueType.ERROR_PRONE,
-
-    'Dataclass definition and usages':
-        IssueType.ERROR_PRONE,
-
-    'Default argument is mutable':
-        IssueType.ERROR_PRONE,
-
-    'Definition of __slots__ in a class':
-        IssueType.ERROR_PRONE,
-
-    'Deprecated function, class or module':
-        IssueType.ERROR_PRONE,
-
-    'Dictionary contains duplicate keys':
-        IssueType.ERROR_PRONE,
-
-    'Dictionary creation could be rewritten by dictionary literal':
-        IssueType.BEST_PRACTICES,
-
-    'Errors in string formatting operations':
-        IssueType.ERROR_PRONE,
-
-    'Exception doesn\'t inherit from standard \'\'Exception\'\' class':
-        IssueType.ERROR_PRONE,
-
-    'File contains non-ASCII character':
-        IssueType.ERROR_PRONE,
-
-    'Final classes, methods and variables':
-        IssueType.ERROR_PRONE,
-
-    'from __future__ import must be the first executable statement':
-        IssueType.ERROR_PRONE,
-
-    'Function call can be replaced with set literal':
-        IssueType.BEST_PRACTICES,
-
-    'Global variable is undefined at the module level':
-        IssueType.ERROR_PRONE,
-
-    'Incompatible signatures of __new__ and __init__':
-        IssueType.ERROR_PRONE,
-
-    'Inconsistent indentation':
-        IssueType.ERROR_PRONE,
-
-    'Incorrect call arguments':
-        IssueType.ERROR_PRONE,
-
-    'Incorrect docstring':
-        IssueType.BEST_PRACTICES,
-
-    '__init__ method that returns a value':
-        IssueType.ERROR_PRONE,
-
-    'Instance attribute defined outside __init__':
-        IssueType.BEST_PRACTICES,
-    'Invalid interpreter configured':
-        IssueType.ERROR_PRONE,
-
-    'List creation could be rewritten by list literal':
-        IssueType.BEST_PRACTICES,
-
-    'Method may be static':
-        IssueType.BEST_PRACTICES,
-
-    'Method signature does not match signature of overridden method':
-        IssueType.ERROR_PRONE,
-
-    'Methods having troubles with first parameter':
-        IssueType.ERROR_PRONE,
-
-    'Missed call to __init__ of super class':
-        IssueType.ERROR_PRONE,
-
-    'Missing or empty docstring':
-        IssueType.BEST_PRACTICES,
-
-    'Missing type hinting for function definition':
-        IssueType.BEST_PRACTICES,
-
-    'Namedtuple definition':
-        IssueType.ERROR_PRONE,
-
-    'No encoding specified for file':
-        IssueType.BEST_PRACTICES,
-
-    'Old-style class contains new-style class features':
-        IssueType.ERROR_PRONE,
-
-    'Overloads in regular Python files':
-        IssueType.ERROR_PRONE,
-
-    'Package requirements':
-        IssueType.ERROR_PRONE,
-
-    'PEP 8 coding style violation':
-        IssueType.CODE_STYLE,
-
-    'PEP 8 naming convention violation':
-        IssueType.CODE_STYLE,
-
-    'Problematic nesting of decorators':
-        IssueType.BEST_PRACTICES,
-
-    'Property definitions':
-        IssueType.ERROR_PRONE,
-
-    'Protocol definition and usages':
-        IssueType.ERROR_PRONE,
-
-    'Raising a string exception':
-        IssueType.ERROR_PRONE,
-
-    'Reassignment of method\'s first argument':
-        IssueType.ERROR_PRONE,
-
-    'Redeclared names without usage':
-        IssueType.ERROR_PRONE,
-
-    'Redundant parentheses':
-        IssueType.CODE_STYLE,
-
-    'Shadowing built-ins':
-        IssueType.ERROR_PRONE,
-
-    'Shadowing names from outer scopes':
-        IssueType.BEST_PRACTICES,
-
-    'Single quoted docstring':
-        IssueType.BEST_PRACTICES,
-
-    'Statement has no effect':
-        IssueType.ERROR_PRONE,
-
-    'Stub packages advertiser':
-        IssueType.BEST_PRACTICES,
-
-    'Stub packages compatibility inspection':
-        IssueType.ERROR_PRONE,
-
-    'Too broad exception clauses':
-        IssueType.BEST_PRACTICES,
-
-    'Trailing semicolon in statement':
-        IssueType.CODE_STYLE,
-
-    'Trying to call a non-callable object':
-        IssueType.ERROR_PRONE,
-
-    'Tuple assignment balance is incorrect':
-        IssueType.ERROR_PRONE,
-
-    'Tuple item assignment':
-        IssueType.ERROR_PRONE,
-
-    'Type checker':
-        IssueType.ERROR_PRONE,
-
-    'Type hints definitions and usages':
-        IssueType.ERROR_PRONE,
-
-    'Type in docstring doesn\'t match inferred type':
-        IssueType.BEST_PRACTICES,
-
-    'TypedDict definition and usages':
-        IssueType.ERROR_PRONE,
-
-    'Unbound local variable':
-        IssueType.ERROR_PRONE,
-
-    'Unnecessary backslash':
-        IssueType.BEST_PRACTICES,
-
-    'Unreachable code':
-        IssueType.ERROR_PRONE,
-
-    'Unresolved references':
-        IssueType.ERROR_PRONE,
-
-    'Unused local':
-        IssueType.BEST_PRACTICES,
-
-    'Wrong arguments to call super':
-        IssueType.ERROR_PRONE,
-}
diff --git a/src/python/review/inspectors/intellij/jdk.table.xml b/src/python/review/inspectors/intellij/jdk.table.xml
deleted file mode 100644
index 8b9ec0d7..00000000
--- a/src/python/review/inspectors/intellij/jdk.table.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<application>
-  <component name="ProjectJdkTable">
-    <jdk version="2">
-      <name value="11" />
-      <type value="JavaSDK" />
-      <version value="java version &quot;11.0.6&quot;" />
-      <homePath value="/usr/lib/jvm/java-11-openjdk" />
-      <roots>
-        <annotationsPath>
-          <root type="composite">
-            <root url="jar://$APPLICATION_HOME_DIR$/lib/jdkAnnotations.jar!/" type="simple" />
-          </root>
-        </annotationsPath>
-        <classPath>
-          <root type="composite">
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/java.activation" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/java.base" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/java.compiler" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/java.corba" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/java.datatransfer" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/java.desktop" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/java.instrument" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/java.logging" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/java.management" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/java.management.rmi" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/java.naming" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/java.prefs" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/java.rmi" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/java.scripting" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/java.se" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/java.se.ee" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/java.security.jgss" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/java.security.sasl" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/java.smartcardio" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/java.sql" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/java.sql.rowset" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/java.transaction" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/java.xml" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/java.xml.bind" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/java.xml.crypto" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/java.xml.ws" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/java.xml.ws.annotation" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.accessibility" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.aot" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.attach" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.charsets" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.compiler" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.crypto.cryptoki" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.crypto.ec" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.dynalink" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.editpad" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.hotspot.agent" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.httpserver" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.incubator.httpclient" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.internal.ed" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.internal.jvmstat" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.internal.le" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.internal.opt" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.internal.vm.ci" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.internal.vm.compiler" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.internal.vm.compiler.management" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.jartool" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.javadoc" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.jcmd" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.jconsole" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.jdeps" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.jdi" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.jdwp.agent" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.jlink" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.jshell" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.jsobject" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.jstatd" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.localedata" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.management" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.management.agent" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.naming.dns" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.naming.rmi" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.net" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.pack" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.rmic" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.scripting.nashorn" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.scripting.nashorn.shell" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.sctp" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.security.auth" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.security.jgss" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.unsupported" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.xml.bind" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.xml.dom" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.xml.ws" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-11-openjdk!/jdk.zipfs" type="simple" />
-          </root>
-        </classPath>
-        <javadocPath>
-          <root type="composite" />
-        </javadocPath>
-        <sourcePath>
-          <root type="composite" />
-        </sourcePath>
-      </roots>
-      <additional />
-    </jdk>
-    <jdk version="2">
-      <name value="Python 3.8" />
-      <type value="Python SDK" />
-      <version value="Python 3.8.2" />
-      <homePath value="/usr/local/bin/python3" />
-      <roots>
-        <annotationsPath>
-          <root type="composite" />
-        </annotationsPath>
-        <classPath>
-          <root type="composite">
-            <root url="file:///usr/local/lib/python3.8" type="simple" />
-            <root url="file:///usr/local/lib/python3.8/lib-dynload" type="simple" />
-            <root url="file:///usr/local/lib/python3.8/site-packages" type="simple" />
-            <root url="file:///root/.IdeaIC2019.3/config/plugins/python-ce/helpers/python-skeletons" type="simple" />
-            <root url="file:///root/.IdeaIC2019.3/config/plugins/python-ce/helpers/typeshed/stdlib/3" type="simple" />
-            <root url="file:///root/.IdeaIC2019.3/config/plugins/python-ce/helpers/typeshed/stdlib/2and3" type="simple" />
-            <root url="file:///root/.IdeaIC2019.3/config/plugins/python-ce/helpers/typeshed/third_party/3" type="simple" />
-            <root url="file:///root/.IdeaIC2019.3/config/plugins/python-ce/helpers/typeshed/third_party/2and3" type="simple" />
-          </root>
-        </classPath>
-        <javadocPath>
-          <root type="composite" />
-        </javadocPath>
-        <sourcePath>
-          <root type="composite" />
-        </sourcePath>
-      </roots>
-      <additional />
-    </jdk>
-  </component>
-</application>
diff --git a/src/python/review/inspectors/intellij/project/.idea/inspectionProfiles/custom_profiles.xml b/src/python/review/inspectors/intellij/project/.idea/inspectionProfiles/custom_profiles.xml
deleted file mode 100644
index 7a95bdb1..00000000
--- a/src/python/review/inspectors/intellij/project/.idea/inspectionProfiles/custom_profiles.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Checkstyle" />
-    <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
-        <option name="processCode" value="false" />
-        <option name="processLiterals" value="false" />
-        <option name="processComments" value="false" />
-    </inspection_tool>
-
-    <inspection_tool class="WeakerAccess" enabled="false" level="WARNING" enabled_by_default="false">
-        <option name="SUGGEST_PACKAGE_LOCAL_FOR_MEMBERS" value="false" />
-        <option name="SUGGEST_PACKAGE_LOCAL_FOR_TOP_CLASSES" value="false" />
-        <option name="SUGGEST_PRIVATE_FOR_INNERS" value="false" />
-    </inspection_tool>
-
-    <!-- Checked by checkstyle -->
-<!--    <inspection_tool class="CStyleArrayDeclaration" enabled="false" level="ERROR" enabled_by_default="false" />-->
-
-    <!-- Only unused local variables are reported. -->
-    <inspection_tool class="unused" enabled="true" level="WARNING" enabled_by_default="true">
-        <option name="LOCAL_VARIABLE" value="true" />
-        <option name="FIELD" value="false" />
-        <option name="METHOD" value="false" />
-        <option name="CLASS" value="false" />
-        <option name="PARAMETER" value="false" />
-        <option name="REPORT_PARAMETER_FOR_PUBLIC_METHODS" value="false" />
-        <option name="ADD_MAINS_TO_ENTRIES" value="false" />
-        <option name="ADD_APPLET_TO_ENTRIES" value="false" />
-        <option name="ADD_SERVLET_TO_ENTRIES" value="false" />
-        <option name="ADD_NONJAVA_TO_ENTRIES" value="false" />
-    </inspection_tool>
-
-    <inspection_tool class="CanBeFinal" enabled="false" level="ERROR" enabled_by_default="false">
-        <option name="REPORT_CLASSES" value="false" />
-        <option name="REPORT_METHODS" value="false" />
-        <option name="REPORT_FIELDS" value="false" />
-    </inspection_tool>
-
-    <inspection_tool class="FieldCanBeLocal" enabled="false"/>
-
-    <inspection_tool class="SameParameterValue" enabled="false"/>
-
-    <inspection_tool class="PackageDirectoryMismatch" enabled="false" level="ERROR" enabled_by_default="false" />
-
-  </profile>
-</component>
diff --git a/src/python/review/inspectors/intellij/project/.idea/inspectionProfiles/profiles_settings.xml b/src/python/review/inspectors/intellij/project/.idea/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 11beaba0..00000000
--- a/src/python/review/inspectors/intellij/project/.idea/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-      <option name="PROJECT_PROFILE" value="Default" />
-      <option name="USE_PROJECT_PROFILE" value="false"/>
-    <version value="1.0" />
-  </settings>
-</component>
diff --git a/src/python/review/inspectors/intellij/project/.idea/kotlinc.xml b/src/python/review/inspectors/intellij/project/.idea/kotlinc.xml
deleted file mode 100644
index 39c35f32..00000000
--- a/src/python/review/inspectors/intellij/project/.idea/kotlinc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Kotlin2JvmCompilerArguments">
-    <option name="jvmTarget" value="1.8" />
-  </component>
-</project>
diff --git a/src/python/review/inspectors/intellij/project/.idea/libraries/KotlinJavaRuntime.xml b/src/python/review/inspectors/intellij/project/.idea/libraries/KotlinJavaRuntime.xml
deleted file mode 100644
index b7ef79a5..00000000
--- a/src/python/review/inspectors/intellij/project/.idea/libraries/KotlinJavaRuntime.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<component name="libraryTable">
-  <library name="KotlinJavaRuntime">
-    <CLASSES>
-      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-stdlib.jar!/" />
-      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-reflect.jar!/" />
-      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-test.jar!/" />
-      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-stdlib-jdk7.jar!/" />
-      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-stdlib-jdk8.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-stdlib-sources.jar!/" />
-      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-reflect-sources.jar!/" />
-      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-test-sources.jar!/" />
-      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-stdlib-jdk7-sources.jar!/" />
-      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-stdlib-jdk8-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
diff --git a/src/python/review/inspectors/intellij/project/.idea/modules.xml b/src/python/review/inspectors/intellij/project/.idea/modules.xml
deleted file mode 100644
index efa66b3b..00000000
--- a/src/python/review/inspectors/intellij/project/.idea/modules.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-    <component name="ProjectModuleManager">
-        <modules>
-            <module fileurl="file://$PROJECT_DIR$/kotlin_sources/kotlin_sources.iml" filepath="$PROJECT_DIR$/kotlin_sources/kotlin_sources.iml" />
-            <module fileurl="file://$PROJECT_DIR$/java_sources/java_sources.iml" filepath="$PROJECT_DIR$/java_sources/java_sources.iml"/>
-            <module fileurl="file://$PROJECT_DIR$/python_sources/python_sources.iml" filepath="$PROJECT_DIR$/python_sources/python_sources.iml"/>
-        </modules>
-    </component>
-</project>
diff --git a/src/python/review/inspectors/intellij/project/java_sources/java_sources.iml b/src/python/review/inspectors/intellij/project/java_sources/java_sources.iml
deleted file mode 100644
index 0fe5243b..00000000
--- a/src/python/review/inspectors/intellij/project/java_sources/java_sources.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="11" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
-
diff --git a/src/python/review/inspectors/intellij/project/kotlin_sources/kotlin_sources.iml b/src/python/review/inspectors/intellij/project/kotlin_sources/kotlin_sources.iml
deleted file mode 100644
index 25474137..00000000
--- a/src/python/review/inspectors/intellij/project/kotlin_sources/kotlin_sources.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="11" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
-  </component>
-</module>
diff --git a/src/python/review/inspectors/intellij/project/python_sources/python_sources.iml b/src/python/review/inspectors/intellij/project/python_sources/python_sources.iml
deleted file mode 100644
index dfe7286d..00000000
--- a/src/python/review/inspectors/intellij/project/python_sources/python_sources.iml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="Python 3.8" jdkType="Python SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/src/python/review/inspectors/issue.py b/src/python/review/inspectors/issue.py
index b1b3cf52..055f77c7 100644
--- a/src/python/review/inspectors/issue.py
+++ b/src/python/review/inspectors/issue.py
@@ -1,33 +1,112 @@
 import abc
+import logging
+from collections import defaultdict
 from dataclasses import dataclass
 from enum import Enum, unique
 from pathlib import Path
-from typing import Any, Dict, Union
+from typing import Any, Dict, List, Union
 
 from src.python.review.inspectors.inspector_type import InspectorType
 
+logger = logging.getLogger(__name__)
+
 
 @unique
 class IssueType(Enum):
+    # Code style issues
     CODE_STYLE = 'CODE_STYLE'
+    LINE_LEN = 'LINE_LEN'
+
+    # Best practice issues
     BEST_PRACTICES = 'BEST_PRACTICES'
-    ERROR_PRONE = 'ERROR_PRONE'
     FUNC_LEN = 'FUNC_LEN'
-    LINE_LEN = 'LINE_LEN'
-    CYCLOMATIC_COMPLEXITY = 'CYCLOMATIC_COMPLEXITY'
     BOOL_EXPR_LEN = 'BOOL_EXPR_LEN'
+    CLASS_RESPONSE = 'CLASS_RESPONSE'
+    METHOD_NUMBER = 'METHOD_NUMBER'
+
+    # Error-prone issues
+    ERROR_PRONE = 'ERROR_PRONE'
+
+    # Code complexity issues
     COMPLEXITY = 'COMPLEXITY'
-    ARCHITECTURE = 'ARCHITECTURE'
+    CYCLOMATIC_COMPLEXITY = 'CYCLOMATIC_COMPLEXITY'
     INHERITANCE_DEPTH = 'INHERITANCE_DEPTH'
     CHILDREN_NUMBER = 'CHILDREN_NUMBER'
     WEIGHTED_METHOD = 'WEIGHTED_METHOD'
     COUPLING = 'COUPLING'
     COHESION = 'COHESION'
-    CLASS_RESPONSE = 'CLASS_RESPONSE'
-    METHOD_NUMBER = 'METHOD_NUMBER'
     MAINTAINABILITY = 'MAINTAINABILITY'
+
+    # Info issues
     INFO = 'INFO'
 
+    # Others
+    UNDEFINED = 'UNDEFINED'
+    ARCHITECTURE = 'ARCHITECTURE'  # TODO: Distribute into one of the main types
+
+    def __str__(self) -> str:
+        return ' '.join(self.value.lower().split('_'))
+
+    def to_main_type(self) -> 'IssueType':
+        """
+        Converts the issue type to main issue type.
+        Main issue types: CODE_STYLE, BEST_PRACTICES, ERROR_PRONE, COMPLEXITY, INFO.
+        """
+        return get_main_category_by_issue_type(self)
+
+
+ISSUE_TYPE_TO_MAIN_CATEGORY = {
+    # CODE_STYLE
+    IssueType.CODE_STYLE: IssueType.CODE_STYLE,
+    IssueType.LINE_LEN: IssueType.CODE_STYLE,
+
+    # BEST_PRACTICES
+    IssueType.BEST_PRACTICES: IssueType.BEST_PRACTICES,
+    IssueType.FUNC_LEN: IssueType.BEST_PRACTICES,
+    IssueType.BOOL_EXPR_LEN: IssueType.BEST_PRACTICES,
+    IssueType.METHOD_NUMBER: IssueType.BEST_PRACTICES,
+    IssueType.CLASS_RESPONSE: IssueType.BEST_PRACTICES,
+
+    # ERROR_PRONE
+    IssueType.ERROR_PRONE: IssueType.ERROR_PRONE,
+
+    # COMPLEXITY
+    IssueType.COMPLEXITY: IssueType.COMPLEXITY,
+    IssueType.CYCLOMATIC_COMPLEXITY: IssueType.COMPLEXITY,
+    IssueType.WEIGHTED_METHOD: IssueType.COMPLEXITY,
+    IssueType.COUPLING: IssueType.COMPLEXITY,
+    IssueType.COHESION: IssueType.COMPLEXITY,
+    IssueType.MAINTAINABILITY: IssueType.COMPLEXITY,
+    IssueType.CHILDREN_NUMBER: IssueType.COMPLEXITY,
+    IssueType.INHERITANCE_DEPTH: IssueType.COMPLEXITY,
+    IssueType.ARCHITECTURE: IssueType.COMPLEXITY,
+
+    # INFO
+    IssueType.INFO: IssueType.INFO,
+}
+
+
+def get_main_category_by_issue_type(issue_type: IssueType) -> IssueType:
+    return ISSUE_TYPE_TO_MAIN_CATEGORY.get(issue_type, IssueType.UNDEFINED)
+
+
+def main_category_to_issue_type_list_dict() -> Dict[IssueType, List[IssueType]]:
+    main_category_to_issue_type = defaultdict(list)
+    for key, value in ISSUE_TYPE_TO_MAIN_CATEGORY.items():
+        main_category_to_issue_type[value].append(key)
+    return main_category_to_issue_type
+
+
+MAIN_CATEGORY_TO_ISSUE_TYPE_LIST = main_category_to_issue_type_list_dict()
+
+IssuesStat = Dict[IssueType, int]
+
+
+def get_default_issue_stat() -> IssuesStat:
+    stat = {issue: 0 for issue in set(ISSUE_TYPE_TO_MAIN_CATEGORY.values())}
+    stat[IssueType.UNDEFINED] = 0
+    return stat
+
 
 # Keys in results dictionary
 @unique
@@ -42,6 +121,7 @@ class IssueData(Enum):
     # Additional fields
     ISSUE_TYPE = 'type'
     DESCRIPTION = 'description'
+    DIFFICULTY = 'difficulty'
 
     LINE_LEN = 'line_len'
     FUNCTION_LEN = 'func_len'
@@ -66,17 +146,65 @@ def get_base_issue_data_dict(cls,
         }
 
 
+@unique
+class IssueDifficulty(Enum):
+    EASY = 'EASY'
+    MEDIUM = 'MEDIUM'
+    HARD = 'HARD'
+
+    @classmethod
+    def get_by_issue_type(cls, issue_type: IssueType) -> 'IssueDifficulty':
+        issue_type_to_difficulty = {
+            # Easy
+            IssueType.CODE_STYLE: cls.EASY,
+            IssueType.LINE_LEN: cls.EASY,
+            IssueType.FUNC_LEN: cls.EASY,
+            IssueType.BOOL_EXPR_LEN: cls.EASY,
+            IssueType.INFO: cls.EASY,  # Because INFO should always be shown on the platforms
+
+            # Medium
+            IssueType.BEST_PRACTICES: cls.MEDIUM,
+
+            # Hard
+            IssueType.CLASS_RESPONSE: cls.HARD,
+            IssueType.METHOD_NUMBER: cls.HARD,
+            IssueType.ERROR_PRONE: cls.HARD,
+            IssueType.COMPLEXITY: cls.HARD,
+            IssueType.CYCLOMATIC_COMPLEXITY: cls.HARD,
+            IssueType.INHERITANCE_DEPTH: cls.HARD,
+            IssueType.CHILDREN_NUMBER: cls.HARD,
+            IssueType.WEIGHTED_METHOD: cls.HARD,
+            IssueType.COUPLING: cls.HARD,
+            IssueType.COHESION: cls.HARD,
+            IssueType.MAINTAINABILITY: cls.HARD,
+            IssueType.UNDEFINED: cls.HARD,
+            IssueType.ARCHITECTURE: cls.HARD,
+        }
+
+        if issue_type not in issue_type_to_difficulty:
+            logger.warning(f'IssueDifficulty: {issue_type} - unknown issue type.')
+            return cls.HARD
+
+        return issue_type_to_difficulty[issue_type]
+
+
+@dataclass(frozen=True, eq=True)
+class ShortIssue:
+    origin_class: str
+
+    type: IssueType
+
+
 @dataclass(frozen=True, eq=True)
-class BaseIssue:
+class BaseIssue(ShortIssue):
+    description: str
+
     file_path: Path
     line_no: int
     column_no: int
 
-    description: str
-    origin_class: str
-
     inspector_type: InspectorType
-    type: IssueType
+    difficulty: IssueDifficulty
 
 
 class Measurable(abc.ABC):
@@ -196,3 +324,33 @@ class MaintainabilityLackIssue(BaseIssue, Measurable):
 
     def measure(self) -> int:
         return self.maintainability_lack
+
+
+ISSUE_TYPE_TO_CLASS = {
+    IssueType.CODE_STYLE: CodeIssue,
+    IssueType.BEST_PRACTICES: CodeIssue,
+    IssueType.ERROR_PRONE: CodeIssue,
+    IssueType.COMPLEXITY: CodeIssue,
+    IssueType.INFO: CodeIssue,
+
+    IssueType.LINE_LEN: LineLenIssue,
+    IssueType.FUNC_LEN: FuncLenIssue,
+    IssueType.BOOL_EXPR_LEN: BoolExprLenIssue,
+    IssueType.CYCLOMATIC_COMPLEXITY: CyclomaticComplexityIssue,
+    IssueType.MAINTAINABILITY: MaintainabilityLackIssue,
+    IssueType.COHESION: CohesionIssue,
+}
+
+
+def get_issue_class_by_issue_type(issue_type: IssueType):
+    return ISSUE_TYPE_TO_CLASS.get(issue_type, CodeIssue)
+
+
+MEASURABLE_ISSUE_TYPE_TO_MEASURE_NAME = {
+    IssueType.LINE_LEN: IssueData.LINE_LEN.value,
+    IssueType.FUNC_LEN: IssueData.FUNCTION_LEN.value,
+    IssueType.BOOL_EXPR_LEN: IssueData.BOOL_EXPR_LEN.value,
+    IssueType.CYCLOMATIC_COMPLEXITY: IssueData.CYCLOMATIC_COMPLEXITY.value,
+    IssueType.MAINTAINABILITY: IssueData.MAINTAINABILITY_LACK.value,
+    IssueType.COHESION: IssueData.COHESION_LACK.value,
+}
diff --git a/src/python/review/inspectors/parsers/checkstyle_parser.py b/src/python/review/inspectors/parsers/xml_parser.py
similarity index 80%
rename from src/python/review/inspectors/parsers/checkstyle_parser.py
rename to src/python/review/inspectors/parsers/xml_parser.py
index 1db9874c..c7491263 100644
--- a/src/python/review/inspectors/parsers/checkstyle_parser.py
+++ b/src/python/review/inspectors/parsers/xml_parser.py
@@ -13,6 +13,7 @@
     CyclomaticComplexityIssue,
     FuncLenIssue,
     IssueData,
+    IssueDifficulty,
     IssueType,
     LineLenIssue,
 )
@@ -26,8 +27,10 @@
 logger = logging.getLogger(__name__)
 
 
-# Check if the result of the inspectors is correct: it exists and it is not empty
 def __is_result_file_correct(file_path: Path, inspector_type: InspectorType) -> bool:
+    """
+    Check if the result of the inspectors is correct: it exists and it is not empty.
+    """
     if not file_path.is_file():
         logger.error('%s: error - no output file' % inspector_type.value)
         return False
@@ -36,10 +39,16 @@ def __is_result_file_correct(file_path: Path, inspector_type: InspectorType) ->
     if not file_content:
         logger.error('%s: error - empty file' % inspector_type.value)
         return False
+
     return True
 
 
 def __parse_error_message(element: ElementTree) -> str:
+    """
+    Extracts the error message from the tree element and
+    removes the substring '(max allowed is \\d+)' from it, if possible.
+    """
+
     message = element.attrib['message']
     return re.sub(r'\(max allowed is \d+\). ', '', message)
 
@@ -48,6 +57,10 @@ def __parse_error_message(element: ElementTree) -> str:
 # e.g. BoolExprLenIssue, CyclomaticComplexityIssue and so on
 def __parse_measurable_issue(issue_data: Dict[str, Any], issue_type: IssueType,
                              measure_value: int) -> Optional[BaseIssue]:
+    """
+    Depending on the issue_type creates a corresponding measurable issue.
+    """
+
     if issue_type == IssueType.CYCLOMATIC_COMPLEXITY:
         issue_data[IssueData.CYCLOMATIC_COMPLEXITY.value] = measure_value
         issue_data[IssueData.DESCRIPTION.value] = get_cyclomatic_complexity_tip()
@@ -68,19 +81,36 @@ def __parse_measurable_issue(issue_data: Dict[str, Any], issue_type: IssueType,
 
 
 def __should_handle_element(element: ElementTree) -> bool:
+    """
+    Checks if a tree element is a file.
+    """
+
     return element.tag == 'file'
 
 
 def __is_error(element: ElementTree) -> bool:
+    """
+    Checks if a tree element is an error.
+    """
+
     return element.tag == 'error'
 
 
-# TODO Needs testing
-def parse_checkstyle_file_result(
+# TODO: Needs refactoring
+def parse_xml_file_result(
         file_path: Path,
         inspector_type: InspectorType,
         issue_type_selector: Callable[[str], IssueType],
+        difficulty_selector: Callable[[IssueType], IssueDifficulty],
         origin_class_to_description: Dict[str, str]) -> List[BaseIssue]:
+    """
+    Parses the output, which is a xml file, and returns a list of the issues found there.
+    issue_type_selector determines the IssueType of an inspection.
+    origin_class_to_description allows to parse measurable errors.
+
+    If the passed path is not a correct file, an empty list is returned.
+    """
+
     if not __is_result_file_correct(file_path, inspector_type):
         return []
 
@@ -98,6 +128,7 @@ def parse_checkstyle_file_result(
                 continue
 
             message = __parse_error_message(inner_element)
+            # Example: com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck -> LineLengthCheck
             origin_class = inner_element.attrib['source'].split('.')[-1]
             issue_data = IssueData.get_base_issue_data_dict(code_file_path, inspector_type,
                                                             line_number=int(inner_element.attrib['line']),
@@ -107,6 +138,7 @@ def parse_checkstyle_file_result(
 
             issue_type = issue_type_selector(origin_class)
             issue_data[IssueData.ISSUE_TYPE.value] = issue_type
+            issue_data[IssueData.DIFFICULTY.value] = difficulty_selector(issue_type)
 
             if origin_class in origin_class_to_description:
                 pattern = origin_class_to_description.get(origin_class)
diff --git a/src/python/review/inspectors/pmd/files/LICENSE b/src/python/review/inspectors/pmd/files/LICENSE
deleted file mode 100644
index 5ecc8658..00000000
--- a/src/python/review/inspectors/pmd/files/LICENSE
+++ /dev/null
@@ -1,237 +0,0 @@
-PMD's BSD-style license:
-
-Copyright (c) 2003-2009, InfoEther, LLC
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-    * The end-user documentation included with the redistribution, if
-any, must include the following acknowledgement:
-      "This product includes software developed in part by support from
-the Defense Advanced Research Project Agency (DARPA)"
-    * Neither the name of InfoEther, LLC nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
----------------------------------------------------------------------
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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
-
-       http://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.
diff --git a/src/python/review/inspectors/pmd/files/bin/bgastviewer.bat b/src/python/review/inspectors/pmd/files/bin/bgastviewer.bat
deleted file mode 100755
index 56f460db..00000000
--- a/src/python/review/inspectors/pmd/files/bin/bgastviewer.bat
+++ /dev/null
@@ -1,6 +0,0 @@
-@echo off
-set TOPDIR=%~dp0..
-set OPTS=
-set MAIN_CLASS=net.sourceforge.pmd.util.viewer.Viewer
-
-java %PMD_JAVA_OPTS% -classpath "%TOPDIR%\lib\*" %OPTS% %MAIN_CLASS% %*
diff --git a/src/python/review/inspectors/pmd/files/bin/cpd.bat b/src/python/review/inspectors/pmd/files/bin/cpd.bat
deleted file mode 100755
index dbdda187..00000000
--- a/src/python/review/inspectors/pmd/files/bin/cpd.bat
+++ /dev/null
@@ -1,6 +0,0 @@
-@echo off
-set TOPDIR=%~dp0..
-set OPTS=
-set MAIN_CLASS=net.sourceforge.pmd.cpd.CPD
-
-java %PMD_JAVA_OPTS% -classpath "%TOPDIR%\lib\*" %OPTS% %MAIN_CLASS% %*
diff --git a/src/python/review/inspectors/pmd/files/bin/cpdgui.bat b/src/python/review/inspectors/pmd/files/bin/cpdgui.bat
deleted file mode 100755
index 38ce3ffb..00000000
--- a/src/python/review/inspectors/pmd/files/bin/cpdgui.bat
+++ /dev/null
@@ -1,6 +0,0 @@
-@echo off
-set TOPDIR=%~dp0..
-set OPTS=
-set MAIN_CLASS=net.sourceforge.pmd.cpd.GUI
-
-java %PMD_JAVA_OPTS% -classpath "%TOPDIR%\lib\*" %OPTS% %MAIN_CLASS% %*
diff --git a/src/python/review/inspectors/pmd/files/bin/designer.bat b/src/python/review/inspectors/pmd/files/bin/designer.bat
deleted file mode 100755
index b33e9af1..00000000
--- a/src/python/review/inspectors/pmd/files/bin/designer.bat
+++ /dev/null
@@ -1,51 +0,0 @@
-@echo off
-set TOPDIR=%~dp0..
-set OPTS=
-set MAIN_CLASS=net.sourceforge.pmd.util.fxdesigner.DesignerStarter
-
-
-:: sets the jver variable to the java version, eg 901 for 9.0.1+x or 180 for 1.8.0_171-b11
-:: sets the jvendor variable to either java (oracle) or openjdk
-for /f tokens^=1^,3^,4^,5^ delims^=.-_+^"^  %%j in ('java -version 2^>^&1 ^| find "version"') do (
-  set jvendor=%%j
-  if %%l EQU ea (
-    set /A "jver=%%k00"
-  ) else (
-    set /A jver=%%k%%l%%m
-  )
-)
-
-Set "jreopts="
-:: oracle java 9 and 10 has javafx included as a module
-if /I "%jvendor%" EQU "java" (
-    if %jver% GEQ 900 (
-        if %jver% LSS 1100 (
-            :: enable reflection
-            Set jreopts=--add-opens javafx.controls/javafx.scene.control.skin=ALL-UNNAMED
-        )
-    )
-)
-
-set "_needjfxlib=0"
-if /I "%jvendor%" EQU "openjdk" set _needjfxlib=1
-if /I "%jvendor%" EQU "java" (
-    if %jver% GEQ 1100 set _needjfxlib=1
-)
-if %_needjfxlib% EQU 1 (
-    if %jver% LSS 1000 (
-        echo For openjfx at least java 10 is required.
-        pause
-        exit
-    )
-    if [%JAVAFX_HOME%] EQU [] (
-        echo The environment variable JAVAFX_HOME is missing.
-        pause
-        exit
-    )
-    set "classpath=%TOPDIR%\lib\*;%JAVAFX_HOME%\lib\*"
-) else (
-    set "classpath=%TOPDIR%\lib\*"
-)
-
-
-java %PMD_JAVA_OPTS% %jreopts% -classpath "%classpath%" %OPTS% %MAIN_CLASS% %*
diff --git a/src/python/review/inspectors/pmd/files/bin/pmd.bat b/src/python/review/inspectors/pmd/files/bin/pmd.bat
deleted file mode 100755
index 0a5d79e1..00000000
--- a/src/python/review/inspectors/pmd/files/bin/pmd.bat
+++ /dev/null
@@ -1,6 +0,0 @@
-@echo off
-set TOPDIR=%~dp0..
-set OPTS=
-set MAIN_CLASS=net.sourceforge.pmd.PMD
-
-java %PMD_JAVA_OPTS% -classpath "%TOPDIR%\lib\*" %OPTS% %MAIN_CLASS% %*
diff --git a/src/python/review/inspectors/pmd/files/bin/run.sh b/src/python/review/inspectors/pmd/files/bin/run.sh
deleted file mode 100755
index 3a6636a8..00000000
--- a/src/python/review/inspectors/pmd/files/bin/run.sh
+++ /dev/null
@@ -1,218 +0,0 @@
-#!/bin/bash
-
-usage() {
-    echo "Usage:"
-    echo "    $(basename $0) <application-name> [-h|-v] ..."
-    echo ""
-    echo "application-name: valid options are: $(valid_app_options)"
-    echo "-h print this help"
-    echo "-v display PMD's version"
-}
-
-valid_app_options () {
-    echo "pmd, cpd, cpdgui, designer, bgastviewer, designerold"
-}
-
-is_cygwin() {
-    case "$(uname)" in
-        CYGWIN*|MINGW*)
-            readonly cygwin=true
-            ;;
-    esac
-    # OS specific support.  $var _must_ be set to either true or false.
-    if [ -z ${cygwin} ] ; then
-        readonly cygwin=false
-    fi
-}
-
-cygwin_paths() {
-    # For Cygwin, switch paths to Windows format before running java
-    if ${cygwin} ; then
-        [ -n "${JAVA_HOME}" ] && JAVA_HOME=$(cygpath --windows "${JAVA_HOME}")
-        [ -n "${JAVAFX_HOME}" ] && JAVAFX_HOME=$(cygpath --windows "${JAVAFX_HOME}")
-        [ -n "${DIRECTORY}" ] && DIRECTORY=$(cygpath --windows "${DIRECTORY}")
-        classpath=$(cygpath --path --windows "${classpath}")
-    fi
-}
-
-convert_cygwin_vars() {
-    # If cygwin, convert to Unix form before manipulating
-    if ${cygwin} ; then
-        [ -n "${JAVA_HOME}" ] && JAVA_HOME=$(cygpath --unix "${JAVA_HOME}")
-        [ -n "${JAVAFX_HOME}" ] && JAVAFX_HOME=$(cygpath --unix "${JAVAFX_HOME}")
-        [ -n "${CLASSPATH}" ] && CLASSPATH=$(cygpath --path --unix "${CLASSPATH}")
-    fi
-}
-
-java_heapsize_settings() {
-    local heapsize=${HEAPSIZE}
-    case "${heapsize}" in
-        [1-9]*[mgMG])
-            readonly HEAPSIZE="-Xmx${heapsize}"
-            ;;
-        '')
-            ;;
-        *)
-            echo "HEAPSIZE '${HEAPSIZE}' unknown (try: 1024m)"
-            exit 1
-    esac
-}
-
-
-set_lib_dir() {
-  if [ -z ${LIB_DIR} ]; then
-    # Allow for symlinks to this script
-    if [ -L $0 ]; then
-      local script_real_loc=$(readlink "$0")
-    else
-      local script_real_loc=$0
-    fi
-    local script_dir=$(dirname "${script_real_loc}")
-    local cwd="${PWD}"
-
-    cd "${script_dir}/../lib"
-    readonly LIB_DIR=$(pwd -P)
-    cd "${cwd}"
-  fi
-}
-
-check_lib_dir() {
-  if [ ! -e "${LIB_DIR}" ]; then
-    echo "The jar directory [${LIB_DIR}] does not exist"
-  fi
-}
-
-function script_exit() {
-    echo $1 >&2
-    exit 1
-}
-
-determine_java_version() {
-    local full_ver=$(java -version 2>&1)
-    # java_ver is eg "18" for java 1.8, "90" for java 9.0, "100" for java 10.0.x
-    readonly java_ver=$(echo $full_ver | sed -n '{
-        # replace early access versions, e.g. 11-ea with 11.0.0
-        s/-ea/.0.0/
-        # replace versions such as 10 with 10.0.0
-        s/version "\([0-9]\{1,\}\)"/version "\1.0.0"/
-        # extract the major and minor parts of the version
-        s/^.* version "\(.*\)\.\(.*\)\..*".*$/\1\2/p
-    }')
-    # java_vendor is either java (oracle) or openjdk
-    readonly java_vendor=$(echo $full_ver | sed -n -e 's/^\(.*\) version .*$/\1/p')
-}
-
-jre_specific_vm_options() {
-  if [ "${APPNAME}" = "designer" ]
-  then
-    options=""
-
-    if [ "$java_ver" -ge 80 ] && [ "$java_ver" -lt 90 ]
-    then
-      # no options needed for java8.
-      options=""
-    elif [ "$java_ver" -ge 90 ] && [ "$java_ver" -lt 110 ] && [ "$java_vendor" = "java" ]
-    then
-      # java9 and java10 from oracle contain javafx as a module
-      # open internal module of javafx to reflection (for our TreeViewWrapper)
-      options="--add-opens javafx.controls/javafx.scene.control.skin=ALL-UNNAMED"
-      # The rest here is for RichtextFX
-      options+=" --add-opens javafx.graphics/javafx.scene.text=ALL-UNNAMED"
-      options+=" --add-opens javafx.graphics/com.sun.javafx.scene.text=ALL-UNNAMED"
-      options+=" --add-opens javafx.graphics/com.sun.javafx.text=ALL-UNNAMED"
-      options+=" --add-opens javafx.graphics/com.sun.javafx.geom=ALL-UNNAMED"
-      # Warn of remaining illegal accesses
-      options+=" --illegal-access=warn"
-    elif [ "$java_vendor" = "openjdk" ] || ( [ "$java_vendor" = "java" ] && [ "$java_ver" -ge 110 ] )
-    then
-      # openjdk and java11 from oracle onwards do not contain javafx directly
-      # there are no extra options either - javafx will be added to the classpath without modules
-      options=""
-    fi
-
-    echo $options
-  else
-    echo ""
-  fi
-}
-
-function add_pmd_classpath() {
-    if [ -n "$classpath" ]; then
-        classpath="$classpath:${LIB_DIR}/*"
-    else
-        classpath="${LIB_DIR}/*"
-    fi
-}
-
-function add_openjfx_classpath() {
-  if [ "${APPNAME}" = "designer" ]
-  then
-    if [ "$java_vendor" = "openjdk" ] && [ "$java_ver" -lt 100 ]
-    then
-      script_exit "For openjfx at least java 10 is required"
-    elif [ "$java_vendor" = "openjdk" ] || ( [ "$java_vendor" = "java" ] && [ "$java_ver" -ge 110 ] )
-    then
-      # openjfx is required for openjdk builds and oracle java 11 or later
-      if [ -z "${JAVAFX_HOME}" ]
-      then
-        script_exit "The environment variable JAVAFX_HOME is missing."
-      else
-        if [ -n "$classpath" ]; then
-          classpath="$classpath:${JAVAFX_HOME}/lib/*"
-        else
-          classpath="${JAVAFX_HOME}/lib/*"
-        fi
-      fi
-    fi
-  fi
-}
-
-readonly APPNAME="${1}"
-if [ -z "${APPNAME}" ]; then
-    usage
-    exit 1
-fi
-shift
-
-case "${APPNAME}" in
-  "pmd")
-    readonly CLASSNAME="net.sourceforge.pmd.PMD"
-    ;;
-  "cpd")
-    readonly CLASSNAME="net.sourceforge.pmd.cpd.CPD"
-    ;;
-  "designer")
-    readonly CLASSNAME="net.sourceforge.pmd.util.fxdesigner.DesignerStarter"
-    ;;
-  "designerold")
-    readonly CLASSNAME="net.sourceforge.pmd.util.designer.Designer"
-    ;;
-  "bgastviewer")
-    readonly CLASSNAME="net.sourceforge.pmd.util.viewer.Viewer"
-    ;;
-  "cpdgui")
-    readonly CLASSNAME="net.sourceforge.pmd.cpd.GUI"
-    ;;
-  *)
-    echo "${APPNAME} is NOT a valid application name, valid options are:$(valid_app_options)"
-    ;;
-esac
-
-is_cygwin
-
-set_lib_dir
-check_lib_dir
-
-convert_cygwin_vars
-
-classpath=$CLASSPATH
-
-add_pmd_classpath
-determine_java_version
-add_openjfx_classpath
-
-cygwin_paths
-
-java_heapsize_settings
-
-java ${HEAPSIZE} ${PMD_JAVA_OPTS} $(jre_specific_vm_options) -cp "${classpath}" "${CLASSNAME}" "$@"
diff --git a/src/python/review/inspectors/pmd/files/bin/basic.xml b/src/python/review/inspectors/pmd/files/config.xml
similarity index 78%
rename from src/python/review/inspectors/pmd/files/bin/basic.xml
rename to src/python/review/inspectors/pmd/files/config.xml
index 612bbf0e..7dffeeed 100644
--- a/src/python/review/inspectors/pmd/files/bin/basic.xml
+++ b/src/python/review/inspectors/pmd/files/config.xml
@@ -1,19 +1,25 @@
 <?xml version="1.0"?>
+
 <ruleset name="Basic"
-    xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">
-  <description>
-    The Basic ruleset contains a collection of good practices which should be followed.
-  </description>
+         xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">
+
+    <description>
+        The Basic ruleset contains a collection of good practices which should be followed.
+    </description>
+
+    <!-- This config was created using the following table: https://bit.ly/2VC6E61 -->
+
     <!-- Best Practices -->
     <rule ref="category/java/bestpractices.xml/AbstractClassWithoutAbstractMethod"/>
     <rule ref="category/java/bestpractices.xml/AccessorClassGeneration"/>
     <rule ref="category/java/bestpractices.xml/AccessorMethodGeneration"/>
     <rule ref="category/java/bestpractices.xml/ArrayIsStoredDirectly"/>
     <rule ref="category/java/bestpractices.xml/AvoidMessageDigestField"/>
-    <rule ref="category/java/bestpractices.xml/AvoidReassigningParameters"/>
+    <rule ref="category/java/bestpractices.xml/AvoidReassigningCatchVariables"/>
     <rule ref="category/java/bestpractices.xml/AvoidReassigningLoopVariables"/>
+    <rule ref="category/java/bestpractices.xml/AvoidReassigningParameters"/>
     <rule ref="category/java/bestpractices.xml/AvoidStringBufferField"/>
     <rule ref="category/java/bestpractices.xml/AvoidUsingHardCodedIP"/>
     <rule ref="category/java/bestpractices.xml/CheckResultSet"/>
@@ -25,71 +31,68 @@
             <property name="maximumVariables" value="2"/>
         </properties>
     </rule>
-    <rule ref="category/java/bestpractices.xml/GuardLogStatement"/>
+    <rule ref="category/java/bestpractices.xml/LiteralsFirstInComparisons"/>
     <rule ref="category/java/bestpractices.xml/MethodReturnsInternalArray"/>
+    <rule ref="category/java/bestpractices.xml/MissingOverride"/>
     <rule ref="category/java/bestpractices.xml/OneDeclarationPerLine"/>
-    <rule ref="category/java/bestpractices.xml/PositionLiteralsFirstInCaseInsensitiveComparisons"/>
-    <rule ref="category/java/bestpractices.xml/PositionLiteralsFirstInComparisons"/>
     <rule ref="category/java/bestpractices.xml/PreserveStackTrace"/>
     <rule ref="category/java/bestpractices.xml/ReplaceEnumerationWithIterator"/>
     <rule ref="category/java/bestpractices.xml/SwitchStmtsShouldHaveDefault"/>
     <rule ref="category/java/bestpractices.xml/UnusedFormalParameter"/>
-    <rule ref="category/java/bestpractices.xml/UnusedImports"/>
     <rule ref="category/java/bestpractices.xml/UnusedLocalVariable"/>
     <rule ref="category/java/bestpractices.xml/UnusedPrivateField"/>
     <rule ref="category/java/bestpractices.xml/UnusedPrivateMethod"/>
     <rule ref="category/java/bestpractices.xml/UseCollectionIsEmpty"/>
+    <rule ref="category/java/bestpractices.xml/UseStandardCharsets"/>
     <rule ref="category/java/bestpractices.xml/UseTryWithResources"/>
+    <rule ref="category/java/bestpractices.xml/WhileLoopWithLiteralBoolean"/>
 
-    <!-- Code Style rules -->
+    <!-- Code Style -->
     <rule ref="category/java/codestyle.xml/AvoidDollarSigns"/>
     <rule ref="category/java/codestyle.xml/AvoidProtectedFieldInFinalClass"/>
-    <rule ref="category/java/codestyle.xml/AvoidUsingNativeCode"/>
+    <rule ref="category/java/codestyle.xml/AvoidProtectedMethodInFinalClassNotExtending"/>
     <rule ref="category/java/codestyle.xml/BooleanGetMethodName"/>
+    <rule ref="category/java/codestyle.xml/CallSuperInConstructor"/>
     <rule ref="category/java/codestyle.xml/ClassNamingConventions"
           message="Name ''{1}'' must use PascalCase (checked pattern ''{2}'').">
-      <properties>
-        <property name="utilityClassPattern" value="[A-Z][a-zA-Z0-9]+(Utils?|Helper|Constants)?" />
-      </properties>
+        <properties>
+            <property name="utilityClassPattern" value="[A-Z][a-zA-Z0-9]+(Utils?|Helper|Constants)?"/>
+        </properties>
     </rule>
-<!--    <rule ref="category/java/codestyle.xml/ConfusingTernary"/>-->
     <!-- Disabled due to NeedBracesCheck duplication -->
     <!-- <rule ref="category/java/codestyle.xml/ControlStatementBraces"/> -->
-    <rule ref="category/java/codestyle.xml/DontImportJavaLang"/>
-    <rule ref="category/java/codestyle.xml/DuplicateImports"/>
     <rule ref="category/java/codestyle.xml/EmptyMethodInAbstractClassShouldBeAbstract"/>
     <rule ref="category/java/codestyle.xml/ExtendsObject"/>
     <rule ref="category/java/codestyle.xml/FieldDeclarationsShouldBeAtStartOfClass"/>
     <rule ref="category/java/codestyle.xml/FieldNamingConventions"
           message="Fields must be written using camelCase and constants using UPPER_CASE_SNAKE_CASE. (Incorrect name: ''{1}''. Checked pattern: ''{2}'').">
-      <properties>
-        <property name="exclusions" value="serialVersionUID|serialPersistentFields|log|logger"/>
-      </properties>
+        <properties>
+            <property name="exclusions" value="serialVersionUID|serialPersistentFields|log|logger"/>
+        </properties>
     </rule>
     <rule ref="category/java/codestyle.xml/ForLoopShouldBeWhileLoop"/>
     <rule ref="category/java/codestyle.xml/FormalParameterNamingConventions"
           message="Name ''{1}'' must use camelCase (checked pattern ''{2}'')."/>
     <rule ref="category/java/codestyle.xml/IdenticalCatchBranches"/>
-<!--    <rule ref="category/java/codestyle.xml/LinguisticNaming"/>-->
     <rule ref="category/java/codestyle.xml/LocalVariableNamingConventions"
           message="Name ''{1}'' must use camelCase (checked pattern ''{2}'')."/>
     <rule ref="category/java/codestyle.xml/MethodNamingConventions"
           message="Name ''{1}'' must use camelCase (checked pattern ''{2}'')."/>
     <rule ref="category/java/codestyle.xml/PackageCase"/>
-<!--    <rule ref="category/java/codestyle.xml/TooManyStaticImports">-->
-<!--      <properties>-->
-<!--        <property name="maximumStaticImports" value="5"/>-->
-<!--      </properties>-->
-<!--    </rule>-->
+    <rule ref="category/java/codestyle.xml/UnnecessaryCast"/>
     <rule ref="category/java/codestyle.xml/UnnecessaryConstructor"/>
     <rule ref="category/java/codestyle.xml/UnnecessaryFullyQualifiedName"/>
+    <rule ref="category/java/codestyle.xml/UnnecessaryImport"/>
     <rule ref="category/java/codestyle.xml/UnnecessaryLocalBeforeReturn"/>
     <rule ref="category/java/codestyle.xml/UnnecessaryReturn"/>
-    <rule ref="category/java/codestyle.xml/UseDiamondOperator"/>
+    <rule ref="category/java/codestyle.xml/UseDiamondOperator">
+        <properties>
+            <property name="java7Compatibility" value="true"/>
+        </properties>
+    </rule>
     <rule ref="category/java/codestyle.xml/UselessParentheses"/>
     <rule ref="category/java/codestyle.xml/UselessQualifiedThis"/>
     <rule ref="category/java/codestyle.xml/UseShortArrayInitializer"/>
-    <rule ref="category/java/codestyle.xml/UseUnderscoresInNumericLiterals"/>
 
     <!-- Design -->
     <rule ref="category/java/design.xml/AvoidDeeplyNestedIfStmts"/>
@@ -98,21 +101,11 @@
     <rule ref="category/java/design.xml/AvoidUncheckedExceptionsInSignatures"/>
     <rule ref="category/java/design.xml/CollapsibleIfStatements"
           message="These nested if statements could be combined by &amp;&amp; operator."/>
-<!--    <rule ref="category/java/design.xml/CouplingBetweenObjects"/>-->
-<!--    <rule ref="category/java/design.xml/CyclomaticComplexity"/>-->
     <rule ref="category/java/design.xml/DoNotExtendJavaLangError"/>
-<!--    <rule ref="category/java/design.xml/ExcessiveClassLength"/>-->
-<!--    <rule ref="category/java/design.xml/ExcessiveMethodLength">-->
-<!--        <properties>-->
-<!--            <property name="minimum" value="200.0"/>-->
-<!--        </properties>-->
-<!--    </rule>-->
     <rule ref="category/java/design.xml/ExcessiveParameterList"/>
     <rule ref="category/java/design.xml/ExcessivePublicCount"/>
     <rule ref="category/java/design.xml/GodClass"/>
-<!--    <rule ref="category/java/design.xml/LogicInversion"/>-->
-<!--    <rule ref="category/java/design.xml/NcssCount"/>-->
-<!--    <rule ref="category/java/design.xml/NPathComplexity"/>-->
+    <rule ref="category/java/design.xml/LogicInversion"/>
     <rule ref="category/java/design.xml/SimplifiedTernary"/>
     <rule ref="category/java/design.xml/SimplifyBooleanAssertion"/>
     <rule ref="category/java/design.xml/SimplifyBooleanExpressions"/>
@@ -124,12 +117,12 @@
     <rule ref="category/java/design.xml/UselessOverridingMethod"/>
     <rule ref="category/java/design.xml/UseObjectForClearerAPI"/>
 
-    <!-- Documentation rules -->
-    <rule ref="category/java/documentation.xml/CommentContent"/>
+    <!-- Documentation -->
     <rule ref="category/java/documentation.xml/UncommentedEmptyConstructor"/>
     <rule ref="category/java/documentation.xml/UncommentedEmptyMethodBody"/>
 
     <!-- Error-prone -->
+    <rule ref="category/java/errorprone.xml/AssignmentInOperand"/>
     <rule ref="category/java/errorprone.xml/AvoidAssertAsIdentifier"/>
     <rule ref="category/java/errorprone.xml/AvoidBranchingStatementAsLastInLoop"/>
     <rule ref="category/java/errorprone.xml/AvoidCallingFinalize"/>
@@ -141,23 +134,29 @@
     <rule ref="category/java/errorprone.xml/AvoidFieldNameMatchingMethodName"/>
     <rule ref="category/java/errorprone.xml/AvoidFieldNameMatchingTypeName"/>
     <rule ref="category/java/errorprone.xml/AvoidInstanceofChecksInCatchClause"/>
+    <rule ref="category/java/errorprone.xml/AvoidLiteralsInIfCondition"
+          message="Avoid using magic numbers in Conditional Statements. It is better to use constants.">
+        <properties>
+            <property name="ignoreMagicNumbers" value="-1,0,1"/>
+        </properties>
+    </rule>
     <rule ref="category/java/errorprone.xml/AvoidLosingExceptionInformation"/>
     <rule ref="category/java/errorprone.xml/AvoidMultipleUnaryOperators"/>
     <rule ref="category/java/errorprone.xml/AvoidUsingOctalValues"/>
-    <rule ref="category/java/errorprone.xml/BadComparison"/>
     <rule ref="category/java/errorprone.xml/BrokenNullCheck"/>
     <rule ref="category/java/errorprone.xml/CheckSkipResult"/>
     <rule ref="category/java/errorprone.xml/ClassCastExceptionWithToArray"/>
-<!--    <rule ref="category/java/errorprone.xml/CloseResource"/>-->
     <rule ref="category/java/errorprone.xml/CompareObjectsWithEquals"/>
+    <rule ref="category/java/errorprone.xml/ComparisonWithNaN"/>
     <rule ref="category/java/errorprone.xml/ConstructorCallsOverridableMethod"/>
     <rule ref="category/java/errorprone.xml/DoNotExtendJavaLangThrowable"/>
     <rule ref="category/java/errorprone.xml/DontUseFloatTypeForLoopIndices"/>
     <rule ref="category/java/errorprone.xml/EmptyCatchBlock">
-      <properties>
-        <property name="allowCommentedBlocks" value="true"/>
-      </properties>
+        <properties>
+            <property name="allowCommentedBlocks" value="true"/>
+        </properties>
     </rule>
+    <rule ref="category/java/errorprone.xml/EmptyFinalizer"/>
     <rule ref="category/java/errorprone.xml/EmptyFinallyBlock"/>
     <rule ref="category/java/errorprone.xml/EmptyIfStmt"/>
     <rule ref="category/java/errorprone.xml/EmptyInitializer"/>
@@ -168,13 +167,12 @@
     <rule ref="category/java/errorprone.xml/EmptyTryBlock"/>
     <rule ref="category/java/errorprone.xml/EmptyWhileStmt"/>
     <rule ref="category/java/errorprone.xml/EqualsNull"/>
-    <rule ref="category/java/errorprone.xml/EmptyFinalizer"/>
     <rule ref="category/java/errorprone.xml/FinalizeDoesNotCallSuperFinalize"/>
     <rule ref="category/java/errorprone.xml/FinalizeOnlyCallsSuperFinalize"/>
     <rule ref="category/java/errorprone.xml/FinalizeOverloaded"/>
     <rule ref="category/java/errorprone.xml/FinalizeShouldBeProtected"/>
     <rule ref="category/java/errorprone.xml/IdempotentOperations"/>
-    <rule ref="category/java/errorprone.xml/ImportFromSamePackage"/>
+    <rule ref="category/java/errorprone.xml/InstantiationToGetClass"/>
     <rule ref="category/java/errorprone.xml/JumbledIncrementer"/>
     <rule ref="category/java/errorprone.xml/MethodWithSameNameAsEnclosingClass"/>
     <rule ref="category/java/errorprone.xml/MisplacedNullCheck"/>
@@ -198,30 +196,28 @@
     <rule ref="category/java/errorprone.xml/UnnecessaryConversionTemporary"/>
     <rule ref="category/java/errorprone.xml/UseEqualsToCompareStrings"/>
 
-    <!-- Multithreading rules -->
+    <!-- Multithreading -->
     <rule ref="category/java/multithreading.xml/AvoidThreadGroup"/>
     <rule ref="category/java/multithreading.xml/DontCallThreadRun"/>
     <rule ref="category/java/multithreading.xml/DoubleCheckedLocking"/>
     <rule ref="category/java/multithreading.xml/UnsynchronizedStaticFormatter"/>
     <rule ref="category/java/multithreading.xml/UseNotifyAllInsteadOfNotify"/>
 
-    <!-- Security rules -->
+    <!-- Security -->
     <rule ref="category/java/security.xml/HardCodedCryptoKey"/>
     <rule ref="category/java/security.xml/InsecureCryptoIv"/>
 
-    <!-- Performance rules -->
+    <!-- Performance -->
+    <rule ref="category/java/performance.xml/AddEmptyString"/>
     <rule ref="category/java/performance.xml/AvoidArrayLoops"/>
-<!--    <rule ref="category/java/performance.xml/AvoidFileStream"/>-->
-    <rule ref="category/java/performance.xml/AvoidUsingShortType"/>
-    <rule ref="category/java/performance.xml/BigIntegerInstantiation"/>
     <rule ref="category/java/performance.xml/ConsecutiveAppendsShouldReuse"/>
     <rule ref="category/java/performance.xml/ConsecutiveLiteralAppends"/>
+    <rule ref="category/java/performance.xml/InefficientStringBuffering"/>
     <rule ref="category/java/performance.xml/OptimizableToArrayCall"/>
-    <rule ref="category/java/performance.xml/SimplifyStartsWith"/>
+    <rule ref="category/java/performance.xml/StringToString"/>
     <rule ref="category/java/performance.xml/TooFewBranchesForASwitchStatement"/>
     <rule ref="category/java/performance.xml/UnnecessaryWrapperObjectCreation"/>
     <rule ref="category/java/performance.xml/UseArraysAsList"/>
-    <rule ref="category/java/performance.xml/StringToString"/>
     <rule ref="category/java/performance.xml/UselessStringValueOf"/>
     <rule ref="category/java/performance.xml/UseStringBufferLength"/>
 
diff --git a/src/python/review/inspectors/pmd/files/lib/animal-sniffer-annotations-1.14.jar b/src/python/review/inspectors/pmd/files/lib/animal-sniffer-annotations-1.14.jar
deleted file mode 100644
index fb76acf7..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/animal-sniffer-annotations-1.14.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/ant-1.10.1.jar b/src/python/review/inspectors/pmd/files/lib/ant-1.10.1.jar
deleted file mode 100644
index 4a7f8edc..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/ant-1.10.1.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/ant-launcher-1.10.1.jar b/src/python/review/inspectors/pmd/files/lib/ant-launcher-1.10.1.jar
deleted file mode 100644
index 5073d2f8..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/ant-launcher-1.10.1.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/antlr-2.7.7.jar b/src/python/review/inspectors/pmd/files/lib/antlr-2.7.7.jar
deleted file mode 100644
index 5e5f14b3..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/antlr-2.7.7.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/antlr-runtime-3.5.2.jar b/src/python/review/inspectors/pmd/files/lib/antlr-runtime-3.5.2.jar
deleted file mode 100644
index d48e3e86..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/antlr-runtime-3.5.2.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/antlr4-runtime-4.7.jar b/src/python/review/inspectors/pmd/files/lib/antlr4-runtime-4.7.jar
deleted file mode 100644
index 5c3bf7d3..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/antlr4-runtime-4.7.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/aopalliance-1.0.jar b/src/python/review/inspectors/pmd/files/lib/aopalliance-1.0.jar
deleted file mode 100644
index 578b1a0c..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/aopalliance-1.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/asm-7.1.jar b/src/python/review/inspectors/pmd/files/lib/asm-7.1.jar
deleted file mode 100644
index 355eb08d..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/asm-7.1.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/cglib-3.2.0.jar b/src/python/review/inspectors/pmd/files/lib/cglib-3.2.0.jar
deleted file mode 100644
index 51e2d851..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/cglib-3.2.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/checker-qual-2.5.2.jar b/src/python/review/inspectors/pmd/files/lib/checker-qual-2.5.2.jar
deleted file mode 100644
index ae4e7f1f..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/checker-qual-2.5.2.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/common_2.13-4.2.0.jar b/src/python/review/inspectors/pmd/files/lib/common_2.13-4.2.0.jar
deleted file mode 100644
index 8b149e97..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/common_2.13-4.2.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/commons-io-2.6.jar b/src/python/review/inspectors/pmd/files/lib/commons-io-2.6.jar
deleted file mode 100644
index 00556b11..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/commons-io-2.6.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/commons-lang3-3.8.1.jar b/src/python/review/inspectors/pmd/files/lib/commons-lang3-3.8.1.jar
deleted file mode 100644
index 2c65ce67..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/commons-lang3-3.8.1.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/error_prone_annotations-2.1.3.jar b/src/python/review/inspectors/pmd/files/lib/error_prone_annotations-2.1.3.jar
deleted file mode 100644
index ec3b1856..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/error_prone_annotations-2.1.3.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/fastparse-utils_2.13-1.0.1.jar b/src/python/review/inspectors/pmd/files/lib/fastparse-utils_2.13-1.0.1.jar
deleted file mode 100644
index 396781e4..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/fastparse-utils_2.13-1.0.1.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/fastparse_2.13-1.0.1.jar b/src/python/review/inspectors/pmd/files/lib/fastparse_2.13-1.0.1.jar
deleted file mode 100644
index bd4d8e05..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/fastparse_2.13-1.0.1.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/fastparse_2.13-2.1.3.jar b/src/python/review/inspectors/pmd/files/lib/fastparse_2.13-2.1.3.jar
deleted file mode 100644
index 906495b3..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/fastparse_2.13-2.1.3.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/groovy-2.4.7.jar b/src/python/review/inspectors/pmd/files/lib/groovy-2.4.7.jar
deleted file mode 100644
index 36983ff9..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/groovy-2.4.7.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/gson-2.8.5.jar b/src/python/review/inspectors/pmd/files/lib/gson-2.8.5.jar
deleted file mode 100644
index 0d5baf3f..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/gson-2.8.5.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/guava-26.0-jre.jar b/src/python/review/inspectors/pmd/files/lib/guava-26.0-jre.jar
deleted file mode 100644
index cd71a92f..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/guava-26.0-jre.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/j2objc-annotations-1.1.jar b/src/python/review/inspectors/pmd/files/lib/j2objc-annotations-1.1.jar
deleted file mode 100644
index 4b6f1274..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/j2objc-annotations-1.1.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/javacc-5.0.jar b/src/python/review/inspectors/pmd/files/lib/javacc-5.0.jar
deleted file mode 100644
index 2550727e..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/javacc-5.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/javax.inject-1.jar b/src/python/review/inspectors/pmd/files/lib/javax.inject-1.jar
deleted file mode 100644
index b2a9d0bf..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/javax.inject-1.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/jcommander-1.72.jar b/src/python/review/inspectors/pmd/files/lib/jcommander-1.72.jar
deleted file mode 100644
index acb8e609..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/jcommander-1.72.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/jline-2.14.6.jar b/src/python/review/inspectors/pmd/files/lib/jline-2.14.6.jar
deleted file mode 100644
index fe11ed54..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/jline-2.14.6.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/jol-core-0.4.jar b/src/python/review/inspectors/pmd/files/lib/jol-core-0.4.jar
deleted file mode 100644
index 66c9440e..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/jol-core-0.4.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/jsr305-3.0.2.jar b/src/python/review/inspectors/pmd/files/lib/jsr305-3.0.2.jar
deleted file mode 100644
index 59222d9c..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/jsr305-3.0.2.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/lenses_2.13-0.9.0.jar b/src/python/review/inspectors/pmd/files/lib/lenses_2.13-0.9.0.jar
deleted file mode 100644
index 0497dc65..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/lenses_2.13-0.9.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/logback-classic-1.1.7.jar b/src/python/review/inspectors/pmd/files/lib/logback-classic-1.1.7.jar
deleted file mode 100644
index e05c037f..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/logback-classic-1.1.7.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/logback-core-1.1.7.jar b/src/python/review/inspectors/pmd/files/lib/logback-core-1.1.7.jar
deleted file mode 100644
index f14819b4..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/logback-core-1.1.7.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/parsers_2.13-4.2.0.jar b/src/python/review/inspectors/pmd/files/lib/parsers_2.13-4.2.0.jar
deleted file mode 100644
index 1c338eb3..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/parsers_2.13-4.2.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/pmd-apex-6.20.0.jar b/src/python/review/inspectors/pmd/files/lib/pmd-apex-6.20.0.jar
deleted file mode 100644
index 07c29668..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/pmd-apex-6.20.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/pmd-apex-jorje-6.20.0-lib.jar b/src/python/review/inspectors/pmd/files/lib/pmd-apex-jorje-6.20.0-lib.jar
deleted file mode 100644
index bb1964a6..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/pmd-apex-jorje-6.20.0-lib.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/pmd-apex-jorje-6.20.0.pom b/src/python/review/inspectors/pmd/files/lib/pmd-apex-jorje-6.20.0.pom
deleted file mode 100644
index f5790c5b..00000000
--- a/src/python/review/inspectors/pmd/files/lib/pmd-apex-jorje-6.20.0.pom
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>pmd-apex-jorje</artifactId>
-  <name>PMD Apex Jorje Parser Library</name>
-  <packaging>pom</packaging>
-
-  <parent>
-    <groupId>net.sourceforge.pmd</groupId>
-    <artifactId>pmd</artifactId>
-    <version>6.20.0</version>
-  </parent>
-
-  <properties>
-    <java.version>8</java.version>
-    <!-- Workaround for https://youtrack.jetbrains.com/issue/IDEA-188690 -->
-    <maven.compiler.source>1.${java.version}</maven.compiler.source>
-    <maven.compiler.target>1.${java.version}</maven.compiler.target>
-    <apex.jorje.version>2019-01-18-a041d7</apex.jorje.version>
-  </properties>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <version>3.0.0</version>
-        <executions>
-            <execution>
-                <id>attach-apex-jorje</id>
-                <phase>package</phase>
-                <goals>
-                    <goal>attach-artifact</goal>
-                </goals>
-                <configuration>
-                    <artifacts>
-                        <artifact>
-                            <file>${basedir}/repo/apex/apex-jorje-lsp-minimized/${apex.jorje.version}/apex-jorje-lsp-minimized-${apex.jorje.version}.jar</file>
-                            <type>jar</type>
-                            <classifier>lib</classifier>
-                        </artifact>
-                    </artifacts>
-                </configuration>
-            </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <!-- transitive dependencies of apex-jorje -->
-    <dependency>
-        <groupId>cglib</groupId>
-        <artifactId>cglib</artifactId>
-        <version>3.2.0</version>
-    </dependency>
-    <dependency>
-        <groupId>ch.qos.logback</groupId>
-        <artifactId>logback-classic</artifactId>
-        <version>1.1.7</version>
-    </dependency>
-    <dependency>
-        <groupId>ch.qos.logback</groupId>
-        <artifactId>logback-core</artifactId>
-        <version>1.1.7</version>
-    </dependency>
-    <dependency>
-        <groupId>com.google.code.findbugs</groupId>
-        <artifactId>jsr305</artifactId>
-        <version>3.0.2</version>
-    </dependency>
-    <dependency>
-        <groupId>com.google.code.gson</groupId>
-        <artifactId>gson</artifactId>
-        <version>2.7</version>
-    </dependency>
-    <dependency>
-        <groupId>com.google.errorprone</groupId>
-        <artifactId>error_prone_annotations</artifactId>
-        <version>2.1.3</version>
-    </dependency>
-    <dependency>
-        <groupId>com.google.guava</groupId>
-        <artifactId>guava</artifactId>
-        <version>26.0-jre</version>
-    </dependency>
-    <dependency>
-        <groupId>com.google.j2objc</groupId>
-        <artifactId>j2objc-annotations</artifactId>
-        <version>1.1</version>
-    </dependency>
-    <dependency>
-        <groupId>org.antlr</groupId>
-        <artifactId>antlr-runtime</artifactId>
-        <version>3.5.2</version>
-    </dependency>
-    <dependency>
-        <groupId>org.antlr</groupId>
-        <artifactId>stringtemplate</artifactId>
-        <version>3.2.1</version>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-lang3</artifactId>
-        <version>3.0</version>
-    </dependency>
-    <dependency>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>animal-sniffer-annotations</artifactId>
-        <version>1.14</version>
-    </dependency>
-    <dependency>
-        <groupId>org.openjdk.jol</groupId>
-        <artifactId>jol-core</artifactId>
-        <version>0.4</version>
-    </dependency>
-    <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <version>1.7.20</version>
-    </dependency>
-    <dependency>
-        <groupId>org.yaml</groupId>
-        <artifactId>snakeyaml</artifactId>
-        <version>1.17</version>
-    </dependency>
-    <dependency>
-        <groupId>aopalliance</groupId>
-        <artifactId>aopalliance</artifactId>
-        <version>1.0</version>
-    </dependency>
-    <dependency>
-        <groupId>javax.inject</groupId>
-        <artifactId>javax.inject</artifactId>
-        <version>1</version>
-    </dependency>
-    <dependency>
-        <groupId>org.ow2.asm</groupId>
-        <artifactId>asm</artifactId>
-        <version>5.0.3</version>
-        <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/src/python/review/inspectors/pmd/files/lib/pmd-core-6.20.0.jar b/src/python/review/inspectors/pmd/files/lib/pmd-core-6.20.0.jar
deleted file mode 100644
index 8d849eff..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/pmd-core-6.20.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/pmd-cpp-6.20.0.jar b/src/python/review/inspectors/pmd/files/lib/pmd-cpp-6.20.0.jar
deleted file mode 100644
index 581460cb..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/pmd-cpp-6.20.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/pmd-cs-6.20.0.jar b/src/python/review/inspectors/pmd/files/lib/pmd-cs-6.20.0.jar
deleted file mode 100644
index 8a2a1dfd..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/pmd-cs-6.20.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/pmd-dart-6.20.0.jar b/src/python/review/inspectors/pmd/files/lib/pmd-dart-6.20.0.jar
deleted file mode 100644
index fb9a6610..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/pmd-dart-6.20.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/pmd-fortran-6.20.0.jar b/src/python/review/inspectors/pmd/files/lib/pmd-fortran-6.20.0.jar
deleted file mode 100644
index 9fa9e9a6..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/pmd-fortran-6.20.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/pmd-go-6.20.0.jar b/src/python/review/inspectors/pmd/files/lib/pmd-go-6.20.0.jar
deleted file mode 100644
index 51b72e62..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/pmd-go-6.20.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/pmd-groovy-6.20.0.jar b/src/python/review/inspectors/pmd/files/lib/pmd-groovy-6.20.0.jar
deleted file mode 100644
index cbc51a70..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/pmd-groovy-6.20.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/pmd-java-6.20.0.jar b/src/python/review/inspectors/pmd/files/lib/pmd-java-6.20.0.jar
deleted file mode 100644
index 9cebecdb..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/pmd-java-6.20.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/pmd-javascript-6.20.0.jar b/src/python/review/inspectors/pmd/files/lib/pmd-javascript-6.20.0.jar
deleted file mode 100644
index c074c354..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/pmd-javascript-6.20.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/pmd-jsp-6.20.0.jar b/src/python/review/inspectors/pmd/files/lib/pmd-jsp-6.20.0.jar
deleted file mode 100644
index 4884e646..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/pmd-jsp-6.20.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/pmd-kotlin-6.20.0.jar b/src/python/review/inspectors/pmd/files/lib/pmd-kotlin-6.20.0.jar
deleted file mode 100644
index 5d6b741c..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/pmd-kotlin-6.20.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/pmd-lua-6.20.0.jar b/src/python/review/inspectors/pmd/files/lib/pmd-lua-6.20.0.jar
deleted file mode 100644
index a138a1b3..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/pmd-lua-6.20.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/pmd-matlab-6.20.0.jar b/src/python/review/inspectors/pmd/files/lib/pmd-matlab-6.20.0.jar
deleted file mode 100644
index f08a093b..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/pmd-matlab-6.20.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/pmd-objectivec-6.20.0.jar b/src/python/review/inspectors/pmd/files/lib/pmd-objectivec-6.20.0.jar
deleted file mode 100644
index 72fd2d2c..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/pmd-objectivec-6.20.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/pmd-perl-6.20.0.jar b/src/python/review/inspectors/pmd/files/lib/pmd-perl-6.20.0.jar
deleted file mode 100644
index 091b59cf..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/pmd-perl-6.20.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/pmd-php-6.20.0.jar b/src/python/review/inspectors/pmd/files/lib/pmd-php-6.20.0.jar
deleted file mode 100644
index 368f1840..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/pmd-php-6.20.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/pmd-plsql-6.20.0.jar b/src/python/review/inspectors/pmd/files/lib/pmd-plsql-6.20.0.jar
deleted file mode 100644
index 0d5ed200..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/pmd-plsql-6.20.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/pmd-python-6.20.0.jar b/src/python/review/inspectors/pmd/files/lib/pmd-python-6.20.0.jar
deleted file mode 100644
index 6ec84d25..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/pmd-python-6.20.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/pmd-ruby-6.20.0.jar b/src/python/review/inspectors/pmd/files/lib/pmd-ruby-6.20.0.jar
deleted file mode 100644
index ada5152d..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/pmd-ruby-6.20.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/pmd-scala-6.20.0.jar b/src/python/review/inspectors/pmd/files/lib/pmd-scala-6.20.0.jar
deleted file mode 100644
index 3e69bc52..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/pmd-scala-6.20.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/pmd-swift-6.20.0.jar b/src/python/review/inspectors/pmd/files/lib/pmd-swift-6.20.0.jar
deleted file mode 100644
index a070ff4a..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/pmd-swift-6.20.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/pmd-ui-6.19.0.jar b/src/python/review/inspectors/pmd/files/lib/pmd-ui-6.19.0.jar
deleted file mode 100644
index 1b0b00e6..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/pmd-ui-6.19.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/pmd-visualforce-6.20.0.jar b/src/python/review/inspectors/pmd/files/lib/pmd-visualforce-6.20.0.jar
deleted file mode 100644
index 511bc3ed..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/pmd-visualforce-6.20.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/pmd-vm-6.20.0.jar b/src/python/review/inspectors/pmd/files/lib/pmd-vm-6.20.0.jar
deleted file mode 100644
index feade8d0..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/pmd-vm-6.20.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/pmd-xml-6.20.0.jar b/src/python/review/inspectors/pmd/files/lib/pmd-xml-6.20.0.jar
deleted file mode 100644
index 5520477b..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/pmd-xml-6.20.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/protobuf-java-3.7.1.jar b/src/python/review/inspectors/pmd/files/lib/protobuf-java-3.7.1.jar
deleted file mode 100644
index 40761f39..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/protobuf-java-3.7.1.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/rhino-1.7.7.2.jar b/src/python/review/inspectors/pmd/files/lib/rhino-1.7.7.2.jar
deleted file mode 100644
index 4a18d336..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/rhino-1.7.7.2.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/saxon-9.1.0.8-dom.jar b/src/python/review/inspectors/pmd/files/lib/saxon-9.1.0.8-dom.jar
deleted file mode 100644
index 6ded01e4..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/saxon-9.1.0.8-dom.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/saxon-9.1.0.8.jar b/src/python/review/inspectors/pmd/files/lib/saxon-9.1.0.8.jar
deleted file mode 100644
index de236e50..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/saxon-9.1.0.8.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/scala-compiler-2.13.0.jar b/src/python/review/inspectors/pmd/files/lib/scala-compiler-2.13.0.jar
deleted file mode 100644
index 8cff2511..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/scala-compiler-2.13.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/scala-library-2.13.0.jar b/src/python/review/inspectors/pmd/files/lib/scala-library-2.13.0.jar
deleted file mode 100644
index 85964eea..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/scala-library-2.13.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/scala-reflect-2.13.0.jar b/src/python/review/inspectors/pmd/files/lib/scala-reflect-2.13.0.jar
deleted file mode 100644
index 0290492a..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/scala-reflect-2.13.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/scalameta_2.13-4.2.0.jar b/src/python/review/inspectors/pmd/files/lib/scalameta_2.13-4.2.0.jar
deleted file mode 100644
index a4adfcdf..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/scalameta_2.13-4.2.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/scalap-2.13.0.jar b/src/python/review/inspectors/pmd/files/lib/scalap-2.13.0.jar
deleted file mode 100644
index 3dbe3e2a..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/scalap-2.13.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/scalapb-runtime_2.13-0.9.0.jar b/src/python/review/inspectors/pmd/files/lib/scalapb-runtime_2.13-0.9.0.jar
deleted file mode 100644
index 4aa2f5c8..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/scalapb-runtime_2.13-0.9.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/slf4j-api-1.7.25.jar b/src/python/review/inspectors/pmd/files/lib/slf4j-api-1.7.25.jar
deleted file mode 100644
index 0143c099..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/slf4j-api-1.7.25.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/snakeyaml-1.17.jar b/src/python/review/inspectors/pmd/files/lib/snakeyaml-1.17.jar
deleted file mode 100644
index b0372a3c..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/snakeyaml-1.17.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/sourcecode_2.13-0.1.7.jar b/src/python/review/inspectors/pmd/files/lib/sourcecode_2.13-0.1.7.jar
deleted file mode 100644
index ca3f39f5..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/sourcecode_2.13-0.1.7.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/stringtemplate-3.2.1.jar b/src/python/review/inspectors/pmd/files/lib/stringtemplate-3.2.1.jar
deleted file mode 100644
index d0e11b71..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/stringtemplate-3.2.1.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/files/lib/trees_2.13-4.2.0.jar b/src/python/review/inspectors/pmd/files/lib/trees_2.13-4.2.0.jar
deleted file mode 100644
index 1970b9bd..00000000
Binary files a/src/python/review/inspectors/pmd/files/lib/trees_2.13-4.2.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/pmd/issue_types.py b/src/python/review/inspectors/pmd/issue_types.py
index 2188702b..3e42176d 100644
--- a/src/python/review/inspectors/pmd/issue_types.py
+++ b/src/python/review/inspectors/pmd/issue_types.py
@@ -3,182 +3,179 @@
 from src.python.review.inspectors.issue import IssueType
 
 PMD_RULE_TO_ISSUE_TYPE: Dict[str, IssueType] = {
-    # Best Practices
+    # ---- Best Practices ----
     'AbstractClassWithoutAbstractMethod': IssueType.BEST_PRACTICES,
     'AccessorClassGeneration': IssueType.BEST_PRACTICES,
     'AccessorMethodGeneration': IssueType.BEST_PRACTICES,
     'ArrayIsStoredDirectly': IssueType.BEST_PRACTICES,
     'AvoidMessageDigestField': IssueType.BEST_PRACTICES,
-    'AvoidPrintStackTrace': IssueType.BEST_PRACTICES,
+    'AvoidReassigningCatchVariables': IssueType.BEST_PRACTICES,
     'AvoidReassigningLoopVariables': IssueType.BEST_PRACTICES,
     'AvoidReassigningParameters': IssueType.BEST_PRACTICES,
-    'AvoidStringBufferField': IssueType.BEST_PRACTICES,
+    'AvoidStringBufferField': IssueType.ERROR_PRONE,
     'AvoidUsingHardCodedIP': IssueType.BEST_PRACTICES,
     'CheckResultSet': IssueType.BEST_PRACTICES,
     'ConstantsInInterface': IssueType.BEST_PRACTICES,
     'DefaultLabelNotLastInSwitchStmt': IssueType.BEST_PRACTICES,
-    'DoubleBraceInitialization': IssueType.BEST_PRACTICES,
     'ForLoopCanBeForeach': IssueType.BEST_PRACTICES,
     'ForLoopVariableCount': IssueType.BEST_PRACTICES,
-    'GuardLogStatement': IssueType.BEST_PRACTICES,
-    'JUnit4SuitesShouldUseSuiteAnnotation': IssueType.BEST_PRACTICES,
-    'JUnit4TestShouldUseAfterAnnotation': IssueType.BEST_PRACTICES,
-    'JUnit4TestShouldUseBeforeAnnotation': IssueType.BEST_PRACTICES,
-    'JUnit4TestShouldUseTestAnnotation': IssueType.BEST_PRACTICES,
-    'JUnitAssertionsShouldIncludeMessage': IssueType.BEST_PRACTICES,
-    'JUnitTestContainsTooManyAsserts': IssueType.BEST_PRACTICES,
-    'JUnitTestsShouldIncludeAssert': IssueType.BEST_PRACTICES,
-    'JUnitUseExpected': IssueType.BEST_PRACTICES,
-    'LooseCoupling': IssueType.BEST_PRACTICES,
+    'LiteralsFirstInComparisons': IssueType.BEST_PRACTICES,
     'MethodReturnsInternalArray': IssueType.BEST_PRACTICES,
     'MissingOverride': IssueType.BEST_PRACTICES,
     'OneDeclarationPerLine': IssueType.CODE_STYLE,
-    'PositionLiteralsFirstInCaseInsensitiveComparisons':
-        IssueType.BEST_PRACTICES,
-    'PositionLiteralsFirstInComparisons': IssueType.BEST_PRACTICES,
     'PreserveStackTrace': IssueType.BEST_PRACTICES,
     'ReplaceEnumerationWithIterator': IssueType.BEST_PRACTICES,
-    'ReplaceHashtableWithMap': IssueType.BEST_PRACTICES,
-    'ReplaceVectorWithList': IssueType.BEST_PRACTICES,
     'SwitchStmtsShouldHaveDefault': IssueType.ERROR_PRONE,
-    'SystemPrintln': IssueType.BEST_PRACTICES,
     'UnusedFormalParameter': IssueType.BEST_PRACTICES,
-    'UnusedImports': IssueType.BEST_PRACTICES,
     'UnusedLocalVariable': IssueType.BEST_PRACTICES,
     'UnusedPrivateField': IssueType.BEST_PRACTICES,
     'UnusedPrivateMethod': IssueType.BEST_PRACTICES,
-    'UseAssertEqualsInsteadOfAssertTrue': IssueType.BEST_PRACTICES,
-    'UseAssertNullInsteadOfAssertTrue': IssueType.BEST_PRACTICES,
-    'UseAssertSameInsteadOfAssertTrue': IssueType.BEST_PRACTICES,
-    'UseAssertTrueInsteadOfAssertEquals': IssueType.BEST_PRACTICES,
     'UseCollectionIsEmpty': IssueType.BEST_PRACTICES,
+    'UseStandardCharsets': IssueType.BEST_PRACTICES,
     'UseTryWithResources': IssueType.BEST_PRACTICES,
-    'UseVarargs': IssueType.BEST_PRACTICES,
     'WhileLoopWithLiteralBoolean': IssueType.BEST_PRACTICES,
+    # 'AvoidPrintStackTrace': IssueType.BEST_PRACTICES,
+    # 'DoubleBraceInitialization': IssueType.BEST_PRACTICES,
+    # 'GuardLogStatement': IssueType.BEST_PRACTICES,
+    # 'JUnit4SuitesShouldUseSuiteAnnotation': IssueType.BEST_PRACTICES,
+    # 'JUnit4TestShouldUseAfterAnnotation': IssueType.BEST_PRACTICES,
+    # 'JUnit4TestShouldUseBeforeAnnotation': IssueType.BEST_PRACTICES,
+    # 'JUnit4TestShouldUseTestAnnotation': IssueType.BEST_PRACTICES,
+    # 'JUnit5TestShouldBePackagePrivate': IssueType.BEST_PRACTICES,
+    # 'JUnitAssertionsShouldIncludeMessage': IssueType.BEST_PRACTICES,
+    # 'JUnitTestContainsTooManyAsserts': IssueType.BEST_PRACTICES,
+    # 'JUnitTestsShouldIncludeAssert': IssueType.BEST_PRACTICES,
+    # 'JUnitUseExpected': IssueType.BEST_PRACTICES,
+    # 'LooseCoupling': IssueType.BEST_PRACTICES,
+    # 'PositionLiteralsFirstInCaseInsensitiveComparisons': IssueType.BEST_PRACTICES,
+    # 'PositionLiteralsFirstInComparisons': IssueType.BEST_PRACTICES,
+    # 'ReplaceHashtableWithMap': IssueType.BEST_PRACTICES,
+    # 'ReplaceVectorWithList': IssueType.BEST_PRACTICES,
+    # 'SystemPrintln': IssueType.BEST_PRACTICES,
+    # 'UnusedAssignment': IssueType.BEST_PRACTICES,
+    # 'UnusedImports': IssueType.BEST_PRACTICES,
+    # 'UseAssertEqualsInsteadOfAssertTrue': IssueType.BEST_PRACTICES,
+    # 'UseAssertNullInsteadOfAssertTrue': IssueType.BEST_PRACTICES,
+    # 'UseAssertSameInsteadOfAssertTrue': IssueType.BEST_PRACTICES,
+    # 'UseAssertTrueInsteadOfAssertEquals': IssueType.BEST_PRACTICES,
+    # 'UseVarargs': IssueType.BEST_PRACTICES,
 
-    # Code Style
-    'AbstractNaming': IssueType.CODE_STYLE,
-    'AtLeastOneConstructor': IssueType.CODE_STYLE,
+    # ---- Code Style ----
     'AvoidDollarSigns': IssueType.CODE_STYLE,
-    'AvoidFinalLocalVariable': IssueType.CODE_STYLE,
-    'AvoidPrefixingMethodParameters': IssueType.CODE_STYLE,
     'AvoidProtectedFieldInFinalClass': IssueType.BEST_PRACTICES,
-    'AvoidProtectedMethodInFinalClassNotExtending': IssueType.CODE_STYLE,
-    'AvoidUsingNativeCode': IssueType.BEST_PRACTICES,
+    'AvoidProtectedMethodInFinalClassNotExtending': IssueType.BEST_PRACTICES,
     'BooleanGetMethodName': IssueType.CODE_STYLE,
-    'CallSuperInConstructor': IssueType.CODE_STYLE,
+    'CallSuperInConstructor': IssueType.BEST_PRACTICES,
     'ClassNamingConventions': IssueType.CODE_STYLE,
-    'CommentDefaultAccessModifier': IssueType.CODE_STYLE,
-    'ConfusingTernary': IssueType.BEST_PRACTICES,
     'ControlStatementBraces': IssueType.CODE_STYLE,
-    'DefaultPackage': IssueType.BEST_PRACTICES,
-    'DontImportJavaLang': IssueType.BEST_PRACTICES,
-    'DuplicateImports': IssueType.BEST_PRACTICES,
     'EmptyMethodInAbstractClassShouldBeAbstract': IssueType.BEST_PRACTICES,
     'ExtendsObject': IssueType.BEST_PRACTICES,
     'FieldDeclarationsShouldBeAtStartOfClass': IssueType.CODE_STYLE,
     'FieldNamingConventions': IssueType.CODE_STYLE,
     'ForLoopShouldBeWhileLoop': IssueType.BEST_PRACTICES,
-    'ForLoopsMustUseBraces': IssueType.CODE_STYLE,
     'FormalParameterNamingConventions': IssueType.CODE_STYLE,
-    'GenericsNaming': IssueType.CODE_STYLE,
     'IdenticalCatchBranches': IssueType.BEST_PRACTICES,
-    'IfElseStmtsMustUseBraces': IssueType.CODE_STYLE,
-    'IfStmtsMustUseBraces': IssueType.CODE_STYLE,
-    'LinguisticNaming': IssueType.CODE_STYLE,
-    'LocalHomeNamingConvention': IssueType.CODE_STYLE,
-    'LocalInterfaceSessionNamingConvention': IssueType.CODE_STYLE,
-    'LocalVariableCouldBeFinal': IssueType.CODE_STYLE,
     'LocalVariableNamingConventions': IssueType.CODE_STYLE,
-    'LongVariable': IssueType.CODE_STYLE,
-    'MDBAndSessionBeanNamingConvention': IssueType.CODE_STYLE,
-    'MethodArgumentCouldBeFinal': IssueType.CODE_STYLE,
     'MethodNamingConventions': IssueType.CODE_STYLE,
-    'MIsLeadingVariableName': IssueType.CODE_STYLE,
-    'NoPackage': IssueType.BEST_PRACTICES,
-    'OnlyOneReturn': IssueType.BEST_PRACTICES,
     'PackageCase': IssueType.CODE_STYLE,
-    'PrematureDeclaration': IssueType.CODE_STYLE,
-    'RemoteInterfaceNamingConvention': IssueType.CODE_STYLE,
-    'RemoteSessionInterfaceNamingConvention': IssueType.CODE_STYLE,
-    'ShortClassName': IssueType.CODE_STYLE,
-    'ShortMethodName': IssueType.CODE_STYLE,
-    'ShortVariable': IssueType.CODE_STYLE,
-    'SuspiciousConstantFieldName': IssueType.CODE_STYLE,
-    'TooManyStaticImports': IssueType.CODE_STYLE,
-    'UnnecessaryAnnotationValueElement': IssueType.CODE_STYLE,
+    'UnnecessaryCast': IssueType.BEST_PRACTICES,
     'UnnecessaryConstructor': IssueType.BEST_PRACTICES,
     'UnnecessaryFullyQualifiedName': IssueType.CODE_STYLE,
+    'UnnecessaryImport': IssueType.BEST_PRACTICES,
     'UnnecessaryLocalBeforeReturn': IssueType.CODE_STYLE,
-    'UnnecessaryModifier': IssueType.CODE_STYLE,
     'UnnecessaryReturn': IssueType.CODE_STYLE,
     'UseDiamondOperator': IssueType.CODE_STYLE,
     'UselessParentheses': IssueType.CODE_STYLE,
     'UselessQualifiedThis': IssueType.CODE_STYLE,
     'UseShortArrayInitializer': IssueType.BEST_PRACTICES,
-    'UseUnderscoresInNumericLiterals': IssueType.BEST_PRACTICES,
-    'VariableNamingConventions': IssueType.CODE_STYLE,
-    'WhileLoopsMustUseBraces': IssueType.CODE_STYLE,
+    # 'AbstractNaming': IssueType.CODE_STYLE,
+    # 'AtLeastOneConstructor': IssueType.CODE_STYLE,
+    # 'AvoidFinalLocalVariable': IssueType.CODE_STYLE,
+    # 'AvoidPrefixingMethodParameters': IssueType.CODE_STYLE,
+    # 'AvoidUsingNativeCode': IssueType.BEST_PRACTICES,
+    # 'CommentDefaultAccessModifier': IssueType.CODE_STYLE,
+    # 'ConfusingTernary': IssueType.BEST_PRACTICES,
+    # 'DefaultPackage': IssueType.BEST_PRACTICES,
+    # 'DontImportJavaLang': IssueType.BEST_PRACTICES,
+    # 'DuplicateImports': IssueType.BEST_PRACTICES,
+    # 'ForLoopsMustUseBraces': IssueType.CODE_STYLE,
+    # 'GenericsNaming': IssueType.CODE_STYLE,
+    # 'IfElseStmtsMustUseBraces': IssueType.CODE_STYLE,
+    # 'IfStmtsMustUseBraces': IssueType.CODE_STYLE,
+    # 'LinguisticNaming': IssueType.CODE_STYLE,
+    # 'LocalHomeNamingConvention': IssueType.CODE_STYLE,
+    # 'LocalInterfaceSessionNamingConvention': IssueType.CODE_STYLE,
+    # 'LocalVariableCouldBeFinal': IssueType.CODE_STYLE,
+    # 'LongVariable': IssueType.CODE_STYLE,
+    # 'MDBAndSessionBeanNamingConvention': IssueType.CODE_STYLE,
+    # 'MethodArgumentCouldBeFinal': IssueType.CODE_STYLE,
+    # 'MIsLeadingVariableName': IssueType.CODE_STYLE,
+    # 'NoPackage': IssueType.BEST_PRACTICES,
+    # 'OnlyOneReturn': IssueType.BEST_PRACTICES,
+    # 'UnnecessaryModifier': IssueType.CODE_STYLE,
+    # 'UseUnderscoresInNumericLiterals': IssueType.BEST_PRACTICES,
+    # 'VariableNamingConventions': IssueType.CODE_STYLE,
+    # 'WhileLoopsMustUseBraces': IssueType.CODE_STYLE,
 
-    # Design
-    'AbstractClassWithoutAnyMethod': IssueType.BEST_PRACTICES,
-    'AvoidCatchingGenericException': IssueType.BEST_PRACTICES,
+    # ---- Design ----
     'AvoidDeeplyNestedIfStmts': IssueType.COMPLEXITY,
     'AvoidRethrowingException': IssueType.BEST_PRACTICES,
     'AvoidThrowingNewInstanceOfSameException': IssueType.BEST_PRACTICES,
-    'AvoidThrowingNullPointerException': IssueType.BEST_PRACTICES,
-    'AvoidThrowingRawExceptionTypes': IssueType.BEST_PRACTICES,
     'AvoidUncheckedExceptionsInSignatures': IssueType.BEST_PRACTICES,
-    'ClassWithOnlyPrivateConstructorsShouldBeFinal': IssueType.BEST_PRACTICES,
     'CollapsibleIfStatements': IssueType.BEST_PRACTICES,
-    'CouplingBetweenObjects': IssueType.BEST_PRACTICES,
-    'CyclomaticComplexity': IssueType.COMPLEXITY,
-    'DataClass': IssueType.BEST_PRACTICES,
     'DoNotExtendJavaLangError': IssueType.BEST_PRACTICES,
-    'ExceptionAsFlowControl': IssueType.BEST_PRACTICES,
-    'ExcessiveClassLength': IssueType.BEST_PRACTICES,
-    'ExcessiveImports': IssueType.BEST_PRACTICES,
-    'ExcessiveMethodLength': IssueType.COMPLEXITY,
-    'ExcessiveParameterList': IssueType.BEST_PRACTICES,
-    'ExcessivePublicCount': IssueType.BEST_PRACTICES,
-    'FinalFieldCouldBeStatic': IssueType.BEST_PRACTICES,
-    'GodClass': IssueType.BEST_PRACTICES,
-    'ImmutableField': IssueType.BEST_PRACTICES,
-    'LawOfDemeter': IssueType.BEST_PRACTICES,
+    'ExcessiveParameterList': IssueType.COMPLEXITY,
+    'ExcessivePublicCount': IssueType.COMPLEXITY,
+    'GodClass': IssueType.COMPLEXITY,
     'LogicInversion': IssueType.BEST_PRACTICES,
-    'LoosePackageCoupling': IssueType.BEST_PRACTICES,
-    'ModifiedCyclomaticComplexity': IssueType.COMPLEXITY,
-    'NcssConstructorCount': IssueType.COMPLEXITY,
-    'NcssCount': IssueType.COMPLEXITY,
-    'NcssMethodCount': IssueType.COMPLEXITY,
-    'NcssTypeCount': IssueType.COMPLEXITY,
-    'NPathComplexity': IssueType.COMPLEXITY,
-    'SignatureDeclareThrowsException': IssueType.BEST_PRACTICES,
     'SimplifiedTernary': IssueType.BEST_PRACTICES,
     'SimplifyBooleanAssertion': IssueType.BEST_PRACTICES,
     'SimplifyBooleanExpressions': IssueType.BEST_PRACTICES,
     'SimplifyBooleanReturns': IssueType.BEST_PRACTICES,
     'SimplifyConditional': IssueType.BEST_PRACTICES,
     'SingularField': IssueType.BEST_PRACTICES,
-    'StdCyclomaticComplexity': IssueType.COMPLEXITY,
     'SwitchDensity': IssueType.COMPLEXITY,
     'TooManyFields': IssueType.COMPLEXITY,
-    'TooManyMethods': IssueType.COMPLEXITY,
     'UselessOverridingMethod': IssueType.BEST_PRACTICES,
     'UseObjectForClearerAPI': IssueType.BEST_PRACTICES,
-    'UseUtilityClass': IssueType.BEST_PRACTICES,
+    # 'AbstractClassWithoutAnyMethod': IssueType.BEST_PRACTICES,
+    # 'AvoidCatchingGenericException': IssueType.BEST_PRACTICES,
+    # 'AvoidThrowingNullPointerException': IssueType.BEST_PRACTICES,
+    # 'AvoidThrowingRawExceptionTypes': IssueType.BEST_PRACTICES,
+    # 'ClassWithOnlyPrivateConstructorsShouldBeFinal': IssueType.BEST_PRACTICES,
+    # 'CognitiveComplexity': IssueType.COMPLEXITY,
+    # 'CouplingBetweenObjects': IssueType.BEST_PRACTICES,
+    # 'CyclomaticComplexity': IssueType.COMPLEXITY,
+    # 'DataClass': IssueType.BEST_PRACTICES,
+    # 'ExceptionAsFlowControl': IssueType.BEST_PRACTICES,
+    # 'ExcessiveClassLength': IssueType.BEST_PRACTICES,
+    # 'ExcessiveImports': IssueType.BEST_PRACTICES,
+    # 'ExcessiveMethodLength': IssueType.COMPLEXITY,
+    # 'FinalFieldCouldBeStatic': IssueType.BEST_PRACTICES,
+    # 'ImmutableField': IssueType.BEST_PRACTICES,
+    # 'LawOfDemeter': IssueType.BEST_PRACTICES,
+    # 'LoosePackageCoupling': IssueType.BEST_PRACTICES,
+    # 'ModifiedCyclomaticComplexity': IssueType.COMPLEXITY,
+    # 'MutableStaticState': IssueType.BEST_PRACTICES,
+    # 'NcssConstructorCount': IssueType.COMPLEXITY,
+    # 'NcssCount': IssueType.COMPLEXITY,
+    # 'NcssMethodCount': IssueType.COMPLEXITY,
+    # 'NcssTypeCount': IssueType.COMPLEXITY,
+    # 'NPathComplexity': IssueType.COMPLEXITY,
+    # 'SignatureDeclareThrowsException': IssueType.BEST_PRACTICES,
+    # 'StdCyclomaticComplexity': IssueType.COMPLEXITY,
+    # 'TooManyMethods': IssueType.COMPLEXITY,
+    # 'UseUtilityClass': IssueType.BEST_PRACTICES,
 
-    # Documentation
-    'CommentContent': IssueType.BEST_PRACTICES,
-    'CommentRequired': IssueType.BEST_PRACTICES,
-    'CommentSize': IssueType.BEST_PRACTICES,
+    # ---- Documentation ----
     'UncommentedEmptyConstructor': IssueType.BEST_PRACTICES,
     'UncommentedEmptyMethodBody': IssueType.BEST_PRACTICES,
+    # 'CommentContent': IssueType.BEST_PRACTICES,
+    # 'CommentRequired': IssueType.BEST_PRACTICES,
+    # 'CommentSize': IssueType.BEST_PRACTICES,
 
-    # Error Prone
+    # ---- Error Prone ----
     'AssignmentInOperand': IssueType.ERROR_PRONE,
-    'AssignmentToNonFinalStatic': IssueType.ERROR_PRONE,
-    'AvoidAccessibilityAlteration': IssueType.ERROR_PRONE,
     'AvoidAssertAsIdentifier': IssueType.ERROR_PRONE,
     'AvoidBranchingStatementAsLastInLoop': IssueType.BEST_PRACTICES,
     'AvoidCallingFinalize': IssueType.ERROR_PRONE,
@@ -190,32 +187,17 @@
     'AvoidFieldNameMatchingMethodName': IssueType.BEST_PRACTICES,
     'AvoidFieldNameMatchingTypeName': IssueType.BEST_PRACTICES,
     'AvoidInstanceofChecksInCatchClause': IssueType.BEST_PRACTICES,
-    'AvoidLiteralsInIfCondition': IssueType.ERROR_PRONE,
+    'AvoidLiteralsInIfCondition': IssueType.INFO,
     'AvoidLosingExceptionInformation': IssueType.ERROR_PRONE,
     'AvoidMultipleUnaryOperators': IssueType.ERROR_PRONE,
     'AvoidUsingOctalValues': IssueType.BEST_PRACTICES,
-    'BadComparison': IssueType.ERROR_PRONE,
-    'BeanMembersShouldSerialize': IssueType.ERROR_PRONE,
     'BrokenNullCheck': IssueType.ERROR_PRONE,
-    'CallSuperFirst': IssueType.ERROR_PRONE,
-    'CallSuperLast': IssueType.ERROR_PRONE,
     'CheckSkipResult': IssueType.ERROR_PRONE,
     'ClassCastExceptionWithToArray': IssueType.ERROR_PRONE,
-    'CloneMethodMustBePublic': IssueType.ERROR_PRONE,
-    'CloneMethodMustImplementCloneable': IssueType.ERROR_PRONE,
-    'CloneMethodReturnTypeMustMatchClassName': IssueType.ERROR_PRONE,
-    'CloneThrowsCloneNotSupportedException': IssueType.ERROR_PRONE,
-    'CloseResource': IssueType.ERROR_PRONE,
     'CompareObjectsWithEquals': IssueType.ERROR_PRONE,
+    'ComparisonWithNaN': IssueType.ERROR_PRONE,
     'ConstructorCallsOverridableMethod': IssueType.ERROR_PRONE,
-    'DataflowAnomalyAnalysis': IssueType.ERROR_PRONE,
-    'DetachedTestCase': IssueType.ERROR_PRONE,
-    'DoNotCallGarbageCollectionExplicitly': IssueType.ERROR_PRONE,
-    'DoNotCallSystemExit': IssueType.ERROR_PRONE,
     'DoNotExtendJavaLangThrowable': IssueType.ERROR_PRONE,
-    'DoNotHardCodeSDCard': IssueType.ERROR_PRONE,
-    'DoNotThrowExceptionInFinally': IssueType.ERROR_PRONE,
-    'DontImportSun': IssueType.ERROR_PRONE,
     'DontUseFloatTypeForLoopIndices': IssueType.ERROR_PRONE,
     'EmptyCatchBlock': IssueType.BEST_PRACTICES,
     'EmptyFinalizer': IssueType.BEST_PRACTICES,
@@ -223,7 +205,7 @@
     'EmptyIfStmt': IssueType.BEST_PRACTICES,
     'EmptyInitializer': IssueType.BEST_PRACTICES,
     'EmptyStatementBlock': IssueType.BEST_PRACTICES,
-    'EmptyStatementNotInLoop': IssueType.BEST_PRACTICES,
+    'EmptyStatementNotInLoop': IssueType.ERROR_PRONE,
     'EmptySwitchStatements': IssueType.BEST_PRACTICES,
     'EmptySynchronizedBlock': IssueType.BEST_PRACTICES,
     'EmptyTryBlock': IssueType.BEST_PRACTICES,
@@ -234,94 +216,115 @@
     'FinalizeOverloaded': IssueType.ERROR_PRONE,
     'FinalizeShouldBeProtected': IssueType.ERROR_PRONE,
     'IdempotentOperations': IssueType.BEST_PRACTICES,
-    'ImportFromSamePackage': IssueType.BEST_PRACTICES,
-    'InstantiationToGetClass': IssueType.ERROR_PRONE,
-    'InvalidLogMessageFormat': IssueType.ERROR_PRONE,
-    'InvalidSlf4jMessageFormat': IssueType.ERROR_PRONE,
+    'InstantiationToGetClass': IssueType.BEST_PRACTICES,
     'JumbledIncrementer': IssueType.ERROR_PRONE,
-    'JUnitSpelling': IssueType.ERROR_PRONE,
-    'JUnitStaticSuite': IssueType.ERROR_PRONE,
-    'LoggerIsNotStaticFinal': IssueType.ERROR_PRONE,
     'MethodWithSameNameAsEnclosingClass': IssueType.BEST_PRACTICES,
     'MisplacedNullCheck': IssueType.ERROR_PRONE,
     'MissingBreakInSwitch': IssueType.ERROR_PRONE,
     'MissingSerialVersionUID': IssueType.ERROR_PRONE,
     'MissingStaticMethodInNonInstantiatableClass': IssueType.ERROR_PRONE,
-    'MoreThanOneLogger': IssueType.ERROR_PRONE,
     'NonCaseLabelInSwitchStatement': IssueType.BEST_PRACTICES,
-    'NonStaticInitializer': IssueType.ERROR_PRONE,
-    'NullAssignment': IssueType.ERROR_PRONE,
     'OverrideBothEqualsAndHashcode': IssueType.ERROR_PRONE,
     'ProperCloneImplementation': IssueType.ERROR_PRONE,
-    'ProperLogger': IssueType.ERROR_PRONE,
     'ReturnEmptyArrayRatherThanNull': IssueType.ERROR_PRONE,
     'ReturnFromFinallyBlock': IssueType.BEST_PRACTICES,
     'SimpleDateFormatNeedsLocale': IssueType.BEST_PRACTICES,
     'SingleMethodSingleton': IssueType.ERROR_PRONE,
     'SingletonClassReturningNewInstance': IssueType.ERROR_PRONE,
-    'StaticEJBFieldShouldBeFinal': IssueType.ERROR_PRONE,
     'StringBufferInstantiationWithChar': IssueType.ERROR_PRONE,
     'SuspiciousEqualsMethodName': IssueType.ERROR_PRONE,
     'SuspiciousHashcodeMethodName': IssueType.ERROR_PRONE,
-    'SuspiciousOctalEscape': IssueType.ERROR_PRONE,
-    'TestClassWithoutTestCases': IssueType.ERROR_PRONE,
     'UnconditionalIfStatement': IssueType.BEST_PRACTICES,
     'UnnecessaryBooleanAssertion': IssueType.BEST_PRACTICES,
     'UnnecessaryCaseChange': IssueType.BEST_PRACTICES,
     'UnnecessaryConversionTemporary': IssueType.BEST_PRACTICES,
-    'UnusedNullCheckInEquals': IssueType.ERROR_PRONE,
-    'UseCorrectExceptionLogging': IssueType.ERROR_PRONE,
     'UseEqualsToCompareStrings': IssueType.ERROR_PRONE,
-    'UselessOperationOnImmutable': IssueType.ERROR_PRONE,
-    'UseLocaleWithCaseConversions': IssueType.ERROR_PRONE,
-    'UseProperClassLoader': IssueType.ERROR_PRONE,
+    # 'AssignmentToNonFinalStatic': IssueType.ERROR_PRONE,
+    # 'AvoidAccessibilityAlteration': IssueType.ERROR_PRONE,
+    # 'BadComparison': IssueType.ERROR_PRONE,
+    # 'BeanMembersShouldSerialize': IssueType.ERROR_PRONE,
+    # 'CallSuperFirst': IssueType.ERROR_PRONE,
+    # 'CallSuperLast': IssueType.ERROR_PRONE,
+    # 'CloneMethodMustBePublic': IssueType.ERROR_PRONE,
+    # 'CloneMethodMustImplementCloneable': IssueType.ERROR_PRONE,
+    # 'CloneMethodReturnTypeMustMatchClassName': IssueType.ERROR_PRONE,
+    # 'CloneThrowsCloneNotSupportedException': IssueType.ERROR_PRONE,
+    # 'CloseResource': IssueType.ERROR_PRONE,
+    # 'DataflowAnomalyAnalysis': IssueType.ERROR_PRONE,
+    # 'DetachedTestCase': IssueType.ERROR_PRONE,
+    # 'DoNotCallGarbageCollectionExplicitly': IssueType.ERROR_PRONE,
+    # 'DoNotCallSystemExit': IssueType.ERROR_PRONE,
+    # 'DoNotHardCodeSDCard': IssueType.ERROR_PRONE,
+    # 'DoNotTerminateVM': IssueType.ERROR_PRONE,
+    # 'DoNotThrowExceptionInFinally': IssueType.ERROR_PRONE,
+    # 'DontImportSun': IssueType.ERROR_PRONE,
+    # 'ImportFromSamePackage': IssueType.BEST_PRACTICES,
+    # 'InvalidLogMessageFormat': IssueType.ERROR_PRONE,
+    # 'InvalidSlf4jMessageFormat': IssueType.ERROR_PRONE,
+    # 'JUnitSpelling': IssueType.ERROR_PRONE,
+    # 'JUnitStaticSuite': IssueType.ERROR_PRONE,
+    # 'LoggerIsNotStaticFinal': IssueType.ERROR_PRONE,
+    # 'MoreThanOneLogger': IssueType.ERROR_PRONE,
+    # 'NonStaticInitializer': IssueType.ERROR_PRONE,
+    # 'NullAssignment': IssueType.ERROR_PRONE,
+    # 'ProperLogger': IssueType.ERROR_PRONE,
+    # 'StaticEJBFieldShouldBeFinal': IssueType.ERROR_PRONE,
+    # 'SuspiciousOctalEscape': IssueType.ERROR_PRONE,
+    # 'TestClassWithoutTestCases': IssueType.ERROR_PRONE,
+    # 'UnusedNullCheckInEquals': IssueType.ERROR_PRONE,
+    # 'UseCorrectExceptionLogging': IssueType.ERROR_PRONE,
+    # 'UselessOperationOnImmutable': IssueType.ERROR_PRONE,
+    # 'UseLocaleWithCaseConversions': IssueType.ERROR_PRONE,
+    # 'UseProperClassLoader': IssueType.ERROR_PRONE,
 
-    # Multithreading
-    'AvoidSynchronizedAtMethodLevel': IssueType.BEST_PRACTICES,
+    # ---- Multithreading ----
     'AvoidThreadGroup': IssueType.ERROR_PRONE,
-    # 'AvoidUsingVolatile': IssueType.ERROR_PRONE,
-    # 'DoNotUseThreads': IssueType.ERROR_PRONE,
     'DontCallThreadRun': IssueType.ERROR_PRONE,
     'DoubleCheckedLocking': IssueType.ERROR_PRONE,
-    'NonThreadSafeSingleton': IssueType.ERROR_PRONE,
-    'UnsynchronizedStaticDateFormatter': IssueType.ERROR_PRONE,
     'UnsynchronizedStaticFormatter': IssueType.ERROR_PRONE,
-    'UseConcurrentHashMap': IssueType.ERROR_PRONE,
     'UseNotifyAllInsteadOfNotify': IssueType.ERROR_PRONE,
+    # 'AvoidSynchronizedAtMethodLevel': IssueType.BEST_PRACTICES,
+    # 'AvoidUsingVolatile': IssueType.ERROR_PRONE,
+    # 'DoNotUseThreads': IssueType.ERROR_PRONE,
+    # 'NonThreadSafeSingleton': IssueType.ERROR_PRONE,
+    # 'UnsynchronizedStaticDateFormatter': IssueType.ERROR_PRONE,
+    # 'UseConcurrentHashMap': IssueType.ERROR_PRONE,
 
-    # Performance
+    # ---- Performance ----
     'AddEmptyString': IssueType.BEST_PRACTICES,
-    'AppendCharacterWithChar': IssueType.BEST_PRACTICES,
     'AvoidArrayLoops': IssueType.BEST_PRACTICES,
-    'AvoidFileStream': IssueType.BEST_PRACTICES,
-    'AvoidInstantiatingObjectsInLoops': IssueType.BEST_PRACTICES,
-    'AvoidUsingShortType': IssueType.BEST_PRACTICES,
-    'BigIntegerInstantiation': IssueType.BEST_PRACTICES,
-    'BooleanInstantiation': IssueType.BEST_PRACTICES,
-    'ByteInstantiation': IssueType.BEST_PRACTICES,
     'ConsecutiveAppendsShouldReuse': IssueType.BEST_PRACTICES,
     'ConsecutiveLiteralAppends': IssueType.BEST_PRACTICES,
-    'InefficientEmptyStringCheck': IssueType.BEST_PRACTICES,
     'InefficientStringBuffering': IssueType.BEST_PRACTICES,
-    'InsufficientStringBufferDeclaration': IssueType.BEST_PRACTICES,
-    'IntegerInstantiation': IssueType.BEST_PRACTICES,
-    'LongInstantiation': IssueType.BEST_PRACTICES,
     'OptimizableToArrayCall': IssueType.BEST_PRACTICES,
-    'RedundantFieldInitializer': IssueType.BEST_PRACTICES,
-    'ShortInstantiation': IssueType.BEST_PRACTICES,
-    'SimplifyStartsWith': IssueType.BEST_PRACTICES,
-    'StringInstantiation': IssueType.BEST_PRACTICES,
     'StringToString': IssueType.BEST_PRACTICES,
     'TooFewBranchesForASwitchStatement': IssueType.BEST_PRACTICES,
     'UnnecessaryWrapperObjectCreation': IssueType.BEST_PRACTICES,
-    'UseArrayListInsteadOfVector': IssueType.BEST_PRACTICES,
     'UseArraysAsList': IssueType.BEST_PRACTICES,
-    'UseIndexOfChar': IssueType.BEST_PRACTICES,
     'UselessStringValueOf': IssueType.BEST_PRACTICES,
-    'UseStringBufferForStringAppends': IssueType.BEST_PRACTICES,
     'UseStringBufferLength': IssueType.BEST_PRACTICES,
+    # 'AppendCharacterWithChar': IssueType.BEST_PRACTICES,
+    # 'AvoidCalendarDateCreation': IssueType.BEST_PRACTICES,
+    # 'AvoidFileStream': IssueType.BEST_PRACTICES,
+    # 'AvoidInstantiatingObjectsInLoops': IssueType.BEST_PRACTICES,
+    # 'AvoidUsingShortType': IssueType.BEST_PRACTICES,
+    # 'BigIntegerInstantiation': IssueType.BEST_PRACTICES,
+    # 'BooleanInstantiation': IssueType.BEST_PRACTICES,
+    # 'ByteInstantiation': IssueType.BEST_PRACTICES,
+    # 'InefficientEmptyStringCheck': IssueType.BEST_PRACTICES,
+    # 'InsufficientStringBufferDeclaration': IssueType.BEST_PRACTICES,
+    # 'IntegerInstantiation': IssueType.BEST_PRACTICES,
+    # 'LongInstantiation': IssueType.BEST_PRACTICES,
+    # 'RedundantFieldInitializer': IssueType.BEST_PRACTICES,
+    # 'ShortInstantiation': IssueType.BEST_PRACTICES,
+    # 'SimplifyStartsWith': IssueType.BEST_PRACTICES,
+    # 'StringInstantiation': IssueType.BEST_PRACTICES,
+    # 'UseArrayListInsteadOfVector': IssueType.BEST_PRACTICES,
+    # 'UseIndexOfChar': IssueType.BEST_PRACTICES,
+    # 'UseIOStreamsWithApacheCommonsFileItem': IssueType.BEST_PRACTICES,
+    # 'UseStringBufferForStringAppends': IssueType.BEST_PRACTICES,
 
-    # Security
+    # ---- Security ----
     'HardCodedCryptoKey': IssueType.BEST_PRACTICES,
     'InsecureCryptoIv': IssueType.BEST_PRACTICES,
 }
diff --git a/src/python/review/inspectors/pmd/pmd.py b/src/python/review/inspectors/pmd/pmd.py
index eb4878dd..84d7acba 100644
--- a/src/python/review/inspectors/pmd/pmd.py
+++ b/src/python/review/inspectors/pmd/pmd.py
@@ -2,22 +2,27 @@
 import logging
 import os
 from pathlib import Path
-from typing import List
+from typing import Any, Dict, List
 
 from src.python.review.application_config import LanguageVersion
-from src.python.review.common.file_system import new_temp_dir
+from src.python.review.common.file_system import check_set_up_env_variable, new_temp_dir
 from src.python.review.common.subprocess_runner import run_in_subprocess
 from src.python.review.inspectors.base_inspector import BaseInspector
 from src.python.review.inspectors.common import remove_prefix
 from src.python.review.inspectors.inspector_type import InspectorType
-from src.python.review.inspectors.issue import BaseIssue, CodeIssue, IssueType
+from src.python.review.inspectors.issue import BaseIssue, CodeIssue, IssueDifficulty, IssueType
 from src.python.review.inspectors.pmd.issue_types import PMD_RULE_TO_ISSUE_TYPE
 
 logger = logging.getLogger(__name__)
 
+PMD_DIRECTORY_ENV = 'PMD_DIRECTORY'
+check_set_up_env_variable(PMD_DIRECTORY_ENV)
+PMD_VERSION_ENV = 'PMD_VERSION'
+check_set_up_env_variable(PMD_VERSION_ENV)
+PATH_TOOLS_PMD_SHELL_SCRIPT = f'{os.environ[PMD_DIRECTORY_ENV]}/pmd-bin-{os.environ[PMD_VERSION_ENV]}/bin/run.sh'
+
 PATH_TOOLS_PMD_FILES = Path(__file__).parent / 'files'
-PATH_TOOLS_PMD_SHELL_SCRIPT = PATH_TOOLS_PMD_FILES / 'bin' / 'run.sh'
-PATH_TOOLS_PMD_RULES_SET = PATH_TOOLS_PMD_FILES / 'bin' / 'basic.xml'
+PATH_TOOLS_PMD_RULES_SET = PATH_TOOLS_PMD_FILES / 'config.xml'
 DEFAULT_JAVA_VERSION = LanguageVersion.JAVA_11
 
 
@@ -42,7 +47,7 @@ def _create_command(cls, path: Path,
             '-t', str(n_cpu),
         ]
 
-    def inspect(self, path: Path, config: dict) -> List[BaseIssue]:
+    def inspect(self, path: Path, config: Dict[str, Any]) -> List[BaseIssue]:
         with new_temp_dir() as temp_dir:
             output_path = Path(temp_dir / 'out.csv')
 
@@ -78,6 +83,7 @@ def parse_output(self, output_path: Path) -> List[BaseIssue]:
                     origin_class=row['Rule'],
                     description=row['Description'],
                     inspector_type=self.inspector_type,
+                    difficulty=IssueDifficulty.get_by_issue_type(self.choose_issue_type(row['Rule'])),
                 ) for row in reader]
 
     @classmethod
diff --git a/src/python/review/inspectors/pyast/python_ast.py b/src/python/review/inspectors/pyast/python_ast.py
index 6426d115..cb0eb537 100644
--- a/src/python/review/inspectors/pyast/python_ast.py
+++ b/src/python/review/inspectors/pyast/python_ast.py
@@ -1,14 +1,14 @@
 import ast
 from collections import Counter, defaultdict
 from pathlib import Path
-from typing import Dict, List
+from typing import Any, Dict, List
 
 from src.python.review.common import language
 from src.python.review.common.file_system import get_all_file_system_items
 from src.python.review.common.language import Language
 from src.python.review.inspectors.base_inspector import BaseInspector
 from src.python.review.inspectors.inspector_type import InspectorType
-from src.python.review.inspectors.issue import BaseIssue, BoolExprLenIssue, FuncLenIssue, IssueType
+from src.python.review.inspectors.issue import BaseIssue, BoolExprLenIssue, FuncLenIssue, IssueDifficulty, IssueType
 from src.python.review.inspectors.tips import get_bool_expr_len_tip, get_func_len_tip
 
 BOOL_EXPR_LEN_ORIGIN_CLASS = 'C001'
@@ -32,6 +32,8 @@ def visit(self, node: ast.AST):
             if isinstance(inner_node, ast.BoolOp):
                 length += len(inner_node.values) - 1
 
+        issue_type = PythonAstInspector.choose_issue_type(BOOL_EXPR_LEN_ORIGIN_CLASS)
+
         self.bool_expression_lens.append(BoolExprLenIssue(
             file_path=self._file_path,
             line_no=node.lineno,
@@ -40,7 +42,8 @@ def visit(self, node: ast.AST):
             origin_class=BOOL_EXPR_LEN_ORIGIN_CLASS,
             inspector_type=self._inspector_type,
             bool_expr_len=length,
-            type=IssueType.BOOL_EXPR_LEN,
+            type=issue_type,
+            difficulty=IssueDifficulty.get_by_issue_type(issue_type),
         ))
 
 
@@ -61,6 +64,8 @@ def visit(self, node):
                 self._previous_node.lineno, node.lineno,
             )
 
+            issue_type = PythonAstInspector.choose_issue_type(FUNC_LEN_ORIGIN_CLASS)
+
             self._function_lens.append(FuncLenIssue(
                 file_path=self._file_path,
                 line_no=self._previous_node.lineno,
@@ -69,7 +74,8 @@ def visit(self, node):
                 origin_class=FUNC_LEN_ORIGIN_CLASS,
                 inspector_type=self._inspector_type,
                 func_len=func_length,
-                type=IssueType.FUNC_LEN,
+                type=issue_type,
+                difficulty=IssueDifficulty.get_by_issue_type(issue_type),
             ))
 
         self._previous_node = node
@@ -83,6 +89,8 @@ def function_lens(self) -> List[FuncLenIssue]:
                 self._previous_node.lineno, self._n_lines + 1,
             )
 
+            issue_type = PythonAstInspector.choose_issue_type(FUNC_LEN_ORIGIN_CLASS)
+
             self._function_lens.append(FuncLenIssue(
                 file_path=self._file_path,
                 line_no=self._previous_node.lineno,
@@ -91,7 +99,8 @@ def function_lens(self) -> List[FuncLenIssue]:
                 origin_class=FUNC_LEN_ORIGIN_CLASS,
                 inspector_type=self._inspector_type,
                 func_len=func_length,
-                type=IssueType.FUNC_LEN,
+                type=issue_type,
+                difficulty=IssueDifficulty.get_by_issue_type(issue_type),
             ))
 
         self._previous_node = None
@@ -109,7 +118,7 @@ class PythonAstInspector(BaseInspector):
     inspector_type = InspectorType.PYTHON_AST
 
     @classmethod
-    def inspect(cls, path: Path, config: dict) -> List[BaseIssue]:
+    def inspect(cls, path: Path, config: Dict[str, Any]) -> List[BaseIssue]:
         if path.is_file():
             path_to_files = [path]
         else:
@@ -136,6 +145,16 @@ def inspect(cls, path: Path, config: dict) -> List[BaseIssue]:
 
         return metrics
 
+    @staticmethod
+    def choose_issue_type(code: str) -> IssueType:
+        if code == BOOL_EXPR_LEN_ORIGIN_CLASS:
+            return IssueType.BOOL_EXPR_LEN
+
+        if code == FUNC_LEN_ORIGIN_CLASS:
+            return IssueType.FUNC_LEN
+
+        return IssueType.BEST_PRACTICES
+
 
 def create_line_no_to_sym_no_map(content) -> Dict[int, int]:
     mapping = defaultdict(lambda: len(content), {1: 0})
diff --git a/src/python/review/inspectors/pylint/issue_types.py b/src/python/review/inspectors/pylint/issue_types.py
index 5df676b1..1a9ab612 100644
--- a/src/python/review/inspectors/pylint/issue_types.py
+++ b/src/python/review/inspectors/pylint/issue_types.py
@@ -2,29 +2,148 @@
 
 from src.python.review.inspectors.issue import IssueType
 
+CODE_TO_ISSUE_TYPE: Dict[str, IssueType] = {
+    # Basic checker
+    'W0129': IssueType.ERROR_PRONE,  # Assert statement has a string literal as its first argument
+    'W0127': IssueType.ERROR_PRONE,  # Assigning the same variable to itself
+    'W0143': IssueType.ERROR_PRONE,  # Comparing against a callable
+    'W0102': IssueType.ERROR_PRONE,  # Dangerous default value as argument
+    'W0109': IssueType.ERROR_PRONE,  # Duplicate key in dictionary
+    'W0106': IssueType.ERROR_PRONE,  # Expression is assigned to nothing
+    'W0128': IssueType.ERROR_PRONE,  # Redeclared variable in assignment
+    'W0104': IssueType.ERROR_PRONE,  # Statement seems to have no effect
+    'W0105': IssueType.ERROR_PRONE,  # String statement has no effect
+    'W0107': IssueType.BEST_PRACTICES,  # Unnecessary pass statement
+    'W0101': IssueType.ERROR_PRONE,  # Unreachable code
+    'W0125': IssueType.ERROR_PRONE,  # Using a conditional statement with a constant value
+    'W0126': IssueType.ERROR_PRONE,  # Using a conditional statement with wrong function due to missing parentheses
+    'R0124': IssueType.ERROR_PRONE,  # Redundant comparison
+    'C0121': IssueType.BEST_PRACTICES,  # Expression is compared to singleton values like True, False or None
+    'C0112': IssueType.BEST_PRACTICES,  # Empty docstring
+    'C0123': IssueType.BEST_PRACTICES,  # Use isinstance() rather than type() for a type check
+
+    # Classes checker
+    'E0213': IssueType.CODE_STYLE,  # Method should have "self" as first argument
+    'W0221': IssueType.ERROR_PRONE,  # Method has diff. number of args than in the interface or in an overridden method
+    'W0237': IssueType.ERROR_PRONE,  # Method parameter has diff. name than in the interface or in an overridden method
+    'W0223': IssueType.ERROR_PRONE,  # Method is abstract in class but is not overridden
+    'W0236': IssueType.ERROR_PRONE,  # Method was overridden in a way that does not match its base class
+    'W0222': IssueType.ERROR_PRONE,  # Signature differs from method
+    'W0231': IssueType.ERROR_PRONE,  # __init__ method from base class is not called
+    'C0205': IssueType.ERROR_PRONE,  # Class __slots__ should be a non-string iterable
+
+    # Design checker
+    'R0901': IssueType.COMPLEXITY,  # Too many ancestors
+    'R0913': IssueType.COMPLEXITY,  # Too many arguments
+    'R0916': IssueType.COMPLEXITY,  # Too many boolean expressions
+    'R0912': IssueType.COMPLEXITY,  # Too many branches
+    'R0902': IssueType.COMPLEXITY,  # Too many instance attributes
+    'R0914': IssueType.COMPLEXITY,  # Too many locals
+    'R0904': IssueType.COMPLEXITY,  # Too many public methods
+    'R0911': IssueType.COMPLEXITY,  # Too many return statements
+    'R0915': IssueType.COMPLEXITY,  # Too many statements
+
+    # Exceptions checker
+    'W0705': IssueType.ERROR_PRONE,  # Catching previously caught exception type
+    'W0706': IssueType.ERROR_PRONE,  # The except handler raises immediately
+
+    # Format checker
+    'W0311': IssueType.CODE_STYLE,  # Bad indentation
+    'W0301': IssueType.CODE_STYLE,  # Unnecessary semicolon
+    'C0302': IssueType.COMPLEXITY,  # Too many lines in module
+
+    # Imports checker
+    'R0401': IssueType.ERROR_PRONE,  # Cyclic import
+    'C0415': IssueType.BEST_PRACTICES,  # Import outside toplevel
+
+    # Python3 checker
+    'W1659': IssueType.ERROR_PRONE,  # Accessing a removed xreadlines attribute
+    'W1623': IssueType.ERROR_PRONE,  # Assigning to a class's __metaclass__ attribute
+    'W1622': IssueType.ERROR_PRONE,  # Called a next() method on an object
+    'W1620': IssueType.ERROR_PRONE,  # Calling a dict.iter*() method
+    'W1621': IssueType.ERROR_PRONE,  # Calling a dict.view*() method
+    'W1645': IssueType.ERROR_PRONE,  # Exception.message removed in Python 3
+    'W1641': IssueType.ERROR_PRONE,  # Implementing __eq__ without also implementing __hash__
+    'W1624': IssueType.ERROR_PRONE,  # Indexing exceptions will not work on Python 3
+    'W1648': IssueType.ERROR_PRONE,  # Module moved in Python 3
+    'W1625': IssueType.ERROR_PRONE,  # Raising a string exception
+    'W1611': IssueType.ERROR_PRONE,  # StandardError built-in referenced
+    'W1662': IssueType.ERROR_PRONE,  # Using a variable that was bound inside a comprehension
+    'W1661': IssueType.ERROR_PRONE,  # Using an exception object that was bound by an except handler
+    'W1640': IssueType.ERROR_PRONE,  # Using the cmp argument for list.sort / sorted
+    'W1630': IssueType.ERROR_PRONE,  # __cmp__ method defined
+    'W1614': IssueType.ERROR_PRONE,  # __coerce__ method defined
+    'W1615': IssueType.ERROR_PRONE,  # __delslice__ method defined
+    'W1642': IssueType.ERROR_PRONE,  # __div__ method defined
+    'W1616': IssueType.ERROR_PRONE,  # __getslice__ method defined
+    'W1628': IssueType.ERROR_PRONE,  # __hex__ method defined
+    'W1643': IssueType.ERROR_PRONE,  # __idiv__ method defined
+    'W1629': IssueType.ERROR_PRONE,  # __nonzero__ method defined
+    'W1627': IssueType.ERROR_PRONE,  # __oct__ method defined
+    'W1644': IssueType.ERROR_PRONE,  # __rdiv__ method defined
+    'W1617': IssueType.ERROR_PRONE,  # __setslice__ method defined
+    'W1601': IssueType.ERROR_PRONE,  # apply built-in referenced
+    'W1602': IssueType.ERROR_PRONE,  # basestring built-in referenced
+    'W1603': IssueType.ERROR_PRONE,  # buffer built-in referenced
+    'W1604': IssueType.ERROR_PRONE,  # cmp built-in referenced
+    'W1605': IssueType.ERROR_PRONE,  # coerce built-in referenced
+    'W1619': IssueType.ERROR_PRONE,  # division w/o __future__ statement
+    'W1606': IssueType.ERROR_PRONE,  # execfile built-in referenced
+    'W1607': IssueType.ERROR_PRONE,  # file built-in referenced
+    'W1618': IssueType.ERROR_PRONE,  # import missing `from __future__ import absolute_import`
+    'W1632': IssueType.ERROR_PRONE,  # input built-in referenced
+    'W1634': IssueType.ERROR_PRONE,  # intern built-in referenced
+    'W1608': IssueType.ERROR_PRONE,  # long built-in referenced
+    'W1653': IssueType.ERROR_PRONE,  # next method defined
+    'W1609': IssueType.ERROR_PRONE,  # raw_input built-in referenced
+    'W1610': IssueType.ERROR_PRONE,  # reduce built-in referenced
+    'W1626': IssueType.ERROR_PRONE,  # reload built-in referenced
+    'W1633': IssueType.ERROR_PRONE,  # round built-in referenced
+    'W1647': IssueType.ERROR_PRONE,  # sys.maxint removed
+    'W1635': IssueType.ERROR_PRONE,  # unichr built-in referenced
+    'W1612': IssueType.ERROR_PRONE,  # unicode built-in referenced
+    'W1613': IssueType.ERROR_PRONE,  # xrange built-in referenced
+
+    # Refactoring checker
+    'R1702': IssueType.COMPLEXITY,  # Too many nested blocks
+    'C0113': IssueType.BEST_PRACTICES,  # Boolean expression contains an unneeded negation
+    'C0201': IssueType.BEST_PRACTICES,  # Consider iterating the dictionary directly instead of calling .keys()
+    'C0206': IssueType.BEST_PRACTICES,  # Consider iterating with .items()
+    'C0200': IssueType.BEST_PRACTICES,  # Consider using enumerate instead of iterating with range and len
+    'C1801': IssueType.BEST_PRACTICES,  # Do not use `len(foo)` without comparison to determine if a 'foo' is empty
+    'C0207': IssueType.BEST_PRACTICES,  # use-maxsplit-arg
+    'C0208': IssueType.BEST_PRACTICES,  # Use a sequence type when iterating over values
+
+    # Stdlib checker
+    'W1501': IssueType.ERROR_PRONE,  # bad-open-mode
+
+    # String checker
+    'W1308': IssueType.ERROR_PRONE,  # Duplicate string formatting argument, consider passing as named argument
+    'W1305': IssueType.ERROR_PRONE,  # Format string contains both automatic numbering and manual specification
+    'W1300': IssueType.ERROR_PRONE,  # Format string dictionary key should be a string
+    'W1302': IssueType.ERROR_PRONE,  # Invalid format string
+    'W1306': IssueType.ERROR_PRONE,  # Missing format attribute in format specifier
+    'W1303': IssueType.ERROR_PRONE,  # Missing keyword argument for format string
+    'W1304': IssueType.ERROR_PRONE,  # Unused format argument
+    'W1301': IssueType.ERROR_PRONE,  # Unused key in format string dictionary
+    'W1309': IssueType.ERROR_PRONE,  # Using an f-string that does not have any interpolated variables
+    'W1310': IssueType.ERROR_PRONE,  # Using formatting for a string that does not have any interpolated variables
+    'W1307': IssueType.ERROR_PRONE,  # Using invalid lookup key in format specifier
+
+    # Variables check
+    'W0632': IssueType.ERROR_PRONE,  # Possible unbalanced tuple unpacking with sequence
+    'W0622': IssueType.ERROR_PRONE,  # Redefining built-in
+    'W0631': IssueType.ERROR_PRONE,  # Using possibly undefined loop variable
+
+    # Other
+    'W0312': IssueType.CODE_STYLE,  # mixed indentation
+}
+
 # C convention related checks
 # R refactoring related checks
 # W warnings for stylistic issues, or minor programming issues
 # E errors, for probable bugs in the code
 
-CODE_TO_ISSUE_TYPE: Dict[str, IssueType] = {
-    'C0200': IssueType.BEST_PRACTICES,  # consider using enumerate
-    'C0415': IssueType.BEST_PRACTICES,  # import-outside-toplevel
-    'W0101': IssueType.ERROR_PRONE,  # unreachable code
-    'W0102': IssueType.ERROR_PRONE,  # dangerous default value
-    'W0104': IssueType.ERROR_PRONE,  # statement doesn't have any effect
-    'W0109': IssueType.ERROR_PRONE,  # duplicate key in dictionary
-    'W0221': IssueType.ERROR_PRONE,  # arguments number differs from method
-    'W0222': IssueType.ERROR_PRONE,  # different signature
-    'W0223': IssueType.ERROR_PRONE,  # abstract method is not overridden
-    'W0231': IssueType.ERROR_PRONE,  # super init not called
-    'W0311': IssueType.CODE_STYLE,  # bad indentation
-    'W0312': IssueType.CODE_STYLE,  # mixed indentation
-    'W0631': IssueType.ERROR_PRONE,  # using an undefined loop variable
-    'W0622': IssueType.ERROR_PRONE,  # redefining built-in
-    'W1648': IssueType.ERROR_PRONE,  # a module is no longer exists
-}
-
 CATEGORY_TO_ISSUE_TYPE: Dict[str, IssueType] = {
     'C': IssueType.CODE_STYLE,
     'R': IssueType.BEST_PRACTICES,
diff --git a/src/python/review/inspectors/pylint/pylint.py b/src/python/review/inspectors/pylint/pylint.py
index e5a256cb..5467f998 100644
--- a/src/python/review/inspectors/pylint/pylint.py
+++ b/src/python/review/inspectors/pylint/pylint.py
@@ -1,12 +1,12 @@
 import logging
 import re
 from pathlib import Path
-from typing import List, Optional
+from typing import Any, Dict, List, Optional
 
 from src.python.review.common.subprocess_runner import run_in_subprocess
 from src.python.review.inspectors.base_inspector import BaseInspector
 from src.python.review.inspectors.inspector_type import InspectorType
-from src.python.review.inspectors.issue import CodeIssue, IssueType
+from src.python.review.inspectors.issue import CodeIssue, IssueDifficulty, IssueType
 from src.python.review.inspectors.pylint.issue_types import CATEGORY_TO_ISSUE_TYPE, CODE_TO_ISSUE_TYPE
 from src.python.review.inspectors.tips import add_complexity_tip
 
@@ -25,7 +25,7 @@ class PylintInspector(BaseInspector):
     )
 
     @classmethod
-    def inspect(cls, path: Path, config: dict) -> List[CodeIssue]:
+    def inspect(cls, path: Path, config: Dict[str, Any]) -> List[CodeIssue]:
         command = [
             'pylint',
             '--load-plugins', 'pylint_django',
@@ -71,6 +71,7 @@ def parse(cls, output: str) -> List[CodeIssue]:
                 description=description,
                 inspector_type=cls.inspector_type,
                 type=issue_type,
+                difficulty=IssueDifficulty.get_by_issue_type(issue_type),
             ))
 
         return issues
diff --git a/src/python/review/inspectors/pylint/pylintrc b/src/python/review/inspectors/pylint/pylintrc
index 357ba058..7ce63a81 100644
--- a/src/python/review/inspectors/pylint/pylintrc
+++ b/src/python/review/inspectors/pylint/pylintrc
@@ -166,6 +166,7 @@ disable=invalid-name,
         no-else-continue,
         W0614,
         W0622,
+        W0511,
 
 # Enable the message, report, category or checker with the given id(s). You can
 # either give multiple identifier separated by comma (,) or put this option
diff --git a/src/python/review/inspectors/radon/radon.py b/src/python/review/inspectors/radon/radon.py
index 79223164..4499b890 100644
--- a/src/python/review/inspectors/radon/radon.py
+++ b/src/python/review/inspectors/radon/radon.py
@@ -1,27 +1,33 @@
 import re
 from pathlib import Path
-from typing import List
+from typing import Any, Dict, List
 
 from src.python.review.common.subprocess_runner import run_in_subprocess
 from src.python.review.inspectors.base_inspector import BaseInspector
 from src.python.review.inspectors.common import convert_percentage_of_value_to_lack_of_value
 from src.python.review.inspectors.inspector_type import InspectorType
-from src.python.review.inspectors.issue import BaseIssue, IssueData, IssueType, MaintainabilityLackIssue
+from src.python.review.inspectors.issue import (
+    BaseIssue,
+    IssueData,
+    IssueDifficulty,
+    IssueType,
+    MaintainabilityLackIssue,
+)
 from src.python.review.inspectors.tips import get_maintainability_index_tip
 
 
-MAINTAINABILITY_ORIGIN_CLASS = "RAD100"
+MAINTAINABILITY_ORIGIN_CLASS = 'RAD100'
 
 
 class RadonInspector(BaseInspector):
     inspector_type = InspectorType.RADON
 
     @classmethod
-    def inspect(cls, path: Path, config: dict) -> List[BaseIssue]:
+    def inspect(cls, path: Path, config: Dict[str, Any]) -> List[BaseIssue]:
         mi_command = [
-            "radon", "mi",  # compute the Maintainability Index score
-            "--max", "F",  # set the maximum MI rank to display
-            "--show",  # actual MI value is shown in results, alongside the rank
+            'radon', 'mi',  # compute the Maintainability Index score
+            '--max', 'F',  # set the maximum MI rank to display
+            '--show',  # actual MI value is shown in results, alongside the rank
             path,
         ]
 
@@ -31,26 +37,36 @@ def inspect(cls, path: Path, config: dict) -> List[BaseIssue]:
     @classmethod
     def mi_parse(cls, mi_output: str) -> List[BaseIssue]:
         """
-        Parses the results of the "mi" command.
+        Parses the results of the 'mi' command.
         Description: https://radon.readthedocs.io/en/latest/commandline.html#the-mi-command
 
-        :param mi_output: "mi" command output.
+        :param mi_output: 'mi' command output.
         :return: list of issues.
         """
-        row_re = re.compile(r"^(.*) - \w \((.*)\)$", re.M)
+        row_re = re.compile(r'^(.*) - \w \((.*)\)$', re.M)
 
         issues: List[BaseIssue] = []
         for groups in row_re.findall(mi_output):
             file_path = Path(groups[0])
             maintainability_lack = convert_percentage_of_value_to_lack_of_value(float(groups[1]))
 
+            issue_type = cls.choose_issue_type(MAINTAINABILITY_ORIGIN_CLASS)
+
             issue_data = IssueData.get_base_issue_data_dict(
                 file_path, cls.inspector_type, origin_class=MAINTAINABILITY_ORIGIN_CLASS,
             )
             issue_data[IssueData.DESCRIPTION.value] = get_maintainability_index_tip()
             issue_data[IssueData.MAINTAINABILITY_LACK.value] = maintainability_lack
-            issue_data[IssueData.ISSUE_TYPE.value] = IssueType.MAINTAINABILITY
+            issue_data[IssueData.ISSUE_TYPE.value] = issue_type
+            issue_data[IssueData.DIFFICULTY.value] = IssueDifficulty.get_by_issue_type(issue_type)
 
             issues.append(MaintainabilityLackIssue(**issue_data))
 
         return issues
+
+    @staticmethod
+    def choose_issue_type(code: str) -> IssueType:
+        if code == MAINTAINABILITY_ORIGIN_CLASS:
+            return IssueType.MAINTAINABILITY
+
+        return IssueType.BEST_PRACTICES
diff --git a/src/python/review/inspectors/spotbugs/files/LICENSE-ASM.txt b/src/python/review/inspectors/spotbugs/files/LICENSE-ASM.txt
deleted file mode 100644
index 75ad085e..00000000
--- a/src/python/review/inspectors/spotbugs/files/LICENSE-ASM.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Copyright (c) 2000-2005 INRIA, France Telecom
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holders nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/src/python/review/inspectors/spotbugs/files/LICENSE-AppleJavaExtensions.txt b/src/python/review/inspectors/spotbugs/files/LICENSE-AppleJavaExtensions.txt
deleted file mode 100644
index db723b46..00000000
--- a/src/python/review/inspectors/spotbugs/files/LICENSE-AppleJavaExtensions.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-AppleJavaExtensions
-v 1.2
-
-This is a pluggable jar of stub classes representing the new Apple eAWT and eIO APIs for Java 1.4 on Mac OS X.  The purpose of these stubs is to allow for compilation of eAWT- or eIO-referencing code on platforms other than Mac OS X.  The jar file is enclosed in a zip archive for easy expansion on other platforms.  
-
-These stubs are not intended for the runtime classpath on non-Mac platforms.  Please see the OSXAdapter sample for how to write cross-platform code that uses eAWT.
-
-Disclaimer: IMPORTANT:  This Apple software is supplied to you by Apple
-Computer, Inc. ("Apple") in consideration of your agreement to the
-following terms, and your use, installation, modification or
-redistribution of this Apple software constitutes acceptance of these
-terms.  If you do not agree with these terms, please do not use,
-install, modify or redistribute this Apple software.
-
-In consideration of your agreement to abide by the following terms, and
-subject to these terms, Apple grants you a personal, non-exclusive
-license, under Apple's copyrights in this original Apple software (the
-"Apple Software"), to use, reproduce, modify and redistribute the Apple
-Software, with or without modifications, in source and/or binary forms;
-provided that if you redistribute the Apple Software in its entirety and
-without modifications, you must retain this notice and the following
-text and disclaimers in all such redistributions of the Apple Software. 
-Neither the name, trademarks, service marks or logos of Apple Computer,
-Inc. may be used to endorse or promote products derived from the Apple
-Software without specific prior written permission from Apple.  Except
-as expressly stated in this notice, no other rights or licenses, express
-or implied, are granted by Apple herein, including but not limited to
-any patent rights that may be infringed by your derivative works or by
-other works in which the Apple Software may be incorporated.
-
-The Apple Software is provided by Apple on an "AS IS" basis.  APPLE
-MAKES NO WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION
-THE IMPLIED WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND
-OPERATION ALONE OR IN COMBINATION WITH YOUR PRODUCTS.
-
-IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL
-OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION,
-MODIFICATION AND/OR DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED
-AND WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING NEGLIGENCE),
-STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-Copyright � 2003-2006 Apple Computer, Inc., All Rights Reserved
\ No newline at end of file
diff --git a/src/python/review/inspectors/spotbugs/files/LICENSE-Saxon-HE.txt b/src/python/review/inspectors/spotbugs/files/LICENSE-Saxon-HE.txt
deleted file mode 100644
index f4bbcd20..00000000
--- a/src/python/review/inspectors/spotbugs/files/LICENSE-Saxon-HE.txt
+++ /dev/null
@@ -1,373 +0,0 @@
-Mozilla Public License Version 2.0
-==================================
-
-1. Definitions
---------------
-
-1.1. "Contributor"
-    means each individual or legal entity that creates, contributes to
-    the creation of, or owns Covered Software.
-
-1.2. "Contributor Version"
-    means the combination of the Contributions of others (if any) used
-    by a Contributor and that particular Contributor's Contribution.
-
-1.3. "Contribution"
-    means Covered Software of a particular Contributor.
-
-1.4. "Covered Software"
-    means Source Code Form to which the initial Contributor has attached
-    the notice in Exhibit A, the Executable Form of such Source Code
-    Form, and Modifications of such Source Code Form, in each case
-    including portions thereof.
-
-1.5. "Incompatible With Secondary Licenses"
-    means
-
-    (a) that the initial Contributor has attached the notice described
-        in Exhibit B to the Covered Software; or
-
-    (b) that the Covered Software was made available under the terms of
-        version 1.1 or earlier of the License, but not also under the
-        terms of a Secondary License.
-
-1.6. "Executable Form"
-    means any form of the work other than Source Code Form.
-
-1.7. "Larger Work"
-    means a work that combines Covered Software with other material, in 
-    a separate file or files, that is not Covered Software.
-
-1.8. "License"
-    means this document.
-
-1.9. "Licensable"
-    means having the right to grant, to the maximum extent possible,
-    whether at the time of the initial grant or subsequently, any and
-    all of the rights conveyed by this License.
-
-1.10. "Modifications"
-    means any of the following:
-
-    (a) any file in Source Code Form that results from an addition to,
-        deletion from, or modification of the contents of Covered
-        Software; or
-
-    (b) any new file in Source Code Form that contains any Covered
-        Software.
-
-1.11. "Patent Claims" of a Contributor
-    means any patent claim(s), including without limitation, method,
-    process, and apparatus claims, in any patent Licensable by such
-    Contributor that would be infringed, but for the grant of the
-    License, by the making, using, selling, offering for sale, having
-    made, import, or transfer of either its Contributions or its
-    Contributor Version.
-
-1.12. "Secondary License"
-    means either the GNU General Public License, Version 2.0, the GNU
-    Lesser General Public License, Version 2.1, the GNU Affero General
-    Public License, Version 3.0, or any later versions of those
-    licenses.
-
-1.13. "Source Code Form"
-    means the form of the work preferred for making modifications.
-
-1.14. "You" (or "Your")
-    means an individual or a legal entity exercising rights under this
-    License. For legal entities, "You" includes any entity that
-    controls, is controlled by, or is under common control with You. For
-    purposes of this definition, "control" means (a) the power, direct
-    or indirect, to cause the direction or management of such entity,
-    whether by contract or otherwise, or (b) ownership of more than
-    fifty percent (50%) of the outstanding shares or beneficial
-    ownership of such entity.
-
-2. License Grants and Conditions
---------------------------------
-
-2.1. Grants
-
-Each Contributor hereby grants You a world-wide, royalty-free,
-non-exclusive license:
-
-(a) under intellectual property rights (other than patent or trademark)
-    Licensable by such Contributor to use, reproduce, make available,
-    modify, display, perform, distribute, and otherwise exploit its
-    Contributions, either on an unmodified basis, with Modifications, or
-    as part of a Larger Work; and
-
-(b) under Patent Claims of such Contributor to make, use, sell, offer
-    for sale, have made, import, and otherwise transfer either its
-    Contributions or its Contributor Version.
-
-2.2. Effective Date
-
-The licenses granted in Section 2.1 with respect to any Contribution
-become effective for each Contribution on the date the Contributor first
-distributes such Contribution.
-
-2.3. Limitations on Grant Scope
-
-The licenses granted in this Section 2 are the only rights granted under
-this License. No additional rights or licenses will be implied from the
-distribution or licensing of Covered Software under this License.
-Notwithstanding Section 2.1(b) above, no patent license is granted by a
-Contributor:
-
-(a) for any code that a Contributor has removed from Covered Software;
-    or
-
-(b) for infringements caused by: (i) Your and any other third party's
-    modifications of Covered Software, or (ii) the combination of its
-    Contributions with other software (except as part of its Contributor
-    Version); or
-
-(c) under Patent Claims infringed by Covered Software in the absence of
-    its Contributions.
-
-This License does not grant any rights in the trademarks, service marks,
-or logos of any Contributor (except as may be necessary to comply with
-the notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-No Contributor makes additional grants as a result of Your choice to
-distribute the Covered Software under a subsequent version of this
-License (see Section 10.2) or under the terms of a Secondary License (if
-permitted under the terms of Section 3.3).
-
-2.5. Representation
-
-Each Contributor represents that the Contributor believes its
-Contributions are its original creation(s) or it has sufficient rights
-to grant the rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-This License is not intended to limit any rights You have under
-applicable copyright doctrines of fair use, fair dealing, or other
-equivalents.
-
-2.7. Conditions
-
-Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
-in Section 2.1.
-
-3. Responsibilities
--------------------
-
-3.1. Distribution of Source Form
-
-All distribution of Covered Software in Source Code Form, including any
-Modifications that You create or to which You contribute, must be under
-the terms of this License. You must inform recipients that the Source
-Code Form of the Covered Software is governed by the terms of this
-License, and how they can obtain a copy of this License. You may not
-attempt to alter or restrict the recipients' rights in the Source Code
-Form.
-
-3.2. Distribution of Executable Form
-
-If You distribute Covered Software in Executable Form then:
-
-(a) such Covered Software must also be made available in Source Code
-    Form, as described in Section 3.1, and You must inform recipients of
-    the Executable Form how they can obtain a copy of such Source Code
-    Form by reasonable means in a timely manner, at a charge no more
-    than the cost of distribution to the recipient; and
-
-(b) You may distribute such Executable Form under the terms of this
-    License, or sublicense it under different terms, provided that the
-    license for the Executable Form does not attempt to limit or alter
-    the recipients' rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-You may create and distribute a Larger Work under terms of Your choice,
-provided that You also comply with the requirements of this License for
-the Covered Software. If the Larger Work is a combination of Covered
-Software with a work governed by one or more Secondary Licenses, and the
-Covered Software is not Incompatible With Secondary Licenses, this
-License permits You to additionally distribute such Covered Software
-under the terms of such Secondary License(s), so that the recipient of
-the Larger Work may, at their option, further distribute the Covered
-Software under the terms of either this License or such Secondary
-License(s).
-
-3.4. Notices
-
-You may not remove or alter the substance of any license notices
-(including copyright notices, patent notices, disclaimers of warranty,
-or limitations of liability) contained within the Source Code Form of
-the Covered Software, except that You may alter any license notices to
-the extent required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-You may choose to offer, and to charge a fee for, warranty, support,
-indemnity or liability obligations to one or more recipients of Covered
-Software. However, You may do so only on Your own behalf, and not on
-behalf of any Contributor. You must make it absolutely clear that any
-such warranty, support, indemnity, or liability obligation is offered by
-You alone, and You hereby agree to indemnify every Contributor for any
-liability incurred by such Contributor as a result of warranty, support,
-indemnity or liability terms You offer. You may include additional
-disclaimers of warranty and limitations of liability specific to any
-jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
----------------------------------------------------
-
-If it is impossible for You to comply with any of the terms of this
-License with respect to some or all of the Covered Software due to
-statute, judicial order, or regulation then You must: (a) comply with
-the terms of this License to the maximum extent possible; and (b)
-describe the limitations and the code they affect. Such description must
-be placed in a text file included with all distributions of the Covered
-Software under this License. Except to the extent prohibited by statute
-or regulation, such description must be sufficiently detailed for a
-recipient of ordinary skill to be able to understand it.
-
-5. Termination
---------------
-
-5.1. The rights granted under this License will terminate automatically
-if You fail to comply with any of its terms. However, if You become
-compliant, then the rights granted under this License from a particular
-Contributor are reinstated (a) provisionally, unless and until such
-Contributor explicitly and finally terminates Your grants, and (b) on an
-ongoing basis, if such Contributor fails to notify You of the
-non-compliance by some reasonable means prior to 60 days after You have
-come back into compliance. Moreover, Your grants from a particular
-Contributor are reinstated on an ongoing basis if such Contributor
-notifies You of the non-compliance by some reasonable means, this is the
-first time You have received notice of non-compliance with this License
-from such Contributor, and You become compliant prior to 30 days after
-Your receipt of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-infringement claim (excluding declaratory judgment actions,
-counter-claims, and cross-claims) alleging that a Contributor Version
-directly or indirectly infringes any patent, then the rights granted to
-You by any and all Contributors for the Covered Software under Section
-2.1 of this License shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all
-end user license agreements (excluding distributors and resellers) which
-have been validly granted by You or Your distributors under this License
-prior to termination shall survive termination.
-
-************************************************************************
-*                                                                      *
-*  6. Disclaimer of Warranty                                           *
-*  -------------------------                                           *
-*                                                                      *
-*  Covered Software is provided under this License on an "as is"       *
-*  basis, without warranty of any kind, either expressed, implied, or  *
-*  statutory, including, without limitation, warranties that the       *
-*  Covered Software is free of defects, merchantable, fit for a        *
-*  particular purpose or non-infringing. The entire risk as to the     *
-*  quality and performance of the Covered Software is with You.        *
-*  Should any Covered Software prove defective in any respect, You     *
-*  (not any Contributor) assume the cost of any necessary servicing,   *
-*  repair, or correction. This disclaimer of warranty constitutes an   *
-*  essential part of this License. No use of any Covered Software is   *
-*  authorized under this License except under this disclaimer.         *
-*                                                                      *
-************************************************************************
-
-************************************************************************
-*                                                                      *
-*  7. Limitation of Liability                                          *
-*  --------------------------                                          *
-*                                                                      *
-*  Under no circumstances and under no legal theory, whether tort      *
-*  (including negligence), contract, or otherwise, shall any           *
-*  Contributor, or anyone who distributes Covered Software as          *
-*  permitted above, be liable to You for any direct, indirect,         *
-*  special, incidental, or consequential damages of any character      *
-*  including, without limitation, damages for lost profits, loss of    *
-*  goodwill, work stoppage, computer failure or malfunction, or any    *
-*  and all other commercial damages or losses, even if such party      *
-*  shall have been informed of the possibility of such damages. This   *
-*  limitation of liability shall not apply to liability for death or   *
-*  personal injury resulting from such party's negligence to the       *
-*  extent applicable law prohibits such limitation. Some               *
-*  jurisdictions do not allow the exclusion or limitation of           *
-*  incidental or consequential damages, so this exclusion and          *
-*  limitation may not apply to You.                                    *
-*                                                                      *
-************************************************************************
-
-8. Litigation
--------------
-
-Any litigation relating to this License may be brought only in the
-courts of a jurisdiction where the defendant maintains its principal
-place of business and such litigation shall be governed by laws of that
-jurisdiction, without reference to its conflict-of-law provisions.
-Nothing in this Section shall prevent a party's ability to bring
-cross-claims or counter-claims.
-
-9. Miscellaneous
-----------------
-
-This License represents the complete agreement concerning the subject
-matter hereof. If any provision of this License is held to be
-unenforceable, such provision shall be reformed only to the extent
-necessary to make it enforceable. Any law or regulation which provides
-that the language of a contract shall be construed against the drafter
-shall not be used to construe this License against a Contributor.
-
-10. Versions of the License
----------------------------
-
-10.1. New Versions
-
-Mozilla Foundation is the license steward. Except as provided in Section
-10.3, no one other than the license steward has the right to modify or
-publish new versions of this License. Each version will be given a
-distinguishing version number.
-
-10.2. Effect of New Versions
-
-You may distribute the Covered Software under the terms of the version
-of the License under which You originally received the Covered Software,
-or under the terms of any subsequent version published by the license
-steward.
-
-10.3. Modified Versions
-
-If you create software not governed by this License, and you want to
-create a new license for such software, you may create and use a
-modified version of this License if you rename the license and remove
-any references to the name of the license steward (except to note that
-such modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary
-Licenses
-
-If You choose to distribute Source Code Form that is Incompatible With
-Secondary Licenses under the terms of this version of the License, the
-notice described in Exhibit B of this License must be attached.
-
-Exhibit A - Source Code Form License Notice
--------------------------------------------
-
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular
-file, then You may include the notice in a location (such as a LICENSE
-file in a relevant directory) where a recipient would be likely to look
-for such a notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - "Incompatible With Secondary Licenses" Notice
----------------------------------------------------------
-
-  This Source Code Form is "Incompatible With Secondary Licenses", as
-  defined by the Mozilla Public License, v. 2.0.
\ No newline at end of file
diff --git a/src/python/review/inspectors/spotbugs/files/LICENSE-bcel.txt b/src/python/review/inspectors/spotbugs/files/LICENSE-bcel.txt
deleted file mode 100644
index 1c572e31..00000000
--- a/src/python/review/inspectors/spotbugs/files/LICENSE-bcel.txt
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- *                                 Apache License
- *                           Version 2.0, January 2004
- *                        http://www.apache.org/licenses/
- *
- *   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
- *
- *   1. Definitions.
- *
- *      "License" shall mean the terms and conditions for use, reproduction,
- *      and distribution as defined by Sections 1 through 9 of this document.
- *
- *      "Licensor" shall mean the copyright owner or entity authorized by
- *      the copyright owner that is granting the License.
- *
- *      "Legal Entity" shall mean the union of the acting entity and all
- *      other entities that control, are controlled by, or are under common
- *      control with that entity. For the purposes of this definition,
- *      "control" means (i) the power, direct or indirect, to cause the
- *      direction or management of such entity, whether by contract or
- *      otherwise, or (ii) ownership of fifty percent (50%) or more of the
- *      outstanding shares, or (iii) beneficial ownership of such entity.
- *
- *      "You" (or "Your") shall mean an individual or Legal Entity
- *      exercising permissions granted by this License.
- *
- *      "Source" form shall mean the preferred form for making modifications,
- *      including but not limited to software source code, documentation
- *      source, and configuration files.
- *
- *      "Object" form shall mean any form resulting from mechanical
- *      transformation or translation of a Source form, including but
- *      not limited to compiled object code, generated documentation,
- *      and conversions to other media types.
- *
- *      "Work" shall mean the work of authorship, whether in Source or
- *      Object form, made available under the License, as indicated by a
- *      copyright notice that is included in or attached to the work
- *      (an example is provided in the Appendix below).
- *
- *      "Derivative Works" shall mean any work, whether in Source or Object
- *      form, that is based on (or derived from) the Work and for which the
- *      editorial revisions, annotations, elaborations, or other modifications
- *      represent, as a whole, an original work of authorship. For the purposes
- *      of this License, Derivative Works shall not include works that remain
- *      separable from, or merely link (or bind by name) to the interfaces of,
- *      the Work and Derivative Works thereof.
- *
- *      "Contribution" shall mean any work of authorship, including
- *      the original version of the Work and any modifications or additions
- *      to that Work or Derivative Works thereof, that is intentionally
- *      submitted to Licensor for inclusion in the Work by the copyright owner
- *      or by an individual or Legal Entity authorized to submit on behalf of
- *      the copyright owner. For the purposes of this definition, "submitted"
- *      means any form of electronic, verbal, or written communication sent
- *      to the Licensor or its representatives, including but not limited to
- *      communication on electronic mailing lists, source code control systems,
- *      and issue tracking systems that are managed by, or on behalf of, the
- *      Licensor for the purpose of discussing and improving the Work, but
- *      excluding communication that is conspicuously marked or otherwise
- *      designated in writing by the copyright owner as "Not a Contribution."
- *
- *      "Contributor" shall mean Licensor and any individual or Legal Entity
- *      on behalf of whom a Contribution has been received by Licensor and
- *      subsequently incorporated within the Work.
- *
- *   2. Grant of Copyright License. Subject to the terms and conditions of
- *      this License, each Contributor hereby grants to You a perpetual,
- *      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- *      copyright license to reproduce, prepare Derivative Works of,
- *      publicly display, publicly perform, sublicense, and distribute the
- *      Work and such Derivative Works in Source or Object form.
- *
- *   3. Grant of Patent License. Subject to the terms and conditions of
- *      this License, each Contributor hereby grants to You a perpetual,
- *      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- *      (except as stated in this section) patent license to make, have made,
- *      use, offer to sell, sell, import, and otherwise transfer the Work,
- *      where such license applies only to those patent claims licensable
- *      by such Contributor that are necessarily infringed by their
- *      Contribution(s) alone or by combination of their Contribution(s)
- *      with the Work to which such Contribution(s) was submitted. If You
- *      institute patent litigation against any entity (including a
- *      cross-claim or counterclaim in a lawsuit) alleging that the Work
- *      or a Contribution incorporated within the Work constitutes direct
- *      or contributory patent infringement, then any patent licenses
- *      granted to You under this License for that Work shall terminate
- *      as of the date such litigation is filed.
- *
- *   4. Redistribution. You may reproduce and distribute copies of the
- *      Work or Derivative Works thereof in any medium, with or without
- *      modifications, and in Source or Object form, provided that You
- *      meet the following conditions:
- *
- *      (a) You must give any other recipients of the Work or
- *          Derivative Works a copy of this License; and
- *
- *      (b) You must cause any modified files to carry prominent notices
- *          stating that You changed the files; and
- *
- *      (c) You must retain, in the Source form of any Derivative Works
- *          that You distribute, all copyright, patent, trademark, and
- *          attribution notices from the Source form of the Work,
- *          excluding those notices that do not pertain to any part of
- *          the Derivative Works; and
- *
- *      (d) If the Work includes a "NOTICE" text file as part of its
- *          distribution, then any Derivative Works that You distribute must
- *          include a readable copy of the attribution notices contained
- *          within such NOTICE file, excluding those notices that do not
- *          pertain to any part of the Derivative Works, in at least one
- *          of the following places: within a NOTICE text file distributed
- *          as part of the Derivative Works; within the Source form or
- *          documentation, if provided along with the Derivative Works; or,
- *          within a display generated by the Derivative Works, if and
- *          wherever such third-party notices normally appear. The contents
- *          of the NOTICE file are for informational purposes only and
- *          do not modify the License. You may add Your own attribution
- *          notices within Derivative Works that You distribute, alongside
- *          or as an addendum to the NOTICE text from the Work, provided
- *          that such additional attribution notices cannot be construed
- *          as modifying the License.
- *
- *      You may add Your own copyright statement to Your modifications and
- *      may provide additional or different license terms and conditions
- *      for use, reproduction, or distribution of Your modifications, or
- *      for any such Derivative Works as a whole, provided Your use,
- *      reproduction, and distribution of the Work otherwise complies with
- *      the conditions stated in this License.
- *
- *   5. Submission of Contributions. Unless You explicitly state otherwise,
- *      any Contribution intentionally submitted for inclusion in the Work
- *      by You to the Licensor shall be under the terms and conditions of
- *      this License, without any additional terms or conditions.
- *      Notwithstanding the above, nothing herein shall supersede or modify
- *      the terms of any separate license agreement you may have executed
- *      with Licensor regarding such Contributions.
- *
- *   6. Trademarks. This License does not grant permission to use the trade
- *      names, trademarks, service marks, or product names of the Licensor,
- *      except as required for reasonable and customary use in describing the
- *      origin of the Work and reproducing the content of the NOTICE file.
- *
- *   7. Disclaimer of Warranty. Unless required by applicable law or
- *      agreed to in writing, Licensor provides the Work (and each
- *      Contributor provides its Contributions) on an "AS IS" BASIS,
- *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *      implied, including, without limitation, any warranties or conditions
- *      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- *      PARTICULAR PURPOSE. You are solely responsible for determining the
- *      appropriateness of using or redistributing the Work and assume any
- *      risks associated with Your exercise of permissions under this License.
- *
- *   8. Limitation of Liability. In no event and under no legal theory,
- *      whether in tort (including negligence), contract, or otherwise,
- *      unless required by applicable law (such as deliberate and grossly
- *      negligent acts) or agreed to in writing, shall any Contributor be
- *      liable to You for damages, including any direct, indirect, special,
- *      incidental, or consequential damages of any character arising as a
- *      result of this License or out of the use or inability to use the
- *      Work (including but not limited to damages for loss of goodwill,
- *      work stoppage, computer failure or malfunction, or any and all
- *      other commercial damages or losses), even if such Contributor
- *      has been advised of the possibility of such damages.
- *
- *   9. Accepting Warranty or Additional Liability. While redistributing
- *      the Work or Derivative Works thereof, You may choose to offer,
- *      and charge a fee for, acceptance of support, warranty, indemnity,
- *      or other liability obligations and/or rights consistent with this
- *      License. However, in accepting such obligations, You may act only
- *      on Your own behalf and on Your sole responsibility, not on behalf
- *      of any other Contributor, and only if You agree to indemnify,
- *      defend, and hold each Contributor harmless for any liability
- *      incurred by, or claims asserted against, such Contributor by reason
- *      of your accepting any such warranty or additional liability.
- *
- *   END OF TERMS AND CONDITIONS
- *
- *   APPENDIX: How to apply the Apache License to your work.
- *
- *      To apply the Apache License to your work, attach the following
- *      boilerplate notice, with the fields enclosed by brackets "[]"
- *      replaced with your own identifying information. (Don't include
- *      the brackets!)  The text should be enclosed in the appropriate
- *      comment syntax for the file format. We also recommend that a
- *      file or class name and description of purpose be included on the
- *      same "printed page" as the copyright notice for easier
- *      identification within third-party archives.
- *
- *   Copyright [yyyy] [name of copyright owner]
- *
- *   Licensed 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
- *
- *       http://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.
- */
-
diff --git a/src/python/review/inspectors/spotbugs/files/LICENSE-commons-lang.txt b/src/python/review/inspectors/spotbugs/files/LICENSE-commons-lang.txt
deleted file mode 100644
index d6456956..00000000
--- a/src/python/review/inspectors/spotbugs/files/LICENSE-commons-lang.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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
-
-       http://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.
diff --git a/src/python/review/inspectors/spotbugs/files/LICENSE-docbook.txt b/src/python/review/inspectors/spotbugs/files/LICENSE-docbook.txt
deleted file mode 100644
index 6ba2ed1b..00000000
--- a/src/python/review/inspectors/spotbugs/files/LICENSE-docbook.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
-     O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
-     Corporation, Norman Walsh, Sun Microsystems, Inc., and the
-     Organization for the Advancement of Structured Information
-     Standards (OASIS).
-
-     $Id: LICENSE-docbook.txt,v 1.1 2005/11/28 21:36:47 daveho Exp $
-
-     Permission to use, copy, modify and distribute the DocBook XML DTD
-     and its accompanying documentation for any purpose and without fee
-     is hereby granted in perpetuity, provided that the above copyright
-     notice and this paragraph appear in all copies.  The copyright
-     holders make no representation about the suitability of the DTD for
-     any purpose.  It is provided "as is" without expressed or implied
-     warranty.
-
-     If you modify the DocBook DTD in any way, except for declaring and
-     referencing additional sets of general entities and declaring
-     additional notations, label your DTD as a variant of DocBook.  See
-     the maintenance documentation for more information.
-
-     Please direct all questions, bug reports, or suggestions for
-     changes to the docbook@lists.oasis-open.org mailing list. For more
-     information, see http://www.oasis-open.org/docbook/.
--->
diff --git a/src/python/review/inspectors/spotbugs/files/LICENSE-dom4j.txt b/src/python/review/inspectors/spotbugs/files/LICENSE-dom4j.txt
deleted file mode 100644
index 720c83b7..00000000
--- a/src/python/review/inspectors/spotbugs/files/LICENSE-dom4j.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-BSD style license
-
-Redistribution and use of this software and associated documentation
-("Software"), with or without modification, are permitted provided that
-the following conditions are met:
-
-       1. Redistributions of source code must retain copyright statements
-       and notices. Redistributions must also contain a copy of this
-       document.
-
-       2. Redistributions in binary form must reproduce the above
-       copyright notice, this list of conditions and the following
-       disclaimer in the documentation and/or other materials provided
-       with the distribution.
-
-       3. The name "DOM4J" must not be used to endorse or promote
-       products derived from this Software without prior written
-       permission of MetaStuff, Ltd. For written permission, please
-       contact dom4j-info@metastuff.com.
-
-       4. Products derived from this Software may not be called "DOM4J"
-       nor may "DOM4J" appear in their names without prior written
-       permission of MetaStuff, Ltd. DOM4J is a registered trademark of
-       MetaStuff, Ltd.
-
-       5. Due credit should be given to the DOM4J Project
-       (http://dom4j.org/).
-
-THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS ``AS IS''
-AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL METASTUFF, LTD. OR ITS
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Copyright 2001 (C) MetaStuff, Ltd. All Rights Reserved.
diff --git a/src/python/review/inspectors/spotbugs/files/LICENSE-jaxen.txt b/src/python/review/inspectors/spotbugs/files/LICENSE-jaxen.txt
deleted file mode 100644
index ba31ed98..00000000
--- a/src/python/review/inspectors/spotbugs/files/LICENSE-jaxen.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- $Id: LICENSE-jaxen.txt,v 1.1 2008/06/18 18:54:23 wpugh Exp $
-
- Copyright 2003-2006 The Werken Company. All Rights Reserved.
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-  * Neither the name of the Jaxen Project nor the names of its
-    contributors may be used to endorse or promote products derived 
-    from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- */
diff --git a/src/python/review/inspectors/spotbugs/files/LICENSE-jcip.txt b/src/python/review/inspectors/spotbugs/files/LICENSE-jcip.txt
deleted file mode 100644
index ca697589..00000000
--- a/src/python/review/inspectors/spotbugs/files/LICENSE-jcip.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-The Java code in the package net.jcip.annotations 
-is copyright (c) 2005 Brian Goetz
-and is released under the Creative Commons Attribution License
-(http://creativecommons.org/licenses/by/2.5)
-Official home: http://www.jcip.net
diff --git a/src/python/review/inspectors/spotbugs/files/LICENSE-jsr305.txt b/src/python/review/inspectors/spotbugs/files/LICENSE-jsr305.txt
deleted file mode 100644
index 29fae787..00000000
--- a/src/python/review/inspectors/spotbugs/files/LICENSE-jsr305.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-The JSR-305 reference implementation (lib/jsr305.jar) is
-distributed under the terms of the New BSD license:
-
-  http://www.opensource.org/licenses/bsd-license.php
-  
-See the JSR-305 home page for more information:
-
-  http://code.google.com/p/jsr-305/
diff --git a/src/python/review/inspectors/spotbugs/files/LICENSE-logback.txt b/src/python/review/inspectors/spotbugs/files/LICENSE-logback.txt
deleted file mode 100644
index af39fcb9..00000000
--- a/src/python/review/inspectors/spotbugs/files/LICENSE-logback.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Logback LICENSE
----------------
-
-Logback: the reliable, generic, fast and flexible logging framework.
-Copyright (C) 1999-2015, QOS.ch. All rights reserved.
-
-This program and the accompanying materials are dual-licensed under
-either the terms of the Eclipse Public License v1.0 as published by
-the Eclipse Foundation
- 
-  or (per the licensee's choosing)
- 
-under the terms of the GNU Lesser General Public License version 2.1
-as published by the Free Software Foundation.
-
diff --git a/src/python/review/inspectors/spotbugs/files/LICENSE-slf4j.txt b/src/python/review/inspectors/spotbugs/files/LICENSE-slf4j.txt
deleted file mode 100644
index 315bd497..00000000
--- a/src/python/review/inspectors/spotbugs/files/LICENSE-slf4j.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-Copyright (c) 2004-2017 QOS.ch
-All rights reserved.
-
-Permission is hereby granted, free  of charge, to any person obtaining
-a  copy  of this  software  and  associated  documentation files  (the
-"Software"), to  deal in  the Software without  restriction, including
-without limitation  the rights to  use, copy, modify,  merge, publish,
-distribute,  sublicense, and/or sell  copies of  the Software,  and to
-permit persons to whom the Software  is furnished to do so, subject to
-the following conditions:
-
-The  above  copyright  notice  and  this permission  notice  shall  be
-included in all copies or substantial portions of the Software.
-
-THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
-EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
-MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-
diff --git a/src/python/review/inspectors/spotbugs/files/LICENSE.txt b/src/python/review/inspectors/spotbugs/files/LICENSE.txt
deleted file mode 100644
index b1e3f5a2..00000000
--- a/src/python/review/inspectors/spotbugs/files/LICENSE.txt
+++ /dev/null
@@ -1,504 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/src/python/review/inspectors/spotbugs/files/README.txt b/src/python/review/inspectors/spotbugs/files/README.txt
deleted file mode 100644
index 4ddbe736..00000000
--- a/src/python/review/inspectors/spotbugs/files/README.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-To get started, see doc/index.html and doc/manual/index.html
-
-The FindBugs source license is in the file LICENSE.txt
-
-Both the name FindBugs and the FindBugs bug mark are
-trademarked by the University of Maryland.
-
-The Apache BCEL license is in the file LICENSE-bcel.txt
-
-The ASM license is in the file LICENSE-ASM.txt
-
-The dom4j license is in the file LICENSE-dom4j.txt
-
-The AppleJavaExtensions license is in the file LICENSE-AppleJavaExtensions.txt
-
-The Docbook 4.2 XML DTD license is in the file LICENSE-docbook.txt
-
-The JSR-305 reference implementation license is in LICENSE-jsr305.txt
-
-The Jaxen license is in LICENSE-jaxen.txt
diff --git a/src/python/review/inspectors/spotbugs/files/bin/addMessages b/src/python/review/inspectors/spotbugs/files/bin/addMessages
deleted file mode 100644
index 8861c6db..00000000
--- a/src/python/review/inspectors/spotbugs/files/bin/addMessages
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-exec "$(dirname $0)/fbwrap" edu.umd.cs.findbugs.AddMessages "$@"
diff --git a/src/python/review/inspectors/spotbugs/files/bin/computeBugHistory b/src/python/review/inspectors/spotbugs/files/bin/computeBugHistory
deleted file mode 100644
index 1eadf4f5..00000000
--- a/src/python/review/inspectors/spotbugs/files/bin/computeBugHistory
+++ /dev/null
@@ -1,6 +0,0 @@
-#! /bin/sh
-
-# Merge a historical bug collection and a bug collection, producing an updated
-# historical bug collection
-
-exec "$(dirname $0)/fbwrap" edu.umd.cs.findbugs.workflow.Update "$@"
diff --git a/src/python/review/inspectors/spotbugs/files/bin/convertXmlToText b/src/python/review/inspectors/spotbugs/files/bin/convertXmlToText
deleted file mode 100644
index a0f0d736..00000000
--- a/src/python/review/inspectors/spotbugs/files/bin/convertXmlToText
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-exec "$(dirname $0)/fbwrap" edu.umd.cs.findbugs.PrintingBugReporter "$@"
diff --git a/src/python/review/inspectors/spotbugs/files/bin/copyBuggySource b/src/python/review/inspectors/spotbugs/files/bin/copyBuggySource
deleted file mode 100644
index 6651b05c..00000000
--- a/src/python/review/inspectors/spotbugs/files/bin/copyBuggySource
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-exec "$(dirname $0)/fbwrap" edu.umd.cs.findbugs.workflow.CopyBuggySource "$@"
diff --git a/src/python/review/inspectors/spotbugs/files/bin/defectDensity b/src/python/review/inspectors/spotbugs/files/bin/defectDensity
deleted file mode 100644
index 06c835ab..00000000
--- a/src/python/review/inspectors/spotbugs/files/bin/defectDensity
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /bin/sh
-
-# Generate a defect density table from a bug collection
-
-exec "$(dirname $0)/fbwrap" edu.umd.cs.findbugs.workflow.DefectDensity "$@"
diff --git a/src/python/review/inspectors/spotbugs/files/bin/deprecated/bugHistory b/src/python/review/inspectors/spotbugs/files/bin/deprecated/bugHistory
deleted file mode 100644
index 679c4b0b..00000000
--- a/src/python/review/inspectors/spotbugs/files/bin/deprecated/bugHistory
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /bin/sh
-
-# Deprecated
-
-exec "$(dirname $0)/../fbwrap" edu.umd.cs.findbugs.workflow.BugHistory "$@"
diff --git a/src/python/review/inspectors/spotbugs/files/bin/deprecated/unionBugs b/src/python/review/inspectors/spotbugs/files/bin/deprecated/unionBugs
deleted file mode 100644
index bdce784d..00000000
--- a/src/python/review/inspectors/spotbugs/files/bin/deprecated/unionBugs
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /bin/sh
-
-# Deprecated
-
-exec "$(dirname $0)/../unionBugs" "$@"
diff --git a/src/python/review/inspectors/spotbugs/files/bin/deprecated/unionResults b/src/python/review/inspectors/spotbugs/files/bin/deprecated/unionResults
deleted file mode 100644
index 14d227bd..00000000
--- a/src/python/review/inspectors/spotbugs/files/bin/deprecated/unionResults
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /bin/sh
-
-# Deprecated (replaced by unionBugs)
-
-exec "$(dirname $0)/../unionBugs" "$@"
diff --git a/src/python/review/inspectors/spotbugs/files/bin/deprecated/updateBugs b/src/python/review/inspectors/spotbugs/files/bin/deprecated/updateBugs
deleted file mode 100644
index 365c5fea..00000000
--- a/src/python/review/inspectors/spotbugs/files/bin/deprecated/updateBugs
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /bin/sh
-
-# Deprecated (replaced by computeBugHistory)
-
-exec "$(dirname $0)/../computeBugHistory" "$@"
diff --git a/src/python/review/inspectors/spotbugs/files/bin/experimental/backdateHistoryUsingSource b/src/python/review/inspectors/spotbugs/files/bin/experimental/backdateHistoryUsingSource
deleted file mode 100644
index 04f55ee6..00000000
--- a/src/python/review/inspectors/spotbugs/files/bin/experimental/backdateHistoryUsingSource
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-exec "$(dirname $0)/../fbwrap" edu.umd.cs.findbugs.workflow.BackdateHistoryUsingSource "$@"
diff --git a/src/python/review/inspectors/spotbugs/files/bin/experimental/churn b/src/python/review/inspectors/spotbugs/files/bin/experimental/churn
deleted file mode 100644
index 4372b5bf..00000000
--- a/src/python/review/inspectors/spotbugs/files/bin/experimental/churn
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-exec "$(dirname $0)/../fbwrap" edu.umd.cs.findbugs.workflow.Churn "$@"
diff --git a/src/python/review/inspectors/spotbugs/files/bin/experimental/obfuscate b/src/python/review/inspectors/spotbugs/files/bin/experimental/obfuscate
deleted file mode 100644
index 6e6bedde..00000000
--- a/src/python/review/inspectors/spotbugs/files/bin/experimental/obfuscate
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-exec "$(dirname $0)/../fbwrap" edu.umd.cs.findbugs.workflow.ObfuscateBugs "$@"
diff --git a/src/python/review/inspectors/spotbugs/files/bin/experimental/treemapVisualization b/src/python/review/inspectors/spotbugs/files/bin/experimental/treemapVisualization
deleted file mode 100644
index 6261e930..00000000
--- a/src/python/review/inspectors/spotbugs/files/bin/experimental/treemapVisualization
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-exec "$(dirname $0)/../fbwrap" edu.umd.cs.findbugs.workflow.TreemapVisualization "$@"
diff --git a/src/python/review/inspectors/spotbugs/files/bin/fb b/src/python/review/inspectors/spotbugs/files/bin/fb
deleted file mode 100644
index 8e0034cd..00000000
--- a/src/python/review/inspectors/spotbugs/files/bin/fb
+++ /dev/null
@@ -1,207 +0,0 @@
-#! /bin/sh
-
-# Launch FindBugs from the command line.
-
-escape_arg() {
-	echo "$1" | sed -e "s,\\([\\\"' 	]\\),\\\\\\1,g"
-}
-
-program="$0"
-
-# Follow symlinks until we get to the actual file.
-while [ -h "$program" ]; do
-	link=`ls -ld "$program"`
-	link=`expr "$link" : '.*-> \(.*\)'`
-	if [ "`expr "$link" : '/.*'`" = 0 ]; then
-		# Relative
-		dir=`dirname "$program"`
-		program="$dir/$link"
-	else
-		# Absolute
-		program="$link"
-	fi
-done
-
-# Assume SpotBugs home directory is the parent
-# of the directory containing the script (which should
-# normally be "$spotbugs_home/bin").
-dir=`dirname "$program"`
-spotbugs_home="$dir/.."
-
-# Handle FHS-compliant installations (e.g., Fink)
-if [ -d "$spotbugs_home/share/spotbugs" ]; then
-	spotbugs_home="$spotbugs_home/share/spotbugs"
-fi
-
-# Make absolute
-spotbugs_home=`cd "$spotbugs_home" && pwd`
-
-fb_pathsep=':'
-
-# Handle cygwin, courtesy of Peter D. Stout
-fb_osname=`uname`
-if [ `expr "$fb_osname" : CYGWIN` -ne 0 ]; then
-	spotbugs_home=`cygpath --mixed "$spotbugs_home"`
-	fb_pathsep=';'
-fi
-# Handle MKS, courtesy of Kelly O'Hair
-if [ "${fb_osname}" = "Windows_NT" ]; then
-	fb_pathsep=';'
-fi
-
-if [ ! -d "$spotbugs_home" ]; then
-	echo "The path $spotbugs_home,"
-	echo "which is where I think SpotBugs is located,"
-	echo "does not seem to be a directory."
-	exit 1
-fi
-
-# Choose default java binary
-fb_javacmd=java
-if [ ! -z "$JAVA_HOME" ] && [ -x "$JAVA_HOME/bin/java" ]; then
-	if [ `expr "$fb_osname" : CYGWIN` -ne 0 ]; then
-		fb_javacmd=`cygpath --mixed "$JAVA_HOME"`/bin/java
-	else
-		fb_javacmd="$JAVA_HOME/bin/java"
-	fi
-fi
-
-
-fb_appjar="$spotbugs_home/lib/spotbugs.jar"
-
-ShowHelpAndExit() {
-	fb_mainclass="edu.umd.cs.findbugs.ShowHelp"
-	fb_javacmd=${fb_javacmd:-"java"}
-fb_maxheap=${fb_maxheap:-"-Xmx768m"}
-fb_appjar=${fb_appjar:-"$spotbugs_home/lib/spotbugs.jar"}
-if [ -n "$CLASSPATH" ]; then
-	fb_classpath=$fb_appjar$fb_pathsep$CLASSPATH
-else
-	fb_classpath=$fb_appjar
-fi
-set -f
-#echo command: \
-exec "$fb_javacmd" \
-	-classpath "$fb_classpath" \
-	-Dspotbugs.home="$spotbugs_home"\
-	$fb_maxheap $fb_jvmargs $fb_mainclass ${@:+"$@"} $fb_appargs
-	exit 0
-}
-
-# Set defaults
-fb_mainclass="edu.umd.cs.findbugs.workflow.FB"
-user_jvmargs=''
-ea_arg=''
-debug_arg=''
-conservespace_arg=''
-workhard_arg=''
-user_props=''
-
-# Handle command line arguments.
-while [ $# -gt 0 ]; do
-	case $1 in
-	-textui)
-		fb_mainclass="edu.umd.cs.findbugs.FindBugs2"
-		;;
-
-	-jvmArgs)
-		shift
-		user_jvmargs="$1"
-		;;
-		
-	-ea)
-		ea_arg='-ea'
-		;;
-
-	-maxHeap)
-		shift
-		fb_maxheap="-Xmx$1m"
-		;;
-
-	-javahome)
-		shift
-		fb_javacmd="$1/bin/java"
-		;;
-
-	-debug)
-		debug_arg="-Dfindbugs.debug=true"
-		;;
-
-	-conserveSpace)
-		conservespace_arg="-Dfindbugs.conserveSpace=true"
-		;;
-
-	-property)
-		shift
-		user_props="-D$1 $user_props"
-		;;
-	
-	-D*=*)
-		user_props="$1 $user_props"
-		;;
-
-	-version)
-		fb_mainclass=edu.umd.cs.findbugs.Version
-		fb_appargs="-release"
-		while [ $# -gt 0 ]; do
-			shift
-		done
-		fb_javacmd=${fb_javacmd:-"java"}
-fb_maxheap=${fb_maxheap:-"-Xmx768m"}
-fb_appjar=${fb_appjar:-"$spotbugs_home/lib/spotbugs.jar"}
-if [ -n "$CLASSPATH" ]; then
-	fb_classpath=$fb_appjar$fb_pathsep$CLASSPATH
-else
-	fb_classpath=$fb_appjar
-fi
-set -f
-#echo command: \
-exec "$fb_javacmd" \
-	-classpath "$fb_classpath" \
-	-Dspotbugs.home="$spotbugs_home"\
-	$fb_maxheap $fb_jvmargs $fb_mainclass ${@:+"$@"} $fb_appargs
-		exit 0
-		;;
-
-	-help)
-		ShowHelpAndExit
-		;;
-
-	# All unrecognized arguments will be accumulated and
-	# passed to the application.
-	*)
-		fb_appargs="$fb_appargs `escape_arg "$1"`"
-		;;
-	esac
-
-	shift
-done
-
-fb_jvmargs="$user_jvmargs $debug_arg $conservespace_arg $workhard_arg $user_props $ea_arg"
-if [ $maxheap ]; then
-  fb_maxheap="-Xmx${maxheap}m"
-fi
-
-# Extra JVM args for MacOSX.
-if [ $fb_osname = "Darwin" ]; then
-	fb_jvmargs="$fb_jvmargs \
-		-Xdock:name=FindBugs -Xdock:icon=${spotbugs_home}/lib/buggy.icns \
-		-Dapple.laf.useScreenMenuBar=true"
-fi
-
-fb_javacmd=${fb_javacmd:-"java"}
-fb_maxheap=${fb_maxheap:-"-Xmx768m"}
-fb_appjar=${fb_appjar:-"$spotbugs_home/lib/spotbugs.jar"}
-if [ -n "$CLASSPATH" ]; then
-	fb_classpath=$fb_appjar$fb_pathsep$CLASSPATH
-else
-	fb_classpath=$fb_appjar
-fi
-set -f
-#echo command: \
-exec "$fb_javacmd" \
-	-classpath "$fb_classpath" \
-	-Dspotbugs.home="$spotbugs_home"\
-	$fb_maxheap $fb_jvmargs $fb_mainclass ${@:+"$@"} $fb_appargs
-
-# vim:ts=3
diff --git a/src/python/review/inspectors/spotbugs/files/bin/fbwrap b/src/python/review/inspectors/spotbugs/files/bin/fbwrap
deleted file mode 100644
index 8fd85619..00000000
--- a/src/python/review/inspectors/spotbugs/files/bin/fbwrap
+++ /dev/null
@@ -1,89 +0,0 @@
-#! /bin/sh
-
-# A convenient way to call the main() method of a class
-# in findbugs.jar.
-
-program="$0"
-
-# Follow symlinks until we get to the actual file.
-while [ -h "$program" ]; do
-	link=`ls -ld "$program"`
-	link=`expr "$link" : '.*-> \(.*\)'`
-	if [ "`expr "$link" : '/.*'`" = 0 ]; then
-		# Relative
-		dir=`dirname "$program"`
-		program="$dir/$link"
-	else
-		# Absolute
-		program="$link"
-	fi
-done
-
-# Assume SpotBugs home directory is the parent
-# of the directory containing the script (which should
-# normally be "$spotbugs_home/bin").
-dir=`dirname "$program"`
-spotbugs_home="$dir/.."
-
-# Handle FHS-compliant installations (e.g., Fink)
-if [ -d "$spotbugs_home/share/spotbugs" ]; then
-	spotbugs_home="$spotbugs_home/share/spotbugs"
-fi
-
-# Make absolute
-spotbugs_home=`cd "$spotbugs_home" && pwd`
-
-fb_pathsep=':'
-
-# Handle cygwin, courtesy of Peter D. Stout
-fb_osname=`uname`
-if [ `expr "$fb_osname" : CYGWIN` -ne 0 ]; then
-	spotbugs_home=`cygpath --mixed "$spotbugs_home"`
-	fb_pathsep=';'
-fi
-# Handle MKS, courtesy of Kelly O'Hair
-if [ "${fb_osname}" = "Windows_NT" ]; then
-	fb_pathsep=';'
-fi
-
-if [ ! -d "$spotbugs_home" ]; then
-	echo "The path $spotbugs_home,"
-	echo "which is where I think SpotBugs is located,"
-	echo "does not seem to be a directory."
-	exit 1
-fi
-
-# Choose default java binary
-fb_javacmd=java
-if [ ! -z "$JAVA_HOME" ] && [ -x "$JAVA_HOME/bin/java" ]; then
-	if [ `expr "$fb_osname" : CYGWIN` -ne 0 ]; then
-		fb_javacmd=`cygpath --mixed "$JAVA_HOME"`/bin/java
-	else
-		fb_javacmd="$JAVA_HOME/bin/java"
-	fi
-fi
-
-if [ $# -eq 0 ]; then
-	echo "Usage: fbwrap <main class name> <args...>"
-	exit 1
-fi
-
-fb_mainclass="$1"
-shift
-
-fb_javacmd=${fb_javacmd:-"java"}
-fb_maxheap=${fb_maxheap:-"-Xmx768m"}
-fb_appjar=${fb_appjar:-"$spotbugs_home/lib/spotbugs.jar"}
-if [ -n "$CLASSPATH" ]; then
-	fb_classpath=$fb_appjar$fb_pathsep$CLASSPATH
-else
-	fb_classpath=$fb_appjar
-fi
-set -f
-#echo command: \
-exec "$fb_javacmd" \
-	-classpath "$fb_classpath" \
-	-Dspotbugs.home="$spotbugs_home"\
-	$fb_maxheap $fb_jvmargs $fb_mainclass ${@:+"$@"} $fb_appargs
-
-# vim:ts=3
diff --git a/src/python/review/inspectors/spotbugs/files/bin/filterBugs b/src/python/review/inspectors/spotbugs/files/bin/filterBugs
deleted file mode 100644
index 69dcd6a4..00000000
--- a/src/python/review/inspectors/spotbugs/files/bin/filterBugs
+++ /dev/null
@@ -1,6 +0,0 @@
-#! /bin/sh
-
-# General purpose utility for filtering/transforming bug collection and/or
-# historical bug collections
-
-exec "$(dirname $0)/fbwrap" edu.umd.cs.findbugs.workflow.Filter "$@"
diff --git a/src/python/review/inspectors/spotbugs/files/bin/findbugs-msv b/src/python/review/inspectors/spotbugs/files/bin/findbugs-msv
deleted file mode 100644
index fa142540..00000000
--- a/src/python/review/inspectors/spotbugs/files/bin/findbugs-msv
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-exec "$(dirname $0)/fbwrap" edu.umd.cs.findbugs.workflow.MergeSummarizeAndView "$@"
diff --git a/src/python/review/inspectors/spotbugs/files/bin/listBugDatabaseInfo b/src/python/review/inspectors/spotbugs/files/bin/listBugDatabaseInfo
deleted file mode 100644
index 0ebc0866..00000000
--- a/src/python/review/inspectors/spotbugs/files/bin/listBugDatabaseInfo
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-exec "$(dirname $0)/fbwrap" edu.umd.cs.findbugs.workflow.ListBugDatabaseInfo "$@"
diff --git a/src/python/review/inspectors/spotbugs/files/bin/mineBugHistory b/src/python/review/inspectors/spotbugs/files/bin/mineBugHistory
deleted file mode 100644
index 2aa90b3e..00000000
--- a/src/python/review/inspectors/spotbugs/files/bin/mineBugHistory
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-exec "$(dirname $0)/fbwrap" edu.umd.cs.findbugs.workflow.MineBugHistory "$@"
diff --git a/src/python/review/inspectors/spotbugs/files/bin/printAppVersion b/src/python/review/inspectors/spotbugs/files/bin/printAppVersion
deleted file mode 100644
index bcc0e976..00000000
--- a/src/python/review/inspectors/spotbugs/files/bin/printAppVersion
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-exec "$(dirname $0)/fbwrap" edu.umd.cs.findbugs.workflow.PrintAppVersion "$@"
diff --git a/src/python/review/inspectors/spotbugs/files/bin/printClass b/src/python/review/inspectors/spotbugs/files/bin/printClass
deleted file mode 100644
index 7be7d3d0..00000000
--- a/src/python/review/inspectors/spotbugs/files/bin/printClass
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-exec "$(dirname $0)/fbwrap" edu.umd.cs.findbugs.visitclass.PrintClass "$@"
diff --git a/src/python/review/inspectors/spotbugs/files/bin/rejarForAnalysis b/src/python/review/inspectors/spotbugs/files/bin/rejarForAnalysis
deleted file mode 100644
index af846d43..00000000
--- a/src/python/review/inspectors/spotbugs/files/bin/rejarForAnalysis
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-exec "$(dirname $0)/fbwrap" edu.umd.cs.findbugs.workflow.RejarClassesForAnalysis "$@"
diff --git a/src/python/review/inspectors/spotbugs/files/bin/setBugDatabaseInfo b/src/python/review/inspectors/spotbugs/files/bin/setBugDatabaseInfo
deleted file mode 100644
index 0fde311b..00000000
--- a/src/python/review/inspectors/spotbugs/files/bin/setBugDatabaseInfo
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-exec "$(dirname $0)/fbwrap" edu.umd.cs.findbugs.workflow.SetBugDatabaseInfo "$@"
diff --git a/src/python/review/inspectors/spotbugs/files/bin/spotbugs b/src/python/review/inspectors/spotbugs/files/bin/spotbugs
deleted file mode 100755
index 491225c0..00000000
--- a/src/python/review/inspectors/spotbugs/files/bin/spotbugs
+++ /dev/null
@@ -1,214 +0,0 @@
-#! /bin/sh
-
-# Launch SpotBugs from the command line.
-
-escape_arg() {
-	echo "$1" | sed -e "s,\\([\\\"' 	]\\),\\\\\\1,g"
-}
-
-program="$0"
-
-# Follow symlinks until we get to the actual file.
-while [ -h "$program" ]; do
-	link=`ls -ld "$program"`
-	link=`expr "$link" : '.*-> \(.*\)'`
-	if [ "`expr "$link" : '/.*'`" = 0 ]; then
-		# Relative
-		dir=`dirname "$program"`
-		program="$dir/$link"
-	else
-		# Absolute
-		program="$link"
-	fi
-done
-
-# Assume SpotBugs home directory is the parent
-# of the directory containing the script (which should
-# normally be "$spotbugs_home/bin").
-dir=`dirname "$program"`
-spotbugs_home="$dir/.."
-
-# Handle FHS-compliant installations (e.g., Fink)
-if [ -d "$spotbugs_home/share/spotbugs" ]; then
-	spotbugs_home="$spotbugs_home/share/spotbugs"
-fi
-
-# Make absolute
-spotbugs_home=`cd "$spotbugs_home" && pwd`
-
-fb_pathsep=':'
-
-# Handle cygwin, courtesy of Peter D. Stout
-fb_osname=`uname`
-if [ `expr "$fb_osname" : CYGWIN` -ne 0 ]; then
-	spotbugs_home=`cygpath --mixed "$spotbugs_home"`
-	fb_pathsep=';'
-fi
-# Handle MKS, courtesy of Kelly O'Hair
-if [ "${fb_osname}" = "Windows_NT" ]; then
-	fb_pathsep=';'
-fi
-
-if [ ! -d "$spotbugs_home" ]; then
-	echo "The path $spotbugs_home,"
-	echo "which is where I think SpotBugs is located,"
-	echo "does not seem to be a directory."
-	exit 1
-fi
-
-# Choose default java binary
-fb_javacmd=java
-if [ ! -z "$JAVA_HOME" ] && [ -x "$JAVA_HOME/bin/java" ]; then
-	if [ `expr "$fb_osname" : CYGWIN` -ne 0 ]; then
-		fb_javacmd=`cygpath --mixed "$JAVA_HOME"`/bin/java
-	else
-		fb_javacmd="$JAVA_HOME/bin/java"
-	fi
-fi
-
-fb_appjar="$spotbugs_home/lib/spotbugs.jar"
-
-ShowHelpAndExit() {
-	fb_mainclass="edu.umd.cs.findbugs.ShowHelp"
-	fb_javacmd=${fb_javacmd:-"java"}
-fb_maxheap=${fb_maxheap:-"-Xmx768m"}
-fb_appjar=${fb_appjar:-"$spotbugs_home/lib/spotbugs.jar"}
-if [ -n "$CLASSPATH" ]; then
-	fb_classpath=$fb_appjar$fb_pathsep$CLASSPATH
-else
-	fb_classpath=$fb_appjar
-fi
-set -f
-#echo command: \
-exec "$fb_javacmd" \
-	-classpath "$fb_classpath" \
-	-Dspotbugs.home="$spotbugs_home"\
-	$fb_maxheap $fb_jvmargs $fb_mainclass ${@:+"$@"} $fb_appargs
-	exit 0
-}
-
-# Set defaults
-fb_mainclass="edu.umd.cs.findbugs.LaunchAppropriateUI"
-user_jvmargs=''
-ea_arg=''
-debug_arg=''
-conservespace_arg=''
-workhard_arg=''
-user_props=''
-
-# Handle command line arguments.
-while [ $# -gt 0 ]; do
-	case $1 in
-	-gui)
-		# this is the default
-		;;
-
-	-gui1)
-		user_props="-Dfindbugs.launchUI=1 $user_props"
-		;;
-
-	-textui)
-		fb_mainclass="edu.umd.cs.findbugs.FindBugs2"
-		;;
-
-	-jvmArgs)
-		shift
-		user_jvmargs="$1"
-		;;
-		
-	-ea)
-		ea_arg='-ea'
-		;;
-
-	-maxHeap)
-		shift
-		fb_maxheap="-Xmx$1m"
-		;;
-
-	-javahome)
-		shift
-		fb_javacmd="$1/bin/java"
-		;;
-
-	-debug)
-		debug_arg="-Dfindbugs.debug=true"
-		;;
-
-	-conserveSpace)
-		conservespace_arg="-Dfindbugs.conserveSpace=true"
-		;;
-
-	-property)
-		shift
-		user_props="-D$1 $user_props"
-		;;
-	
-	-D*=*)
-		user_props="$1 $user_props"
-		;;
-
-	-version)
-		fb_mainclass=edu.umd.cs.findbugs.Version
-		fb_appargs="-release"
-		while [ $# -gt 0 ]; do
-			shift
-		done
-		fb_javacmd=${fb_javacmd:-"java"}
-fb_maxheap=${fb_maxheap:-"-Xmx768m"}
-fb_appjar=${fb_appjar:-"$spotbugs_home/lib/spotbugs.jar"}
-if [ -n "$CLASSPATH" ]; then
-	fb_classpath=$fb_appjar$fb_pathsep$CLASSPATH
-else
-	fb_classpath=$fb_appjar
-fi
-set -f
-#echo command: \
-exec "$fb_javacmd" \
-	-classpath "$fb_classpath" \
-	-Dspotbugs.home="$spotbugs_home"\
-	$fb_maxheap $fb_jvmargs $fb_mainclass ${@:+"$@"} $fb_appargs
-		exit 0
-		;;
-
-	-help)
-		ShowHelpAndExit
-		;;
-
-	# All unrecognized arguments will be accumulated and
-	# passed to the application.
-	*)
-		fb_appargs="$fb_appargs `escape_arg "$1"`"
-		;;
-	esac
-
-	shift
-done
-
-fb_jvmargs="$user_jvmargs $debug_arg $conservespace_arg $workhard_arg $user_props $ea_arg"
-if [ $maxheap ]; then
-  fb_maxheap="-Xmx${maxheap}m"
-fi
-
-# Extra JVM args for MacOSX.
-if [ $fb_osname = "Darwin" ]; then
-	fb_jvmargs="$fb_jvmargs \
-		-Xdock:name=FindBugs -Xdock:icon=${spotbugs_home}/lib/buggy.icns \
-		-Dapple.laf.useScreenMenuBar=true"
-fi
-
-fb_javacmd=${fb_javacmd:-"java"}
-fb_maxheap=${fb_maxheap:-"-Xmx768m"}
-fb_appjar=${fb_appjar:-"$spotbugs_home/lib/spotbugs.jar"}
-if [ -n "$CLASSPATH" ]; then
-	fb_classpath=$fb_appjar$fb_pathsep$CLASSPATH
-else
-	fb_classpath=$fb_appjar
-fi
-set -f
-#echo command: \
-exec "$fb_javacmd" \
-	-classpath "$fb_classpath" \
-	-Dspotbugs.home="$spotbugs_home"\
-	$fb_maxheap $fb_jvmargs $fb_mainclass ${@:+"$@"} $fb_appargs
-
-# vim:ts=3
diff --git a/src/python/review/inspectors/spotbugs/files/bin/spotbugs.bat b/src/python/review/inspectors/spotbugs/files/bin/spotbugs.bat
deleted file mode 100644
index 1ff32bc0..00000000
--- a/src/python/review/inspectors/spotbugs/files/bin/spotbugs.bat
+++ /dev/null
@@ -1,240 +0,0 @@
-@echo off
-:: Launch SpotBugs on a Windows system.
-:: Adapted from scripts found at http://www.ericphelps.com/batch/
-:: This will only work on Windows NT or later!
-
-:: Don't affect environment outside of this invocation
-setlocal
-
-:: ----------------------------------------------------------------------
-:: Set up default values
-:: ----------------------------------------------------------------------
-set appjar=spotbugs.jar
-set javahome=
-set launcher=java.exe
-set start=start "SpotBugs"
-set jvmargs=
-set debugArg=
-set conserveSpaceArg=
-set workHardArg=
-set args=
-set javaProps=
-set maxheap=768
-
-REM default UI is gui2
-set launchUI=2
-
-:: Try finding the default SPOTBUGS_HOME directory
-:: from the directory path of this script
-set default_spotbugs_home=%~dp0..
-
-:: Honor JAVA_HOME environment variable if it is set
-if "%JAVA_HOME%"=="" goto nojavahome
-if not exist "%JAVA_HOME%\bin\javaw.exe" goto nojavahome
-set javahome=%JAVA_HOME%\bin\
-:nojavahome
-
-goto loop
-
-:: ----------------------------------------------------------------------
-:: Process command-line arguments
-:: ----------------------------------------------------------------------
-
-:shift2
-shift
-:shift1
-shift
-
-:loop
-
-:: Remove surrounding quotes from %1 and %2
-set firstArg=%~1
-set secondArg=%~2
-
-if "%firstArg%"=="" goto launch
-
-:: AddMessages
-if not "%firstArg%"=="-addMessages" goto notAddMessages
-set fb_mainclass=edu.umd.cs.findbugs.AddMessages
-goto shift1
-:notAddMessages
-
-:: computeBugHistory
-if not "%firstArg%"=="-computeBugHistory" goto notUpdate
-set fb_mainclass=edu.umd.cs.findbugs.workflow.Update
-goto shift1
-:notUpdate
-
-:: convertXmlToText
-if not "%firstArg%"=="-xmltotext" goto notXmlToText
-set fb_mainclass=edu.umd.cs.findbugs.PrintingBugReporter
-goto shift1
-:notXmlToText
-
-:: copyBuggySource
-if not "%firstArg%"=="-copyBS" goto notCopyBS
-set fb_mainclass=edu.umd.cs.findbugs.workflow.CopyBuggySource
-goto shift1
-:notCopyBS
-
-:: defectDensity
-if not "%firstArg%"=="-defectDensity" goto notDefectDensity
-set fb_mainclass=edu.umd.cs.findbugs.workflow.DefectDensity
-goto shift1
-:notDefectDensity
-
-:: filterBugs
-if not "%firstArg%"=="-filterBugs" goto notFilterBugs
-set fb_mainclass=edu.umd.cs.findbugs.workflow.Filter
-goto shift1
-:notFilterBugs
-
-:: listBugDatabaseInfo
-if not "%firstArg%"=="-listBugDatabaseInfo" goto notListBugDatabaseInfo
-set fb_mainclass=edu.umd.cs.findbugs.workflow.ListBugDatabaseInfo
-goto shift1
-:notListBugDatabaseInfo
-
-:: mineBugHistory
-if not "%firstArg%"=="-mineBugHistory" goto notMineBugHistory
-set fb_mainclass=edu.umd.cs.findbugs.workflow.MineBugHistory
-goto shift1
-:notMineBugHistory
-
-:: printAppVersion
-if not "%firstArg%"=="-printAppVersion" goto notPrintAppVersion
-set fb_mainclass=edu.umd.cs.findbugs.workflow.PrintAppVersion
-goto shift1
-:notPrintAppVersion
-
-:: printClass
-if not "%firstArg%"=="-printClass" goto notPrintClass
-set fb_mainclass=edu.umd.cs.findbugs.workflow.PrintClass
-goto shift1
-:notPrintClass
-
-:: rejarForAnalysis
-if not "%firstArg%"=="-rejar" goto notRejar
-set fb_mainclass=edu.umd.cs.findbugs.workflow.RejarClassesForAnalysis
-goto shift1
-:notRejar
-
-:: setBugDatabaseInfo
-if not "%firstArg%"=="-setInfo" goto notSetBugDatabaseInfo
-set fb_mainclass=edu.umd.cs.findbugs.workflow.SetBugDatabaseInfo
-goto shift1
-:notSetBugDatabaseInfo
-
-:: unionBugs
-if not "%firstArg%"=="-unionBugs" goto notUnionBugs
-set fb_mainclass=edu.umd.cs.findbugs.workflow.UnionResults
-goto shift1
-:notUnionBugs
-
-:: xpathFind
-if not "%firstArg%"=="-xpathFind" goto notXPathFind
-set fb_mainclass=edu.umd.cs.findbugs.workflow.XPathFind
-goto shift1
-:notXPathFind
-
-if not "%firstArg%"=="-gui" goto notGui
-set launchUI=2
-set launcher=javaw.exe
-goto shift1
-:notGui
-
-if not "%firstArg%"=="-gui1" goto notGui1
-set launchUI=1
-set javaProps=-Dfindbugs.launchUI=1 %javaProps%
-set launcher=javaw.exe
-goto shift1
-:notGui1
-
-if not "%firstArg%"=="-textui" goto notTextui
-set launchUI=0
-set launcher=java.exe
-set start=
-goto shift1
-:notTextui
-
-if not "%firstArg%"=="-debug" goto notDebug
-set launcher=java.exe
-set start=
-set debugArg=-Dfindbugs.debug=true
-goto shift1
-:notDebug
-
-if not "%firstArg%"=="-help" goto notHelp
-set launchUI=help
-set launcher=java.exe
-set start=
-goto shift1
-:notHelp
-
-if not "%firstArg%"=="-version" goto notVersion
-set launchUI=version
-set launcher=java.exe
-set start=
-goto shift1
-:notVersion
-
-if "%firstArg%"=="-home" set SPOTBUGS_HOME=%secondArg%
-if "%firstArg%"=="-home" goto shift2
-
-if "%firstArg%"=="-jvmArgs" set jvmargs=%secondArg%
-if "%firstArg%"=="-jvmArgs" goto shift2
-
-if "%firstArg%"=="-maxHeap" set maxheap=%secondArg%
-if "%firstArg%"=="-maxHeap" goto shift2
-
-if "%firstArg%"=="-conserveSpace" set conserveSpaceArg=-Dfindbugs.conserveSpace=true
-if "%firstArg%"=="-conserveSpace" goto shift1
-
-if "%firstArg%"=="-workHard" set workHardArg=-Dfindbugs.workHard=true
-if "%firstArg%"=="-workHard" goto shift1
-
-if "%firstArg%"=="-javahome" set javahome=%secondArg%\bin\
-if "%firstArg%"=="-javahome" goto shift2
-
-if "%firstArg%"=="-property" set javaProps=-D%secondArg% %javaProps%
-if "%firstArg%"=="-property" goto shift2
-
-if "%firstArg%"=="" goto launch
-
-set args=%args% "%firstArg%"
-goto shift1
-
-:: ----------------------------------------------------------------------
-:: Launch FindBugs
-:: ----------------------------------------------------------------------
-:launch
-:: Make sure SPOTBUGS_HOME is set.
-:: If it isn't, try using the default value based on the
-:: directory path of the invoked script.
-:: Note that this will fail miserably if the value of FINDBUGS_HOME
-:: has quote characters in it.
-if not "%SPOTBUGS_HOME%"=="" goto checkHomeValid
-set SPOTBUGS_HOME=%default_spotbugs_home%
-
-:checkHomeValid
-if not exist "%SPOTBUGS_HOME%\lib\%appjar%" goto homeNotSet
-
-:found_home
-:: Launch FindBugs!
-if "%fb_mainclass%"=="" goto runJar
-"%javahome%%launcher%" %debugArg% %conserveSpaceArg% %workHardArg% %javaProps% "-Dspotbugs.home=%SPOTBUGS_HOME%" -Xmx%maxheap%m %jvmargs% "-Dfindbugs.launchUI=%launchUI%" -cp "%SPOTBUGS_HOME%\lib\%appjar%" %fb_mainclass% %args%
-goto end
-:runjar
-%start% "%javahome%%launcher%" %debugArg% %conserveSpaceArg% %workHardArg% %javaProps% "-Dspotbugs.home=%SPOTBUGS_HOME%" -Xmx%maxheap%m %jvmargs% "-Dfindbugs.launchUI=%launchUI%" -jar "%SPOTBUGS_HOME%\lib\%appjar%" %args%
-goto end
-
-:: ----------------------------------------------------------------------
-:: Report that SPOTBUGS_HOME is not set (and was not specified)
-:: ----------------------------------------------------------------------
-:homeNotSet
-echo Could not find SpotBugs home directory.  There may be a problem
-echo with the FindBugs installation.  Try setting SPOTBUGS_HOME, or
-echo re-installing.
-goto end
-
-:end
diff --git a/src/python/review/inspectors/spotbugs/files/bin/spotbugs.ico b/src/python/review/inspectors/spotbugs/files/bin/spotbugs.ico
deleted file mode 100644
index e46c6c96..00000000
Binary files a/src/python/review/inspectors/spotbugs/files/bin/spotbugs.ico and /dev/null differ
diff --git a/src/python/review/inspectors/spotbugs/files/bin/spotbugs2 b/src/python/review/inspectors/spotbugs/files/bin/spotbugs2
deleted file mode 100644
index 8476db7d..00000000
--- a/src/python/review/inspectors/spotbugs/files/bin/spotbugs2
+++ /dev/null
@@ -1,177 +0,0 @@
-#! /bin/sh
-
-#
-# Simplified SpotBugs startup script.
-# This is an experiment.
-#
-
-program="$0"
-
-# Follow symlinks until we get to the actual file.
-while [ -h "$program" ]; do
-	link=`ls -ld "$program"`
-	link=`expr "$link" : '.*-> \(.*\)'`
-	if [ "`expr "$link" : '/.*'`" = 0 ]; then
-		# Relative
-		dir=`dirname "$program"`
-		program="$dir/$link"
-	else
-		# Absolute
-		program="$link"
-	fi
-done
-
-# Assume SpotBugs home directory is the parent
-# of the directory containing the script (which should
-# normally be "$spotbugs_home/bin").
-dir=`dirname "$program"`
-spotbugs_home="$dir/.."
-
-# Handle FHS-compliant installations (e.g., Fink)
-if [ -d "$spotbugs_home/share/spotbugs" ]; then
-	spotbugs_home="$spotbugs_home/share/spotbugs"
-fi
-
-# Make absolute
-spotbugs_home=`cd "$spotbugs_home" && pwd`
-
-fb_pathsep=':'
-
-# Handle cygwin, courtesy of Peter D. Stout
-fb_osname=`uname`
-if [ `expr "$fb_osname" : CYGWIN` -ne 0 ]; then
-	spotbugs_home=`cygpath --mixed "$spotbugs_home"`
-	fb_pathsep=';'
-fi
-# Handle MKS, courtesy of Kelly O'Hair
-if [ "${fb_osname}" = "Windows_NT" ]; then
-	fb_pathsep=';'
-fi
-
-if [ ! -d "$spotbugs_home" ]; then
-	echo "The path $spotbugs_home,"
-	echo "which is where I think SpotBugs is located,"
-	echo "does not seem to be a directory."
-	exit 1
-fi
-
-# Choose default java binary
-fb_javacmd=java
-if [ ! -z "$JAVA_HOME" ] && [ -x "$JAVA_HOME/bin/java" ]; then
-	if [ `expr "$fb_osname" : CYGWIN` -ne 0 ]; then
-		fb_javacmd=`cygpath --mixed "$JAVA_HOME"`/bin/java
-	else
-		fb_javacmd="$JAVA_HOME/bin/java"
-	fi
-fi
-
-# Default UI is GUI2
-fb_launchui="2"
-
-#
-# Stuff we're going to pass to the JVM as JVM arguments.
-#
-jvm_debug=""
-jvm_maxheap="-Xmx768m"
-jvm_ea=""
-jvm_conservespace=""
-jvm_user_props=""
-
-#
-# Process command line args until we hit one we don't recognize.
-#
-finishedArgs=false
-while [ $# -gt 0 ] && [ "$finishedArgs" = "false" ]; do
-
-	arg=$1
-
-	case $arg in
-		-textui)
-			shift
-			fb_launchui="0"
-			;;
-
-		-gui)
-			shift
-			fb_launchui="2"
-			;;
-
-		-gui1)
-			shift
-			fb_launchui="1"
-			;;
-
-		-maxHeap)
-			shift
-			jvm_maxheap="-Xmx$1m"
-			shift
-			;;
-
-		-ea)
-			shift
-			jvm_ea="-ea"
-			;;
-
-		-javahome)
-			shift
-			fb_javacmd="$1/bin/java"
-			shift
-			;;
-
-		-debug)
-			shift
-			jvm_debug="-Dfindbugs.debug=true"
-			;;
-
-		-conserveSpace)
-			shift
-			jvm_conservespace="-Dfindbugs.conserveSpace=true"
-			;;
-
-		-property)
-			shift
-			jvm_user_props="-D$1 $jvm_user_props"
-			shift
-			;;
-	
-		-D*=*)
-			jvm_user_props="$1 $user_props"
-			shift
-			;;
-
-		-version)
-			shift
-			fb_launchui="version"
-			;;
-
-		-help)
-			shift
-			fb_launchui="help"
-			;;
-
-		# All arguments starting from the first unrecognized arguments
-		# are passed on to the Java app.
-		*)
-			finishedArgs=true
-			;;
-	esac
-
-done
-
-# Extra JVM args for MacOSX.
-if [ $fb_osname = "Darwin" ]; then
-	fb_jvmargs="$fb_jvmargs \
-		-Xdock:name=SpotBugs -Xdock:icon=${spotbugs_home}/lib/buggy.icns \
-		-Dapple.laf.useScreenMenuBar=true"
-fi
-
-#
-# Launch JVM
-#
-exec "$fb_javacmd" \
-	-classpath "$fb_appjar$fb_pathsep$CLASSPATH" \
-	-Dspotbugs.home="$spotbugs_home" \
-	$jvm_debug $jvm_maxheap $jvm_ea $jvm_conservespace $jvm_user_props \
-	-Dfindbugs.launchUI=$fb_launchui \
-	-jar $spotbugs_home/lib/spotbugs.jar \
-	${@:+"$@"}
diff --git a/src/python/review/inspectors/spotbugs/files/bin/unionBugs b/src/python/review/inspectors/spotbugs/files/bin/unionBugs
deleted file mode 100644
index 93593cc2..00000000
--- a/src/python/review/inspectors/spotbugs/files/bin/unionBugs
+++ /dev/null
@@ -1,8 +0,0 @@
-#! /bin/sh
-
-# Deprecated
-
-# Create the union of two results files, preserving annotations in both files
-# in the result.
-
-exec "$(dirname $0)/fbwrap" edu.umd.cs.findbugs.workflow.UnionResults "$@"
diff --git a/src/python/review/inspectors/spotbugs/files/bin/xpathFind b/src/python/review/inspectors/spotbugs/files/bin/xpathFind
deleted file mode 100644
index 3bdd9aca..00000000
--- a/src/python/review/inspectors/spotbugs/files/bin/xpathFind
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-exec "$(dirname $0)/fbwrap" edu.umd.cs.findbugs.xml.XPathFind "$@"
diff --git a/src/python/review/inspectors/spotbugs/files/lib/Saxon-HE-9.9.1-2.jar b/src/python/review/inspectors/spotbugs/files/lib/Saxon-HE-9.9.1-2.jar
deleted file mode 100644
index eae4737f..00000000
Binary files a/src/python/review/inspectors/spotbugs/files/lib/Saxon-HE-9.9.1-2.jar and /dev/null differ
diff --git a/src/python/review/inspectors/spotbugs/files/lib/asm-7.3.1.jar b/src/python/review/inspectors/spotbugs/files/lib/asm-7.3.1.jar
deleted file mode 100644
index 8a502662..00000000
Binary files a/src/python/review/inspectors/spotbugs/files/lib/asm-7.3.1.jar and /dev/null differ
diff --git a/src/python/review/inspectors/spotbugs/files/lib/asm-analysis-7.3.1.jar b/src/python/review/inspectors/spotbugs/files/lib/asm-analysis-7.3.1.jar
deleted file mode 100644
index 1f83a5ed..00000000
Binary files a/src/python/review/inspectors/spotbugs/files/lib/asm-analysis-7.3.1.jar and /dev/null differ
diff --git a/src/python/review/inspectors/spotbugs/files/lib/asm-commons-7.3.1.jar b/src/python/review/inspectors/spotbugs/files/lib/asm-commons-7.3.1.jar
deleted file mode 100644
index 65fb30e7..00000000
Binary files a/src/python/review/inspectors/spotbugs/files/lib/asm-commons-7.3.1.jar and /dev/null differ
diff --git a/src/python/review/inspectors/spotbugs/files/lib/asm-tree-7.3.1.jar b/src/python/review/inspectors/spotbugs/files/lib/asm-tree-7.3.1.jar
deleted file mode 100644
index 28858f4e..00000000
Binary files a/src/python/review/inspectors/spotbugs/files/lib/asm-tree-7.3.1.jar and /dev/null differ
diff --git a/src/python/review/inspectors/spotbugs/files/lib/asm-util-7.3.1.jar b/src/python/review/inspectors/spotbugs/files/lib/asm-util-7.3.1.jar
deleted file mode 100644
index 4fe6c527..00000000
Binary files a/src/python/review/inspectors/spotbugs/files/lib/asm-util-7.3.1.jar and /dev/null differ
diff --git a/src/python/review/inspectors/spotbugs/files/lib/bcel-6.4.1.jar b/src/python/review/inspectors/spotbugs/files/lib/bcel-6.4.1.jar
deleted file mode 100644
index 9b70e300..00000000
Binary files a/src/python/review/inspectors/spotbugs/files/lib/bcel-6.4.1.jar and /dev/null differ
diff --git a/src/python/review/inspectors/spotbugs/files/lib/commons-lang-2.6.jar b/src/python/review/inspectors/spotbugs/files/lib/commons-lang-2.6.jar
deleted file mode 100644
index 98467d3a..00000000
Binary files a/src/python/review/inspectors/spotbugs/files/lib/commons-lang-2.6.jar and /dev/null differ
diff --git a/src/python/review/inspectors/spotbugs/files/lib/config/log4j2.xml b/src/python/review/inspectors/spotbugs/files/lib/config/log4j2.xml
deleted file mode 100644
index 792602b8..00000000
--- a/src/python/review/inspectors/spotbugs/files/lib/config/log4j2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="WARN">
-  <Appenders>
-    <Console name="Console" target="SYSTEM_OUT">
-      <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
-    </Console>
-  </Appenders>
-  <Loggers>
-    <Root level="error">
-      <AppenderRef ref="Console"/>
-    </Root>
-  </Loggers>
-</Configuration>
diff --git a/src/python/review/inspectors/spotbugs/files/lib/dom4j-2.1.1.jar b/src/python/review/inspectors/spotbugs/files/lib/dom4j-2.1.1.jar
deleted file mode 100644
index cda47db4..00000000
Binary files a/src/python/review/inspectors/spotbugs/files/lib/dom4j-2.1.1.jar and /dev/null differ
diff --git a/src/python/review/inspectors/spotbugs/files/lib/icu4j-63.1.jar b/src/python/review/inspectors/spotbugs/files/lib/icu4j-63.1.jar
deleted file mode 100644
index 730335ed..00000000
Binary files a/src/python/review/inspectors/spotbugs/files/lib/icu4j-63.1.jar and /dev/null differ
diff --git a/src/python/review/inspectors/spotbugs/files/lib/jaxen-1.1.6.jar b/src/python/review/inspectors/spotbugs/files/lib/jaxen-1.1.6.jar
deleted file mode 100644
index 52f47a4f..00000000
Binary files a/src/python/review/inspectors/spotbugs/files/lib/jaxen-1.1.6.jar and /dev/null differ
diff --git a/src/python/review/inspectors/spotbugs/files/lib/jcip-annotations-1.0.jar b/src/python/review/inspectors/spotbugs/files/lib/jcip-annotations-1.0.jar
deleted file mode 100644
index 06e9066b..00000000
Binary files a/src/python/review/inspectors/spotbugs/files/lib/jcip-annotations-1.0.jar and /dev/null differ
diff --git a/src/python/review/inspectors/spotbugs/files/lib/jsr305-3.0.2.jar b/src/python/review/inspectors/spotbugs/files/lib/jsr305-3.0.2.jar
deleted file mode 100644
index 59222d9c..00000000
Binary files a/src/python/review/inspectors/spotbugs/files/lib/jsr305-3.0.2.jar and /dev/null differ
diff --git a/src/python/review/inspectors/spotbugs/files/lib/log4j-api-2.11.1.jar b/src/python/review/inspectors/spotbugs/files/lib/log4j-api-2.11.1.jar
deleted file mode 100644
index 96362a6f..00000000
Binary files a/src/python/review/inspectors/spotbugs/files/lib/log4j-api-2.11.1.jar and /dev/null differ
diff --git a/src/python/review/inspectors/spotbugs/files/lib/log4j-core-2.11.1.jar b/src/python/review/inspectors/spotbugs/files/lib/log4j-core-2.11.1.jar
deleted file mode 100644
index 310fa62a..00000000
Binary files a/src/python/review/inspectors/spotbugs/files/lib/log4j-core-2.11.1.jar and /dev/null differ
diff --git a/src/python/review/inspectors/spotbugs/files/lib/log4j-slf4j18-impl-2.11.1.jar b/src/python/review/inspectors/spotbugs/files/lib/log4j-slf4j18-impl-2.11.1.jar
deleted file mode 100644
index 8fc4d2ec..00000000
Binary files a/src/python/review/inspectors/spotbugs/files/lib/log4j-slf4j18-impl-2.11.1.jar and /dev/null differ
diff --git a/src/python/review/inspectors/spotbugs/files/lib/slf4j-api-1.8.0-alpha2.jar b/src/python/review/inspectors/spotbugs/files/lib/slf4j-api-1.8.0-alpha2.jar
deleted file mode 100644
index 7a2a9b2d..00000000
Binary files a/src/python/review/inspectors/spotbugs/files/lib/slf4j-api-1.8.0-alpha2.jar and /dev/null differ
diff --git a/src/python/review/inspectors/spotbugs/files/lib/slf4j-api-1.8.0-beta4.jar b/src/python/review/inspectors/spotbugs/files/lib/slf4j-api-1.8.0-beta4.jar
deleted file mode 100644
index c6458a70..00000000
Binary files a/src/python/review/inspectors/spotbugs/files/lib/slf4j-api-1.8.0-beta4.jar and /dev/null differ
diff --git a/src/python/review/inspectors/spotbugs/files/lib/spotbugs-annotations.jar b/src/python/review/inspectors/spotbugs/files/lib/spotbugs-annotations.jar
deleted file mode 100644
index 628e935b..00000000
Binary files a/src/python/review/inspectors/spotbugs/files/lib/spotbugs-annotations.jar and /dev/null differ
diff --git a/src/python/review/inspectors/spotbugs/files/lib/spotbugs-ant.jar b/src/python/review/inspectors/spotbugs/files/lib/spotbugs-ant.jar
deleted file mode 100644
index 24353506..00000000
Binary files a/src/python/review/inspectors/spotbugs/files/lib/spotbugs-ant.jar and /dev/null differ
diff --git a/src/python/review/inspectors/spotbugs/files/lib/spotbugs.jar b/src/python/review/inspectors/spotbugs/files/lib/spotbugs.jar
deleted file mode 100644
index 208976fd..00000000
Binary files a/src/python/review/inspectors/spotbugs/files/lib/spotbugs.jar and /dev/null differ
diff --git a/src/python/review/inspectors/spotbugs/files/plugin/README b/src/python/review/inspectors/spotbugs/files/plugin/README
deleted file mode 100644
index 6e4a5e1d..00000000
--- a/src/python/review/inspectors/spotbugs/files/plugin/README
+++ /dev/null
@@ -1,8 +0,0 @@
-
-Put the jar files for SpotBugs plugins in this directory. 
-For example, you can download the fb-contrib plugin from:
-	https://github.com/mebigfatguy/fb-contrib
-
-You should carefully evaluate any Spotbugs plugins to determine whether 
-the issues they report are suitable and appropriate for your project.
-
diff --git a/src/python/review/inspectors/spotbugs/files/spotbugs-exclude.xml b/src/python/review/inspectors/spotbugs/files/spotbugs-exclude.xml
deleted file mode 100644
index 0dc8fc00..00000000
--- a/src/python/review/inspectors/spotbugs/files/spotbugs-exclude.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- This file specifies a spotbugs filter for excluding reports that
-     should not be considered errors.
-     The format of this file is documented at:
-       https://spotbugs.readthedocs.io/en/latest/filter.html
-     When possible, please specify the full names of the bug codes,
-     using the pattern attribute, to make it clearer what reports are
-     being suppressed.  You can find a listing of codes at:
-       https://spotbugs.readthedocs.io/en/latest/bugDescriptions.html
-  -->
-
-<FindBugsFilter>
-    <Match>
-        <Bug pattern="DM_DEFAULT_ENCODING"/>
-    </Match>
-    <Match>
-        <Bug pattern="URF_UNREAD_FIELD"/>
-    </Match>
-    <Match>
-        <Bug pattern="UUF_UNUSED_FIELD"/>
-    </Match>
-    <Match>
-        <Bug pattern="URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD"/>
-    </Match>
-    <Match>
-        <Bug pattern="UUF_UNUSED_PUBLIC_OR_PROTECTED_FIELD"/>
-    </Match>
-</FindBugsFilter>
\ No newline at end of file
diff --git a/src/python/review/inspectors/spotbugs/files/src/xsl/color.xsl b/src/python/review/inspectors/spotbugs/files/src/xsl/color.xsl
deleted file mode 100644
index ee0c1a9b..00000000
--- a/src/python/review/inspectors/spotbugs/files/src/xsl/color.xsl
+++ /dev/null
@@ -1,351 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  FindBugs - Find bugs in Java programs
-  Copyright (C) 2004,2005 University of Maryland
-  Copyright (C) 2005, Chris Nappin
-  Copyright (C) 2015, 2017, Brahim Djoudi (modifications)
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
--->
-<xsl:stylesheet version="2.0"
-                xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-<xsl:output
-	method="xml"
-	omit-xml-declaration="yes"
-    doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
-    doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"
-	indent="yes"
-	encoding="UTF-8"/>
-
-<xsl:variable name="bugTableHeader">
-	<tr class="tableheader">
-		<th align="center">Priority</th>
-		<th align="left">Details</th>
-	</tr>
-</xsl:variable>
-
-<xsl:template match="/">
-	<html>
-	<head>
-		<title>SpotBugs Report</title>
-		<style type="text/css">
-            body {
-            	font-family: Candara, Arial, Helvetica, sans-serif;
-            }
-
-            tr {
-                border: 1px solid;
-                border-left: 8px solid;
-            }
-
-            .tablerow0 {
-                background: #EEEEEE;
-            }
-
-            .tablerow1 {
-                background: white;
-            }
-
-            .detailrow0 {
-                background: #EEEEEE;
-            }
-
-            .detailrow1 {
-                background: white;
-            }
-
-            .long_message {
-                color: #220001;
-            }
-
-            .tableheader {
-                font-size: larger;
-                background: #D7D7D7;
-            }
-
-            .high {
-                background: rgb(242, 130, 91);
-                background: -moz-linear-gradient(left, rgba(242, 130, 91, 1) 0%, rgba(255, 35, 35, 1) 100%);
-                background: -webkit-linear-gradient(left, rgba(242, 130, 91, 1) 0%, rgba(255, 35, 35, 1) 100%);
-                background: linear-gradient(to right, rgba(242, 130, 91, 1) 0%, rgba(255, 35, 35, 1) 100%);
-                filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f2825b', endColorstr='#ff2323', GradientType=1);
-                border: 1px solid;
-                border-left: 8px solid;
-                border-color: firebrick;
-            }
-
-            .medium {
-            	background: rgb(235,255,25);
-            	background: -moz-linear-gradient(left,  rgba(235,255,25,1) 0%, rgba(255,125,20,1) 100%);
-            	background: -webkit-linear-gradient(left,  rgba(235,255,25,1) 0%,rgba(255,125,20,1) 100%);
-            	background: linear-gradient(to right,  rgba(235,255,25,1) 0%,rgba(255,125,20,1) 100%);
-            	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ebff19', endColorstr='#ff7d14',GradientType=1 );
-                border: 1px solid;
-                border-left: 8px solid;
-                border-color: darkgoldenrod;
-            }
-
-            .low {
-                background: rgb(185, 221, 93);
-                background: -moz-linear-gradient(left, rgba(185, 221, 93, 1) 0%, rgba(155, 242, 171, 1) 100%);
-                background: -webkit-linear-gradient(left, rgba(185, 221, 93, 1) 0%, rgba(155, 242, 171, 1) 100%);
-                background: linear-gradient(to right, rgba(185, 221, 93, 1) 0%, rgba(155, 242, 171, 1) 100%);
-                filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#b9dd5d', endColorstr='#9bf2ab', GradientType=1);
-                border: 1px solid;
-                border-left: 8px solid;
-                border-color: darkolivegreen;
-            }
-
-            pre {
-                font-family: "Bitstream Vera Sans Mono", Consolas, "Lucida Console", "Courier New", Monospace !important;
-                box-shadow: 0 0;
-                color: black;
-                border-width: 1px 1px 1px 6px;
-                border-style: solid;
-                padding: 2ex;
-                margin: 2ex 2ex 2ex 2ex;
-                overflow: auto;
-                -moz-border-radius: 0px;
-                -webkit-border-radius: 0px;
-                -khtml-border-radius: 0px;
-                border-radius: 0px;
-                border-color: #996666;
-                background: rgb(232, 239, 244);
-                background: -moz-linear-gradient(left, rgba(232, 239, 244, 1) 1%, rgba(244, 249, 249, 1) 23%, rgba(249, 250, 246, 1) 87%, rgba(241, 242, 236, 1) 98%);
-                background: -webkit-gradient(linear, left top, right top, color-stop(1%, rgba(232, 239, 244, 1)), color-stop(23%, rgba(244, 249, 249, 1)), color-stop(87%, rgba(249, 250, 246, 1)), color-stop(98%, rgba(241, 242, 236, 1)));
-                background: -webkit-linear-gradient(left, rgba(232, 239, 244, 1) 1%, rgba(244, 249, 249, 1) 23%, rgba(249, 250, 246, 1) 87%, rgba(241, 242, 236, 1) 98%);
-                background: -o-linear-gradient(left, rgba(232, 239, 244, 1) 1%, rgba(244, 249, 249, 1) 23%, rgba(249, 250, 246, 1) 87%, rgba(241, 242, 236, 1) 98%);
-                background: -ms-linear-gradient(left, rgba(232, 239, 244, 1) 1%, rgba(244, 249, 249, 1) 23%, rgba(249, 250, 246, 1) 87%, rgba(241, 242, 236, 1) 98%);
-                background: linear-gradient(to right, rgba(232, 239, 244, 1) 1%, rgba(244, 249, 249, 1) 23%, rgba(249, 250, 246, 1) 87%, rgba(241, 242, 236, 1) 98%);
-                filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e8eff4', endColorstr='#f1f2ec', GradientType=1);
-            }
-        </style>
-	</head>
-
-	<xsl:variable name="unique-catkey" select="/BugCollection/BugCategory/@category"/>
-	<!--xsl:variable name="unique-catkey" select="/BugCollection/BugInstance[generate-id() = generate-id(key('bug-category-key',@category))]/@category"/-->
-
-	<body>
-
-	<h1>SpotBugs Report</h1>
-		<p>Produced using <a href="https://spotbugs.github.io">SpotBugs </a> <xsl:value-of select="/BugCollection/@version"/>.</p>
-		<p>Project:
-			<xsl:choose>
-				<xsl:when test='string-length(/BugCollection/Project/@projectName)>0'>
-				<xsl:value-of select="/BugCollection/Project/@projectName" /></xsl:when>
-				<xsl:otherwise><xsl:value-of select="/BugCollection/Project/@filename" /></xsl:otherwise>
-			</xsl:choose>
-		</p>
-
-		<table style="width:90%;">
-			<tr>
-				<td>
-					<h2>Metrics</h2>
-					<xsl:apply-templates select="/BugCollection/FindBugsSummary"/>
-				</td>
-				<td>
-					<h2>Summary</h2>
-					<table cellpadding="5" cellspacing="2" style="width:90%;border-collapse: collapse;border-style:solid;border-width:thin;">
-					    <tr class="tableheader">
-							<th align="left">Warning Type</th>
-							<th align="right">Number</th>
-						</tr>
-
-					<xsl:for-each select="$unique-catkey">
-						<xsl:sort select="." order="ascending"/>
-						<xsl:variable name="catkey" select="."/>
-						<xsl:variable name="catdesc" select="/BugCollection/BugCategory[@category=$catkey]/Description"/>
-						<xsl:variable name="styleclass">
-							<xsl:choose><xsl:when test="position() mod 2 = 1">tablerow0</xsl:when>
-								<xsl:otherwise>tablerow1</xsl:otherwise>
-							</xsl:choose>
-						</xsl:variable>
-
-						<tr class="{$styleclass}">
-							<td><a href="#Warnings_{$catkey}"><xsl:value-of select="$catdesc"/> Warnings</a></td>
-							<td align="right"><xsl:value-of select="count(/BugCollection/BugInstance[@category=$catkey])"/></td>
-						</tr>
-					</xsl:for-each>
-
-					<xsl:variable name="styleclass">
-						<xsl:choose><xsl:when test="count($unique-catkey) mod 2 = 0">tablerow0</xsl:when>
-							<xsl:otherwise>tablerow1</xsl:otherwise>
-						</xsl:choose>
-					</xsl:variable>
-						<tr class="{$styleclass}">
-						    <td><b>Total</b></td>
-						    <td align="right"><b><xsl:value-of select="count(/BugCollection/BugInstance)"/></b></td>
-						</tr>
-					</table>
-				</td>
-			</tr>
-		</table>
-
-	<p><br/><br/></p>
-
-	<h1>Warnings</h1>
-
-	<p>Click on each warning link to see a full description of the issue, and
-	    details of how to resolve it.</p>
-
-	<xsl:for-each select="$unique-catkey">
-		<xsl:sort select="." order="ascending"/>
-		<xsl:variable name="catkey" select="."/>
-		<xsl:variable name="catdesc" select="/BugCollection/BugCategory[@category=$catkey]/Description"/>
-
-		<xsl:call-template name="generateWarningTable">
-			<xsl:with-param name="warningSet" select="/BugCollection/BugInstance[@category=$catkey]"/>
-			<xsl:with-param name="sectionTitle"><xsl:value-of select="$catdesc"/> Warnings</xsl:with-param>
-			<xsl:with-param name="sectionId">Warnings_<xsl:value-of select="$catkey"/></xsl:with-param>
-		</xsl:call-template>
-	</xsl:for-each>
-
-    <p><br/><br/></p>
-	<h1><a name="Details">Warning Types</a></h1>
-
-	<xsl:apply-templates select="/BugCollection/BugPattern">
-		<xsl:sort select="@abbrev"/>
-		<xsl:sort select="ShortDescription"/>
-	</xsl:apply-templates>
-
-	</body>
-	</html>
-</xsl:template>
-
-<xsl:template match="BugInstance">
-	<xsl:variable name="warningId"><xsl:value-of select="generate-id()"/></xsl:variable>
-
-	<tr>
-		<!-- class="tablerow{position() mod 2}" -->
-		<xsl:choose>
-			<xsl:when test="@priority = 1"><xsl:attribute name="class">high</xsl:attribute></xsl:when>
-			<xsl:when test="@priority = 2"><xsl:attribute name="class">medium</xsl:attribute></xsl:when>
-			<xsl:when test="@priority = 3"><xsl:attribute name="class">low</xsl:attribute></xsl:when>
-			<xsl:otherwise><xsl:attribute name="bgcolor">#fdfdfd</xsl:attribute></xsl:otherwise>
-		</xsl:choose>
-		<td width="10%" valign="top" align="center">
-			<xsl:choose>
-				<xsl:when test="@priority = 1"><strong>High</strong></xsl:when>
-				<xsl:when test="@priority = 2">Medium</xsl:when>
-				<xsl:when test="@priority = 3">Low</xsl:when>
-				<xsl:otherwise>Unknown</xsl:otherwise>
-			</xsl:choose>
-		</td>
-		<td width="70%">
-			<a href="#{@type}"><xsl:value-of select="ShortMessage"/></a>
-			<dl>
-				<dt class='long_message'><xsl:value-of select="LongMessage"/></dt>
-				<dd>
-					<!--  add source filename and line number(s), if any -->
-					<xsl:if test="SourceLine">
-						In file <tt><strong><xsl:value-of select="SourceLine/@sourcefile"/></strong></tt>,
-						<xsl:choose>
-							<xsl:when test="SourceLine/@start = SourceLine/@end">
-							line <xsl:value-of select="SourceLine/@start"/>
-							</xsl:when>
-							<xsl:otherwise>
-							lines <xsl:value-of select="SourceLine/@start"/>
-							    to <xsl:value-of select="SourceLine/@end"/>
-							</xsl:otherwise>
-						</xsl:choose>
-					</xsl:if>
-
-					<xsl:for-each select="./*/Message">
-						<br/><xsl:value-of select="text()"/>
-					</xsl:for-each>
-				</dd>
-			</dl>
-		</td>
-	</tr>
-</xsl:template>
-
-<xsl:template match="BugPattern">
-	<h2><a name="{@type}"><xsl:value-of select="ShortDescription"/></a></h2>
-	<xsl:value-of select="Details" disable-output-escaping="yes"/>
-	<p><br/><br/></p>
-</xsl:template>
-
-<xsl:template name="generateWarningTable">
-	<xsl:param name="warningSet"/>
-	<xsl:param name="sectionTitle"/>
-	<xsl:param name="sectionId"/>
-
-	<h2><a name="{$sectionId}"><xsl:value-of select="$sectionTitle"/></a></h2>
-	<table class="warningtable" cellspacing="2" cellpadding="5" style="width:100%;border-collapse: collapse;border-style:solid;border-width:thin;">
-		<xsl:copy-of select="$bugTableHeader"/>
-		<xsl:choose>
-		    <xsl:when test="count($warningSet) &gt; 0">
-				<xsl:apply-templates select="$warningSet">
-					<xsl:sort select="@priority"/>
-					<xsl:sort select="@abbrev"/>
-					<xsl:sort select="Class/@classname"/>
-				</xsl:apply-templates>
-		    </xsl:when>
-		    <xsl:otherwise>
-		        <tr><td colspan="2"><p><i>None</i></p></td></tr>
-		    </xsl:otherwise>
-		</xsl:choose>
-	</table>
-	<p><br/><br/></p>
-</xsl:template>
-
-<xsl:template match="FindBugsSummary">
-    <xsl:variable name="kloc" select="@total_size div 1000.0"/>
-    <xsl:variable name="format" select="'#######0.00'"/>
-
-	<p><xsl:value-of select="@total_size"/> lines of code analysed,
-	in <xsl:value-of select="@total_classes"/> classes,
-	in <xsl:value-of select="@num_packages"/> packages.</p>
-	<table cellpadding="5" cellspacing="2" style="width:90%;border-collapse: collapse;border-style:solid;border-width:thin;">
-	    <tr class="tableheader">
-			<th align="left">Metric</th>
-			<th align="right">Total</th>
-			<th align="right">Density*</th>
-		</tr>
-		<tr class="high" >
-			<td>High Priority Warnings</td>
-			<td align="right"><xsl:value-of select="@priority_1"/></td>
-			<td align="right"><xsl:value-of select="format-number(@priority_1 div $kloc, $format)"/></td>
-		</tr>
-		<tr class="medium">
-			<td>Medium Priority Warnings</td>
-			<td align="right"><xsl:value-of select="@priority_2"/></td>
-			<td align="right"><xsl:value-of select="format-number(@priority_2 div $kloc, $format)"/></td>
-		</tr>
-
-    <xsl:choose>
-		<xsl:when test="@priority_3">
-			<tr class="low">
-				<td>Low Priority Warnings</td>
-				<td align="right"><xsl:value-of select="@priority_3"/></td>
-				<td align="right"><xsl:value-of select="format-number(@priority_3 div $kloc, $format)"/></td>
-			</tr>
-		</xsl:when>
-	</xsl:choose>
-
-		<tr bgcolor="#f0f0f0">
-			<td><b>Total Warnings</b></td>
-			<td align="right"><b><xsl:value-of select="@total_bugs"/></b></td>
-			<td align="right"><b><xsl:value-of select="format-number(@total_bugs div $kloc, $format)"/></b></td>
-		</tr>
-	</table>
-	<p><i>(* Defects per thousand lines of non-commenting source statements)</i></p>
-	<p><br/><br/></p>
-
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/src/python/review/inspectors/spotbugs/files/src/xsl/default.xsl b/src/python/review/inspectors/spotbugs/files/src/xsl/default.xsl
deleted file mode 100644
index a2b793a9..00000000
--- a/src/python/review/inspectors/spotbugs/files/src/xsl/default.xsl
+++ /dev/null
@@ -1,372 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  FindBugs - Find bugs in Java programs
-  Copyright (C) 2004,2005 University of Maryland
-  Copyright (C) 2005, Chris Nappin
-  
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-  
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-  
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
--->
-
-<!--
-  A simple XSLT stylesheet to transform FindBugs XML results
-  annotated with messages into HTML.
-
-  If you want to experiment with modifying this stylesheet,
-  or write your own, you need to generate XML output from FindBugs
-  using a special option which lets it know to include
-  human-readable messages in the XML.  Invoke the findbugs script
-  as follows:
-
-    findbugs -textui -xml:withMessages -project myProject.fb > results.xml
-
-  Then you can use your favorite XSLT implementation to transform
-  the XML output into HTML. (But don't use xsltproc. It generates well-nigh
-  unreadable output, and generates incorrect output for the
-  <script> element.)
-
-  Authors:
-  David Hovemeyer
-  Chris Nappin (summary table)
--->
-
-<xsl:stylesheet version="2.0"
-                xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-<xsl:output
-	method="xml"
-	indent="yes"
-	omit-xml-declaration="yes"
-	standalone="omit"
-	doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
-	doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"
-	encoding="UTF-8"/>
-
-<xsl:variable name="literalNbsp">&amp;nbsp;</xsl:variable>
-
-<!--xsl:key name="bug-category-key" match="/BugCollection/BugInstance" use="@category"/-->
-
-<xsl:variable name="bugTableHeader">
-	<tr class="tableheader">
-		<th align="left">Code</th>
-		<th align="left">Warning</th>
-	</tr>
-</xsl:variable>
-
-<xsl:template match="/">
-	<html>
-	<head>
-		<title>SpotBugs Report</title>
-		<style type="text/css">
-		.tablerow0 {
-			background: #EEEEEE;
-		}
-
-		.tablerow1 {
-			background: white;
-		}
-
-		.detailrow0 {
-			background: #EEEEEE;
-		}
-
-		.detailrow1 {
-			background: white;
-		}
-
-		.tableheader {
-			background: #b9b9fe;
-			font-size: larger;
-		}
-
-		.tablerow0:hover, .tablerow1:hover {
-			background: #aaffaa;
-		}
-
-		.priority-1 {
-				color: red;
-				font-weight: bold;
-		}
-		.priority-2 {
-				color: orange;
-				font-weight: bold;
-		}
-		.priority-3 {
-				color: green;
-				font-weight: bold;
-		}
-		.priority-4 {
-				color: blue;
-				font-weight: bold;
-		}
-		</style>
-		<script type="text/javascript">
-			function toggleRow(elid) {
-				if (document.getElementById) {
-					element = document.getElementById(elid);
-					if (element) {
-						if (element.style.display == 'none') {
-							element.style.display = 'block';
-							//window.status = 'Toggle on!';
-						} else {
-							element.style.display = 'none';
-							//window.status = 'Toggle off!';
-						}
-					}
-				}
-			}
-		</script>
-	</head>
-
-	<xsl:variable name="unique-catkey" select="/BugCollection/BugCategory/@category"/>
-	<!--xsl:variable name="unique-catkey" select="/BugCollection/BugInstance[generate-id() = generate-id(key('bug-category-key',@category))]/@category"/-->
-
-	<body>
-
-		<h1><a href="https://spotbugs.github.io/">SpotBugs</a> Report</h1>
-
-	<h2>Project Information</h2>	
-	<xsl:apply-templates select="/BugCollection/Project"/>
-
-	<h2>Metrics</h2>
-	<xsl:apply-templates select="/BugCollection/FindBugsSummary"/>
-
-	<h2>Contents</h2>
-	<ul>
-		<xsl:for-each select="$unique-catkey">
-			<xsl:sort select="." order="ascending"/>
-			<xsl:variable name="catkey" select="."/>
-			<xsl:variable name="catdesc" select="/BugCollection/BugCategory[@category=$catkey]/Description"/>
-			
-			<li><a href="#Warnings_{$catkey}"><xsl:value-of select="$catdesc"/> Warnings</a></li>
-		</xsl:for-each>
-
-		<li><a href="#Details">Details</a></li>
-	</ul>
-
-	<h1>Summary</h1>
-	<table width="500" cellpadding="5" cellspacing="2">
-			<tr class="tableheader">
-			<th align="left">Warning Type</th>
-			<th align="right">Number</th>
-		</tr>
-
-		<xsl:for-each select="$unique-catkey">
-			<xsl:sort select="." order="ascending"/>
-			<xsl:variable name="catkey" select="."/>
-			<xsl:variable name="catdesc" select="/BugCollection/BugCategory[@category=$catkey]/Description"/>
-			<xsl:variable name="styleclass">
-				<xsl:choose><xsl:when test="position() mod 2 = 1">tablerow0</xsl:when>
-					<xsl:otherwise>tablerow1</xsl:otherwise>
-				</xsl:choose>
-			</xsl:variable>
-			
-		<tr class="{$styleclass}">
-			<td><a href="#Warnings_{$catkey}"><xsl:value-of select="$catdesc"/> Warnings</a></td>
-			<td align="right"><xsl:value-of select="count(/BugCollection/BugInstance[(@category=$catkey) and not(@last)])"/></td>
-		</tr>
-		</xsl:for-each>
-
-		<xsl:variable name="styleclass">
-			<xsl:choose><xsl:when test="count($unique-catkey) mod 2 = 0">tablerow0</xsl:when>
-				<xsl:otherwise>tablerow1</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
-		<tr class="{$styleclass}">
-			<td><b>Total</b></td>
-			<td align="right"><b><xsl:value-of select="count(/BugCollection/BugInstance[not(@last)])"/></b></td>
-		</tr>
-	</table>
-
-	<h1>Warnings</h1>
-
-	<p>Click on a warning row to see full context information.</p>
-
-	<xsl:for-each select="$unique-catkey">
-		<xsl:sort select="." order="ascending"/>
-		<xsl:variable name="catkey" select="."/>
-		<xsl:variable name="catdesc" select="/BugCollection/BugCategory[@category=$catkey]/Description"/>
-			
-		<xsl:call-template name="generateWarningTable">
-			<xsl:with-param name="warningSet" select="/BugCollection/BugInstance[(@category=$catkey) and not(@last)]"/>
-			<xsl:with-param name="sectionTitle"><xsl:value-of select="$catdesc"/> Warnings</xsl:with-param>
-			<xsl:with-param name="sectionId">Warnings_<xsl:value-of select="$catkey"/></xsl:with-param>
-		</xsl:call-template>
-	</xsl:for-each>
-
-	<h1><a name="Details">Details</a></h1>
-
-	<xsl:apply-templates select="/BugCollection/BugPattern">
-		<xsl:sort select="@abbrev"/>
-		<xsl:sort select="ShortDescription"/>
-	</xsl:apply-templates>
-
-	</body>
-	</html>
-</xsl:template>
-
-<xsl:template match="Project">
-	<p>Project: 
-		<xsl:choose>
-			<xsl:when test='string-length(/BugCollection/Project/@projectName)>0'><xsl:value-of select="/BugCollection/Project/@projectName" /></xsl:when>
-			<xsl:otherwise><xsl:value-of select="/BugCollection/Project/@filename" /></xsl:otherwise>
-		</xsl:choose>
-	</p>
-	<p>SpotBugs version: <xsl:value-of select="/BugCollection/@version"/></p>
-	
-	<p>Code analyzed:</p>
-	<ul>
-		<xsl:for-each select="./Jar">
-			<li><xsl:value-of select="text()"/></li>
-		</xsl:for-each>
-	</ul>
-	<p><br/><br/></p>
-</xsl:template>
-
-<xsl:template match="BugInstance[not(@last)]">
-	<xsl:variable name="warningId"><xsl:value-of select="generate-id()"/></xsl:variable>
-
-	<tr class="tablerow{position() mod 2}" onclick="toggleRow('{$warningId}');">
-
-	<td>
-		<span><xsl:attribute name="class">priority-<xsl:value-of select="@priority"/></xsl:attribute>
-			<xsl:value-of select="@abbrev"/>
-		</span>
-	</td>
-
-	<td>
-	<xsl:value-of select="LongMessage"/>
-	</td>
-
-	</tr>
-
-	<!-- Add bug annotation elements: Class, Method, Field, SourceLine, Field -->
-	<tr class="detailrow{position() mod 2}">
-		<td/>
-		<td>
-			<p id="{$warningId}" style="display: none;">
-				<a href="#{@type}">Bug type <xsl:value-of select="@type"/> (click for details)</a>
-				<xsl:for-each select="./*/Message">
-					<br/><xsl:value-of select="text()" disable-output-escaping="no"/>
-				</xsl:for-each>
-			</p>
-		</td>
-	</tr>
-</xsl:template>
-
-<xsl:template match="BugPattern">
-	<h2><a name="{@type}"><xsl:value-of select="@type"/>: <xsl:value-of select="ShortDescription"/></a></h2>
-	<xsl:value-of select="Details" disable-output-escaping="yes"/>
-</xsl:template>
-
-<xsl:template name="generateWarningTable">
-	<xsl:param name="warningSet"/>
-	<xsl:param name="sectionTitle"/>
-	<xsl:param name="sectionId"/>
-
-	<h2><a name="{$sectionId}"><xsl:value-of select="$sectionTitle"/></a></h2>
-	<table class="warningtable" width="100%" cellspacing="0">
-		<xsl:copy-of select="$bugTableHeader"/>
-		<xsl:apply-templates select="$warningSet">
-			<xsl:sort select="@abbrev"/>
-			<xsl:sort select="Class/@classname"/>
-		</xsl:apply-templates>
-	</table>
-</xsl:template>
-
-<xsl:template match="FindBugsSummary">
-		<xsl:variable name="kloc" select="@total_size div 1000.0"/>
-		<xsl:variable name="format" select="'#######0.00'"/>
-
-	<p><xsl:value-of select="@total_size"/> lines of code analyzed,
-	in <xsl:value-of select="@total_classes"/> classes, 
-	in <xsl:value-of select="@num_packages"/> packages.</p>
-	<table width="500" cellpadding="5" cellspacing="2">
-			<tr class="tableheader">
-			<th align="left">Metric</th>
-			<th align="right">Total</th>
-			<th align="right">Density*</th>
-		</tr>
-		<tr class="tablerow0">
-			<td>High Priority Warnings</td>
-			<td align="right"><xsl:value-of select="@priority_1"/></td>
-			<td align="right">
-				<xsl:choose>
-					<xsl:when test= "number($kloc) &gt; 0.0 and number(@priority_1) &gt; 0.0">
-						<xsl:value-of select="format-number(@priority_1 div $kloc, $format)"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:value-of select="format-number(0.0, $format)"/>
-					</xsl:otherwise>
-				</xsl:choose>
-			</td>
-		</tr>
-		<tr class="tablerow1">
-			<td>Medium Priority Warnings</td>
-			<td align="right"><xsl:value-of select="@priority_2"/></td>
-			<td align="right">
-				<xsl:choose>
-					<xsl:when test= "number($kloc) &gt; 0.0 and number(@priority_2) &gt; 0.0">
-						<xsl:value-of select="format-number(@priority_2 div $kloc, $format)"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:value-of select="format-number(0.0, $format)"/>
-					</xsl:otherwise>
-				</xsl:choose>
-			</td>
-		</tr>
-
-		<xsl:choose>
-			<xsl:when test="@priority_3">
-				<tr class="tablerow1">
-					<td>Low Priority Warnings</td>
-					<td align="right"><xsl:value-of select="@priority_3"/></td>
-					<td align="right">
-						<xsl:choose>
-							<xsl:when test= "number($kloc) &gt; 0.0 and number(@priority_3) &gt; 0.0">
-								<xsl:value-of select="format-number(@priority_3 div $kloc, $format)"/>
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:value-of select="format-number(0.0, $format)"/>
-							</xsl:otherwise>
-						</xsl:choose>
-					</td>
-				</tr>
-			</xsl:when>
-		</xsl:choose>
-
-		<xsl:variable name = "totalClass" select="if (@priority_3) then 'tablerow0' else 'tablerow1'"/>
-		<tr class="$totalClass">
-			<td><b>Total Warnings</b></td>
-			<td align="right"><b><xsl:value-of select="@total_bugs"/></b></td>
-			<xsl:choose>
-				<xsl:when test="number($kloc) &gt; 0.0">
-					<td align="right"><b><xsl:value-of select="format-number(@total_bugs div $kloc, $format)"/></b></td>
-				</xsl:when>
-				<xsl:otherwise>
-					<td align="right"><b><xsl:value-of select="format-number(0.0, $format)"/></b></td>
-				</xsl:otherwise>
-			</xsl:choose>
-		</tr>
-	</table>
-	<p><i>(* Defects per Thousand lines of non-commenting source statements)</i></p>
-	<p><br/><br/></p>
-
-</xsl:template>
-
-</xsl:stylesheet>
-
-<!-- vim:set ts=4: -->
diff --git a/src/python/review/inspectors/spotbugs/files/src/xsl/fancy-hist.xsl b/src/python/review/inspectors/spotbugs/files/src/xsl/fancy-hist.xsl
deleted file mode 100644
index eaac4a7f..00000000
--- a/src/python/review/inspectors/spotbugs/files/src/xsl/fancy-hist.xsl
+++ /dev/null
@@ -1,1290 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  Copyright (C) 2005, 2006 Etienne Giraudy, InStranet Inc
-  Copyright (C) 2005, 2007 Etienne Giraudy
-  Copyright (C) 2019 Björn Kautler
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
--->
-
-<xsl:transform version="2.0"
-               xmlns:xsl="http://www.w3.org/1999/XSL/Transform" >
-<xsl:output
-      method="xml" indent="yes"
-      doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
-      doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
-      encoding="UTF-8"/>
-
-<xsl:variable name="apos" select="&quot;'&quot;"/>
-
-<xsl:template match="/">
-
-<xsl:variable name="titlePart">
-   <xsl:text> (</xsl:text>
-   <xsl:value-of select="/BugCollection/@version"/>
-   <xsl:text>)</xsl:text>
-   <xsl:variable name="project" select="(/BugCollection/Project/@projectName, /BugCollection/Project/@filename)[1]"/>
-   <xsl:text> analysis</xsl:text>
-   <xsl:if test="$project">
-      <xsl:text> for </xsl:text>
-      <xsl:value-of select="$project"/>
-   </xsl:if>
-   <xsl:variable name="release" select="/BugCollection/@release"/>
-   <xsl:if test="$release">
-      <xsl:text> of release </xsl:text>
-      <xsl:value-of select="$release"/>
-   </xsl:if>
-</xsl:variable>
-
-<html>
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-      <title>
-         <xsl:text>SpotBugs</xsl:text>
-         <xsl:value-of select="$titlePart"/>
-      </title>
-      <style type="text/css">
-         html, body, div, form {
-            margin:0px;
-            padding:0px;
-         }
-         body {
-            padding:3px;
-         }
-         a, a:link , a:active, a:visited, a:hover {
-            text-decoration: none; color: black;
-         }
-         #navlist {
-            padding: 3px 0;
-            margin-left: 0;
-            border-bottom: 1px solid #778;
-            font: bold 12px Verdana, sans-serif;
-         }
-         #navlist li {
-            list-style: none;
-            margin: 0;
-            display: inline;
-         }
-         #navlist li a {
-            padding: 3px 0.5em;
-            margin-left: 3px;
-            border: 1px solid #778;
-            border-bottom: none;
-            background: #DDE;
-            text-decoration: none;
-         }
-         #navlist li a:link { color: #448; }
-         #navlist li a:visited { color: #667; }
-         #navlist li a:hover {
-            color: #000;
-            background: #AAE;
-            border-color: #227;
-         }
-         #navlist li a.current {
-            background: white;
-            border-bottom: 1px solid white;
-         }
-         #filterWrapper {
-            margin-bottom:5px;
-         }
-         #displayWrapper {
-            margin-top:5px;
-         }
-         .message {
-            background:#BBBBBB;
-            border: 1px solid #778;
-         }
-         .displayContainer {
-            border:1px solid #555555;
-            margin-top:3px;
-            padding: 3px;
-            display:none;
-         }
-         #summaryContainer table,
-         #historyContainer table {
-            border:1px solid black;
-         }
-         #summaryContainer th,
-         #historyContainer th {
-            background: #aaaaaa;
-            color: white;
-         }
-         #summaryContainer th, #summaryContainer td,
-         #historyContainer th, #historyContainer td {
-            padding: 2px 4px 2px 4px;
-         }
-         .summary-name {
-            background: #eeeeee;
-            text-align:left;
-         }
-         .summary-size {
-            background: #eeeeee;
-            text-align:center;
-         }
-         .summary-priority-all {
-            background: #dddddd;
-            text-align:center;
-         }
-         .summary-priority-1 {
-            background: #ef2929;
-            text-align:center;
-         }
-         .summary-priority-2 {
-            background: #fcaf3e;
-            text-align:center;
-         }
-         .summary-priority-3 {
-            background: #8ae234;
-            text-align:center;
-         }
-         .summary-priority-4 {
-            background: #729fcf;
-            text-align:center;
-         }
-
-         .bugList-level1 {
-            margin-bottom:5px;
-         }
-         .bugList-level1, .bugList-level2, .bugList-level3, .bugList-level4 {
-            background-color: #ffffff;
-            margin-left:15px;
-            padding-left:10px;
-         }
-         .bugList-level1-label, .bugList-level2-label, .bugList-level3-label, .bugList-level4-label {
-            background-color: #bbbbbb;
-            border: 1px solid black;
-            padding: 1px 3px 1px 3px;
-         }
-         .bugList-level2-label, .bugList-level3-label, .bugList-level4-label {
-            border-width: 0px 1px 1px 1px;
-         }
-         .bugList-level4-label {
-            background-color: #ffffff;
-            border: 0px 0px 1px 0px;
-         }
-         .bugList-level4 {
-            border: 0px 1px 1px 1px;
-         }
-
-         .bugList-level4-inner {
-            border-style: solid;
-            border-color: black;
-            border-width: 0px 1px 1px 1px;
-         }
-         .b-r {
-            font-size: 10pt; font-weight: bold; padding: 0 0 0 60px;
-         }
-         .b-d {
-            font-weight: normal; background: #ccccc0;
-            padding: 0 5px 0 5px; margin: 0px;
-         }
-         .b-1 {
-            background: #ef2929; height: 0.5em; width: 1em;
-            margin-right: 0.5em;
-         }
-         .b-2 {
-            background: #fcaf3e; height: 0.5em; width: 1em;
-            margin-right: 0.5em;
-         }
-         .b-3 {
-            background: #8ae234; height: 0.5em; width: 1em;
-            margin-right: 0.5em;
-         }
-         .b-4 {
-            background: #729fcf; height: 0.5em; width: 1em;
-            margin-right: 0.5em;
-         }
-      </style>
-      <script type='text/javascript'>
-         <xsl:text disable-output-escaping='yes'><![CDATA[
-         var menus = new Array('summary', 'info', 'history', 'listByCategories', 'listByPackages');
-
-         var state = new Proxy({
-            tab: "summary",
-            includeFixed: true,
-            release: -1,
-            priority: 4
-         }, {
-            set: function (target, name, value) {
-               target[name] = value;
-               history.replaceState(null, null, "#" + JSON.stringify(target));
-            }
-         });
-
-         var filterContainerId              = "filterWrapper";
-         var historyControlContainerId      = "historyControlWrapper";
-         var messageContainerId             = "messageContainer";
-         var summaryContainerId             = "summaryContainer";
-         var infoContainerId                = "infoContainer";
-         var historyContainerId             = "historyContainer";
-         var listByCategoriesContainerId    = "listByCategoriesContainer";
-         var listByPackagesContainerId      = "listByPackagesContainer";
-
-         // main init function
-         function init() {
-            if (versions.size <= 1) {
-               hide("historyMenu")
-            }
-            loadFilter();
-            onHashChange()
-            includeFixedIntroducedBugsInHistory();
-            window.addEventListener('hashchange', onHashChange);
-         }
-
-         function onHashChange() {
-            try {
-               var hash = location.hash.substring(1);
-               if (hash.charAt(1) != "\"") {
-                  hash = decodeURIComponent(hash);
-               }
-               var parsedState = JSON.parse(hash);
-               selectMenu(parsedState.tab);
-               var element = document.findbugsHistoryControlForm.includeFixedIntroducedBugs;
-               element.checked = parsedState.includeFixed;
-               element.onchange();
-               element = document.findbugsForm.versions;
-               element.value = (element.namedItem(parsedState.release) == null) ? state.release : parsedState.release;
-               element.onchange();
-               element = document.findbugsForm.priorities;
-               element.value = (element.namedItem(parsedState.priority) == null) ? state.priority : parsedState.priority;
-               element.onchange();
-            } catch (e) {
-               history.replaceState(null, null, "#" + JSON.stringify(state));
-            }
-         }
-
-         // menu callback function
-         function selectMenu(menuId) {
-            document.getElementById(state.tab).className="none";
-            document.getElementById(menuId).className="current";
-            if (menuId!=state.tab) {
-               hideMenu(state.tab);
-               state.tab = menuId;
-            }
-            if (menuId=="summary")           displaySummary();
-            if (menuId=="info")              displayInfo();
-            if (menuId=="history")           displayHistory();
-            if (menuId=="listByCategories")  displayListByCategories();
-            if (menuId=="listByPackages")    displayListByPackages();
-         }
-
-         // display filter
-         function loadFilter() {
-            var versionsBox = document.findbugsForm.versions;
-            versionsBox.options[0] = new Option(" -- All Releases -- ", "-1");
-            versionsBox.options[0].id = "-1";
-            versionsBox.options.selectedIndex = 0;
-            for (version of versions) {
-               var option = new Option(version[1], version[0]);
-               option.id = version[0];
-               versionsBox.options.add(option);
-            }
-            if (versions.size <= 1) {
-               versionsBox.style.display = "none";
-            }
-         }
-
-         // display a message
-         function displayMessage(msg) {
-            var container = document.getElementById(messageContainerId);
-            container.innerHTML = "<div class='message'>"+msg+"</div>";
-         }
-
-         // reset displayed message
-         function resetMessage() {
-            var container = document.getElementById(messageContainerId);
-            container.innerHTML = "";
-         }
-
-         function hideMenu(menuId) {
-            hide(menuId + "Container");
-         }
-
-         // filter callback function
-         function filter() {
-            state.release = document.findbugsForm.versions.value;
-            state.priority = document.findbugsForm.priorities.value;
-            selectMenu(state.tab);
-         }
-
-         // includeFixedBugs callback function
-         function includeFixedIntroducedBugsInHistory() {
-            state.includeFixed = document.findbugsHistoryControlForm.includeFixedIntroducedBugs.checked;
-            selectMenu(state.tab);
-         }
-
-         // display summary tab
-         function displaySummary() {
-            resetMessage();
-            hide(filterContainerId);
-            hide(historyControlContainerId);
-            var container = document.getElementById(summaryContainerId);
-            container.style.display="block";
-         }
-
-         // display info tab
-         function displayInfo() {
-            resetMessage();
-            hide(filterContainerId);
-            hide(historyControlContainerId);
-            var container = document.getElementById(infoContainerId);
-            container.style.display="block";
-         }
-
-         // display history tab
-         function displayHistory() {
-            displayMessage("Loading history...");
-            hide(filterContainerId);
-            show(historyControlContainerId);
-            var container = document.getElementById(historyContainerId);
-            var content = "";
-            var i=0;
-            var p = [0,0,0,0,0];
-            var f = [0,0,0,0,0];
-
-            content += "<table><tr><th>Release</th><th>Total Bugs</th><th>Bugs P1</th><th>Bugs P2</th><th>Bugs P3</th><th>Bugs Experimental</th></tr>";
-
-            var aSpan   = "<span title='Bugs introduced in this release that have not been fixed.'>";
-            var fSpan   = "<span title='Bugs fixed in this release.'>";
-            var fiSpan  = "<span title='Bugs introduced in this release that were fixed in later releases.'>";
-            var afiSpan = "<span title='Total number of bugs introduced in this release.'>";
-            var eSpan   = "</span>";
-
-            var versionIds = Array.from(versions.keys())
-            if(state.includeFixed) {
-               for (i=(versionIds.length-1); i>0; i--) {
-                  var versionId = versionIds[i];
-                  v = countBugsVersion(versionId, 4);
-                  t = countTotalBugsVersion(versionId);
-                  o = countFixedButActiveBugsVersion(versionId);
-                  f = countFixedBugsInVersion(versionId);
-                  fi = countFixedBugsIntroducedInVersion(versionId);
-                  content += "<tr>";
-                  content += "<td class='summary-name'>" + versions.get(versionId) + "</td>";
-                  content += "<td class='summary-priority-all'> " + (t[0] + o[0]) + " (+" + afiSpan + (v[0] + fi[0]) + eSpan +
-                        " [" + aSpan + v[0] + eSpan + " / " + fiSpan + fi[0] + eSpan + "] " + eSpan + " / -" + fSpan + f[0] + eSpan + ") </td>";
-                  content += "<td class='summary-priority-1'> " + (t[1] + o[1]) + " (+" + afiSpan + (v[1] + fi[1]) + eSpan +
-                        " [" + aSpan + v[1] + eSpan + " / " + fiSpan + fi[1] + eSpan + "] " + eSpan + " / -" + fSpan + f[1] + eSpan + ") </td>";
-                  content += "<td class='summary-priority-2'> " + (t[2] + o[2]) + " (+" + afiSpan + (v[2] + fi[2]) + eSpan +
-                        " [" + aSpan + v[2] + eSpan + " / " + fiSpan + fi[2] + eSpan + "] " + eSpan + " / -" + fSpan + f[2] + eSpan + ") </td>";
-                  content += "<td class='summary-priority-3'> " + (t[3] + o[3]) + " (+" + afiSpan + (v[3] + fi[3]) + eSpan +
-                        " [" + aSpan + v[3] + eSpan + " / " + fiSpan + fi[3] + eSpan + "] " + eSpan + " / -" + fSpan + f[3] + eSpan + ") </td>";
-                  content += "<td class='summary-priority-4'> " + (t[4] + o[4]) + " (+" + afiSpan + (v[4] + fi[4]) + eSpan +
-                        " [" + aSpan + v[4] + eSpan + " / " + fiSpan + fi[4] + eSpan + "] " + eSpan + " / -" + fSpan + f[4] + eSpan + ") </td>";
-                  content += "</tr>";
-               }
-            } else {
-               for (i=(versionIds.length-1); i>0; i--) {
-                  var versionId = versionIds[i];
-                  v = countBugsVersion(versionId, 4);
-                  t = countTotalBugsVersion(versionId);
-                  o = countFixedButActiveBugsVersion(versionId);
-                  f = countFixedBugsInVersion(versionId);
-                  content += "<tr>";
-                  content += "<td class='summary-name'>" + versions.get(versionId) + "</td>";
-                  content += "<td class='summary-priority-all'> " + (t[0] + o[0]) + " (+" + aSpan + v[0] + eSpan + " / -" + fSpan + f[0] + eSpan + ") </td>";
-                  content += "<td class='summary-priority-1'  > " + (t[1] + o[1]) + " (+" + aSpan + v[1] + eSpan + " / -" + fSpan + f[1] + eSpan + ") </td>";
-                  content += "<td class='summary-priority-2'  > " + (t[2] + o[2]) + " (+" + aSpan + v[2] + eSpan + " / -" + fSpan + f[2] + eSpan + ") </td>";
-                  content += "<td class='summary-priority-3'  > " + (t[3] + o[3]) + " (+" + aSpan + v[3] + eSpan + " / -" + fSpan + f[3] + eSpan + ") </td>";
-                  content += "<td class='summary-priority-4'  > " + (t[4] + o[4]) + " (+" + aSpan + v[4] + eSpan + " / -" + fSpan + f[4] + eSpan + ") </td>";
-                  content += "</tr>";
-               }
-            }
-
-            t = countTotalBugsVersion(versionIds[0]);
-            o = countFixedButActiveBugsVersion(versionIds[0]);
-            content += "<tr>";
-            content += "<td class='summary-name'>" + versions.get(versionIds[0]) + "</td>";
-            content += "<td class='summary-priority-all'> " + (t[0] + o[0]) + " </td>";
-            content += "<td class='summary-priority-1'  > " + (t[1] + o[1]) + " </td>";
-            content += "<td class='summary-priority-2'  > " + (t[2] + o[2]) + " </td>";
-            content += "<td class='summary-priority-3'  > " + (t[3] + o[3]) + " </td>";
-            content += "<td class='summary-priority-4'  > " + (t[4] + o[4]) + " </td>";
-            content += "</tr>";
-
-            content += "</table>";
-            container.innerHTML = content;
-            container.style.display="block";
-            resetMessage();
-         }
-
-         // display list by cat tab
-         function displayListByCategories() {
-            hide(historyControlContainerId);
-            show(filterContainerId);
-            var container = document.getElementById(listByCategoriesContainerId);
-            container.innerHTML = "";
-            container.style.display="block";
-            displayMessage("Loading stats (categories)...");
-            container.innerHTML = displayLevel1("lbc", "Stats by Bug Categories");
-            resetMessage();
-         }
-
-         // display list by package tab
-         function displayListByPackages() {
-            hide(historyControlContainerId);
-            show(filterContainerId);
-            var container = document.getElementById(listByPackagesContainerId);
-            container.style.display="block";
-            displayMessage("Loading stats (packages)...");
-            container.innerHTML = displayLevel1("lbp", "Stats by Bug Package");
-            resetMessage();
-         }
-
-         // callback function for list item click
-         function toggleList(listType, containerId, id1, id2, id3) {
-            var container = document.getElementById(containerId);
-            if (container.style.display=="block") {
-               container.style.display="none";
-            } else {
-               if (listType=="lbc") {
-                  if (id1.length>0 && id2.length==0 && id3.length==0) {
-                     displayCategoriesCodes(containerId, id1);
-                  } else if (id1.length>0 && id2.length>0 && id3.length==0) {
-                     displayCategoriesCodesPatterns(containerId, id1, id2);
-                  } else if (id1.length>0 && id2.length>0 && id3.length>0) {
-                     displayCategoriesCodesPatternsBugs(containerId, id1, id2, id3);
-                  } else {
-                     // ???
-                  }
-               } else if (listType=="lbp") {
-                  if (id1.length>0 && id2.length==0 && id3.length==0) {
-                     displayPackageCodes(containerId, id1);
-                  } else if (id1.length>0 && id2.length>0 && id3.length==0) {
-                     displayPackageClassPatterns(containerId, id1, id2);
-                  } else if (id1.length>0 && id2.length>0 && id3.length>0) {
-                     displayPackageClassPatternsBugs(containerId, id1, id2, id3);
-                  } else {
-                     // ???
-                  }
-               } else {
-                  // ????
-               }
-            }
-         }
-
-         // list by categories, display bug cat>codes
-         function displayCategoriesCodes(containerId, category) {
-            displayMessage("Loading stats (codes)...");
-            var container = document.getElementById(containerId);
-            container.style.display="block";
-            if (container.innerHTML=="Loading..." || container.innerHTML=="") {
-               container.innerHTML = displayLevel2("lbc", category);
-            }
-            resetMessage();
-         }
-
-         // list by categories, display bug package>codes
-         function displayPackageCodes(containerId, packageName) {
-            displayMessage("Loading stats (codes)...");
-            var container = document.getElementById(containerId);
-            container.style.display="block";
-            if (container.innerHTML=="Loading..." || container.innerHTML=="") {
-               container.innerHTML = displayLevel2("lbp", packageName);
-            }
-            resetMessage();
-         }
-
-         // list by categories, display bug cat>codes>patterns
-         function displayCategoriesCodesPatterns(containerId, category, code) {
-            displayMessage("Loading stats (patterns)...");
-            var container = document.getElementById(containerId);
-            container.style.display="block";
-            if (container.innerHTML=="Loading..." || container.innerHTML=="") {
-               container.innerHTML = displayLevel3("lbc", category, code);
-            }
-            resetMessage();
-         }
-
-         // list by package, display bug package>class>patterns
-         function displayPackageClassPatterns(containerId, packageName, className) {
-            displayMessage("Loading stats (patterns)...");
-            var container = document.getElementById(containerId);
-            container.style.display="block";
-            if (container.innerHTML=="Loading..." || container.innerHTML=="") {
-               container.innerHTML = displayLevel3("lbp", packageName, className);
-            }
-            resetMessage();
-         }
-
-         // list by categories, display bug cat>codes>patterns>bugs
-         function displayCategoriesCodesPatternsBugs(containerId, category, code, pattern) {
-            displayMessage("Loading stats (bugs)...");
-            var container = document.getElementById(containerId);
-            container.style.display="block";
-            if (container.innerHTML=="Loading..." || container.innerHTML=="") {
-               container.innerHTML = displayLevel4("lbc", category, code, pattern);
-            }
-            resetMessage();
-         }
-
-         // list by package, display bug package>class>patterns>bugs
-         function displayPackageClassPatternsBugs(containerId, packageName, className, pattern) {
-            displayMessage("Loading stats (bugs)...");
-            var container = document.getElementById(containerId);
-            container.style.display="block";
-            if (container.innerHTML=="Loading..." || container.innerHTML=="") {
-               container.innerHTML = displayLevel4("lbp", packageName, className, pattern);
-            }
-            resetMessage();
-         }
-
-         // generate level 1 list
-         function displayLevel1(list, title) {
-            var content = "";
-            var content2 = "";
-
-            content += "<h3>"+title+"</h3>";
-            content += getPriorityLegend();
-            content2 += "<div class='bugList'>";
-
-            var id = "";
-            var containerId = "";
-            var subContainerId = "";
-            var prefixSub = "";
-            var prefixId = "";
-            var p = [0,0,0,0,0];
-            var numberOfBugs = 0;
-            var label = "";
-            var max = 0;
-            if (list=="lbc") {
-               max = categories.length;
-            } else if (list=="lbp") {
-               max = packageStats.length;
-            }
-
-            for (var x=0; x<max; x++) {
-               if (list=="lbp" && packageStats[x].totalBugs=="0") continue;
-
-               if (list=="lbc") {
-                  id = categories[x].id;
-                  label = categories[x].label;
-                  containerId = "categories-" + id;
-                  subContainerId = "cat-"+id;
-                  p = countBugsCat(state.release, state.priority, id);
-               }
-               if (list=="lbp") {
-                  id = packageStats[x].packageName;
-                  label = packageStats[x].packageName;
-                  containerId = "packages-" + id;
-                  subContainerId = "package-"+id;
-                  p = countBugsPackage(state.release, state.priority, id);
-               }
-
-               subContainerId = prefixSub+id;
-
-               var total = p[1]+p[2]+p[3]+p[4];
-               if (total > 0) {
-                  content2 += addListItem( 1, containerId, label, total, p, subContainerId,
-                                          "toggleList('" + list + "', '" + subContainerId + "', '"+ id + "', '', '')"
-                                          );
-               }
-               numberOfBugs += total;
-            }
-            content2 += "</div>";
-            content += "<h4>Total number of bugs";
-            if (state.release!=-1) {
-               content += " (introduced in release " + versions.get(state.release) +")";
-            }
-            content += ": "+numberOfBugs+"</h4>";
-            return content+content2;
-         }
-
-         // generate level 2 list
-         function displayLevel2(list, id1) {
-            var content = "";
-            var code = "";
-            var containerId = "";
-            var subContainerId = "";
-            var p = [0,0,0,0,0];
-            var max = 0;
-            var id2 = "";
-            if (list=="lbc") {
-               max = codes.length;
-            } else if (list=="lbp") {
-               max = classStats.length;
-            }
-
-            for (var x=0; x<max; x++) {
-               if (list=="lbp" && classStats[x].totalBugs=="0") continue;
-
-               if (list=="lbc") {
-                  id2 = codes[x].id;
-                  label = codes[x].label;
-                  containerId = "codes-"+id1;
-                  subContainerId = "cat-" + id1 + "-code-" + id2;
-                  p = countBugsCode(state.release, state.priority, id1, id2);
-               }
-               if (list=="lbp") {
-                  id2 = classStats[x].className;
-                  label = classStats[x].className;
-                  containerId = "packages-"+id1;
-                  subContainerId = "package-" + id1 + "-class-" + id2;
-                  p = countBugsClass(state.release, state.priority, id1, id2);
-               }
-
-               var total = p[1]+p[2]+p[3]+p[4];
-               if (total > 0) {
-                  content += addListItem( 2, containerId, label, total, p, subContainerId,
-                                          "toggleList('"+ list + "', '" + subContainerId + "', '"+ id1 + "', '"+ id2 + "', '')"
-                                          );
-               }
-            }
-            return content;
-         }
-
-         // generate level 3 list
-         function displayLevel3(list, id1, id2) {
-            var content = "";
-            var containerId = "";
-            var subContainerId = "";
-            var p = [0,0,0,0,0];
-            var max = 0;
-            var label = "";
-            var id3 = "";
-
-            if ((list=="lbc") || (list=="lbp")) {
-               max = patterns.length;
-            }
-
-            for (var x=0; x<max; x++) {
-               //if (list=="lbp" && (patterns[x].category!=id1 || patterns[x].code!=id2)) continue;
-               //if (list=="lbp" && classStats[x].totalBugs=="0") continue;
-
-               if (list=="lbc") {
-                  id3 = patterns[x].id;
-                  label = patterns[x].label;
-                  containerId = "patterns-"+id1;
-                  subContainerId = "cat-" + id1 + "-code-" + id2 + "-pattern-" + id3;
-                  p = countBugsPattern(state.release, state.priority, id1, id2, id3);
-               }
-               if (list=="lbp") {
-                  id3 = patterns[x].id;
-                  label = patterns[x].label;
-                  containerId = "classpatterns-"+id1;
-                  subContainerId = "package-" + id1 + "-class-" + id2 + "-pattern-" + id3;
-                  p = countBugsClassPattern(state.release, state.priority, id2, id3);
-               }
-
-               var total = p[1]+p[2]+p[3]+p[4];
-               if (total > 0) {
-                  content += addListItem( 3, containerId, label, total, p, subContainerId,
-                                          "toggleList('" + list + "', '" + subContainerId + "', '"+ id1 + "', '"+ id2 + "', '"+ id3 + "')"
-                                          );
-               }
-            }
-            return content;
-         }
-
-         // generate level 4 list
-         function displayLevel4(list, id1, id2, id3) {
-            var content = "";
-            var bug = "";
-            var bugP = 0;
-            var containerId = "";
-            var subContainerId = "";
-            var bugId = "";
-            var label = "";
-            var p = [0,0,0,0,0];
-            for (bug of bugs) {
-               if (list=="lbc") {
-                  if ( bug.category!=id1 || bug.code!=id2 || bug.pattern!=id3 ) continue;
-                  if ( state.release!=-1
-                     && state.release!=bug.firstVersion) continue;
-                  if ( state.priority!=4
-                     && state.priority<bug.priority) continue;
-
-                  subContainerId = "cat-" + id1 + "-code-" + id2 + "-pattern-" + id3 + "-bug-" + bug.id;
-               }
-               if (list=="lbp") {
-                  if ( bug.packageName!=id1 || bug.className!=id2 || bug.pattern!=id3 ) continue;
-                  if ( state.release!=-1
-                     && state.release!=bug.firstVersion) continue;
-                  if ( state.priority!=4
-                     && state.priority<bug.priority) continue;
-
-                  subContainerId = "package-" + id1 + "-class-" + id2 + "-pattern-" + id3 + "-bug-" + bug.id;
-               }
-
-               bugId = "b-uid-" + bug.id;
-               label = bug.className;
-               containerId = "bugs-"+bugId;
-               bugP = bug.priority;
-               p[bugP]++;
-               var total = p[1]+p[2]+p[3]+p[4];
-               if (total > 0) {
-                  content += addBug(   4, containerId, label, bugP, bug.firstVersion, subContainerId,
-                                       "showbug('" + bugId + "', '" + subContainerId + "', '"+id3+"')");
-               }
-            }
-            return content;
-         }
-
-
-         function addListItem(level, id, label, total, p, subId, onclick) {
-            var content = "";
-
-            content += "<div class='bugList-level"+level+"' >";
-            content += "<div class='bugList-level"+level+"-label' id='"+id+"' >";
-            content += "<a href='' onclick=\"" + onclick + ";return false;\" ";
-            content += ">";
-            content += "<strong>"+label+"</strong>";
-            content += " "+total+" bugs";
-            if (state.priority>1)
-               content += " <em>("+p[1];
-            if (state.priority>=2)
-               content += "/"+p[2];
-            if (state.priority>=3)
-               content += "/"+p[3];
-            if (state.priority>=4)
-               content += "/"+p[4];
-            if (state.priority>1)
-               content += ")</em>";
-            content += "</a>";
-            content += "</div>";
-            content += "<div class='bugList-level"+level+"-inner' id='"+subId+"' style='display:none;'>Loading...</div>";
-            content += "</div>";
-            return content;
-         }
-
-         function addBug( level, id, label, p, version, subId, onclick) {
-            var content = "";
-
-            content += "<div class='bugList-level" + level + "' id='" + id + "'>";
-            content += "<div class='bugList-level" + level + "-label' id='" + id + "'>";
-            content += "<span class='b-" + p + "'>&nbsp;&nbsp;&nbsp;</span>";
-            content += "<a href='' onclick=\"" + onclick + ";return false;\">";
-            if ((versions.size>1) && (version==lastVersion)) {
-               content += "<span style='color:#ef2929;font-weight:bold;'>NEW!</span> ";
-            }
-            content += "<strong>" + label + "</strong>";
-            if (version==0) {
-               content += " <em>since first historized release " + versions.get(version.toString()) + "</em>";
-            } else {
-               content += " <em>since release " + versions.get(version.toString()) + "</em>";
-            }
-            content += "</a>";
-            content += "</div>";
-            content += "<div class='bugList-level" + level + "-inner' id='" + subId + "' style='display:none;'>Loading...</div>";
-            content += "</div>";
-            return content;
-         }
-
-         function countBugsVersion(version, priority) {
-            return countBugs(version, priority, null, null, null, null, null);
-         }
-
-         function countBugsCat(version, priority, category) {
-            return countBugs(version, priority, category, null, null, null, null);
-         }
-
-         function countBugsPackage(version, priority, packageName) {
-            return countBugs(version, priority, null, null, null, packageName, null);
-         }
-
-         function countBugsCode(version, priority, category, code) {
-            return countBugs(version, priority, category, code, null, null, null);
-         }
-
-         function countBugsPattern(version, priority, category, code, pattern) {
-            return countBugs(version, priority, category, code, pattern, null, null);
-         }
-
-         function countBugsClass(version, priority, packageName, className) {
-            return countBugs(version, priority, null, null, null, packageName, className);
-         }
-
-         function countBugsClassPattern(version, priority, className, pattern) {
-            return countBugs(version, priority, null, null, pattern, null, className);
-         }
-
-         function countBugs(version, priority, category, code, pattern, packageName, className) {
-            var count = [0,0,0,0,0];
-            for (bug of bugs) {
-               if (     (version==-1  || version==bug.firstVersion)
-                     && (priority==4  || priority>=bug.priority)
-                     && (!category    || bug.category==category)
-                     && (!code        || bug.code==code)
-                     && (!pattern     || bug.pattern==pattern)
-                     && (!packageName || bug.packageName==packageName)
-                     && (!className   || bug.className==className)
-                     ) {
-                  count[bug.priority]++;
-               }
-            }
-            count[0] = count[1] + count[2] + count[3] + count[4];
-            return count;
-         }
-
-         function countFixedBugsInVersion(version) {
-            var count = [0,0,0,0,0];
-            var last=1000000;
-            for (bug of fixedBugs) {
-               if (version==-1 || version==(bug.lastVersion+1)) {
-                  count[bug.priority]++;
-               }
-            }
-            count[0] = count[1] + count[2] + count[3] + count[4];
-            return count;
-         }
-
-         function countFixedBugsIntroducedInVersion(version) {
-            var count = [0,0,0,0,0];
-            var last=1000000;
-            for (bug of fixedBugs) {
-               if (version==-1 || version==(bug.firstVersion)) {
-                  count[bug.priority]++;
-               }
-            }
-            count[0] = count[1] + count[2] + count[3] + count[4];
-            return count;
-         }
-
-         function countFixedButActiveBugsVersion(version) {
-            var count = [0,0,0,0,0];
-            var last=1000000;
-            for (bug of fixedBugs) {
-               if ( version==-1 || (version >=bug.firstVersion && version<=bug.lastVersion) ) {
-                  count[bug.priority]++;
-               }
-            }
-            count[0] = count[1] + count[2] + count[3] + count[4];
-            return count;
-         }
-
-         function countTotalBugsVersion(version) {
-            var count = [0,0,0,0,0];
-            var last=1000000;
-            for (bug of bugs) {
-               if (version==-1 || version>=bug.firstVersion) {
-                  count[bug.priority]++;
-               }
-            }
-            count[0] = count[1] + count[2] + count[3] + count[4];
-            return count;
-         }
-
-         function getPriorityLegend() {
-            var content = "";
-            content += "<h5><span class='b-1'>&nbsp;&nbsp;&nbsp;</span>P1&nbsp;&nbsp;&nbsp;";
-            content += "<span class='b-2'>&nbsp;&nbsp;&nbsp;</span>P2&nbsp;&nbsp;&nbsp;";
-            content += "<span class='b-3'>&nbsp;&nbsp;&nbsp;</span>P3&nbsp;&nbsp;&nbsp;";
-            content += "<span class='b-4'>&nbsp;&nbsp;&nbsp;</span>Experimental";
-            content += "</h5>";
-            return content;
-         }
-
-         function showbug(bugId, containerId, pattern) {
-            var bugplaceholder   = document.getElementById(containerId);
-            var bug              = document.getElementById(bugId);
-
-            if ( bugplaceholder==null) {
-               alert(buguid+'-ph-'+list+' - '+buguid+' - bugplaceholder==null');
-               return;
-            }
-            if ( bug==null) {
-               alert(buguid+'-ph-'+list+' - '+buguid+' - bug==null');
-               return;
-            }
-
-            var newBug = bug.innerHTML;
-            var pattern = document.getElementById('tip-'+pattern).innerHTML;
-            toggle(containerId);
-            bugplaceholder.innerHTML = newBug + pattern;
-         }
-         function toggle(containerId) {
-            if( document.getElementById(containerId).style.display == "none") {
-               show(containerId);
-            } else {
-               if( document.getElementById(containerId).style.display == "block") {
-                  hide(containerId);
-               } else {
-                  show(containerId);
-               }
-            }
-         }
-         function show(containerId) {
-            document.getElementById(containerId).style.display="block";
-         }
-         function hide(containerId) {
-            document.getElementById(containerId).style.display="none";
-         }
-
-         window.onload = function(){
-            init();
-         };
-
-         var lastVersion = "]]></xsl:text>
-         <xsl:value-of select="/BugCollection/@sequence"/>
-         <xsl:text>";
-
-         // versions fields: release id, release label
-         var versions = new Map([</xsl:text>
-            <xsl:for-each select="/BugCollection/History/AppVersion">
-               <xsl:sort select="@sequence" data-type="number"/>
-               <xsl:text>&#x0A;               ["</xsl:text>
-               <xsl:value-of select="@sequence"/>
-               <xsl:text>", "</xsl:text>
-               <xsl:value-of select="@release"/>
-               <xsl:text>"],</xsl:text>
-            </xsl:for-each>
-            <xsl:text>&#x0A;               ["</xsl:text>
-            <xsl:value-of select="/BugCollection/@sequence"/>
-            <xsl:text>", "</xsl:text>
-            <xsl:value-of select="/BugCollection/@release"/>
-            <xsl:text>"]
-         ]);
-
-         var categories = new Array(</xsl:text>
-            <xsl:for-each select="/BugCollection/BugCategory">
-               <xsl:sort select="Description"/>
-               <xsl:text>&#x0A;               {id: "</xsl:text>
-               <xsl:value-of select="@category"/>
-               <xsl:text>", label: "</xsl:text>
-               <xsl:value-of select="Description"/>
-               <xsl:text>"}</xsl:text>
-               <xsl:if test="position() != last()">
-                  <xsl:text>,</xsl:text>
-               </xsl:if>
-            </xsl:for-each>
-         <xsl:text>
-         );
-
-         var codes = new Array(</xsl:text>
-            <xsl:for-each select="/BugCollection/BugCode">
-               <xsl:sort select="Description"/>
-               <xsl:text>&#x0A;               {id: "</xsl:text>
-               <xsl:value-of select="@abbrev"/>
-               <xsl:text>", label: "</xsl:text>
-               <xsl:value-of select="Description"/>
-               <xsl:text>"}</xsl:text>
-               <xsl:if test="position() != last()">
-                  <xsl:text>,</xsl:text>
-               </xsl:if>
-            </xsl:for-each>
-         <xsl:text>
-         );
-
-         var patterns = new Array(</xsl:text>
-            <xsl:for-each select="/BugCollection/BugPattern">
-               <xsl:sort select="ShortDescription"/>
-               <xsl:text>&#x0A;               {category: "</xsl:text>
-               <xsl:value-of select="@category"/>
-               <xsl:text>", code: "</xsl:text>
-               <xsl:value-of select="@abbrev"/>
-               <xsl:text>", id: "</xsl:text>
-               <xsl:value-of select="@type"/>
-               <xsl:text>", label: "</xsl:text>
-               <xsl:value-of select="translate(ShortDescription, '&quot;', $apos)"/>
-               <xsl:text>"}</xsl:text>
-               <xsl:if test="position() != last()">
-                  <xsl:text>,</xsl:text>
-               </xsl:if>
-            </xsl:for-each>
-         <xsl:text>
-         );
-
-         var classStats = new Array(</xsl:text>
-            <xsl:for-each select="/BugCollection/FindBugsSummary/PackageStats/ClassStats">
-               <xsl:sort select="@class"/>
-               <xsl:text>&#x0A;               {className: "</xsl:text>
-               <xsl:value-of select="@class"/>
-               <xsl:text>", packageName: "</xsl:text>
-               <xsl:value-of select="../@package"/>
-               <xsl:text>", isInterface: "</xsl:text>
-               <xsl:value-of select="@interface"/>
-               <xsl:text>", totalBugs: "</xsl:text>
-               <xsl:value-of select="@bugs"/>
-               <xsl:text>", bugsP1: "</xsl:text>
-               <xsl:value-of select="(@priority_1, 0)[1]"/>
-               <xsl:text>", bugsP2: "</xsl:text>
-               <xsl:value-of select="(@priority_2, 0)[1]"/>
-               <xsl:text>", bugsP3: "</xsl:text>
-               <xsl:value-of select="(@priority_3, 0)[1]"/>
-               <xsl:text>", bugsP4: "</xsl:text>
-               <xsl:value-of select="(@priority_4, 0)[1]"/>
-               <xsl:text>"}</xsl:text>
-               <xsl:if test="position() != last()">
-                  <xsl:text>,</xsl:text>
-               </xsl:if>
-            </xsl:for-each>
-         <xsl:text>
-         );
-
-         var packageStats = new Array(</xsl:text>
-            <xsl:for-each select="/BugCollection/FindBugsSummary/PackageStats">
-               <xsl:sort select="@package"/>
-               <xsl:text>&#x0A;               {packageName: "</xsl:text>
-               <xsl:value-of select="@package"/>
-               <xsl:text>", totalBugs: "</xsl:text>
-               <xsl:value-of select="@total_bugs"/>
-               <xsl:text>", bugsP1: "</xsl:text>
-               <xsl:value-of select="(@priority_1, 0)[1]"/>
-               <xsl:text>", bugsP2: "</xsl:text>
-               <xsl:value-of select="(@priority_2, 0)[1]"/>
-               <xsl:text>", bugsP3: "</xsl:text>
-               <xsl:value-of select="(@priority_3, 0)[1]"/>
-               <xsl:text>", bugsP4: "</xsl:text>
-               <xsl:value-of select="(@priority_4, 0)[1]"/>
-               <xsl:text>"}</xsl:text>
-               <xsl:if test="position() != last()">
-                  <xsl:text>,</xsl:text>
-               </xsl:if>
-            </xsl:for-each>
-         <xsl:text>
-         );
-
-         var bugs = new Array(</xsl:text>
-            <xsl:for-each select="/BugCollection/BugInstance[string-length(@last) = 0]">
-               {
-                  id: "<xsl:value-of select="@instanceHash" />-<xsl:value-of select="@instanceOccurrenceNum" />",
-                  category: "<xsl:value-of select="@category" />",
-                  code: "<xsl:value-of select="@abbrev" />",
-                  pattern: "<xsl:value-of select="@type" />",
-                  priority: <xsl:value-of select="@priority" />,
-                  firstVersion: <xsl:value-of select="(@first, 0)[1]"/>,
-                  className: "<xsl:value-of select="(Class[@primary='true'], Class)[1]/@classname"/>",
-                  packageName: "<xsl:value-of select="replace((Class[@primary='true'], Class)[1]/@classname, '\.[^.]+$', '')"/>
-                  <xsl:text>"
-               }</xsl:text>
-               <xsl:if test="position() != last()">
-                  <xsl:text>,</xsl:text>
-               </xsl:if>
-            </xsl:for-each>
-         <xsl:text>
-         );
-
-         var fixedBugs = new Array(</xsl:text>
-            <xsl:for-each select="/BugCollection/BugInstance[string-length(@last) > 0]">
-               {
-                  id: "<xsl:value-of select="@instanceHash" />-<xsl:value-of select="@instanceOccurrenceNum" />",
-                  category: "<xsl:value-of select="@category" />",
-                  code: "<xsl:value-of select="@abbrev" />",
-                  pattern: "<xsl:value-of select="@type" />",
-                  priority: <xsl:value-of select="@priority" />,
-                  firstVersion: <xsl:value-of select="@first"/>,
-                  lastVersion: <xsl:value-of select="@last"/>,
-                  className: "<xsl:value-of select="(Class[@primary='true'], Class)[1]/@classname"/>
-                  <xsl:text>"
-               }</xsl:text>
-               <xsl:if test="position() != last()">
-                  <xsl:text>,</xsl:text>
-               </xsl:if>
-            </xsl:for-each>
-         );
-      </script>
-   </head>
-   <body>
-      <h3>
-         <a href="https://spotbugs.github.io">SpotBugs</a>
-         <xsl:value-of select="$titlePart"/>
-      </h3>
-
-      <div id='menuWrapper'>
-         <div id="navcontainer">
-            <ul id="navlist">
-               <li                 ><a id='summary'           class="current" href="#summaryTab"          onclick="selectMenu('summary'); return false;"         >Summary</a></li>
-               <li id="historyMenu"><a id='history'           class="none"    href="#historyTab"          onclick="selectMenu('history'); return false;"         >History</a></li>
-               <li                 ><a id='listByCategories'  class="none"    href="#listByCategoriesTab" onclick="selectMenu('listByCategories'); return false;">Browse By Categories</a></li>
-               <li                 ><a id='listByPackages'    class="none"    href="#listByPackagesTab"   onclick="selectMenu('listByPackages'); return false;"  >Browse by Packages</a></li>
-               <li                 ><a id='info'              class="none"    href="#infoTab"             onclick="selectMenu('info'); return false;"            >Info</a></li>
-            </ul>
-         </div>
-      </div>
-
-      <div id='displayWrapper'>
-
-      <div style='height:25px;'>
-         <div id='messageContainer' style='float:right;'>
-            Computing data...
-         </div>
-         <div id='filterWrapper' style='display:none;'>
-            <form name='findbugsForm'>
-               <div id='filterContainer' >
-                  <select name='versions' onchange='filter()'>
-                     <option value="loading">Loading filter...</option>
-                  </select>
-                  <select name='priorities' onchange='filter()'>
-                     <option id="4" value="4"> -- All priorities -- </option>
-                     <option id="1" value="1"> P1 bugs </option>
-                     <option id="2" value="2"> P1 and P2 bugs </option>
-                     <option id="3" value="3"> P1, P2 and P3 bugs </option>
-                  </select>
-               </div>
-            </form>
-         </div>
-         <div id='historyControlWrapper' style='display:none;'>
-            <form name="findbugsHistoryControlForm">
-               <div id='historyControlContainer'>
-                  <input type='checkbox' name='includeFixedIntroducedBugs'
-                         value='checked' alt='Include fixed introduced bugs.'
-                         onchange='includeFixedIntroducedBugsInHistory()' />
-                  Include counts of introduced bugs that were fixed in later releases.
-               </div>
-            </form>
-         </div>
-      </div>
-         <div id='summaryContainer' class='displayContainer'>
-            <h3>Package Summary</h3>
-            <table>
-               <tr>
-                  <th>Package</th>
-                  <th>Code Size</th>
-                  <th>Total Bugs</th>
-                  <th>Bugs P1</th>
-                  <th>Bugs P2</th>
-                  <th>Bugs P3</th>
-                  <th>Bugs Experimental</th>
-               </tr>
-               <tr>
-                  <td class='summary-name'>
-                     <xsl:text>Overall (</xsl:text>
-                     <xsl:value-of select="/BugCollection/FindBugsSummary/@num_packages"/>
-                     <xsl:text> packages, </xsl:text>
-                     <xsl:value-of select="/BugCollection/FindBugsSummary/@total_classes"/>
-                     <xsl:text> classes)</xsl:text>
-                  </td>
-                  <td class='summary-size'><xsl:value-of select="/BugCollection/FindBugsSummary/@total_size"/></td>
-                  <td class='summary-priority-all'><xsl:value-of select="/BugCollection/FindBugsSummary/@total_bugs"/></td>
-                  <td class='summary-priority-1'><xsl:value-of select="(/BugCollection/FindBugsSummary/@priority_1, 0)[1]"/></td>
-                  <td class='summary-priority-2'><xsl:value-of select="(/BugCollection/FindBugsSummary/@priority_2, 0)[1]"/></td>
-                  <td class='summary-priority-3'><xsl:value-of select="(/BugCollection/FindBugsSummary/@priority_3, 0)[1]"/></td>
-                  <td class='summary-priority-4'><xsl:value-of select="(/BugCollection/FindBugsSummary/@priority_4, 0)[1]"/></td>
-               </tr>
-               <xsl:for-each select="/BugCollection/FindBugsSummary/PackageStats">
-                  <xsl:sort select="@package"/>
-                  <xsl:if test="@total_bugs != '0'">
-                     <tr>
-                        <td class='summary-name'><xsl:value-of select="@package" /></td>
-                        <td class='summary-size'><xsl:value-of select="@total_size" /></td>
-                        <td class='summary-priority-all'><xsl:value-of select="@total_bugs" /></td>
-                        <td class='summary-priority-1'><xsl:value-of select="(@priority_1, 0)[1]" /></td>
-                        <td class='summary-priority-2'><xsl:value-of select="(@priority_2, 0)[1]" /></td>
-                        <td class='summary-priority-3'><xsl:value-of select="(@priority_3, 0)[1]" /></td>
-                        <td class='summary-priority-4'><xsl:value-of select="(@priority_4, 0)[1]" /></td>
-                     </tr>
-                  </xsl:if>
-               </xsl:for-each>
-            </table>
-         </div>
-
-         <div id='infoContainer' class='displayContainer'>
-            <div id='analyzed-files'>
-               <h3>Analyzed Files:</h3>
-               <ul>
-                  <xsl:for-each select="/BugCollection/Project/Jar">
-                     <xsl:sort select="."/>
-                     <li><xsl:value-of select="."/></li>
-                  </xsl:for-each>
-               </ul>
-            </div>
-            <div id='used-libraries'>
-               <h3>Used Libraries:</h3>
-               <ul>
-                  <xsl:choose>
-                     <xsl:when test="/BugCollection/Project/AuxClasspathEntry">
-                        <xsl:for-each select="/BugCollection/Project/AuxClasspathEntry">
-                           <xsl:sort select="."/>
-                           <li><xsl:value-of select="."/></li>
-                        </xsl:for-each>
-                     </xsl:when>
-                     <xsl:otherwise>
-                        <li>None</li>
-                     </xsl:otherwise>
-                  </xsl:choose>
-               </ul>
-            </div>
-            <div id='source-files'>
-               <h3>Source Files:</h3>
-               <ul>
-                  <xsl:choose>
-                     <xsl:when test="/BugCollection/Project/SrcDir">
-                        <xsl:for-each select="/BugCollection/Project/SrcDir">
-                           <xsl:sort select="."/>
-                           <li><xsl:value-of select="."/></li>
-                        </xsl:for-each>
-                     </xsl:when>
-                     <xsl:otherwise>
-                        <li>None</li>
-                     </xsl:otherwise>
-                  </xsl:choose>
-               </ul>
-            </div>
-            <div id='plugins'>
-               <h3>Plugins:</h3>
-               <ul>
-                  <xsl:choose>
-                     <xsl:when test="/BugCollection/Project/Plugin">
-                        <xsl:for-each select="/BugCollection/Project/Plugin">
-                           <xsl:sort select="@id"/>
-                           <li><xsl:value-of select="@id"/> (enabled: <xsl:value-of select="@enabled"/>)</li>
-                        </xsl:for-each>
-                     </xsl:when>
-                     <xsl:otherwise>
-                        <li>None</li>
-                     </xsl:otherwise>
-                  </xsl:choose>
-               </ul>
-            </div>
-            <div id='analysis-error'>
-               <h3>Analysis Errors:</h3>
-               <ul>
-                  <xsl:choose>
-                     <xsl:when test="/BugCollection/Errors/MissingClass">
-                        <li>
-                           <xsl:text>Missing ref classes for analysis:&#x0A;                     </xsl:text>
-                           <ul>
-                              <xsl:for-each select="/BugCollection/Errors/MissingClass">
-                                 <xsl:sort select="."/>
-                                 <li><xsl:value-of select="."/></li>
-                              </xsl:for-each>
-                           </ul>
-                        </li>
-                     </xsl:when>
-                     <xsl:otherwise>
-                        <li>None</li>
-                     </xsl:otherwise>
-                  </xsl:choose>
-               </ul>
-            </div>
-         </div>
-         <div id='historyContainer' class='displayContainer'>Loading...</div>
-         <div id='listByCategoriesContainer' class='displayContainer'>Loading...</div>
-         <div id='listByPackagesContainer' class='displayContainer'>Loading...</div>
-      </div>
-
-      <div id='bug-collection' style='display:none;'>
-         <!-- bug descriptions -->
-         <xsl:for-each select="/BugCollection/BugInstance[not(@last)]">
-            <div id="{concat('b-uid-', @instanceHash, '-', @instanceOccurrenceNum)}" class='bug'>
-               <xsl:for-each select="*/Message">
-                  <div class="b-r"><xsl:value-of select="."/></div>
-               </xsl:for-each>
-               <div class="b-d"><xsl:value-of select="LongMessage"/></div>
-            </div>
-         </xsl:for-each>
-
-         <!-- advanced tips -->
-         <xsl:for-each select="/BugCollection/BugPattern">
-            <xsl:sort select="@type"/>
-            <div id="{concat('tip-', @type)}" class="tip">
-               <xsl:value-of select="concat('&#x0A;            ', replace(replace(replace(Details, '^\s+', ''), '(\r?\n|\r)\s*', '$1            '), '\s+$', '&#x0A;         '))" disable-output-escaping="yes"/>
-            </div>
-         </xsl:for-each>
-      </div>
-   </body>
-</html>
-</xsl:template>
-</xsl:transform>
diff --git a/src/python/review/inspectors/spotbugs/files/src/xsl/fancy.xsl b/src/python/review/inspectors/spotbugs/files/src/xsl/fancy.xsl
deleted file mode 100644
index a32f4299..00000000
--- a/src/python/review/inspectors/spotbugs/files/src/xsl/fancy.xsl
+++ /dev/null
@@ -1,849 +0,0 @@
-﻿<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  Copyright (C) 2005, 2006 Etienne Giraudy, InStranet Inc
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
--->
-
-<xsl:transform version="2.0"
-               xmlns:xsl="http://www.w3.org/1999/XSL/Transform" >
-   <xsl:output
-         method="xml" indent="yes"
-         doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
-         doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"
-         encoding="UTF-8"/>
-
-    <!--
-        Parameter for specifying HTMLized sources location; if current dir, use "./"
-        If not passed, no links to sources are generated.
-        because of back-compatibility reasons.
-        The source filename should be package.class.java.html
-        The source can have line no anchors like #11 -->
-    <xsl:param name="htmlsrcpath"></xsl:param>
-
-   <!--xsl:key name="lbc-category-key"    match="/BugCollection/BugInstance" use="@category" /-->
-   <xsl:key name="lbc-code-key"        match="/BugCollection/BugInstance" use="concat(@category,@abbrev)" />
-   <xsl:key name="lbc-bug-key"         match="/BugCollection/BugInstance" use="concat(@category,@abbrev,@type)" />
-   <xsl:key name="lbp-class-b-t"  match="/BugCollection/BugInstance" use="concat(Class/@classname,@type)" />
-
-<xsl:template match="/" >
-
-<html>
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-      <title>
-        SpotBugs (<xsl:value-of select="/BugCollection/@version" />)
-         Analysis for
-         <xsl:choose>
-            <xsl:when test='string-length(/BugCollection/Project/@projectName)>0'><xsl:value-of select="/BugCollection/Project/@projectName" /></xsl:when>
-            <xsl:otherwise><xsl:value-of select="/BugCollection/Project/@filename" /></xsl:otherwise>
-         </xsl:choose>
-      </title>
-      <script type="text/javascript">
-         function show(foo) {
-            document.getElementById(foo).style.display="block";
-         }
-         function hide(foo) {
-            document.getElementById(foo).style.display="none";
-         }
-         function toggle(foo) {
-            if( document.getElementById(foo).style.display == "none") {
-               show(foo);
-            } else {
-               if( document.getElementById(foo).style.display == "block") {
-                  hide(foo);
-               } else {
-                  show(foo);
-               }
-            }
-         }
-
-         function showmenu(foo) {
-            if( document.getElementById(foo).style.display == "none") {
-               hide("bug-summary");
-               document.getElementById("bug-summary-tab").className="menu-tab";
-               hide("analysis-data");
-               document.getElementById("analysis-data-tab").className="menu-tab";
-               //hide("list-by-b-t");
-               //document.getElementById("list-by-b-t-tab").className="menu-tab";
-               hide("list-by-package");
-               document.getElementById("list-by-package-tab").className="menu-tab";
-               hide("list-by-category");
-               document.getElementById("list-by-category-tab").className="menu-tab";
-               document.getElementById(foo+"-tab").className="menu-tab-selected";
-               show(foo);
-
-            }
-            // else menu already selected!
-         }
-         function showbug(buguid, list) {
-            var bugplaceholder   = document.getElementById(buguid+'-ph-'+list);
-            var bug              = document.getElementById(buguid);
-
-            if ( bugplaceholder==null) {
-               alert(buguid+'-ph-'+list+' - '+buguid+' - bugplaceholder==null');
-               return;
-            }
-            if ( bug==null) {
-               alert(buguid+'-ph-'+list+' - '+buguid+' - bug==null');
-               return;
-            }
-
-            var oldBug = bugplaceholder.innerHTML;
-            var newBug = bug.innerHTML;
-            //alert(oldBug);
-            //alert(newBug);
-            toggle(buguid+'-ph-'+list);
-            bugplaceholder.innerHTML = newBug;
-         }
-      </script>
-      <script type='text/javascript'><xsl:text disable-output-escaping='yes'>
-     /* <![CDATA[ */
-         // Extended Tooltip Javascript
-         // copyright 9th August 2002, 3rd July 2005
-         // by Stephen Chapman, Felgall Pty Ltd
-
-         // permission is granted to use this javascript provided that the below code is not altered
-         var DH = 0;var an = 0;var al = 0;var ai = 0;if (document.getElementById) {ai = 1; DH = 1;}else {if (document.all) {al = 1; DH = 1;} else { browserVersion = parseInt(navigator.appVersion); if (navigator.appName.indexOf('Netscape') != -1) if (browserVersion == 4) {an = 1; DH = 1;}}}
-         function fd(oi, wS) {if (ai) return wS ? document.getElementById(oi).style:document.getElementById(oi); if (al) return wS ? document.all[oi].style: document.all[oi]; if (an) return document.layers[oi];}
-         function pw() {return window.innerWidth != null? window.innerWidth: document.body.clientWidth != null? document.body.clientWidth:null;}
-         function mouseX(evt) {if (evt.pageX) return evt.pageX; else if (evt.clientX)return evt.clientX + (document.documentElement.scrollLeft ?  document.documentElement.scrollLeft : document.body.scrollLeft); else return null;}
-         function mouseY(evt) {if (evt.pageY) return evt.pageY; else if (evt.clientY)return evt.clientY + (document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop); else return null;}
-         function popUp(evt,oi) {if (DH) {var wp = pw(); ds = fd(oi,1); dm = fd(oi,0); st = ds.visibility; if (dm.offsetWidth) ew = dm.offsetWidth; else if (dm.clip.width) ew = dm.clip.width; if (st == "visible" || st == "show") { ds.visibility = "hidden"; } else {tv = mouseY(evt) + 20; lv = mouseX(evt) - (ew/4); if (lv < 2) lv = 2; else if (lv + ew > wp) lv -= ew/2; if (!an) {lv += 'px';tv += 'px';} ds.left = lv; ds.top = tv; ds.visibility = "visible";}}}
-  /* ]]> */
-</xsl:text></script>
-      <style type='text/css'>
-         html, body {
-            background-color: #ffffff;
-         }
-         a, a:link , a:active, a:visited, a:hover {
-            text-decoration: none; color: black;
-         }
-         .b-r a {
-            text-decoration: underline; color: blue;
-         }
-         div, span {
-            vertical-align: top;
-         }
-         p {
-            margin: 0px;
-         }
-         h1 {
-            /*font-size: 14pt;*/
-            color: red;
-         }
-         #menu {
-            margin-bottom: 10px;
-         }
-         #menu ul {
-            margin-left: 0;
-            padding-left: 0;
-            display: inline;
-         }
-         #menu ul li {
-            margin-left: 0;
-            margin-bottom: 0;
-            padding: 2px 15px 5px;
-            border: 1px solid #000;
-            list-style: none;
-            display: inline;
-         }
-         #menu ul li.here {
-            border-bottom: 1px solid #ffc;
-            list-style: none;
-            display: inline;
-         }
-         .menu-tab {
-            background: white;
-         }
-         .menu-tab:hover {
-            background: grey;
-         }
-         .menu-tab-selected {
-            background: #aaaaaa;
-         }
-         #analysis-data ul {
-            margin-left: 15px;
-         }
-         #analyzed-files, #used-libraries, #analysis-error {
-           margin: 2px;
-           border: 1px black solid;
-           padding: 2px;
-           float: left;
-           overflow:auto;
-         }
-         #analyzed-files {
-           width: 25%;
-         }
-         #used-libraries {
-           width: 25%;
-         }
-         #analysis-error {
-           width: 40%;
-         }
-         div.summary {
-            width:100%;
-            text-align:left;
-         }
-         .summary table {
-            border:1px solid black;
-         }
-         .summary th {
-            background: #aaaaaa;
-            color: white;
-         }
-         .summary th, .summary td {
-            padding: 2px 4px 2px 4px;
-         }
-         .summary-name {
-            background: #eeeeee;
-            text-align:left;
-         }
-         .summary-size {
-            background: #eeeeee;
-            text-align:center;
-         }
-         .summary-ratio {
-            background: #eeeeee;
-            text-align:center;
-         }
-         .summary-priority-all {
-            background: #dddddd;
-            text-align:center;
-         }
-         .summary-priority-1 {
-            background: red;
-            text-align:center;
-         }
-         .summary-priority-2 {
-            background: orange;
-            text-align:center;
-         }
-         .summary-priority-3 {
-            background: green;
-            text-align:center;
-         }
-         .summary-priority-4 {
-            background: blue;
-            text-align:center;
-         }
-         .ob {
-            border: 1px solid black;
-            margin: 10px;
-         }
-         .ob-t {
-            border-bottom: 1px solid #000000; font-size: 12pt; font-weight: bold;
-            background: #cccccc; margin: 0; padding: 0 5px 0 5px;
-         }
-         .t-h {
-            font-weight: normal;
-         }
-         .ib-1, .ib-2 {
-            margin: 0 0 0 10px;
-         }
-         .ib-1-t, .ib-2-t {
-            border-bottom: 1px solid #000000; border-left: 1px solid #000000;
-            margin: 0; padding: 0 5px 0 5px;
-            font-size: 12pt; font-weight: bold; background: #cccccc;
-         }
-         .bb {
-            border-bottom: 1px solid #000000; border-left: 1px solid #000000;
-         }
-         .b-1 {
-            background: red; height: 0.5em; width: 1em;
-            margin-right: 0.5em;
-         }
-         .b-2 {
-            background: orange; height: 0.5em; width: 1em;
-            margin-right: 0.5em;
-         }
-         .b-3 {
-            background: green; height: 0.5em; width: 1em;
-            margin-right: 0.5em;
-         }
-         .b-4 {
-            background: blue; height: 0.5em; width: 1em;
-            margin-right: 0.5em;
-         }
-         .b-t {
-         }
-         .b-r {
-            font-size: 10pt; font-weight: bold; padding: 0 0 0 60px;
-         }
-         .b-d {
-            font-weight: normal; background: #eeeee0;
-            padding: 0 5px 0 5px; margin: 0px;
-         }
-         .bug-placeholder {
-            top:140px;
-            border:1px solid black;
-            display:none;
-         }
-         .tip {
-            border:solid 1px #666666;
-            width:600px;
-            padding:3px;
-            position:absolute;
-            z-index:100;
-            visibility:hidden;
-            color:#333333;
-            top:20px;
-            left:90px;
-            background-color:#ffffcc;
-            layer-background-color:#ffffcc;
-         }
-
-
-      </style>
-   </head>
-   <body>
-   <div id='content'>
-      <h1>
-         SpotBugs (<xsl:value-of select="/BugCollection/@version" />)
-         Analysis for
-         <xsl:choose>
-            <xsl:when test='string-length(/BugCollection/Project/@projectName)>0'><xsl:value-of select="/BugCollection/Project/@projectName" /></xsl:when>
-            <xsl:otherwise><xsl:value-of select="/BugCollection/Project/@filename" /></xsl:otherwise>
-         </xsl:choose>
-      </h1>
-      <div id="menu">
-         <ul>
-            <li id='bug-summary-tab' class='menu-tab-selected'>
-               <xsl:attribute name="onclick">showmenu('bug-summary');return false;</xsl:attribute>
-               <a href='' onclick='return false;'>Bug Summary</a>
-            </li>
-            <li id='analysis-data-tab' class='menu-tab'>
-               <xsl:attribute name="onclick">showmenu('analysis-data');return false;</xsl:attribute>
-               <a href='' onclick='return false;'>Analysis Information</a>
-            </li>
-            <li id='list-by-category-tab' class='menu-tab'>
-               <xsl:attribute name="onclick">showmenu('list-by-category');return false;</xsl:attribute>
-               <a href='' onclick='return false;'>List bugs by bug category</a>
-            </li>
-            <li id='list-by-package-tab' class='menu-tab'>
-               <xsl:attribute name="onclick">showmenu('list-by-package');return false;</xsl:attribute>
-               <a href='' onclick='return false;'>List bugs by package</a>
-            </li>
-         </ul>
-      </div>
-      <xsl:call-template name="generateSummary" />
-      <xsl:call-template name="analysis-data" />
-      <xsl:call-template name="list-by-category" />
-      <xsl:call-template name="list-by-package" />
-
-
-      <!-- advanced tooltips -->
-      <xsl:for-each select="/BugCollection/BugPattern">
-         <xsl:variable name="b-t"><xsl:value-of select="@type" /></xsl:variable>
-         <div>
-            <xsl:attribute name="id">tip-<xsl:value-of select="$b-t" /></xsl:attribute>
-            <xsl:attribute name="class">tip</xsl:attribute>
-            <b><xsl:value-of select="@abbrev" /> / <xsl:value-of select="@type" /></b><br/>
-            <xsl:value-of select="/BugCollection/BugPattern[@type=$b-t]/Details" disable-output-escaping="yes" />
-         </div>
-      </xsl:for-each>
-
-      <!-- bug descriptions - hidden -->
-      <xsl:for-each select="/BugCollection/BugInstance[not(@last)]">
-            <div style="display:none;">
-               <xsl:attribute name="id">b-uid-<xsl:value-of select="@instanceHash" />-<xsl:value-of select="@instanceOccurrenceNum" /></xsl:attribute>
-               <xsl:for-each select="*/Message">
-                   <xsl:choose>
-                    <xsl:when test="parent::SourceLine and $htmlsrcpath != '' ">
-                      <div class="b-r"><a>
-                        <xsl:attribute name="href"><xsl:value-of select="$htmlsrcpath"/><xsl:value-of select="../@sourcepath" />.html#<xsl:value-of select="../@start" /></xsl:attribute>
-                        <xsl:apply-templates />
-                      </a></div>
-                    </xsl:when>
-                    <xsl:otherwise>
-                      <div class="b-r"><xsl:apply-templates /></div>
-                    </xsl:otherwise>
-                   </xsl:choose>
-               </xsl:for-each>
-               <div class="b-d">
-                  <xsl:value-of select="LongMessage" disable-output-escaping="no" />
-               </div>
-            </div>
-      </xsl:for-each>
-   </div>
-   <div id='fixedbox'>
-      <div id='bug-placeholder'></div>
-   </div>
-   </body>
-</html>
-</xsl:template>
-
-<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-<!-- generate summary report from stats -->
-<xsl:template name="generateSummary" >
-<div class='summary' id='bug-summary'>
-   <h2>SpotBugs Analysis generated at: <xsl:value-of select="/BugCollection/FindBugsSummary/@timestamp" /></h2>
-   <table>
-      <tr>
-         <th>Package</th>
-         <th>Code Size</th>
-         <th>Bugs</th>
-         <th>High Prio Bugs</th>
-         <th>Medium Prio Bugs</th>
-         <th>Low Prio Bugs</th>
-         <th>Exp. Bugs</th>
-         <th>Ratio</th>
-      </tr>
-      <tr>
-         <td class='summary-name'>
-            Overall
-            (<xsl:value-of select="/BugCollection/FindBugsSummary/@num_packages" /> packages),
-            (<xsl:value-of select="/BugCollection/FindBugsSummary/@total_classes" /> classes)
-         </td>
-         <td class='summary-size'><xsl:value-of select="/BugCollection/FindBugsSummary/@total_size" /></td>
-         <td class='summary-priority-all'><xsl:value-of select="/BugCollection/FindBugsSummary/@total_bugs" /></td>
-         <td class='summary-priority-1'><xsl:value-of select="/BugCollection/FindBugsSummary/@priority_1" /></td>
-         <td class='summary-priority-2'><xsl:value-of select="/BugCollection/FindBugsSummary/@priority_2" /></td>
-         <td class='summary-priority-3'><xsl:value-of select="/BugCollection/FindBugsSummary/@priority_3" /></td>
-         <td class='summary-priority-4'><xsl:value-of select="/BugCollection/FindBugsSummary/@priority_4" /></td>
-         <td class='summary-ratio'></td>
-      </tr>
-      <xsl:for-each select="/BugCollection/FindBugsSummary/PackageStats">
-         <xsl:sort select="@package" />
-         <xsl:if test="@total_bugs!='0'" >
-            <tr>
-               <td class='summary-name'><xsl:value-of select="@package" /></td>
-               <td class='summary-size'><xsl:value-of select="@total_size" /></td>
-               <td class='summary-priority-all'><xsl:value-of select="@total_bugs" /></td>
-               <td class='summary-priority-1'><xsl:value-of select="@priority_1" /></td>
-               <td class='summary-priority-2'><xsl:value-of select="@priority_2" /></td>
-               <td class='summary-priority-3'><xsl:value-of select="@priority_3" /></td>
-               <td class='summary-priority-4'><xsl:value-of select="@priority_4" /></td>
-               <td class='summary-ratio'></td>
-<!--
-               <xsl:for-each select="ClassStats">
-                  <xsl:if test="@bugs!='0'" >
-                  <li>
-                     <xsl:value-of select="@class" /> - total: <xsl:value-of select="@bugs" />
-                  </li>
-                  </xsl:if>
-               </xsl:for-each>
--->
-            </tr>
-         </xsl:if>
-      </xsl:for-each>
-   </table>
-</div>
-</xsl:template>
-
-<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-<!-- display analysis info -->
-<xsl:template name="analysis-data">
-      <div id='analysis-data' style='display:none;'>
-         <div id='analyzed-files'>
-            <h3>Analyzed Files:</h3>
-            <ul>
-               <xsl:for-each select="/BugCollection/Project/Jar">
-                  <li><xsl:apply-templates /></li>
-               </xsl:for-each>
-            </ul>
-         </div>
-         <div id='used-libraries'>
-            <h3>Used Libraries:</h3>
-            <ul>
-               <xsl:for-each select="/BugCollection/Project/AuxClasspathEntry">
-                  <li><xsl:apply-templates /></li>
-               </xsl:for-each>
-               <xsl:if test="count(/BugCollection/Project/AuxClasspathEntry)=0" >
-                  <li>None</li>
-               </xsl:if>
-            </ul>
-         </div>
-         <div id='analysis-error'>
-            <h3>Analysis Errors:</h3>
-            <ul>
-               <xsl:variable name="error-count"
-                             select="count(/BugCollection/Errors/MissingClass)" />
-               <xsl:if test="$error-count=0" >
-                  <li>None</li>
-               </xsl:if>
-               <xsl:if test="$error-count>0" >
-                  <li>Missing ref classes for analysis:
-                     <ul>
-                        <xsl:for-each select="/BugCollection/Errors/MissingClass">
-                           <li><xsl:apply-templates /></li>
-                        </xsl:for-each>
-                     </ul>
-                  </li>
-               </xsl:if>
-            </ul>
-         </div>
-      </div>
-</xsl:template>
-
-<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-<!-- show priorities helper -->
-<xsl:template name="helpPriorities">
-   <span>
-      <xsl:attribute name="class">b-1</xsl:attribute>
-      <xsl:text disable-output-escaping="yes">&amp;nbsp;&amp;nbsp;</xsl:text>
-   </span> High Prio
-   <span>
-      <xsl:attribute name="class">b-2</xsl:attribute>
-      <xsl:text disable-output-escaping="yes">&amp;nbsp;&amp;nbsp;</xsl:text>
-   </span> Medium Prio
-   <span>
-      <xsl:attribute name="class">b-3</xsl:attribute>
-      <xsl:text disable-output-escaping="yes">&amp;nbsp;&amp;nbsp;</xsl:text>
-   </span> Low Prio
-   <span>
-      <xsl:attribute name="class">b-4</xsl:attribute>
-      <xsl:text disable-output-escaping="yes">&amp;nbsp;&amp;nbsp;</xsl:text>
-   </span> Exp.
-</xsl:template>
-
-<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-<!-- display the details of a bug -->
-<xsl:template name="display-bug" >
-   <xsl:param name="b-t"    select="''" />
-   <xsl:param name="bug-id"      select="''" />
-   <xsl:param name="which-list"  select="''" />
-   <div class="bb">
-      <a>
-         <xsl:attribute name="href"></xsl:attribute>
-         <xsl:attribute name="onclick">showbug('b-uid-<xsl:value-of select="@instanceHash" />-<xsl:value-of select="@instanceOccurrenceNum" />','<xsl:value-of select="$which-list" />');return false;</xsl:attribute>
-         <span>
-            <xsl:attribute name="class">b-<xsl:value-of select="@priority"/></xsl:attribute>
-            <xsl:text disable-output-escaping="yes">&amp;nbsp;&amp;nbsp;</xsl:text>
-         </span>
-         <span class="b-t"><xsl:value-of select="@abbrev" />: </span> <xsl:value-of select="Class/Message" />
-      </a>
-      <div style="display:none;">
-         <xsl:attribute name="id">b-uid-<xsl:value-of select="@instanceHash" />-<xsl:value-of select="@instanceOccurrenceNum" />-ph-<xsl:value-of select="$which-list" /></xsl:attribute>
-         loading...
-      </div>
-   </div>
-</xsl:template>
-
-<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-<!-- main template for the list by category -->
-<xsl:template name="list-by-category" >
-   <div id='list-by-category' class='data-box' style='display:none;'>
-      <xsl:call-template name="helpPriorities" />
-      <xsl:variable name="unique-category" select="/BugCollection/BugCategory/@category"/>
-      <xsl:for-each select="$unique-category">
-         <xsl:sort select="." order="ascending" />
-            <xsl:call-template name="categories">
-               <xsl:with-param name="category" select="." />
-            </xsl:call-template>
-      </xsl:for-each>
-   </div>
-</xsl:template>
-
-<xsl:template name="categories" >
-   <xsl:param name="category" select="''" />
-   <xsl:variable name="category-count"
-                       select="count(/BugCollection/BugInstance[@category=$category and not(@last)])" />
-   <xsl:variable name="category-count-p1"
-                       select="count(/BugCollection/BugInstance[@category=$category and @priority='1' and not(@last)])" />
-   <xsl:variable name="category-count-p2"
-                       select="count(/BugCollection/BugInstance[@category=$category and @priority='2' and not(@last)])" />
-   <xsl:variable name="category-count-p3"
-                       select="count(/BugCollection/BugInstance[@category=$category and @priority='3' and not(@last)])" />
-   <xsl:variable name="category-count-p4"
-                       select="count(/BugCollection/BugInstance[@category=$category and @priority='4' and not(@last)])" />
-   <div class='ob'>
-      <div class='ob-t'>
-         <a>
-            <xsl:attribute name="href"></xsl:attribute>
-            <xsl:attribute name="onclick">toggle('category-<xsl:value-of select="$category" />');return false;</xsl:attribute>
-            <xsl:value-of select="/BugCollection/BugCategory[@category=$category]/Description" />
-            (<xsl:value-of select="$category-count" />:
-            <span class='t-h'><xsl:value-of select="$category-count-p1" />/<xsl:value-of select="$category-count-p2" />/<xsl:value-of select="$category-count-p3" />/<xsl:value-of select="$category-count-p4" /></span>)
-         </a>
-      </div>
-      <div style="display:none;">
-         <xsl:attribute name="id">category-<xsl:value-of select="$category" /></xsl:attribute>
-         <xsl:call-template name="list-by-category-and-code">
-            <xsl:with-param name="category" select="$category" />
-         </xsl:call-template>
-      </div>
-   </div>
-</xsl:template>
-
-<xsl:template name="list-by-category-and-code" >
-   <xsl:param name="category" select="''" />
-   <xsl:variable name="unique-code" select="/BugCollection/BugInstance[@category=$category and not(@last) and generate-id()= generate-id(key('lbc-code-key',concat(@category,@abbrev)))]/@abbrev" />
-   <xsl:for-each select="$unique-code">
-      <xsl:sort select="." order="ascending" />
-         <xsl:call-template name="codes">
-            <xsl:with-param name="category" select="$category" />
-            <xsl:with-param name="code" select="." />
-         </xsl:call-template>
-   </xsl:for-each>
-</xsl:template>
-
-<xsl:template name="codes" >
-   <xsl:param name="category" select="''" />
-   <xsl:param name="code"     select="''" />
-   <xsl:variable name="code-count"
-                       select="count(/BugCollection/BugInstance[@category=$category and @abbrev=$code and not(@last)])" />
-   <xsl:variable name="code-count-p1"
-                       select="count(/BugCollection/BugInstance[@category=$category and @abbrev=$code and @priority='1' and not(@last)])" />
-   <xsl:variable name="code-count-p2"
-                       select="count(/BugCollection/BugInstance[@category=$category and @abbrev=$code and @priority='2' and not(@last)])" />
-   <xsl:variable name="code-count-p3"
-                       select="count(/BugCollection/BugInstance[@category=$category and @abbrev=$code and @priority='3' and not(@last)])" />
-   <xsl:variable name="code-count-p4"
-                       select="count(/BugCollection/BugInstance[@category=$category and @abbrev=$code and @priority='4' and not(@last)])" />
-   <div class='ib-1'>
-      <div class="ib-1-t">
-         <a>
-            <xsl:attribute name="href"></xsl:attribute>
-            <xsl:attribute name="onclick">toggle('category-<xsl:value-of select="$category" />-and-code-<xsl:value-of select="$code" />');return false;</xsl:attribute>
-            <xsl:value-of select="$code" />: <xsl:value-of select="/BugCollection/BugCode[@abbrev=$code]/Description" />
-            (<xsl:value-of select="$code-count" />:
-            <span class='t-h'><xsl:value-of select="$code-count-p1" />/<xsl:value-of select="$code-count-p2" />/<xsl:value-of select="$code-count-p3" />/<xsl:value-of select="$code-count-p4" /></span>)
-         </a>
-      </div>
-      <div style="display:none;">
-         <xsl:attribute name="id">category-<xsl:value-of select="$category" />-and-code-<xsl:value-of select="$code" /></xsl:attribute>
-         <xsl:call-template name="list-by-category-and-code-and-bug">
-            <xsl:with-param name="category" select="$category" />
-            <xsl:with-param name="code" select="$code" />
-         </xsl:call-template>
-      </div>
-   </div>
-</xsl:template>
-
-<xsl:template name="list-by-category-and-code-and-bug" >
-   <xsl:param name="category" select="''" />
-   <xsl:param name="code" select="''" />
-   <xsl:variable name="unique-bug" select="/BugCollection/BugInstance[@category=$category and not(@last) and @abbrev=$code and generate-id()= generate-id(key('lbc-bug-key',concat(@category,@abbrev,@type)))]/@type" />
-   <xsl:for-each select="$unique-bug">
-      <xsl:sort select="." order="ascending" />
-         <xsl:call-template name="bugs">
-            <xsl:with-param name="category" select="$category" />
-            <xsl:with-param name="code" select="$code" />
-            <xsl:with-param name="bug" select="." />
-         </xsl:call-template>
-   </xsl:for-each>
-</xsl:template>
-
-<xsl:template name="bugs" >
-   <xsl:param name="category" select="''" />
-   <xsl:param name="code"     select="''" />
-   <xsl:param name="bug"      select="''" />
-   <xsl:variable name="bug-count"
-                       select="count(/BugCollection/BugInstance[@category=$category and @abbrev=$code and @type=$bug and not(@last)])" />
-   <xsl:variable name="bug-count-p1"
-                       select="count(/BugCollection/BugInstance[@category=$category and @abbrev=$code and @type=$bug and @priority='1' and not(@last)])" />
-   <xsl:variable name="bug-count-p2"
-                       select="count(/BugCollection/BugInstance[@category=$category and @abbrev=$code and @type=$bug and @priority='2' and not(@last)])" />
-   <xsl:variable name="bug-count-p3"
-                       select="count(/BugCollection/BugInstance[@category=$category and @abbrev=$code and @type=$bug and @priority='3' and not(@last)])" />
-   <xsl:variable name="bug-count-p4"
-                       select="count(/BugCollection/BugInstance[@category=$category and @abbrev=$code and @type=$bug and @priority='4' and not(@last)])" />
-   <div class='ib-2'>
-      <div class='ib-2-t'>
-         <a>
-            <xsl:attribute name="href"></xsl:attribute>
-            <xsl:attribute name="onclick">toggle('category-<xsl:value-of select="$category" />-and-code-<xsl:value-of select="$code" />-and-bug-<xsl:value-of select="$bug" />');return false;</xsl:attribute>
-            <xsl:attribute name="onmouseout">popUp(event,'tip-<xsl:value-of select="$bug" />');</xsl:attribute>
-            <xsl:attribute name="onmouseover">popUp(event,'tip-<xsl:value-of select="$bug" />');</xsl:attribute>
-            <xsl:value-of select="/BugCollection/BugPattern[@category=$category and @abbrev=$code and @type=$bug]/ShortDescription" /><xsl:text disable-output-escaping="yes">&amp;nbsp;&amp;nbsp;</xsl:text>
-            (<xsl:value-of select="$bug-count" />:
-            <span class='t-h'><xsl:value-of select="$bug-count-p1" />/<xsl:value-of select="$bug-count-p2" />/<xsl:value-of select="$bug-count-p3" />/<xsl:value-of select="$bug-count-p4" /></span>)
-         </a>
-      </div>
-      <div style="display:none;">
-         <xsl:attribute name="id">category-<xsl:value-of select="$category" />-and-code-<xsl:value-of select="$code" />-and-bug-<xsl:value-of select="$bug" /></xsl:attribute>
-         <xsl:variable name="cat-code-type">category-<xsl:value-of select="$category" />-and-code-<xsl:value-of select="$code" />-and-bug-<xsl:value-of select="$bug" /></xsl:variable>
-         <xsl:variable name="bug-id">b-uid-<xsl:value-of select="@instanceHash" />-<xsl:value-of select="@instanceOccurrenceNum" /></xsl:variable>
-         <xsl:for-each select="/BugCollection/BugInstance[@category=$category and @abbrev=$code and @type=$bug and not(@last)]">
-            <xsl:call-template name="display-bug">
-               <xsl:with-param name="b-t"     select="@type" />
-               <xsl:with-param name="bug-id"       select="$bug-id" />
-               <xsl:with-param name="which-list"   select="'c'" />
-            </xsl:call-template>
-         </xsl:for-each>
-      </div>
-   </div>
-</xsl:template>
-
-<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-<!-- main template for the list by package -->
-<xsl:template name="list-by-package" >
-   <div id='list-by-package' class='data-box' style='display:none;'>
-      <xsl:call-template name="helpPriorities" />
-      <xsl:for-each select="/BugCollection/FindBugsSummary/PackageStats[@total_bugs != '0']/@package">
-         <xsl:sort select="." order="ascending" />
-            <xsl:call-template name="packages">
-               <xsl:with-param name="package" select="." />
-            </xsl:call-template>
-      </xsl:for-each>
-   </div>
-</xsl:template>
-
-<xsl:template name="packages" >
-   <xsl:param name="package" select="''" />
-   <xsl:variable name="package-count-p1">
-      <xsl:if test="not(/BugCollection/FindBugsSummary/PackageStats[@package=$package]/@priority_1 != '')">0</xsl:if>
-      <xsl:if test="/BugCollection/FindBugsSummary/PackageStats[@package=$package]/@priority_1 != ''">
-         <xsl:value-of select="/BugCollection/FindBugsSummary/PackageStats[@package=$package]/@priority_1" />
-      </xsl:if>
-   </xsl:variable>
-   <xsl:variable name="package-count-p2">
-      <xsl:if test="not(/BugCollection/FindBugsSummary/PackageStats[@package=$package]/@priority_2 != '')">0</xsl:if>
-      <xsl:if test="/BugCollection/FindBugsSummary/PackageStats[@package=$package]/@priority_2 != ''">
-         <xsl:value-of select="/BugCollection/FindBugsSummary/PackageStats[@package=$package]/@priority_2" />
-      </xsl:if>
-   </xsl:variable>
-   <xsl:variable name="package-count-p3">
-      <xsl:if test="not(/BugCollection/FindBugsSummary/PackageStats[@package=$package]/@priority_3 != '')">0</xsl:if>
-      <xsl:if test="/BugCollection/FindBugsSummary/PackageStats[@package=$package]/@priority_3 != ''">
-         <xsl:value-of select="/BugCollection/FindBugsSummary/PackageStats[@package=$package]/@priority_3" />
-      </xsl:if>
-   </xsl:variable>
-   <xsl:variable name="package-count-p4">
-      <xsl:if test="not(/BugCollection/FindBugsSummary/PackageStats[@package=$package]/@priority_4 != '')">0</xsl:if>
-      <xsl:if test="/BugCollection/FindBugsSummary/PackageStats[@package=$package]/@priority_4 != ''">
-         <xsl:value-of select="/BugCollection/FindBugsSummary/PackageStats[@package=$package]/@priority_4" />
-      </xsl:if>
-   </xsl:variable>
-
-   <div class='ob'>
-      <div class='ob-t'>
-         <a>
-            <xsl:attribute name="href"></xsl:attribute>
-            <xsl:attribute name="onclick">toggle('package-<xsl:value-of select="$package" />');return false;</xsl:attribute>
-            <xsl:value-of select="$package" />
-            (<xsl:value-of select="/BugCollection/FindBugsSummary/PackageStats[@package=$package]/@total_bugs" />:
-            <span class='t-h'><xsl:value-of select="$package-count-p1" />/<xsl:value-of select="$package-count-p2" />/<xsl:value-of select="$package-count-p3" />/<xsl:value-of select="$package-count-p4" /></span>)
-         </a>
-      </div>
-      <div style="display:none;">
-         <xsl:attribute name="id">package-<xsl:value-of select="$package" /></xsl:attribute>
-         <xsl:call-template name="list-by-package-and-class">
-            <xsl:with-param name="package" select="$package" />
-         </xsl:call-template>
-      </div>
-   </div>
-</xsl:template>
-
-<xsl:template name="list-by-package-and-class" >
-   <xsl:param name="package" select="''" />
-   <xsl:for-each select="/BugCollection/FindBugsSummary/PackageStats[@package=$package]/ClassStats[@bugs != '0']/@class">
-      <xsl:sort select="." order="ascending" />
-         <xsl:call-template name="classes">
-            <xsl:with-param name="package" select="$package" />
-            <xsl:with-param name="class" select="." />
-         </xsl:call-template>
-   </xsl:for-each>
-</xsl:template>
-
-<xsl:template name="classes" >
-   <xsl:param name="package" select="''" />
-   <xsl:param name="class"     select="''" />
-   <xsl:variable name="class-count"
-                       select="/BugCollection/FindBugsSummary/PackageStats[@package=$package]/ClassStats[@class=$class and @bugs != '0']/@bugs" />
-
-   <xsl:variable name="class-count-p1">
-      <xsl:if test="not(/BugCollection/FindBugsSummary/PackageStats[@package=$package]/ClassStats[@class=$class and @bugs != '0']/@priority_1 != '')">0</xsl:if>
-      <xsl:if test="/BugCollection/FindBugsSummary/PackageStats[@package=$package]/ClassStats[@class=$class and @bugs != '0']/@priority_1 != ''">
-         <xsl:value-of select="/BugCollection/FindBugsSummary/PackageStats[@package=$package]/ClassStats[@class=$class and @bugs != '0']/@priority_1" />
-      </xsl:if>
-   </xsl:variable>
-   <xsl:variable name="class-count-p2">
-      <xsl:if test="not(/BugCollection/FindBugsSummary/PackageStats[@package=$package]/ClassStats[@class=$class and @bugs != '0']/@priority_2 != '')">0</xsl:if>
-      <xsl:if test="/BugCollection/FindBugsSummary/PackageStats[@package=$package]/ClassStats[@class=$class and @bugs != '0']/@priority_2 != ''">
-         <xsl:value-of select="/BugCollection/FindBugsSummary/PackageStats[@package=$package]/ClassStats[@class=$class and @bugs != '0']/@priority_2" />
-      </xsl:if>
-   </xsl:variable>
-   <xsl:variable name="class-count-p3">
-      <xsl:if test="not(/BugCollection/FindBugsSummary/PackageStats[@package=$package]/ClassStats[@class=$class and @bugs != '0']/@priority_3 != '')">0</xsl:if>
-      <xsl:if test="/BugCollection/FindBugsSummary/PackageStats[@package=$package]/ClassStats[@class=$class and @bugs != '0']/@priority_3 != ''">
-         <xsl:value-of select="/BugCollection/FindBugsSummary/PackageStats[@package=$package]/ClassStats[@class=$class and @bugs != '0']/@priority_3" />
-      </xsl:if>
-   </xsl:variable>
-   <xsl:variable name="class-count-p4">
-      <xsl:if test="not(/BugCollection/FindBugsSummary/PackageStats[@package=$package]/ClassStats[@class=$class and @bugs != '0']/@priority_4 != '')">0</xsl:if>
-      <xsl:if test="/BugCollection/FindBugsSummary/PackageStats[@package=$package]/ClassStats[@class=$class and @bugs != '0']/@priority_4 != ''">
-         <xsl:value-of select="/BugCollection/FindBugsSummary/PackageStats[@package=$package]/ClassStats[@class=$class and @bugs != '0']/@priority_4" />
-      </xsl:if>
-   </xsl:variable>
-
-   <div class='ib-1'>
-      <div class="ib-1-t">
-         <a>
-            <xsl:attribute name="href"></xsl:attribute>
-            <xsl:attribute name="onclick">toggle('package-<xsl:value-of select="$package" />-and-class-<xsl:value-of select="$class" />');return false;</xsl:attribute>
-            <xsl:value-of select="$class" />  (<xsl:value-of select="$class-count" />:
-            <span class='t-h'><xsl:value-of select="$class-count-p1" />/<xsl:value-of select="$class-count-p2" />/<xsl:value-of select="$class-count-p3" />/<xsl:value-of select="$class-count-p4" /></span>)
-         </a>
-      </div>
-      <div style="display:none;">
-         <xsl:attribute name="id">package-<xsl:value-of select="$package" />-and-class-<xsl:value-of select="$class" /></xsl:attribute>
-         <xsl:call-template name="list-by-package-and-class-and-bug">
-            <xsl:with-param name="package" select="$package" />
-            <xsl:with-param name="class" select="$class" />
-         </xsl:call-template>
-      </div>
-   </div>
-</xsl:template>
-
-<xsl:template name="list-by-package-and-class-and-bug" >
-   <xsl:param name="package" select="''" />
-   <xsl:param name="class" select="''" />
-   <xsl:variable name="unique-class-bugs" select="/BugCollection/BugInstance[not(@last) and Class[position()=1 and @classname=$class] and generate-id() = generate-id(key('lbp-class-b-t',concat(Class/@classname,@type)))]/@type" />
-
-   <xsl:for-each select="$unique-class-bugs">
-      <xsl:sort select="." order="ascending" />
-         <xsl:call-template name="class-bugs">
-            <xsl:with-param name="package" select="$package" />
-            <xsl:with-param name="class" select="$class" />
-            <xsl:with-param name="type" select="." />
-         </xsl:call-template>
-   </xsl:for-each>
-</xsl:template>
-
-<xsl:template name="class-bugs" >
-   <xsl:param name="package" select="''" />
-   <xsl:param name="class"     select="''" />
-   <xsl:param name="type"      select="''" />
-   <xsl:variable name="bug-count"
-                       select="count(/BugCollection/BugInstance[@type=$type and not(@last) and Class[position()=1 and @classname=$class]])" />
-   <div class='ib-2'>
-      <div class='ib-2-t'>
-         <a>
-            <xsl:attribute name="href"></xsl:attribute>
-            <xsl:attribute name="onclick">toggle('package-<xsl:value-of select="$package" />-and-class-<xsl:value-of select="$class" />-and-type-<xsl:value-of select="$type" />');return false;</xsl:attribute>
-            <xsl:attribute name="onmouseout">popUp(event,'tip-<xsl:value-of select="$type" />')</xsl:attribute>
-            <xsl:attribute name="onmouseover">popUp(event,'tip-<xsl:value-of select="$type" />')</xsl:attribute>
-            <xsl:value-of select="/BugCollection/BugPattern[@type=$type]/ShortDescription" /><xsl:text disable-output-escaping="yes">&amp;nbsp;&amp;nbsp;</xsl:text>
-            (<xsl:value-of select="$bug-count" />)
-         </a>
-      </div>
-      <div style="display:none;">
-         <xsl:attribute name="id">package-<xsl:value-of select="$package" />-and-class-<xsl:value-of select="$class" />-and-type-<xsl:value-of select="$type" /></xsl:attribute>
-         <xsl:variable name="package-class-type">package-<xsl:value-of select="$package" />-and-class-<xsl:value-of select="$class" />-and-type-<xsl:value-of select="$type" /></xsl:variable>
-         <xsl:variable name="bug-id">b-uid-<xsl:value-of select="@instanceHash" />-<xsl:value-of select="@instanceOccurrenceNum" /></xsl:variable>
-         <xsl:for-each select="/BugCollection/BugInstance[@type=$type and not(@last) and Class[position()=1 and @classname=$class]]">
-            <xsl:call-template name="display-bug">
-               <xsl:with-param name="b-t"     select="@type" />
-               <xsl:with-param name="bug-id"       select="$bug-id" />
-               <xsl:with-param name="which-list"   select="'p'" />
-            </xsl:call-template>
-         </xsl:for-each>
-      </div>
-   </div>
-</xsl:template>
-
-</xsl:transform>
diff --git a/src/python/review/inspectors/spotbugs/files/src/xsl/plain.xsl b/src/python/review/inspectors/spotbugs/files/src/xsl/plain.xsl
deleted file mode 100644
index 99edcf7a..00000000
--- a/src/python/review/inspectors/spotbugs/files/src/xsl/plain.xsl
+++ /dev/null
@@ -1,303 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  FindBugs - Find bugs in Java programs
-  Copyright (C) 2004,2005 University of Maryland
-  Copyright (C) 2005, Chris Nappin
-  
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-  
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-  
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
--->
-<xsl:stylesheet version="2.0"
-                xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-<xsl:output
-	method="xml"
-	omit-xml-declaration="yes"
-	standalone="yes"
-         doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
-         doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"
-	indent="yes"
-	encoding="UTF-8"/>
-
-<xsl:variable name="bugTableHeader">
-	<tr class="tableheader">
-		<th align="left">Warning</th>
-		<th align="left">Priority</th>
-		<th align="left">Details</th>
-	</tr>
-</xsl:variable>
-
-<xsl:template match="/">
-	<html>
-	<head>
-		<title>SpotBugs Report</title>
-		<style type="text/css">
-		.tablerow0 {
-			background: #EEEEEE;
-		}
-
-		.tablerow1 {
-			background: white;
-		}
-
-		.detailrow0 {
-			background: #EEEEEE;
-		}
-
-		.detailrow1 {
-			background: white;
-		}
-
-		.tableheader {
-			background: #b9b9fe;
-			font-size: larger;
-		}
-		</style>
-	</head>
-
-	<xsl:variable name="unique-catkey" select="/BugCollection/BugCategory/@category"/>
-
-	<body>
-
-	<h1>SpotBugs Report</h1>
-		<p>Produced using <a href="https://spotbugs.github.io">SpotBugs</a> <xsl:value-of select="/BugCollection/@version"/>.</p>
-		<p>Project: 
-			<xsl:choose>
-				<xsl:when test='string-length(/BugCollection/Project/@projectName)>0'><xsl:value-of select="/BugCollection/Project/@projectName" /></xsl:when>
-				<xsl:otherwise><xsl:value-of select="/BugCollection/Project/@filename" /></xsl:otherwise>
-			</xsl:choose>
-		</p>
-	<h2>Metrics</h2>
-	<xsl:apply-templates select="/BugCollection/FindBugsSummary"/>
-
-	<h2>Summary</h2>
-	<table width="500" cellpadding="5" cellspacing="2">
-	    <tr class="tableheader">
-			<th align="left">Warning Type</th>
-			<th align="right">Number</th>
-		</tr>
-
-	<xsl:for-each select="$unique-catkey">
-		<xsl:sort select="." order="ascending"/>
-		<xsl:variable name="catkey" select="."/>
-		<xsl:variable name="catdesc" select="/BugCollection/BugCategory[@category=$catkey]/Description"/>
-		<xsl:variable name="styleclass">
-			<xsl:choose><xsl:when test="position() mod 2 = 1">tablerow0</xsl:when>
-				<xsl:otherwise>tablerow1</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
-
-		<tr class="{$styleclass}">
-			<td><a href="#Warnings_{$catkey}"><xsl:value-of select="$catdesc"/> Warnings</a></td>
-			<td align="right"><xsl:value-of select="count(/BugCollection/BugInstance[(@category=$catkey) and (not(@last))])"/></td>
-		</tr>
-	</xsl:for-each>
-
-	<xsl:variable name="styleclass">
-		<xsl:choose><xsl:when test="count($unique-catkey) mod 2 = 0">tablerow0</xsl:when>
-			<xsl:otherwise>tablerow1</xsl:otherwise>
-		</xsl:choose>
-	</xsl:variable>
-		<tr class="{$styleclass}">
-		    <td><b>Total</b></td>
-		    <td align="right"><b><xsl:value-of select="count(/BugCollection/BugInstance[not(@last)])"/></b></td>
-		</tr>
-	</table>
-	<p><br/><br/></p>
-	
-	<h1>Warnings</h1>
-
-	<p>Click on each warning link to see a full description of the issue, and
-	    details of how to resolve it.</p>
-
-	<xsl:for-each select="$unique-catkey">
-		<xsl:sort select="." order="ascending"/>
-		<xsl:variable name="catkey" select="."/>
-		<xsl:variable name="catdesc" select="/BugCollection/BugCategory[@category=$catkey]/Description"/>
-
-		<xsl:call-template name="generateWarningTable">
-			<xsl:with-param name="warningSet" select="/BugCollection/BugInstance[(@category=$catkey) and (not(@last))]"/>
-			<xsl:with-param name="sectionTitle"><xsl:value-of select="$catdesc"/> Warnings</xsl:with-param>
-			<xsl:with-param name="sectionId">Warnings_<xsl:value-of select="$catkey"/></xsl:with-param>
-		</xsl:call-template>
-	</xsl:for-each>
-
-    <p><br/><br/></p>
-	<h1><a name="Details">Warning Types</a></h1>
-
-	<xsl:apply-templates select="/BugCollection/BugPattern">
-		<xsl:sort select="@abbrev"/>
-		<xsl:sort select="ShortDescription"/>
-	</xsl:apply-templates>
-
-	</body>
-	</html>
-</xsl:template>
-
-<xsl:template match="BugInstance[not(@last)]">
-	<xsl:variable name="warningId"><xsl:value-of select="generate-id()"/></xsl:variable>
-
-	<tr class="tablerow{position() mod 2}">
-		<td width="20%" valign="top">
-			<a href="#{@type}"><xsl:value-of select="ShortMessage"/></a>
-		</td>
-		<td width="10%" valign="top">
-			<xsl:choose>
-				<xsl:when test="@priority = 1">High</xsl:when>
-				<xsl:when test="@priority = 2">Medium</xsl:when>
-				<xsl:when test="@priority = 3">Low</xsl:when>
-				<xsl:otherwise>Unknown</xsl:otherwise>
-			</xsl:choose>
-		</td>
-		<td width="70%">
-		    <p><xsl:value-of select="LongMessage"/><br/><br/>
-		    
-		    	<!--  add source filename and line number(s), if any -->
-				<xsl:if test="SourceLine">
-					<br/>In file <xsl:value-of select="SourceLine/@sourcefile"/>,
-					<xsl:choose>
-						<xsl:when test="SourceLine/@start = SourceLine/@end">
-						line <xsl:value-of select="SourceLine/@start"/>
-						</xsl:when>
-						<xsl:otherwise>
-						lines <xsl:value-of select="SourceLine/@start"/>
-						    to <xsl:value-of select="SourceLine/@end"/>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:if>
-				
-				<xsl:for-each select="./*/Message">
-					<br/><xsl:value-of select="text()"/>
-				</xsl:for-each>
-		    </p>
-		</td>
-	</tr>
-</xsl:template>
-
-<xsl:template match="BugPattern">
-	<h2><a name="{@type}"><xsl:value-of select="ShortDescription"/></a></h2>
-	<xsl:value-of select="Details" disable-output-escaping="yes"/>
-	<p><br/><br/></p>
-</xsl:template>
-
-<xsl:template name="generateWarningTable">
-	<xsl:param name="warningSet"/>
-	<xsl:param name="sectionTitle"/>
-	<xsl:param name="sectionId"/>
-
-	<h2><a name="{$sectionId}"><xsl:value-of select="$sectionTitle"/></a></h2>
-	<table class="warningtable" width="100%" cellspacing="2" cellpadding="5">
-		<xsl:copy-of select="$bugTableHeader"/>
-		<xsl:choose>
-		    <xsl:when test="count($warningSet) &gt; 0">
-				<xsl:apply-templates select="$warningSet">
-					<xsl:sort select="@priority"/>
-					<xsl:sort select="@abbrev"/>
-					<xsl:sort select="Class/@classname"/>
-				</xsl:apply-templates>
-		    </xsl:when>
-		    <xsl:otherwise>
-		        <tr><td colspan="2"><p><i>None</i></p></td></tr>
-		    </xsl:otherwise>
-		</xsl:choose>
-	</table>
-	<p><br/><br/></p>
-</xsl:template>
-
-<xsl:template match="FindBugsSummary">
-    <xsl:variable name="kloc" select="@total_size div 1000.0"/>
-    <xsl:variable name="format" select="'#######0.00'"/>
-
-	<p><xsl:value-of select="@total_size"/> lines of code analyzed,
-	in <xsl:value-of select="@total_classes"/> classes, 
-	in <xsl:value-of select="@num_packages"/> packages.</p>
-	<table width="500" cellpadding="5" cellspacing="2">
-	    <tr class="tableheader">
-			<th align="left">Metric</th>
-			<th align="right">Total</th>
-			<th align="right">Density*</th>
-		</tr>
-		<tr class="tablerow0">
-			<td>High Priority Warnings</td>
-			<td align="right"><xsl:value-of select="@priority_1"/></td>
-			<td align="right">
-                <xsl:choose>
-                    <xsl:when test= "number($kloc) &gt; 0.0">
-       			        <xsl:value-of select="format-number(@priority_1 div $kloc, $format)"/>
-                    </xsl:when>
-                    <xsl:otherwise>
-      		            <xsl:value-of select="format-number(0.0, $format)"/>
-                    </xsl:otherwise>
-		        </xsl:choose>
-			</td>
-		</tr>
-		<tr class="tablerow1">
-			<td>Medium Priority Warnings</td>
-			<td align="right"><xsl:value-of select="@priority_2"/></td>
-			<td align="right">
-                <xsl:choose>
-                    <xsl:when test= "number($kloc) &gt; 0.0">
-       			        <xsl:value-of select="format-number(@priority_2 div $kloc, $format)"/>
-                    </xsl:when>
-                    <xsl:otherwise>
-      		            <xsl:value-of select="format-number(0.0, $format)"/>
-                    </xsl:otherwise>
-		        </xsl:choose>
-			</td>
-		</tr>
-
-    <xsl:choose>
-		<xsl:when test="@priority_3">
-			<tr class="tablerow1">
-				<td>Low Priority Warnings</td>
-				<td align="right"><xsl:value-of select="@priority_3"/></td>
-				<td align="right">
-	                <xsl:choose>
-	                    <xsl:when test= "number($kloc) &gt; 0.0">
-	       			        <xsl:value-of select="format-number(@priority_3 div $kloc, $format)"/>
-	                    </xsl:when>
-	                    <xsl:otherwise>
-	      		            <xsl:value-of select="format-number(0.0, $format)"/>
-	                    </xsl:otherwise>
-			        </xsl:choose>
-				</td>
-			</tr>
-		</xsl:when>
-	</xsl:choose>
-
-		<xsl:variable name = "totalClass" select="if (@priority_3) then 'tablerow0' else 'tablerow1'"/>
-		<tr class="$totalClass">
-			<td><b>Total Warnings</b></td>
-			<td align="right"><b><xsl:value-of select="@total_bugs"/></b></td>
-			<td align="right">
-				<b>
-                <xsl:choose>
-                    <xsl:when test= "number($kloc) &gt; 0.0">
-       			        <xsl:value-of select="format-number(@total_bugs div $kloc, $format)"/>
-                    </xsl:when>
-                    <xsl:otherwise>
-      		            <xsl:value-of select="format-number(0.0, $format)"/>
-                    </xsl:otherwise>
-		        </xsl:choose>
-				</b>
-			</td>
-		</tr>
-	</table>
-	<p><i>(* Defects per Thousand lines of non-commenting source statements)</i></p>
-	<p><br/><br/></p>
-
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/src/python/review/inspectors/spotbugs/files/src/xsl/summary.xsl b/src/python/review/inspectors/spotbugs/files/src/xsl/summary.xsl
deleted file mode 100644
index bfdb5973..00000000
--- a/src/python/review/inspectors/spotbugs/files/src/xsl/summary.xsl
+++ /dev/null
@@ -1,253 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet version="2.0"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform" >
-
-<xsl:output
-         method="xml" indent="yes"
-         doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
-         doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"
- 		encoding="UTF-8"/>
-
-<xsl:param name="PAGE.TITLE" select="'SpotBugs Summary Statistics'" />
-<xsl:param name="PAGE.FONT" select="'Arial'" />
-<xsl:param name="SUMMARY.HEADER" select="'SpotBugs Summary Report'" />
-<xsl:param name="SUMMARY.LABEL" select="'Summary Analysis Generated at: '" />
-<xsl:param name="PACKAGE.HEADER" select="'Bugs By Package'" />
-<xsl:param name="PACKAGE.SORT.LABEL" select="'Sorted by Total Bugs'" />
-<xsl:param name="PACKAGE.LABEL" select="'Analysis of Package: '" />
-<xsl:param name="DEFAULT.PACKAGE.NAME" select="'default package'" />
-<xsl:param name="PACKAGE.BUGCLASS.LABEL" select="'Most Buggy Class in Package with #1 $1:'" />
-<xsl:param name="TOTAL.PACKAGES.LABEL" select="'#1 $1 Analyzed'" />
-
-<xsl:param name="BUGS.SINGLE.LABEL" select="'Bug'" />
-<xsl:param name="BUGS.PULURAL.LABEL" select="'Bugs'" />
-<xsl:param name="PACKAGE.SINGLE.LABEL" select="'Package'" />
-<xsl:param name="PACKAGE.PULURAL.LABEL" select="'Packages'" />
-
-
-<xsl:param name="TABLE.HEADING.TYPE" select="'Type Checked'" />
-<xsl:param name="TABLE.HEADING.COUNT" select="'Count'" />
-<xsl:param name="TABLE.HEADING.BUGS" select="'Bugs'" />
-<xsl:param name="TABLE.HEADING.PERCENT" select="'Percentage'" />
-<xsl:param name="TABLE.ROW.OUTER" select="'Outer Classes'" />
-<xsl:param name="TABLE.ROW.INNER" select="'Inner Classes'" />
-<xsl:param name="TABLE.ROW.INTERFACE" select="'Interfaces'" />
-<xsl:param name="TABLE.ROW.TOTAL" select="'Total'" />
-<xsl:param name="TABLE.WIDTH" select="'90%'" />
-
-<xsl:param name="PERCENTAGE.FORMAT" select="'#0.00%'" />
-
-<!-- This template drives the rest of the output -->
-<xsl:template match="/" >
-  <html>
-   <!-- JEditorPane gets really angry if it sees this
-	WWP: Sorry, this needs to be explained better. Not a valid HTML document without a head.
-	 -->
-   <head><title><xsl:value-of select="$PAGE.TITLE" /></title></head>
-  <body>
-    <h1 align="center"><a href="https://spotbugs.github.io"><xsl:value-of select="$SUMMARY.HEADER" /></a></h1>
-    <h2 align="center"> Analysis for 
-    <xsl:choose>
-      <xsl:when test='string-length(/BugCollection/Project/@projectName)>0'>
-          <xsl:value-of select="/BugCollection/Project/@projectName" /></xsl:when>
-      <xsl:otherwise><xsl:value-of select="/BugCollection/Project/@filename" /></xsl:otherwise>
-    </xsl:choose>
-      </h2>
-  <h2 align="center"><xsl:value-of select="$SUMMARY.LABEL" /> 
-      <i><xsl:value-of select="//FindBugsSummary/@timestamp" /></i></h2>
-  <xsl:apply-templates select="//FindBugsSummary" />
-  <br/>
-  <p align="center">
-  <font face="{$PAGE.FONT}" size="6"><xsl:value-of select="$PACKAGE.HEADER" /></font>
-    <br/><font face="{$PAGE.FONT}" size="4"><i>(<xsl:value-of select="$PACKAGE.SORT.LABEL"/>)</i></font>
-  </p>
-  <xsl:for-each select="//FindBugsSummary/PackageStats">
-  <xsl:sort select="@total_bugs" data-type="number" order="descending" />
-  <xsl:apply-templates select="." />
-  </xsl:for-each>
-  </body>
-  </html>
-</xsl:template>
-
-<xsl:template name="status_table_row" >
-  <xsl:param name="LABEL" select="''" />
-  <xsl:param name="COUNT" select="1" />
-  <xsl:param name="BUGS" select="0" />
-  <xsl:param name="FONT_SIZE" select="4" />
-  <tr>
-   <td align="left"><font face="{$PAGE.FONT}" size="{$FONT_SIZE}"><xsl:value-of select="$LABEL" /></font></td>
-   <td align="center"><font face="{$PAGE.FONT}" color="green" size="{$FONT_SIZE}"><xsl:value-of select="$COUNT" /></font></td>
-   <td align="center"><font face="{$PAGE.FONT}" color="red" size="{$FONT_SIZE}"><xsl:value-of select="$BUGS" /></font></td>
-   <td align="center"><font face="{$PAGE.FONT}" color="blue" size="{$FONT_SIZE}">
-      <xsl:choose>
-      <xsl:when test="$COUNT &gt; 0">
-       <xsl:value-of select="format-number(number($BUGS div $COUNT), $PERCENTAGE.FORMAT)"/>
-      </xsl:when>
-      <xsl:otherwise>
-       <xsl:value-of select="format-number(0, $PERCENTAGE.FORMAT)"/>
-      </xsl:otherwise>
-      </xsl:choose>
-     </font>
-   </td>
-  </tr>
-</xsl:template>
-
-<xsl:template name="table_header" >
-  <tr>
-  <th><font face="{$PAGE.FONT}" size="4"><xsl:value-of select="$TABLE.HEADING.TYPE"/></font></th>
-  <th><font face="{$PAGE.FONT}" size="4"><xsl:value-of select="$TABLE.HEADING.COUNT"/></font></th>
-  <th><font face="{$PAGE.FONT}" size="4"><xsl:value-of select="$TABLE.HEADING.BUGS"/></font></th>
-  <th><font face="{$PAGE.FONT}" size="4"><xsl:value-of select="$TABLE.HEADING.PERCENT"/></font></th>
-  </tr>
-</xsl:template>
-
-<xsl:template match="FindBugsSummary" >
-  <table width="{$TABLE.WIDTH}" border="1" align="center">
-   <xsl:call-template name="table_header" />
-
-   <xsl:call-template name="status_table_row">
-     <xsl:with-param name="LABEL" select="$TABLE.ROW.OUTER" />
-     <xsl:with-param name="COUNT" select="count(PackageStats/ClassStats[@interface='false' and substring-after(@class,'$')=''])" />
-     <xsl:with-param name="BUGS" select="sum(PackageStats/ClassStats[@interface='false' and substring-after(@class,'$')='']/@bugs)" />
-   </xsl:call-template>
-
-   <xsl:call-template name="status_table_row">
-     <xsl:with-param name="LABEL" select="$TABLE.ROW.INNER" />
-     <xsl:with-param name="COUNT" select="count(PackageStats/ClassStats[@interface='false' and substring-after(@class,'$')!=''])" />
-     <xsl:with-param name="BUGS" select="sum(PackageStats/ClassStats[@interface='false' and substring-after(@class,'$')!='']/@bugs)" />
-   </xsl:call-template>
-
-   <xsl:call-template name="status_table_row">
-     <xsl:with-param name="LABEL" select="$TABLE.ROW.INTERFACE" />
-     <xsl:with-param name="COUNT" select="count(PackageStats/ClassStats[@interface='true'])" />
-     <xsl:with-param name="BUGS" select="sum(PackageStats/ClassStats[@interface='true']/@bugs)" />
-   </xsl:call-template>
-
-   <xsl:call-template name="status_table_row">
-     <xsl:with-param name="LABEL" select="$TABLE.ROW.TOTAL" />
-     <xsl:with-param name="COUNT" select="@total_classes" />
-     <xsl:with-param name="BUGS" select="@total_bugs"/>
-     <xsl:with-param name="FONT_SIZE" select="5"/>
-   </xsl:call-template>
-   <xsl:variable name="num_packages" select="count(PackageStats)" />
-   <tr><td align="center" colspan="4"><font face="{$PAGE.FONT}" size="4">
-     <xsl:call-template name='string_format'>
-     <xsl:with-param name="COUNT" select="$num_packages"/>
-     <xsl:with-param name="STRING" select="$TOTAL.PACKAGES.LABEL"/>
-     <xsl:with-param name="SINGLE" select="$PACKAGE.SINGLE.LABEL"/>
-     <xsl:with-param name="PULURAL" select="$PACKAGE.PULURAL.LABEL"/>
-     </xsl:call-template>
-     </font></td>
-   </tr>
-  </table>
-</xsl:template>
-
-
-<xsl:template name='string_format'>
-  <xsl:param name="COUNT" select="1"/>
-  <xsl:param name="STRING" select="''"/>
-  <xsl:param name="SINGLE" select="''"/>
-  <xsl:param name="PULURAL" select="''"/>
-  <xsl:variable name="count_str" select="concat(substring-before($STRING,'#1'), $COUNT, substring-after($STRING,'#1'))" />
-
-  <xsl:choose>
-    <xsl:when test="$COUNT &gt; 1">
-      <xsl:value-of select="concat(substring-before($count_str,'$1'), $PULURAL, substring-after($count_str,'$1'))" />
-    </xsl:when>
-    <xsl:otherwise>
-    <xsl:value-of select="concat(substring-before($count_str,'$1'), $SINGLE, substring-after($count_str,'$1'))" />
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-
-<xsl:template match="PackageStats" >
-  <xsl:variable name="package-name">
-    <xsl:choose>
-      <xsl:when test="@package = ''">
-        <xsl:value-of select="$DEFAULT.PACKAGE.NAME"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="@package"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:variable name="package-prefix">
-    <xsl:choose>
-      <xsl:when test="@package = ''">
-        <xsl:text></xsl:text>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="concat(@package,'.')"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <h2 align="center"><xsl:value-of select="$PACKAGE.LABEL"/><i><font color='green'><xsl:value-of select="$package-name" /></font></i></h2>
-   <table width="{$TABLE.WIDTH}" border="1" align="center">
-   <xsl:call-template name="table_header" />
-
-   <xsl:call-template name="status_table_row">
-     <xsl:with-param name="LABEL" select="$TABLE.ROW.OUTER" />
-     <xsl:with-param name="COUNT" select="count(ClassStats[@interface='false' and substring-after(@class,'$')=''])" />
-     <xsl:with-param name="BUGS" select="sum(ClassStats[@interface='false' and substring-after(@class,'$')='']/@bugs)" />
-   </xsl:call-template>
-
-   <xsl:call-template name="status_table_row">
-     <xsl:with-param name="LABEL" select="$TABLE.ROW.INNER" />
-     <xsl:with-param name="COUNT" select="count(ClassStats[@interface='false' and substring-after(@class,'$')!=''])" />
-     <xsl:with-param name="BUGS" select="sum(ClassStats[@interface='false' and substring-after(@class,'$')!='']/@bugs)" />
-   </xsl:call-template>
-
-   <xsl:call-template name="status_table_row">
-     <xsl:with-param name="LABEL" select="$TABLE.ROW.INTERFACE" />
-     <xsl:with-param name="COUNT" select="count(ClassStats[@interface='true'])" />
-     <xsl:with-param name="BUGS" select="sum(ClassStats[@interface='true']/@bugs)" />
-   </xsl:call-template>
-
-   <xsl:call-template name="status_table_row">
-     <xsl:with-param name="LABEL" select="$TABLE.ROW.TOTAL" />
-     <xsl:with-param name="COUNT" select="@total_types" />
-     <xsl:with-param name="BUGS" select="@total_bugs" />
-     <xsl:with-param name="FONT_SIZE" select="5"/>
-   </xsl:call-template>
-
-  </table>
-  <xsl:if test="@total_bugs &gt; 0">
-  <table width="{$TABLE.WIDTH}" border="0" align="center">
-     <xsl:variable name="max_bugs">
-       <xsl:for-each select="ClassStats">
-         <xsl:sort select="@bugs" data-type="number" order="descending"/>
-         <xsl:if test="position()=1">
-           <xsl:value-of select="@bugs"/>
-         </xsl:if>
-       </xsl:for-each>
-     </xsl:variable>
-
-     <tr>
-       <td align="left" colspan="2">
-         <font face="{$PAGE.FONT}" size="4">
-     <xsl:call-template name='string_format'>
-     <xsl:with-param name="COUNT" select="$max_bugs"/>
-     <xsl:with-param name="STRING" select="$PACKAGE.BUGCLASS.LABEL"/>
-     <xsl:with-param name="SINGLE" select="$BUGS.SINGLE.LABEL"/>
-     <xsl:with-param name="PULURAL" select="$BUGS.PULURAL.LABEL"/>
-     </xsl:call-template>
-         </font>
-       </td>
-     </tr>
-
-     <xsl:for-each select="ClassStats">
-       <xsl:if test="@bugs = $max_bugs">
-       <tr>
-          <td>&#160;&#160;&#160;&#160;&#160;&#160;&#160;</td>
-          <td align="left"><font face="{$PAGE.FONT}" color="red" size="4"><i><xsl:value-of select="$package-prefix"/><xsl:value-of select="@class" /></i></font></td>
-       </tr>
-       </xsl:if>
-     </xsl:for-each>
-
-   </table>
-  </xsl:if>
-  <br/>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/src/python/review/inspectors/spotbugs/spotbugs.py b/src/python/review/inspectors/spotbugs/spotbugs.py
deleted file mode 100644
index a2ee8b38..00000000
--- a/src/python/review/inspectors/spotbugs/spotbugs.py
+++ /dev/null
@@ -1,104 +0,0 @@
-import logging
-import re
-from collections import Counter
-from pathlib import Path
-from typing import Dict, List
-
-from src.python.review.common.file_system import get_all_file_system_items
-from src.python.review.common.java_compiler import javac, javac_project
-from src.python.review.common.subprocess_runner import run_in_subprocess
-from src.python.review.inspectors.base_inspector import BaseInspector
-from src.python.review.inspectors.inspector_type import InspectorType
-from src.python.review.inspectors.issue import BaseIssue, CodeIssue, IssueType
-
-logger = logging.getLogger(__name__)
-
-PATH_SPOTBUGS_FILES = Path(__file__).parent / 'files'
-PATH_SPOTBUGS_EXECUTABLE = PATH_SPOTBUGS_FILES / 'bin' / 'spotbugs'
-PATH_SPOTBUGS_EXCLUDE = PATH_SPOTBUGS_FILES / 'spotbugs-exclude.xml'
-
-
-class SpotbugsInspector(BaseInspector):
-    inspector_type = InspectorType.SPOTBUGS
-
-    @classmethod
-    def _create_command(cls, path: Path) -> List[str]:
-        return [
-            PATH_SPOTBUGS_EXECUTABLE,
-            '-quiet',  # disable warning and messages
-            '-exclude',
-            PATH_SPOTBUGS_EXCLUDE,
-            '-textui',
-            '-medium',
-            str(path),
-        ]
-
-    def inspect(self, path: Path, config: dict) -> List[BaseIssue]:
-        if path.is_file():
-            is_successful = javac(path)
-        else:
-            is_successful = javac_project(path)
-
-        if not is_successful:
-            logger.error('%s: cant compile java files')
-
-        return self._inspect_compiled(path)
-
-    def _inspect_compiled(self, path: Path) -> List[BaseIssue]:
-        if path.is_dir():
-            command = self._create_command(path)
-        else:
-            command = self._create_command(path.parent)
-        output = run_in_subprocess(command)
-
-        if path.is_file():
-            file_paths = [path]
-        else:
-            file_paths = get_all_file_system_items(path)
-
-        java_file_paths = [file_path for file_path in file_paths if file_path.suffix == '.java']
-        file_path_counter = Counter(java_file_paths)
-        file_name_to_path = {file_path.name: file_path for file_path in java_file_paths}
-        return self._parse(output, file_path_counter, file_name_to_path)
-
-    @classmethod
-    def _parse(cls, output: str, file_path_counter: Dict[Path, int],
-               file_name_to_path: Dict[str, Path]) -> List[BaseIssue]:
-        lines = [line for line in output.split('\n') if line]
-        issues: List[BaseIssue] = []
-        for line in lines:
-            try:
-                issue = cls._parse_single_line(line, file_name_to_path)
-                file_path = issue.file_path
-                if file_path_counter[file_path] == 1:
-                    issues.append(issue)
-                else:
-                    logger.warning(f'Cannot inspect duplicate file: {file_path}')
-            except Exception as e:
-                logger.warning(f'Cannot parse output line {line}', e)
-        return issues
-
-    @classmethod
-    def _parse_single_line(cls, line: str, file_name_to_path: Dict[str, Path]) -> BaseIssue:
-        file_name = re.compile(r'(At|In|at|in) ([^ ]+.java)').findall(line)[-1][1].strip()
-
-        desc_start_index = line.find(':')
-        desc_end_index = max(line.rfind(':'), line.rfind('.java'))
-
-        issue_class = line[:desc_start_index].strip()
-        long_desc = line[desc_start_index + 1: desc_end_index].strip()
-        short_desc = long_desc.split('  ')[0]
-
-        line_number_str = line[desc_end_index + 1:].strip()
-        line_number_parsed = re.compile(r'\d+').findall(line_number_str)
-        line_number = int(line_number_parsed[0]) if line_number_parsed else 0
-
-        return CodeIssue(
-            file_path=file_name_to_path[file_name],
-            line_no=line_number,
-            column_no=1,
-            type=IssueType.ERROR_PRONE,
-            origin_class=issue_class,
-            description=short_desc,
-            inspector_type=cls.inspector_type,
-        )
diff --git a/src/python/review/inspectors/springlint/files/springlint-0.6.jar b/src/python/review/inspectors/springlint/files/springlint-0.6.jar
deleted file mode 100644
index 10409b5e..00000000
Binary files a/src/python/review/inspectors/springlint/files/springlint-0.6.jar and /dev/null differ
diff --git a/src/python/review/inspectors/springlint/springlint.py b/src/python/review/inspectors/springlint/springlint.py
deleted file mode 100644
index b5eca5a4..00000000
--- a/src/python/review/inspectors/springlint/springlint.py
+++ /dev/null
@@ -1,192 +0,0 @@
-import json
-import logging
-import re
-from pathlib import Path
-from shutil import copy
-from typing import Any, AnyStr, Dict, List, Optional
-
-from src.python.review.common.file_system import new_temp_dir
-from src.python.review.common.subprocess_runner import run_in_subprocess
-from src.python.review.inspectors.base_inspector import BaseInspector
-from src.python.review.inspectors.inspector_type import InspectorType
-from src.python.review.inspectors.issue import (
-    BaseIssue,
-    ChildrenNumberIssue,
-    ClassResponseIssue,
-    CodeIssue,
-    CohesionIssue,
-    CouplingIssue,
-    InheritanceIssue,
-    IssueData,
-    IssueType,
-    MethodNumberIssue,
-    WeightedMethodIssue,
-)
-from src.python.review.inspectors.tips import (
-    get_child_number_tip,
-    get_class_coupling_tip,
-    get_class_response_tip,
-    get_cohesion_tip,
-    get_inheritance_depth_tip,
-    get_method_number_tip,
-    get_weighted_method_tip,
-)
-
-PATH_TOOLS_SPRINGLINT_FILES = Path(__file__).parent / 'files'
-PATH_SPRINGLINT_JAR = PATH_TOOLS_SPRINGLINT_FILES / 'springlint-0.6.jar'
-SPRINGLINT_OUTPUT_NAME = 'springlint-result.html'
-
-logger = logging.getLogger(__name__)
-
-
-class SpringlintInspector(BaseInspector):
-    inspector_type = InspectorType.SPRINGLINT
-
-    metric_name_to_property = {
-        'dit': 'inheritance_tree_depth',
-        'noc': 'children_number',
-        'wmc': 'weighted_method',
-        'cbo': 'class_objects_coupling',
-        'lcom': 'cohesion_lack',
-        'rfc': 'class_response',
-        'nom': 'method_number',
-    }
-
-    metric_name_to_description = {
-        'dit': get_inheritance_depth_tip(),
-        'noc': get_child_number_tip(),
-        'wmc': get_weighted_method_tip(),
-        'cbo': get_class_coupling_tip(),
-        'lcom': get_cohesion_tip(),
-        'rfc': get_class_response_tip(),
-        'nom': get_method_number_tip(),
-    }
-
-    metric_name_to_issue_type = {
-        'dit': IssueType.INHERITANCE_DEPTH,
-        'noc': IssueType.CHILDREN_NUMBER,
-        'wmc': IssueType.WEIGHTED_METHOD,
-        'cbo': IssueType.COUPLING,
-        'lcom': IssueType.COHESION,
-        'rfc': IssueType.CLASS_RESPONSE,
-        'nom': IssueType.METHOD_NUMBER,
-    }
-
-    @classmethod
-    def _create_command(cls, path: Path, output_path: Path) -> List[str]:
-        return [
-            'java', '-jar',
-            PATH_SPRINGLINT_JAR,
-            '--output', str(output_path),
-            '-otype', 'html',
-            '--project', str(path),
-        ]
-
-    def inspect(self, path: Path, config: dict) -> List[BaseIssue]:
-        with new_temp_dir() as temp_dir:
-            if path.is_file():
-                return self._inspect_file(path, temp_dir)
-            else:
-                return self._inspect_project(path, temp_dir)
-
-    @classmethod
-    def _inspect_project(cls, path: Path, temp_dir: Path) -> List[BaseIssue]:
-        output_path = temp_dir / SPRINGLINT_OUTPUT_NAME
-        command = cls._create_command(path, temp_dir)
-        run_in_subprocess(command)
-        return cls._parse(output_path)
-
-    @classmethod
-    def _inspect_file(cls, path: Path, temp_dir: Path) -> List[BaseIssue]:
-        output_path = temp_dir / SPRINGLINT_OUTPUT_NAME
-        copy(str(path), str(temp_dir))
-        command = cls._create_command(temp_dir, temp_dir)
-        run_in_subprocess(command)
-        return cls._parse(output_path, str(path))
-
-    @classmethod
-    def _parse(cls, output_path: Path, origin_path: str = '') -> List[BaseIssue]:
-        if not output_path.is_file():
-            logger.error('%s: error - no output file' % cls.inspector_type.value)
-            return []
-
-        with open(str(output_path)) as out_file:
-            file_content = out_file.read()
-            issues: List[BaseIssue] = cls._parse_smells(file_content, origin_path)
-            issues.extend(cls._parse_metrics(file_content, origin_path))
-            return issues
-
-    @classmethod
-    def _parse_smells(cls, file_content: AnyStr, origin_path: str = '') -> List[BaseIssue]:
-        smells_re = re.compile(r'var smells=([^;]*);', re.S)
-        smells_string = smells_re.findall(file_content)[0]
-        smells = json.JSONDecoder().decode(smells_string)
-
-        issues: List[BaseIssue] = []
-        for file_smell in smells:
-            if origin_path:
-                file_path = origin_path
-            else:
-                file_path = file_smell['file']
-            issues.extend([CodeIssue(
-                file_path=Path(file_path),
-                line_no=1,
-                column_no=1,
-                origin_class=smell['name'],
-                inspector_type=cls.inspector_type,
-                type=IssueType.ARCHITECTURE,
-                description=smell['description'],
-            ) for smell in file_smell['smells']])
-
-        return issues
-
-    @classmethod
-    def _parse_metrics(cls, file_content: AnyStr, origin_path: str = '') -> List[BaseIssue]:
-        metrics_re = re.compile(r'var classes =([^;]*);', re.S)
-        metrics_string = metrics_re.findall(file_content)[0]
-        type_metrics_list = json.loads(metrics_string).items()
-
-        issues: List[BaseIssue] = []
-        for metrics_list in type_metrics_list:
-            for metrics in metrics_list[1]:
-                for metric_name in metrics:
-                    if metric_name not in cls.metric_name_to_property:
-                        continue
-                    if origin_path:
-                        file_path = origin_path
-                    else:
-                        file_path = metrics['file']
-                    issues.append(cls._create_issue(metric_name,
-                                                    metrics[metric_name],
-                                                    Path(file_path)))
-        return issues
-
-    @classmethod
-    def _create_issue(cls, metric_name: str,
-                      metric_value: int, path: Path) -> Optional[BaseIssue]:
-        property_name = cls.metric_name_to_property[metric_name]
-        issue_data = cls._get_common_issue_data(path)
-        issue_data[property_name] = metric_value
-        issue_data['description'] = cls.metric_name_to_description[metric_name]
-        issue_data['type'] = cls.metric_name_to_issue_type[metric_name]
-
-        if metric_name == 'dit':
-            return InheritanceIssue(**issue_data)
-        if metric_name == 'noc':
-            return ChildrenNumberIssue(**issue_data)
-        if metric_name == 'wmc':
-            return WeightedMethodIssue(**issue_data)
-        if metric_name == 'cbo':
-            return CouplingIssue(**issue_data)
-        if metric_name == 'lcom':
-            return CohesionIssue(**issue_data)
-        if metric_name == 'rfc':
-            return ClassResponseIssue(**issue_data)
-        if metric_name == 'nom':
-            return MethodNumberIssue(**issue_data)
-
-        return None
-
-    @classmethod
-    def _get_common_issue_data(cls, file: Path) -> Dict[str, Any]:
-        return IssueData.get_base_issue_data_dict(file, cls.inspector_type)
diff --git a/src/python/review/quality/evaluate_quality.py b/src/python/review/quality/evaluate_quality.py
index b6329653..f4eb3a9e 100644
--- a/src/python/review/quality/evaluate_quality.py
+++ b/src/python/review/quality/evaluate_quality.py
@@ -17,6 +17,7 @@
     CohesionRule,
     LANGUAGE_TO_COHESION_RULE_CONFIG,
 )
+from src.python.review.quality.rules.complexity_scoring import ComplexityRule, LANGUAGE_TO_COMPLEXITY_RULE_CONFIG
 from src.python.review.quality.rules.coupling_scoring import CouplingRule, LANGUAGE_TO_COUPLING_RULE_CONFIG
 from src.python.review.quality.rules.cyclomatic_complexity_scoring import (
     CyclomaticComplexityRule,
@@ -51,6 +52,7 @@ def __get_available_rules(language: Language) -> List[Rule]:
     return [
         ErrorProneRule(LANGUAGE_TO_ERROR_PRONE_RULE_CONFIG[language]),
         BestPracticesRule(LANGUAGE_TO_BEST_PRACTICES_RULE_CONFIG[language]),
+        ComplexityRule(LANGUAGE_TO_COMPLEXITY_RULE_CONFIG[language]),
         CyclomaticComplexityRule(LANGUAGE_TO_CYCLOMATIC_COMPLEXITY_RULE_CONFIG[language]),
         BooleanExpressionRule(LANGUAGE_TO_BOOLEAN_EXPRESSION_RULE_CONFIG[language]),
         FunctionLengthRule(LANGUAGE_TO_FUNCTION_LENGTH_RULE_CONFIG[language]),
diff --git a/src/python/review/quality/model.py b/src/python/review/quality/model.py
index 7a57dcf6..78291370 100644
--- a/src/python/review/quality/model.py
+++ b/src/python/review/quality/model.py
@@ -15,15 +15,18 @@ class QualityType(Enum):
     GOOD = 'GOOD'
     EXCELLENT = 'EXCELLENT'
 
-    def __le__(self, other: 'QualityType') -> bool:
-        order = {
+    def to_number(self) -> int:
+        type_to_number = {
             QualityType.BAD: 0,
             QualityType.MODERATE: 1,
             QualityType.GOOD: 2,
             QualityType.EXCELLENT: 3,
         }
 
-        return order[self] < order[other]
+        return type_to_number.get(self, 3)
+
+    def __le__(self, other: 'QualityType') -> bool:
+        return self.to_number() < other.to_number()
 
 
 class Rule(abc.ABC):
diff --git a/src/python/review/quality/penalty.py b/src/python/review/quality/penalty.py
new file mode 100644
index 00000000..e8cfce2f
--- /dev/null
+++ b/src/python/review/quality/penalty.py
@@ -0,0 +1,211 @@
+import json
+from dataclasses import dataclass
+from typing import Dict, List, Optional, Set
+
+from src.python.review.common.language import Language
+from src.python.review.inspectors.issue import BaseIssue, IssueType
+from src.python.review.quality.model import QualityType
+
+
+@dataclass(frozen=True, eq=True)
+class PenaltyIssue(BaseIssue):
+    influence_on_penalty: int
+
+
+# TODO: need testing
+ISSUE_TYPE_TO_PENALTY_COEFFICIENT = {
+    IssueType.COHESION: 0.6,
+    IssueType.COUPLING: 0.6,
+    IssueType.FUNC_LEN: 0.6,
+    IssueType.LINE_LEN: 1,
+    IssueType.ARCHITECTURE: 1,  # TODO: Change the coefficient when the tool can find this type of issues
+    IssueType.BEST_PRACTICES: 0.9,
+    IssueType.BOOL_EXPR_LEN: 0.6,
+    IssueType.CHILDREN_NUMBER: 0.2,
+    IssueType.CLASS_RESPONSE: 0.2,
+    IssueType.CODE_STYLE: 1,
+    IssueType.COMPLEXITY: 0.5,
+    IssueType.CYCLOMATIC_COMPLEXITY: 0.7,
+    IssueType.ERROR_PRONE: 0.6,
+    IssueType.INHERITANCE_DEPTH: 0.2,
+    IssueType.MAINTAINABILITY: 0.3,
+    IssueType.METHOD_NUMBER: 0.2,
+    IssueType.WEIGHTED_METHOD: 0.2,
+    IssueType.UNDEFINED: 0,
+    IssueType.INFO: 0,
+}
+
+
+@dataclass
+class PenaltyConfig:
+    one_level_quality_reduction: float
+    two_level_quality_reduction: float
+    three_level_quality_reduction: float
+
+
+# TODO: need testing
+common_penalty_rule = PenaltyConfig(
+    one_level_quality_reduction=0.5,
+    two_level_quality_reduction=0.7,
+    three_level_quality_reduction=0.9,
+)
+
+
+@dataclass
+class PreviousIssue:
+    origin_class: str
+    number: int
+    category: IssueType = None
+
+
+def get_previous_issues_by_language(lang_to_history: Optional[str], language: Language) -> List[PreviousIssue]:
+    """
+    Reads a json string and returns a list of previously made issues for the specified language.
+    """
+    if lang_to_history is None:
+        return []
+
+    language_to_history = json.loads(lang_to_history)
+    history = language_to_history.get(language.value.lower(), [])
+
+    previous_issues = []
+    for issue_data in history:
+        previous_issues.append(PreviousIssue(**issue_data))
+    return previous_issues
+
+
+def categorize(previous_issues: List[PreviousIssue], current_issues: List[BaseIssue]):
+    """
+    For each previously made issue determines its category, with the help of current issues.
+    """
+    origin_class_to_category = {}
+    for issue in current_issues:
+        origin_class_to_category[issue.origin_class] = issue.type
+
+    for issue in previous_issues:
+        issue.category = origin_class_to_category.get(issue.origin_class, None)
+
+
+class Punisher:
+    """
+    Punisher with the list of previous issues and current issues allows you to use the 'get_quality_with_penalty'
+    function to get quality including the penalty for previous issues and use the 'get_issue_influence_on_penalty'
+    function to get the influence of an issues on reducing the quality score.
+    """
+
+    _penalty_coefficient: float
+    _normalized_penalty_coefficient: float
+    _issue_class_to_influence: Dict[str, float]
+
+    def __init__(self, current_issues: List[BaseIssue], previous_issues: List[PreviousIssue]):
+        self._penalty_coefficient = self._get_penalty_coefficient(current_issues, previous_issues)
+        self._normalized_penalty_coefficient = self._get_normalized_penalty_coefficient(current_issues)
+        self._issue_class_to_influence = self._get_issue_class_to_influence(current_issues, previous_issues)
+
+    def get_quality_with_penalty(self, quality_without_penalty: QualityType) -> QualityType:
+        """
+        Depending on the penalty coefficient, reduces the quality type.
+        """
+        numbered_quality_type = quality_without_penalty.to_number()
+        numbered_quality_type -= self._get_penalty_score()
+
+        quality = QualityType.EXCELLENT
+
+        if numbered_quality_type <= 0:
+            quality = QualityType.BAD
+        elif numbered_quality_type == 1:
+            quality = QualityType.MODERATE
+        elif numbered_quality_type == 2:
+            quality = QualityType.GOOD
+
+        return quality
+
+    def get_issue_influence_on_penalty(self, issue_class: str) -> int:
+        """
+        Calculates the influence of the issue on the penalty.
+
+        Returns a number in the range from 0 to 100.
+        """
+
+        return int(self._issue_class_to_influence.get(issue_class, 0) * 100)
+
+    def _get_penalty_score(self) -> int:
+        """
+        Calculates the penalty score with the penalty coefficient
+
+        Returns a number equal to 0, 1, 2 or 3, which describes how many levels the grade should be lowered.
+        """
+
+        penalty_score = 3
+
+        if self._normalized_penalty_coefficient < common_penalty_rule.one_level_quality_reduction:
+            penalty_score = 0
+        elif self._normalized_penalty_coefficient < common_penalty_rule.two_level_quality_reduction:
+            penalty_score = 1
+        elif self._normalized_penalty_coefficient < common_penalty_rule.three_level_quality_reduction:
+            penalty_score = 2
+
+        return penalty_score
+
+    def _get_penalty_coefficient(self, current_issues: List[BaseIssue], previous_issues: List[PreviousIssue]) -> float:
+        """
+        To calculate the penalty coefficient we use those issues that occurred earlier and repeated again.
+        Such issues will be called penalizing issues. For each penalizing issue, we calculate a number equal to
+        the number of times this issue was repeated earlier multiplied by the coefficient of the category to
+        which the issue belongs. These numbers are added up to get the penalty coefficient.
+        """
+
+        penalizing_classes = self._get_penalizing_classes(current_issues, previous_issues)
+        penalizing_issues = list(filter(lambda issue: issue.origin_class in penalizing_classes, previous_issues))
+
+        coefficient = 0
+        for issue in penalizing_issues:
+            coefficient += ISSUE_TYPE_TO_PENALTY_COEFFICIENT.get(issue.category, 1) * issue.number
+
+        return coefficient
+
+    def _get_normalized_penalty_coefficient(self, current_issues: List[BaseIssue]) -> float:
+        """
+        The penalty coefficient is normalized by the formula: k / (k + n),
+        where k is the penalty coefficient, n is the number of current issues.
+        """
+
+        coefficient = 0
+        if current_issues:
+            coefficient = self._penalty_coefficient / (self._penalty_coefficient + len(current_issues))
+
+        return coefficient
+
+    def _get_issue_class_to_influence(self,
+                                      current_issues: List[BaseIssue],
+                                      previous_issues: List[PreviousIssue]) -> Dict[str, float]:
+        """
+        For each issue to be penalized, the corresponding influence on penalty is calculated.
+
+        To do this, for each issue we count its penalty coefficient, normalize it,
+        and divide the resulting number by the total normalized penalty coefficient.
+        """
+
+        penalizing_classes = self._get_penalizing_classes(current_issues, previous_issues)
+        penalizing_issues = list(filter(lambda issue: issue.origin_class in penalizing_classes, previous_issues))
+
+        result = {}
+        for issue in penalizing_issues:
+            issue_coefficient = ISSUE_TYPE_TO_PENALTY_COEFFICIENT.get(issue.category, 1) * issue.number
+            normalized_issue_coefficient = issue_coefficient / (self._penalty_coefficient + len(current_issues))
+            influence = normalized_issue_coefficient / self._normalized_penalty_coefficient
+
+            result[issue.origin_class] = influence
+
+        return result
+
+    @staticmethod
+    def _get_penalizing_classes(current_issues: List[BaseIssue], previous_issues: List[PreviousIssue]) -> Set[str]:
+        """
+        Returns issues that should be penalized.
+        We penalize for those issues that were there before, but repeated again.
+        """
+        current_classes = set(map(lambda issue: issue.origin_class, current_issues))
+        previous_classes = set(map(lambda issue: issue.origin_class, previous_issues))
+
+        return previous_classes.intersection(current_classes)
diff --git a/src/python/review/quality/rules/best_practices_scoring.py b/src/python/review/quality/rules/best_practices_scoring.py
index 633387f2..4541ee34 100644
--- a/src/python/review/quality/rules/best_practices_scoring.py
+++ b/src/python/review/quality/rules/best_practices_scoring.py
@@ -14,7 +14,7 @@ class BestPracticesRuleConfig:
 
 
 common_best_practices_rule_config = BestPracticesRuleConfig(
-    n_best_practices_moderate=3,
+    n_best_practices_moderate=4,
     n_best_practices_good=1,
     n_files=1,
 )
diff --git a/src/python/review/quality/rules/boolean_length_scoring.py b/src/python/review/quality/rules/boolean_length_scoring.py
index 2a33c327..a338f081 100644
--- a/src/python/review/quality/rules/boolean_length_scoring.py
+++ b/src/python/review/quality/rules/boolean_length_scoring.py
@@ -14,20 +14,20 @@ class BooleanExpressionRuleConfig:
 
 
 common_boolean_expression_rule_config = BooleanExpressionRuleConfig(
-    bool_expr_len_bad=10,
-    bool_expr_len_moderate=7,
-    bool_expr_len_good=5,
+    bool_expr_len_bad=6,
+    bool_expr_len_moderate=5,
+    bool_expr_len_good=3,
 )
 
-java_boolean_expression_rule_config = BooleanExpressionRuleConfig(
-    bool_expr_len_bad=8,
-    bool_expr_len_moderate=6,
-    bool_expr_len_good=4,
+kotlin_boolean_expression_rule_config = BooleanExpressionRuleConfig(
+    bool_expr_len_bad=9,
+    bool_expr_len_moderate=7,
+    bool_expr_len_good=5,
 )
 
 LANGUAGE_TO_BOOLEAN_EXPRESSION_RULE_CONFIG = {
-    Language.JAVA: java_boolean_expression_rule_config,
-    Language.KOTLIN: common_boolean_expression_rule_config,
+    Language.JAVA: common_boolean_expression_rule_config,
+    Language.KOTLIN: kotlin_boolean_expression_rule_config,
     Language.PYTHON: common_boolean_expression_rule_config,
     Language.JS: common_boolean_expression_rule_config,
 }
diff --git a/src/python/review/quality/rules/code_style_scoring.py b/src/python/review/quality/rules/code_style_scoring.py
index a1edda09..8fdabd23 100644
--- a/src/python/review/quality/rules/code_style_scoring.py
+++ b/src/python/review/quality/rules/code_style_scoring.py
@@ -70,7 +70,8 @@ def apply(self, n_code_style_lines, n_code_style, total_lines):
         self.n_code_style_lines = n_code_style_lines
         self.n_code_style = n_code_style
 
-        self.get_ratio(n_code_style_lines, n_code_style, total_lines)
+        self.update_quality(n_code_style_lines, n_code_style)
+        self.ratio = self.get_ratio(n_code_style_lines, total_lines, self.config.language)
 
         if self.ratio > self.config.n_code_style_bad:
             self.save_quality(QualityType.BAD)
@@ -84,17 +85,22 @@ def apply(self, n_code_style_lines, n_code_style, total_lines):
         if n_code_style_lines > self.config.n_code_style_lines_bad:
             self.quality_type = QualityType.BAD
 
-    def get_ratio(self, n_code_style_lines, n_code_style, total_lines):
+    @staticmethod
+    def get_ratio(n_code_style_lines: int, total_lines: int, language: Language) -> float:
+        if language == Language.PYTHON:
+            return n_code_style_lines / max(1, total_lines)
+        else:
+            return n_code_style_lines / max(1, total_lines - 4)
+
+    def update_quality(self, n_code_style_lines: int, n_code_style: int):
         if self.config.language == Language.PYTHON:
             if n_code_style == 1:
                 self.save_quality(QualityType.MODERATE)
-            self.ratio = n_code_style_lines / max(1, total_lines)
         else:
             if n_code_style_lines == 1:
                 self.save_quality(QualityType.GOOD)
             elif n_code_style_lines == 2:
                 self.save_quality(QualityType.MODERATE)
-            self.ratio = n_code_style_lines / max(1, total_lines - 4)
 
     def __get_next_quality_type(self) -> QualityType:
         if self.quality_type == QualityType.BAD:
diff --git a/src/python/review/quality/rules/cohesion_scoring.py b/src/python/review/quality/rules/cohesion_scoring.py
index 623fd2db..15de7a62 100644
--- a/src/python/review/quality/rules/cohesion_scoring.py
+++ b/src/python/review/quality/rules/cohesion_scoring.py
@@ -15,11 +15,11 @@ class CohesionRuleConfig:
 
 # TODO: Need testing
 # Cohesion plugin by default only shows issues where cohesion is less than 50%.
-# Therefore cohesion_lack_bad = 50. The other levels are set in steps of 20%.
+# Therefore cohesion_lack_good = 50. The other levels are set in steps of 20%.
 common_cohesion_rule_config = CohesionRuleConfig(
-    cohesion_lack_bad=50,
-    cohesion_lack_moderate=30,
-    cohesion_lack_good=10,
+    cohesion_lack_bad=90,
+    cohesion_lack_moderate=70,
+    cohesion_lack_good=50,
 )
 
 LANGUAGE_TO_COHESION_RULE_CONFIG = {
diff --git a/src/python/review/quality/rules/complexity_scoring.py b/src/python/review/quality/rules/complexity_scoring.py
new file mode 100644
index 00000000..31083074
--- /dev/null
+++ b/src/python/review/quality/rules/complexity_scoring.py
@@ -0,0 +1,68 @@
+from dataclasses import dataclass
+from typing import Optional
+
+from src.python.review.common.language import Language
+from src.python.review.inspectors.issue import IssueType
+from src.python.review.quality.model import QualityType, Rule
+
+
+@dataclass
+class ComplexityRuleConfig:
+    complexity_good: int
+    complexity_moderate: int
+    complexity_bad: int
+
+
+common_complexity_rule_config = ComplexityRuleConfig(
+    complexity_good=1,
+    complexity_moderate=3,
+    complexity_bad=6,
+)
+
+LANGUAGE_TO_COMPLEXITY_RULE_CONFIG = {
+    Language.JAVA: common_complexity_rule_config,
+    Language.PYTHON: common_complexity_rule_config,
+    Language.KOTLIN: common_complexity_rule_config,
+    Language.JS: common_complexity_rule_config,
+}
+
+
+class ComplexityRule(Rule):
+    def __init__(self, config: ComplexityRuleConfig):
+        self.config = config
+        self.rule_type = IssueType.COMPLEXITY
+        self.complexity: Optional[int] = None
+
+    def apply(self, complexity):
+        self.complexity = complexity
+        if complexity > self.config.complexity_bad:
+            self.quality_type = QualityType.BAD
+            self.next_level_delta = complexity - self.config.complexity_bad
+        elif complexity > self.config.complexity_moderate:
+            self.quality_type = QualityType.MODERATE
+            self.next_level_delta = complexity - self.config.complexity_moderate
+        elif complexity > self.config.complexity_good:
+            self.quality_type = QualityType.GOOD
+            self.next_level_delta = complexity - self.config.complexity_good
+        else:
+            self.quality_type = QualityType.EXCELLENT
+            self.next_level_delta = 0
+        self.next_level_type = self.__get_next_quality_type()
+
+    def __get_next_quality_type(self) -> QualityType:
+        if self.quality_type == QualityType.BAD:
+            return QualityType.MODERATE
+        elif self.quality_type == QualityType.MODERATE:
+            return QualityType.GOOD
+        return QualityType.EXCELLENT
+
+    def merge(self, other: 'ComplexityRule') -> 'ComplexityRule':
+        config = ComplexityRuleConfig(
+            min(self.config.complexity_bad, other.config.complexity_bad),
+            min(self.config.complexity_moderate, other.config.complexity_moderate),
+            min(self.config.complexity_good, other.config.complexity_good),
+        )
+        result_rule = ComplexityRule(config)
+        result_rule.apply(max(self.complexity, other.complexity))
+
+        return result_rule
diff --git a/src/python/review/quality/rules/error_prone_scoring.py b/src/python/review/quality/rules/error_prone_scoring.py
index 8df9c157..1ee57305 100644
--- a/src/python/review/quality/rules/error_prone_scoring.py
+++ b/src/python/review/quality/rules/error_prone_scoring.py
@@ -11,6 +11,10 @@ class ErrorProneRuleConfig:
     n_error_prone_bad: int
 
 
+# TODO: It is necessary to add subcategories where the following boundaries can be used:
+#       GOOD: 0
+#       MODERATE: 1
+#       BAD: 2
 common_error_prone_rule_config = ErrorProneRuleConfig(
     n_error_prone_bad=0,
 )
diff --git a/src/python/review/quality/rules/line_len_scoring.py b/src/python/review/quality/rules/line_len_scoring.py
index b188576f..4ae8cc67 100644
--- a/src/python/review/quality/rules/line_len_scoring.py
+++ b/src/python/review/quality/rules/line_len_scoring.py
@@ -8,11 +8,13 @@
 @dataclass
 class LineLengthRuleConfig:
     n_line_len_bad: float
+    n_line_len_moderate: float
     n_line_len_good: float
 
 
 common_line_length_rule_config = LineLengthRuleConfig(
-    n_line_len_bad=0.05,
+    n_line_len_bad=0.07,
+    n_line_len_moderate=0.05,
     n_line_len_good=0.035,
 )
 
@@ -31,13 +33,16 @@ def __init__(self, config: LineLengthRuleConfig):
 
     # TODO: refactor
     def apply(self, n_line_len, n_lines):
-        self.ratio = n_line_len / max(n_lines, 1)
+        self.ratio = self.get_ratio(n_line_len, n_lines)
         self.n_line_len = n_line_len
         self.n_lines = n_lines
 
         if self.ratio > self.config.n_line_len_bad:
             self.quality_type = QualityType.BAD
             self.next_level_delta = n_line_len - self.config.n_line_len_bad
+        if self.ratio > self.config.n_line_len_moderate:
+            self.quality_type = QualityType.MODERATE
+            self.next_level_delta = n_line_len - self.config.n_line_len_moderate
         elif self.ratio > self.config.n_line_len_good:
             self.quality_type = QualityType.GOOD
             self.next_level_delta = n_line_len - self.config.n_line_len_good
@@ -54,9 +59,14 @@ def __get_next_quality_type(self) -> QualityType:
     def merge(self, other: 'LineLengthRule') -> 'LineLengthRule':
         config = LineLengthRuleConfig(
             min(self.config.n_line_len_bad, other.config.n_line_len_bad),
+            min(self.config.n_line_len_moderate, other.config.n_line_len_moderate),
             min(self.config.n_line_len_good, other.config.n_line_len_good),
         )
         result_rule = LineLengthRule(config)
         result_rule.apply(self.n_line_len + other.n_line_len, self.n_lines + other.n_lines)
 
         return result_rule
+
+    @staticmethod
+    def get_ratio(n_line_len: int, n_lines: int) -> float:
+        return n_line_len / max(n_lines, 1)
diff --git a/src/python/review/reviewers/common.py b/src/python/review/reviewers/common.py
index 9340d824..c1ccadf6 100644
--- a/src/python/review/reviewers/common.py
+++ b/src/python/review/reviewers/common.py
@@ -15,9 +15,14 @@
 from src.python.review.inspectors.radon.radon import RadonInspector
 from src.python.review.quality.evaluate_quality import evaluate_quality
 from src.python.review.quality.model import Quality
-from src.python.review.reviewers.review_result import FileReviewResult, ReviewResult
+from src.python.review.quality.penalty import categorize, get_previous_issues_by_language, Punisher
+from src.python.review.reviewers.review_result import FileReviewResult, GeneralReviewResult
 from src.python.review.reviewers.utils.code_statistics import gather_code_statistics
-from src.python.review.reviewers.utils.issues_filter import filter_duplicate_issues, filter_low_measure_issues
+from src.python.review.reviewers.utils.issues_filter import (
+    filter_duplicate_issues,
+    filter_low_measure_issues,
+    group_issues_by_difficulty,
+)
 from src.python.review.reviewers.utils.metadata_exploration import FileMetadata, Metadata
 
 LANGUAGE_TO_INSPECTORS = {
@@ -30,8 +35,6 @@
     Language.JAVA: [
         CheckstyleInspector(),
         PMDInspector(),
-        # SpotbugsInspector(),
-        # SpringlintInspector()  # TODO experimental
     ],
     Language.KOTLIN: [
         DetektInspector(),
@@ -42,9 +45,7 @@
 }
 
 
-def perform_language_review(metadata: Metadata,
-                            config: ApplicationConfig,
-                            language: Language) -> ReviewResult:
+def perform_language_review(metadata: Metadata, config: ApplicationConfig, language: Language) -> GeneralReviewResult:
     inspectors = LANGUAGE_TO_INSPECTORS[language]
 
     issues = inspect_in_parallel(metadata.path, config, inspectors)
@@ -64,26 +65,55 @@ def perform_language_review(metadata: Metadata,
     for issue in issues:
         file_path_to_issues[issue.file_path].append(issue)
 
-    file_review_results = []
-    general_quality = Quality([])
-    for file_metadata in files_metadata:
-        issues = file_path_to_issues[file_metadata.path]
-        code_statistics = gather_code_statistics(issues, file_metadata.path)
-        code_statistics.total_lines = min(code_statistics.total_lines,
-                                          get_range_lines(config.start_line, config.end_line))
+    previous_issues = get_previous_issues_by_language(config.history, language)
+    categorize(previous_issues, issues)
+
+    issues_by_difficulty = group_issues_by_difficulty(issues)
 
-        quality = evaluate_quality(code_statistics, language)
-        general_quality = general_quality.merge(quality)
+    general_punisher_by_difficulty = {
+        difficulty: Punisher(issues, previous_issues) for difficulty, issues in issues_by_difficulty.items()
+    }
 
-        file_review_results.append(FileReviewResult(
-            file_metadata.path,
-            issues,
-            quality,
-        ))
+    general_quality_by_difficulty = {
+        difficulty: Quality([]) for difficulty in issues_by_difficulty.keys()
+    }
 
-    return ReviewResult(
+    file_review_results = []
+    for file_metadata in files_metadata:
+        file_issues = file_path_to_issues[file_metadata.path]
+        file_issues_by_difficulty = group_issues_by_difficulty(file_issues)
+
+        code_statistics_by_difficulty = {
+            difficulty: gather_code_statistics(file_issues, file_metadata.path)
+            for difficulty, file_issues in file_issues_by_difficulty.items()
+        }
+
+        for code_statistics in code_statistics_by_difficulty.values():
+            code_statistics.total_lines = min(code_statistics.total_lines,
+                                              get_range_lines(config.start_line, config.end_line))
+
+        punisher_by_difficulty = {
+            difficulty: Punisher(file_issues, previous_issues)
+            for difficulty, file_issues in file_issues_by_difficulty.items()
+        }
+
+        quality_by_difficulty = {
+            difficulty: evaluate_quality(code_statistics, language)
+            for difficulty, code_statistics in code_statistics_by_difficulty.items()
+        }
+
+        for difficulty, quality in quality_by_difficulty.items():
+            general_quality_by_difficulty[difficulty] = general_quality_by_difficulty[difficulty].merge(quality)
+
+        file_review_results.append(
+            FileReviewResult(quality_by_difficulty, punisher_by_difficulty, file_issues, file_metadata.path),
+        )
+
+    return GeneralReviewResult(
+        general_quality_by_difficulty,
+        general_punisher_by_difficulty,
+        issues,
         file_review_results,
-        general_quality,
     )
 
 
diff --git a/src/python/review/reviewers/perform_review.py b/src/python/review/reviewers/perform_review.py
index 9f495751..a2561d05 100644
--- a/src/python/review/reviewers/perform_review.py
+++ b/src/python/review/reviewers/perform_review.py
@@ -9,7 +9,7 @@
 from src.python.review.inspectors.issue import IssueType
 from src.python.review.reviewers.common import perform_language_review
 from src.python.review.reviewers.python import perform_python_review
-from src.python.review.reviewers.review_result import ReviewResult
+from src.python.review.reviewers.review_result import GeneralReviewResult
 from src.python.review.reviewers.utils.metadata_exploration import explore_file, explore_project
 from src.python.review.reviewers.utils.print_review import (
     print_review_result_as_json,
@@ -61,17 +61,17 @@ def perform_and_print_review(path: Path,
 
     if OutputFormat.JSON == output_format:
         if config.new_format:
-            print_review_result_as_multi_file_json(review_result)
+            print_review_result_as_multi_file_json(review_result, config)
         else:
-            print_review_result_as_json(review_result)
+            print_review_result_as_json(review_result, config)
     else:
-        print_review_result_as_text(review_result, path)
+        print_review_result_as_text(review_result, path, config)
 
     # Don't count INFO issues too
-    return len(list(filter(lambda issue: issue.type != IssueType.INFO, review_result.all_issues)))
+    return len(list(filter(lambda issue: issue.type != IssueType.INFO, review_result.issues)))
 
 
-def perform_review(path: Path, config: ApplicationConfig) -> ReviewResult:
+def perform_review(path: Path, config: ApplicationConfig) -> GeneralReviewResult:
     if not path.exists():
         raise PathNotExists
 
diff --git a/src/python/review/reviewers/python.py b/src/python/review/reviewers/python.py
index d51b526a..14d7b85e 100644
--- a/src/python/review/reviewers/python.py
+++ b/src/python/review/reviewers/python.py
@@ -5,11 +5,11 @@
 from src.python.review.common.file_system import FileSystemItem, get_all_file_system_items
 from src.python.review.common.language import Language
 from src.python.review.reviewers.common import perform_language_review
-from src.python.review.reviewers.review_result import ReviewResult
+from src.python.review.reviewers.review_result import GeneralReviewResult
 from src.python.review.reviewers.utils.metadata_exploration import Metadata, ProjectMetadata
 
 
-def perform_python_review(metadata: Metadata, config: ApplicationConfig) -> ReviewResult:
+def perform_python_review(metadata: Metadata, config: ApplicationConfig) -> GeneralReviewResult:
     created_file_paths = []
     if isinstance(metadata, ProjectMetadata):
         created_file_paths.extend(create_init_scripts_in_subdirs(metadata.path))
diff --git a/src/python/review/reviewers/review_result.py b/src/python/review/reviewers/review_result.py
index 0fde257a..88854d3f 100644
--- a/src/python/review/reviewers/review_result.py
+++ b/src/python/review/reviewers/review_result.py
@@ -1,27 +1,33 @@
 from dataclasses import dataclass
 from pathlib import Path
-from typing import List
+from typing import Dict, List
 
-from src.python.review.inspectors.issue import BaseIssue
+from src.python.review.inspectors.issue import BaseIssue, IssueDifficulty
 from src.python.review.quality.model import Quality
+from src.python.review.quality.penalty import Punisher
 
 
 @dataclass
-class FileReviewResult:
-    file_path: Path
+class ReviewResult:
+    """
+    ReviewResult contains a list of issues, as well as quality and punisher obtained with these issues.
+    """
+    quality_by_difficulty: Dict[IssueDifficulty, Quality]
+    punisher_by_difficulty: Dict[IssueDifficulty, Punisher]
     issues: List[BaseIssue]
-    quality: Quality
 
 
 @dataclass
-class ReviewResult:
-    file_review_results: List[FileReviewResult]
-    general_quality: Quality
+class FileReviewResult(ReviewResult):
+    """
+    FileReviewResult contains the information needed to output about a particular inspected file.
+    """
+    file_path: Path
 
-    @property
-    def all_issues(self) -> List[BaseIssue]:
-        issues = []
-        for file_review_result in self.file_review_results:
-            issues.extend(file_review_result.issues)
 
-        return issues
+@dataclass
+class GeneralReviewResult(ReviewResult):
+    """
+    GeneralReviewResult contains the information needed to output about the entire inspected project.
+    """
+    file_review_results: List[FileReviewResult]
diff --git a/src/python/review/reviewers/utils/code_statistics.py b/src/python/review/reviewers/utils/code_statistics.py
index 19218a7b..23e3ee8e 100644
--- a/src/python/review/reviewers/utils/code_statistics.py
+++ b/src/python/review/reviewers/utils/code_statistics.py
@@ -3,7 +3,7 @@
 from pathlib import Path
 from typing import Dict, List
 
-from src.python.review.common.file_system import get_content_from_file
+from src.python.review.common.file_system import get_total_code_lines_from_file
 from src.python.review.inspectors.issue import BaseIssue, IssueType
 
 
@@ -11,6 +11,7 @@
 class CodeStatistics:
     n_best_practices_issue: int
     n_error_prone_issues: int
+    n_complexity_issues: int
     n_line_len: int
 
     method_number: int
@@ -35,6 +36,7 @@ def issue_type_to_statistics_dict(self) -> Dict[IssueType, int]:
         return {
             IssueType.BEST_PRACTICES: self.n_best_practices_issue,
             IssueType.ERROR_PRONE: self.n_error_prone_issues,
+            IssueType.COMPLEXITY: self.n_complexity_issues,
             IssueType.LINE_LEN: self.n_line_len,
 
             IssueType.METHOD_NUMBER: self.method_number,
@@ -53,19 +55,6 @@ def issue_type_to_statistics_dict(self) -> Dict[IssueType, int]:
         }
 
 
-def __get_total_lines(path: Path) -> int:
-    lines = get_content_from_file(path, to_strip_nl=False).splitlines()
-    return len(list(filter(lambda line: not __is_empty(line) and not __is_comment(line), lines)))
-
-
-def __is_empty(line: str) -> bool:
-    return len(line.strip()) == 0
-
-
-def __is_comment(line: str) -> bool:
-    return line.strip().startswith(('#', '//'))
-
-
 def get_code_style_lines(issues: List[BaseIssue]) -> int:
     code_style_issues = filter(lambda issue: issue.type == IssueType.CODE_STYLE, issues)
     line_counter = Counter([issue.line_no for issue in code_style_issues])
@@ -100,6 +89,7 @@ def gather_code_statistics(issues: List[BaseIssue], path: Path) -> CodeStatistic
         n_code_style_issues=issue_type_counter[IssueType.CODE_STYLE],
         n_best_practices_issue=issue_type_counter[IssueType.BEST_PRACTICES],
         n_error_prone_issues=issue_type_counter[IssueType.ERROR_PRONE],
+        n_complexity_issues=issue_type_counter[IssueType.COMPLEXITY],
         max_bool_expr_len=bool_expr_lens,
         max_func_len=func_lens,
         n_line_len=issue_type_counter[IssueType.LINE_LEN],
@@ -111,6 +101,6 @@ def gather_code_statistics(issues: List[BaseIssue], path: Path) -> CodeStatistic
         coupling=couplings,
         weighted_method_complexities=weighted_method_complexities,
         method_number=method_numbers,
-        total_lines=__get_total_lines(path),
+        total_lines=get_total_code_lines_from_file(path),
         code_style_lines=get_code_style_lines(issues),
     )
diff --git a/src/python/review/reviewers/utils/issues_filter.py b/src/python/review/reviewers/utils/issues_filter.py
index b6e5529e..dfec89ff 100644
--- a/src/python/review/reviewers/utils/issues_filter.py
+++ b/src/python/review/reviewers/utils/issues_filter.py
@@ -2,7 +2,7 @@
 from typing import Dict, List, Tuple
 
 from src.python.review.common.language import Language
-from src.python.review.inspectors.issue import BaseIssue, IssueType, Measurable
+from src.python.review.inspectors.issue import BaseIssue, IssueDifficulty, IssueType, Measurable
 from src.python.review.quality.rules.boolean_length_scoring import LANGUAGE_TO_BOOLEAN_EXPRESSION_RULE_CONFIG
 from src.python.review.quality.rules.class_response_scoring import LANGUAGE_TO_RESPONSE_RULE_CONFIG
 from src.python.review.quality.rules.cohesion_scoring import LANGUAGE_TO_COHESION_RULE_CONFIG
@@ -130,3 +130,11 @@ def group_issues(issues: List[BaseIssue]) -> GroupedIssues:
         grouped_issues[file_path][line_no][inspector_name][issue_type].append(issue)
 
     return grouped_issues
+
+
+def group_issues_by_difficulty(issues: List[BaseIssue]) -> Dict[IssueDifficulty, List[BaseIssue]]:
+    return {
+        IssueDifficulty.EASY: [issue for issue in issues if issue.difficulty == IssueDifficulty.EASY],
+        IssueDifficulty.MEDIUM: [issue for issue in issues if issue.difficulty != IssueDifficulty.HARD],
+        IssueDifficulty.HARD: issues,
+    }
diff --git a/src/python/review/reviewers/utils/metadata_exploration.py b/src/python/review/reviewers/utils/metadata_exploration.py
index f928a1a9..318f5328 100644
--- a/src/python/review/reviewers/utils/metadata_exploration.py
+++ b/src/python/review/reviewers/utils/metadata_exploration.py
@@ -4,7 +4,7 @@
 from pathlib import Path
 from typing import Dict, List, Set, Union
 
-from src.python.review.common.file_system import get_all_file_system_items, get_extension_from_file
+from src.python.review.common.file_system import Extension, get_all_file_system_items
 from src.python.review.common.language import guess_file_language, Language
 
 
@@ -16,7 +16,7 @@ class FileMetadata:
 
     @property
     def extension(self) -> str:
-        return get_extension_from_file(self.path).value
+        return Extension.get_extension_from_file(self.path).value
 
 
 @dataclass
@@ -39,7 +39,7 @@ def size_bytes(self) -> int:
     def extension_to_files(self) -> Dict[str, List[FileMetadata]]:
         extension_to_files = defaultdict(list)
         for file in self.inner_files:
-            extension_to_files[get_extension_from_file(file.path)].append(file)
+            extension_to_files[Extension.get_extension_from_file(file.path)].append(file)
         return extension_to_files
 
     @property
diff --git a/src/python/review/reviewers/utils/print_review.py b/src/python/review/reviewers/utils/print_review.py
index 9da0e35b..1467c45c 100644
--- a/src/python/review/reviewers/utils/print_review.py
+++ b/src/python/review/reviewers/utils/print_review.py
@@ -1,17 +1,23 @@
 import json
 import linecache
+from enum import Enum, unique
 from pathlib import Path
+from typing import Any, Dict, List, Union
 
+from src.python.review.application_config import ApplicationConfig
 from src.python.review.common.file_system import get_file_line
-from src.python.review.reviewers.review_result import ReviewResult
+from src.python.review.inspectors.inspector_type import InspectorType
+from src.python.review.inspectors.issue import BaseIssue, IssueDifficulty, IssueType
+from src.python.review.quality.model import QualityType
+from src.python.review.quality.penalty import PenaltyIssue
+from src.python.review.reviewers.review_result import FileReviewResult, GeneralReviewResult, ReviewResult
 
 
-def print_review_result_as_text(review_result: ReviewResult,
-                                path: Path) -> None:
-    heading = f'\nReview of {str(path)} ({len(review_result.all_issues)} violations)'
+def print_review_result_as_text(review_result: GeneralReviewResult, path: Path, config: ApplicationConfig) -> None:
+    heading = f'\nReview of {str(path)} ({len(review_result.issues)} violations)'
     print(heading)
 
-    if len(review_result.all_issues) == 0:
+    if len(review_result.issues) == 0:
         print('There is no issues found')
     else:
         for file_review_result in review_result.file_review_results:
@@ -27,86 +33,175 @@ def print_review_result_as_text(review_result: ReviewResult,
                     issue.line_no,
                 ).strip()
 
+                issue_type = issue.type
+                if not config.with_all_categories:
+                    issue_type = issue_type.to_main_type()
+
                 print(f'{issue.line_no} : '
                       f'{issue.column_no} : '
-                      f'{issue.type.value} : '
+                      f'{issue_type.value} : '
                       f'{issue.inspector_type.value} : '
                       f'{issue.origin_class} : '
                       f'{issue.description} : '
                       f'{line_text}: '
                       f'{issue.file_path}')
             print('-' * len(heading))
-            print(file_review_result.quality)
+            print(file_review_result.quality_by_difficulty[IssueDifficulty.HARD])
 
     print('*' * len(heading))
     print('General quality:')
-    print(review_result.general_quality, end='')
+    print(review_result.quality_by_difficulty[IssueDifficulty.HARD], end='')
+
+
+def _get_quality_without_penalty(review_result: ReviewResult) -> Dict[IssueDifficulty, QualityType]:
+    return {difficulty: quality.quality_type for difficulty, quality in review_result.quality_by_difficulty.items()}
+
+
+def _get_quality_with_penalty(review_result: ReviewResult) -> Dict[IssueDifficulty, QualityType]:
+    quality_without_penalty = _get_quality_without_penalty(review_result)
+
+    return {
+        difficulty: punisher.get_quality_with_penalty(quality_without_penalty[difficulty])
+        for difficulty, punisher in review_result.punisher_by_difficulty.items()
+    }
+
+
+def get_quality_json_dict(quality: Dict[IssueDifficulty, QualityType], config: ApplicationConfig) -> Dict:
+    quality_json_dict = {
+        difficulty.value: {
+            OutputJsonFields.CODE.value: quality.value,
+            OutputJsonFields.TEXT.value: f'Code quality (beta): {quality.value}',
+        }
+        for difficulty, quality in quality.items()
+    }
+
+    if config.group_by_difficulty:
+        return quality_json_dict
+
+    return quality_json_dict[IssueDifficulty.HARD.value]
+
+
+def get_influence_on_penalty_json_dict(
+    origin_class: str,
+    review_result: ReviewResult,
+    config: ApplicationConfig,
+) -> Union[Dict[IssueDifficulty, int], int]:
+    quality_without_penalty = _get_quality_without_penalty(review_result)
+    quality_with_penalty = _get_quality_with_penalty(review_result)
+
+    influence_on_penalty_json_dict = {
+        difficulty.value: punisher.get_issue_influence_on_penalty(origin_class)
+        if quality_with_penalty[difficulty] != quality_without_penalty[difficulty]
+        else 0
+        for difficulty, punisher in review_result.punisher_by_difficulty.items()
+    }
 
+    if config.group_by_difficulty:
+        return influence_on_penalty_json_dict
 
-def print_review_result_as_json(review_result: ReviewResult) -> None:
-    issues = review_result.all_issues
+    return influence_on_penalty_json_dict[IssueDifficulty.HARD.value]
 
+
+def convert_review_result_to_json_dict(review_result: ReviewResult, config: ApplicationConfig) -> Dict:
+    issues = review_result.issues
     issues.sort(key=lambda issue: issue.line_no)
 
-    quality_value = review_result.general_quality.quality_type.value
-    output_json = {'quality': {
-        'code': quality_value,
-        'text': f'Code quality (beta): {quality_value}',
-    }, 'issues': []}
+    quality_with_penalty = _get_quality_with_penalty(review_result)
+
+    output_json = {}
+
+    if isinstance(review_result, FileReviewResult):
+        output_json[OutputJsonFields.FILE_NAME.value] = str(review_result.file_path)
+
+    output_json[OutputJsonFields.QUALITY.value] = get_quality_json_dict(quality_with_penalty, config)
+    output_json[OutputJsonFields.ISSUES.value] = []
 
     for issue in issues:
-        line_text = get_file_line(issue.file_path, issue.line_no)
+        json_issue = convert_issue_to_json(issue, config)
 
-        output_json['issues'].append({
-            'code': issue.origin_class,
-            'text': issue.description,
-            'line': line_text,
-            'line_number': issue.line_no,
-            'column_number': issue.column_no,
-            'category': issue.type.value,
-        })
+        json_issue[OutputJsonFields.INFLUENCE_ON_PENALTY.value] = get_influence_on_penalty_json_dict(
+            issue.origin_class,
+            review_result,
+            config,
+        )
 
-    print(json.dumps(output_json))
+        output_json[OutputJsonFields.ISSUES.value].append(json_issue)
 
+    return output_json
+
+
+def print_review_result_as_json(review_result: GeneralReviewResult, config: ApplicationConfig) -> None:
+    print(json.dumps(convert_review_result_to_json_dict(review_result, config)))
 
-def print_review_result_as_multi_file_json(review_result: ReviewResult) -> None:
-    file_review_result_jsons = []
 
+def print_review_result_as_multi_file_json(review_result: GeneralReviewResult, config: ApplicationConfig) -> None:
     review_result.file_review_results.sort(key=lambda result: result.file_path)
 
+    file_review_result_jsons = []
     for file_review_result in review_result.file_review_results:
-        quality_value = file_review_result.quality.quality_type.value
-        file_review_result_json = {
-            'file_name': str(file_review_result.file_path),
-            'quality': {
-                'code': quality_value,
-                'text': f'Code quality (beta): {quality_value}',
-            },
-            'issues': [],
-        }
+        file_review_result_jsons.append(convert_review_result_to_json_dict(file_review_result, config))
 
-        file_review_result_jsons.append(file_review_result_json)
+    quality_with_penalty = _get_quality_with_penalty(review_result)
 
-        for issue in file_review_result.issues:
-            line_text = get_file_line(issue.file_path, issue.line_no)
+    output_json = {
+        OutputJsonFields.QUALITY.value: get_quality_json_dict(quality_with_penalty, config),
+        OutputJsonFields.FILE_REVIEW_RESULTS.value: file_review_result_jsons,
+    }
 
-            file_review_result_json['issues'].append({
-                'code': issue.origin_class,
-                'text': issue.description,
-                'line': line_text,
-                'line_number': issue.line_no,
-                'column_number': issue.column_no,
-                'category': issue.type.value,
-            })
+    print(json.dumps(output_json))
 
-    quality_value = review_result.general_quality.quality_type.value
 
-    output_json = {
-        'quality': {
-            'code': quality_value,
-            'text': f'Code quality (beta): {quality_value}',
-        },
-        'file_review_results': file_review_result_jsons,
+@unique
+class OutputJsonFields(Enum):
+    QUALITY = 'quality'
+    ISSUES = 'issues'
+    FILE_REVIEW_RESULTS = 'file_review_results'
+    FILE_NAME = 'file_name'
+
+    CODE = 'code'
+    TEXT = 'text'
+    LINE = 'line'
+    LINE_NUMBER = 'line_number'
+    COLUMN_NUMBER = 'column_number'
+    CATEGORY = 'category'
+    INFLUENCE_ON_PENALTY = 'influence_on_penalty'
+    DIFFICULTY = 'difficulty'
+
+
+def convert_issue_to_json(issue: BaseIssue, config: ApplicationConfig) -> Dict[str, Any]:
+    line_text = get_file_line(issue.file_path, issue.line_no)
+
+    issue_type = issue.type
+    if not config.with_all_categories:
+        issue_type = issue_type.to_main_type()
+
+    return {
+        OutputJsonFields.CODE.value: issue.origin_class,
+        OutputJsonFields.TEXT.value: issue.description,
+        OutputJsonFields.LINE.value: line_text,
+        OutputJsonFields.LINE_NUMBER.value: issue.line_no,
+        OutputJsonFields.COLUMN_NUMBER.value: issue.column_no,
+        OutputJsonFields.CATEGORY.value: issue_type.value,
+        OutputJsonFields.DIFFICULTY.value: issue.difficulty.value,
     }
 
-    print(json.dumps(output_json))
+
+# It works only for old json format
+def convert_json_to_issues(issues_json: List[dict]) -> List[PenaltyIssue]:
+    issues = []
+    for issue in issues_json:
+        issues.append(
+            PenaltyIssue(
+                origin_class=issue[OutputJsonFields.CODE.value],
+                description=issue[OutputJsonFields.TEXT.value],
+                line_no=int(issue[OutputJsonFields.LINE_NUMBER.value]),
+                column_no=int(issue[OutputJsonFields.COLUMN_NUMBER.value]),
+                type=IssueType(issue[OutputJsonFields.CATEGORY.value]),
+
+                file_path=Path(),
+                inspector_type=InspectorType.UNDEFINED,
+                influence_on_penalty=issue.get(OutputJsonFields.INFLUENCE_ON_PENALTY.value, 0),
+                difficulty=IssueDifficulty(issue.get(OutputJsonFields.DIFFICULTY.value, IssueDifficulty.HARD.value)),
+            ),
+        )
+    return issues
diff --git a/src/python/review/run_tool.py b/src/python/review/run_tool.py
index 9b3b89f8..33c2e415 100644
--- a/src/python/review/run_tool.py
+++ b/src/python/review/run_tool.py
@@ -1,13 +1,12 @@
 import argparse
-import enum
 import logging.config
 import os
 import sys
 import traceback
+from json import JSONDecodeError
 from pathlib import Path
 from typing import Set
 
-
 sys.path.append('')
 sys.path.append('../../..')
 
@@ -27,6 +26,10 @@
 
 def parse_disabled_inspectors(value: str) -> Set[InspectorType]:
     passed_names = value.upper().split(',')
+    # TODO: delete it after updating the run configuration in production
+    intellij_key_word = 'intellij'.upper()
+    if intellij_key_word in passed_names:
+        passed_names.remove(intellij_key_word)
     allowed_names = {inspector.value for inspector in InspectorType}
     if not all(name in allowed_names for name in passed_names):
         raise argparse.ArgumentError('disable', 'Incorrect inspectors\' names')
@@ -42,66 +45,78 @@ def positive_int(value: str) -> int:
     return value_int
 
 
-def configure_arguments(parser: argparse.ArgumentParser, tool_arguments: enum.EnumMeta) -> None:
-    parser.add_argument(tool_arguments.VERBOSITY.value.short_name,
-                        tool_arguments.VERBOSITY.value.long_name,
-                        help=tool_arguments.VERBOSITY.value.description,
+def configure_arguments(parser: argparse.ArgumentParser) -> None:
+    parser.add_argument(RunToolArgument.VERBOSITY.value.short_name,
+                        RunToolArgument.VERBOSITY.value.long_name,
+                        help=RunToolArgument.VERBOSITY.value.description,
                         default=VerbosityLevel.DISABLE.value,
                         choices=VerbosityLevel.values(),
                         type=int)
 
     # Usage example: -d Flake8,Intelli
-    parser.add_argument(tool_arguments.DISABLE.value.short_name,
-                        tool_arguments.DISABLE.value.long_name,
-                        help=tool_arguments.DISABLE.value.description,
+    parser.add_argument(RunToolArgument.DISABLE.value.short_name,
+                        RunToolArgument.DISABLE.value.long_name,
+                        help=RunToolArgument.DISABLE.value.description,
                         type=parse_disabled_inspectors,
                         default=set())
 
-    parser.add_argument(tool_arguments.DUPLICATES.value.long_name,
+    parser.add_argument(RunToolArgument.DUPLICATES.value.long_name,
                         action='store_true',
-                        help=tool_arguments.DUPLICATES.value.description)
+                        help=RunToolArgument.DUPLICATES.value.description)
 
     # TODO: deprecated argument: language_version. Delete after several releases.
     parser.add_argument('--language_version',
-                        tool_arguments.LANG_VERSION.value.long_name,
-                        help=tool_arguments.LANG_VERSION.value.description,
+                        RunToolArgument.LANG_VERSION.value.long_name,
+                        help=RunToolArgument.LANG_VERSION.value.description,
                         default=None,
                         choices=LanguageVersion.values(),
                         type=str)
 
     # TODO: deprecated argument: --n_cpu. Delete after several releases.
     parser.add_argument('--n_cpu',
-                        tool_arguments.CPU.value.long_name,
-                        help=tool_arguments.CPU.value.description,
+                        RunToolArgument.CPU.value.long_name,
+                        help=RunToolArgument.CPU.value.description,
                         default=1,
                         type=positive_int)
 
-    parser.add_argument(tool_arguments.PATH.value.long_name,
+    parser.add_argument(RunToolArgument.PATH.value.long_name,
                         type=lambda value: Path(value).absolute(),
-                        help=tool_arguments.PATH.value.description)
+                        help=RunToolArgument.PATH.value.description)
 
-    parser.add_argument(tool_arguments.FORMAT.value.short_name,
-                        tool_arguments.FORMAT.value.long_name,
+    parser.add_argument(RunToolArgument.FORMAT.value.short_name,
+                        RunToolArgument.FORMAT.value.long_name,
                         default=OutputFormat.JSON.value,
                         choices=OutputFormat.values(),
                         type=str,
-                        help=tool_arguments.FORMAT.value.description)
+                        help=RunToolArgument.FORMAT.value.description)
 
-    parser.add_argument(tool_arguments.START_LINE.value.short_name,
-                        tool_arguments.START_LINE.value.long_name,
+    parser.add_argument(RunToolArgument.START_LINE.value.short_name,
+                        RunToolArgument.START_LINE.value.long_name,
                         default=1,
                         type=positive_int,
-                        help=tool_arguments.START_LINE.value.description)
+                        help=RunToolArgument.START_LINE.value.description)
 
-    parser.add_argument(tool_arguments.END_LINE.value.short_name,
-                        tool_arguments.END_LINE.value.long_name,
+    parser.add_argument(RunToolArgument.END_LINE.value.short_name,
+                        RunToolArgument.END_LINE.value.long_name,
                         default=None,
                         type=positive_int,
-                        help=tool_arguments.END_LINE.value.description)
+                        help=RunToolArgument.END_LINE.value.description)
 
-    parser.add_argument(tool_arguments.NEW_FORMAT.value.long_name,
+    parser.add_argument(RunToolArgument.NEW_FORMAT.value.long_name,
                         action='store_true',
-                        help=tool_arguments.NEW_FORMAT.value.description)
+                        help=RunToolArgument.NEW_FORMAT.value.description)
+
+    parser.add_argument(RunToolArgument.HISTORY.value.long_name,
+                        help=RunToolArgument.HISTORY.value.description,
+                        type=str)
+
+    parser.add_argument(RunToolArgument.WITH_ALL_CATEGORIES.value.long_name,
+                        help=RunToolArgument.WITH_ALL_CATEGORIES.value.description,
+                        action='store_true')
+
+    parser.add_argument(RunToolArgument.GROUP_BY_DIFFICULTY.value.long_name,
+                        help=RunToolArgument.GROUP_BY_DIFFICULTY.value.description,
+                        action='store_true')
 
 
 def configure_logging(verbosity: VerbosityLevel) -> None:
@@ -119,7 +134,7 @@ def configure_logging(verbosity: VerbosityLevel) -> None:
 
 def main() -> int:
     parser = argparse.ArgumentParser()
-    configure_arguments(parser, RunToolArgument)
+    configure_arguments(parser)
 
     try:
         args = parser.parse_args()
@@ -146,6 +161,9 @@ def main() -> int:
             start_line=start_line,
             end_line=args.end_line,
             new_format=args.new_format,
+            history=args.history,
+            with_all_categories=args.with_all_categories,
+            group_by_difficulty=args.group_by_difficulty,
         )
 
         n_issues = perform_and_print_review(args.path, OutputFormat(args.format), config)
@@ -153,12 +171,19 @@ def main() -> int:
             return 0
 
         return 1
+
     except PathNotExists:
         logger.error('Path not exists')
         return 2
+
     except UnsupportedLanguage:
         logger.error('Unsupported language. Supported ones are Java, Kotlin, Python')
         return 2
+
+    except JSONDecodeError:
+        logger.error('Incorrect JSON')
+        return 2
+
     except Exception:
         traceback.print_exc()
         logger.exception('An unexpected error')
diff --git a/whitelist.txt b/whitelist.txt
index b1834c32..34148f0a 100644
--- a/whitelist.txt
+++ b/whitelist.txt
@@ -1,98 +1,259 @@
-capsys
 Checkstyle
-conftest
 Cyclomatic
+D3
+DARK2
+DARK24
+DOTALL
 Detekt
-dirs
 ECMA
 EXPR
-file
-FUNC
+G10
 IGNORECASE
 INTELLIJ
 Intelli
-interop
-IssueType
 JS
+KTS
+LIGHT24
 Multithreading
+Namespace
+OOP
+PASTEL2
+Pastel1
+SET1
+SET2
+SET3
 Spotbugs
 SpringLint
+T10
+WPS
+XLSX
 abstractmethod
+arange
+astype
+atclause
+barmode
+bce
+bgcolor
+binarizer
+capsys
+case18
+case34
+cbo
+changelog
+checkstyle
+cloneable
+concat
 config
+configs
+conftest
+const
+consts
+copytree
+coroutine
 coroutines
 csv
+ctor
+cuda
+cyclomatic
+dataflow
+dataframe
+dataframes
+dataloader
+dataset
+datasets
+dedent
+delslice
 desc
-DOTALL
+destructuring
+detekt
+df
+dicts
+dirname
+dirs
+dit
+dont
+dotall
+dropna
+dtype
+dyn
+ecma
+eps
 eq
 eslint
 etree
+eval
 exc
+execfile
+expr
 exprs
+f1
+file
+filemode
+fillna
+formatter
+fs
+fullmatch
+func
+getitem
 getline
 getroot
+getslice
+getuid
 gradle
+groupby
+hashtable
+hline
+hyperstyle
+idiv
+idx
+ignorecase
+iloc
 inerop
+initializer
+inplace
+instantiation
+intelli
+intellij
+interop
+isin
+isna
+isnull
+issuetype
+iterrows
 javac
+javadoc
+jpg
+js
 json
 jsons
 jsonschema
+kts
+lateinit
+lcom
 linecache
+linecolor
 lineno
+linesep
+linewidth
+listdir
+loc
+logits
+maintainabilities
+matcher
+maxint
+maxsplit
+mccabe
+mcs
+measurer
+metaclass
 min
+minsize
+misrefactored
+mlb
+multilabel
+multiline
+multithreading
+namespace
+nbins
+ncss
+ndarray
+nl
+nn
+noc
+nom
 noqa
+nrows
+nullable
+num
+numpy
+oop
+openpyxl
+pandarallel
+param
 parametrize
+params
+parsers
 pathlib
+pickler
+plotly
 pmd
+png
+popen
+pred
+preprocess
+preprocessing
+pretrained
+println
+punisher
+puppycrawl
 pyast
 pylint
+qodana
+qodanadataset
+rbrace
+rdiv
 readouterr
+redeclared
+reindex
+removeprefix
 rfind
+rmdir
+runtime
+setdefault
+setslice
+showline
+sigmoid
+singleline
+sklearn
+slf4j
+splitext
+spotbugs
+springlint
+sqrt
+src
+stdlib
+stmts
 subdir
 subdirs
+sublist
+svg
 sym
-unlink
-utils
-param
-params
-changelog
-multiline
-sqrt
-WPS
-OOP
-mccabe
-mcs
-dicts
-misrefactored
-src
+textangle
+textposition
 textwrap
-dedent
-maintainabilities
-parsers
-fs
-KTS
-nl
-splitext
-dirname
-hyperstyle
-XLSX
-Eval
-eval
-openpyxl
-dataframe
-writelines
-rmdir
-df
+throwable
+tmp
+tokenizer
+toplevel
+unary
+uncommented
+unichr
+uniformtext
+uniq
 unique
-# Springlint issues
-cbo
-dit
-lcom
-noc
-nom
-wmc
+unit4
+unit5
+unlink
+unpickler
+unsynchronized
+usecols
 util
-Namespace
-case18
-case34
-removeprefix
-toplevel
+utils
+varargs
+vline
+wandb
+warmup
+webp
+wmc
+wps
+writelines
+xanchor
+xaxes
+xaxis
+xlsx
+xpath
+xrange
+xreadlines
+yanchor
+yaxes
+yaxis


Test patch:
diff --git a/requirements-test.txt b/requirements-test.txt
index cc876366..824641d9 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -2,8 +2,3 @@ pytest==6.2.3
 pytest-runner==5.2
 pytest-subtests==0.4.0
 jsonschema==3.2.0
-pandas==1.2.3
-django==3.2
-pylint==2.7.4
-requests==2.25.1
-setuptools==56.0.0
\ No newline at end of file
diff --git a/test/python/functional_tests/conftest.py b/test/python/functional_tests/conftest.py
index da01adde..99131521 100644
--- a/test/python/functional_tests/conftest.py
+++ b/test/python/functional_tests/conftest.py
@@ -5,6 +5,7 @@
 
 import pytest
 from src.python import MAIN_FOLDER
+from src.python.common.tool_arguments import RunToolArgument
 
 DATA_PATH = TEST_DATA_FOLDER / 'functional_tests'
 
@@ -12,7 +13,7 @@
 @dataclass
 class LocalCommandBuilder:
     verbosity: int = 2
-    disable: List[str] = field(default_factory=lambda: ['intellij', 'spotbugs'])
+    disable: List[str] = field(default_factory=lambda: [])
     allow_duplicates: bool = False
     language_version: Optional[str] = None
     n_cpu: int = 1
@@ -22,34 +23,46 @@ class LocalCommandBuilder:
     start_line: Optional[int] = None
     end_line: Optional[int] = None
     new_format: bool = False
+    group_by_difficulty: bool = False
+    history: Optional[str] = None
 
     def build(self) -> List[str]:
         assert self.path is not None
 
-        command = ['python3', (MAIN_FOLDER.parent / 'review/run_tool.py'), f'-v{self.verbosity}']
+        command = [
+            'python3', (MAIN_FOLDER.parent / 'review/run_tool.py'),
+            RunToolArgument.VERBOSITY.value.long_name, str(self.verbosity),
+        ]
+
         if self.disable:
-            command.extend(['-d', ','.join(self.disable)])
+            command.extend([RunToolArgument.DISABLE.value.long_name, ','.join(self.disable)])
 
         if self.allow_duplicates:
-            command.append('--allow-duplicates')
+            command.append(RunToolArgument.DUPLICATES.value.long_name)
 
         if self.language_version is not None:
-            command.extend(['--language-version', self.language_version])
+            command.extend([RunToolArgument.LANG_VERSION.value.long_name, self.language_version])
 
         if self.new_format:
-            command.append('--new-format')
+            command.append(RunToolArgument.NEW_FORMAT.value.long_name)
+
+        if self.history is not None:
+            command.extend([RunToolArgument.HISTORY.value.long_name, self.history])
+
+        if self.group_by_difficulty:
+            command.append(RunToolArgument.GROUP_BY_DIFFICULTY.value.long_name)
 
         command.extend([
-            '--n_cpu', str(self.n_cpu),
-            '-f', self.format,
+            RunToolArgument.CPU.value.long_name, str(self.n_cpu),
+            RunToolArgument.FORMAT.value.long_name, self.format,
             str(self.path),
         ])
 
         if self.start_line is not None:
-            command.extend(['-s', str(self.start_line)])
+            command.extend([RunToolArgument.START_LINE.value.long_name, str(self.start_line)])
 
         if self.end_line is not None:
-            command.extend(['-e', str(self.end_line)])
+            command.extend([RunToolArgument.END_LINE.value.long_name, str(self.end_line)])
 
         return command
 
diff --git a/test/python/functional_tests/test_difficulty_levels.py b/test/python/functional_tests/test_difficulty_levels.py
new file mode 100644
index 00000000..fcbdb1a1
--- /dev/null
+++ b/test/python/functional_tests/test_difficulty_levels.py
@@ -0,0 +1,441 @@
+import json
+import subprocess
+from test.python.functional_tests.conftest import DATA_PATH, LocalCommandBuilder
+from typing import Dict, Optional
+
+import pytest
+
+
+def _get_output_json(local_command: LocalCommandBuilder, file_path: str, history: Optional[str] = None) -> Dict:
+    file_path = DATA_PATH / 'difficulty_levels' / file_path
+
+    local_command.verbosity = 0
+    local_command.format = 'json'
+    local_command.path = file_path
+    local_command.new_format = False
+    local_command.group_by_difficulty = True
+    local_command.history = history
+
+    process = subprocess.run(
+        local_command.build(),
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+    )
+
+    return json.loads(process.stdout.decode())
+
+
+WITHOUT_ISSUES = {
+    'quality': {
+        'EASY': {'code': 'EXCELLENT', 'text': 'Code quality (beta): EXCELLENT'},
+        'MEDIUM': {'code': 'EXCELLENT', 'text': 'Code quality (beta): EXCELLENT'},
+        'HARD': {'code': 'EXCELLENT', 'text': 'Code quality (beta): EXCELLENT'},
+    },
+    'issues': [],
+}
+
+HARD_ISSUES = {
+    'quality': {
+        'EASY': {'code': 'EXCELLENT', 'text': 'Code quality (beta): EXCELLENT'},
+        'MEDIUM': {'code': 'EXCELLENT', 'text': 'Code quality (beta): EXCELLENT'},
+        'HARD': {'code': 'MODERATE', 'text': 'Code quality (beta): MODERATE'},
+    },
+    'issues': [
+        {
+            'category': 'COMPLEXITY',
+            'code': 'H601',
+            'column_number': 1,
+            'difficulty': 'HARD',
+            'influence_on_penalty': {'EASY': 0, 'HARD': 0, 'MEDIUM': 0},
+            'line': 'class BadClass:',
+            'line_number': 4,
+            'text': 'class has low (20.00%) cohesion',
+        },
+    ],
+}
+
+MEDIUM_ISSUES = {
+    'quality': {
+        'EASY': {'code': 'EXCELLENT', 'text': 'Code quality (beta): EXCELLENT'},
+        'HARD': {'code': 'MODERATE', 'text': 'Code quality (beta): MODERATE'},
+        'MEDIUM': {'code': 'MODERATE', 'text': 'Code quality (beta): MODERATE'},
+    },
+    'issues': [
+        {
+            'category': 'BEST_PRACTICES',
+            'code': 'WPS407',
+            'column_number': 1,
+            'difficulty': 'MEDIUM',
+            'influence_on_penalty': {'EASY': 0, 'HARD': 0, 'MEDIUM': 0},
+            'line': 'MUTABLE_CONSTANT = {"1": 1, "2": 2}',
+            'line_number': 1,
+            'text': 'Found mutable module constant',
+        },
+        {
+            'category': 'BEST_PRACTICES',
+            'code': 'WPS446',
+            'column_number': 6,
+            'difficulty': 'MEDIUM',
+            'influence_on_penalty': {'EASY': 0, 'HARD': 0, 'MEDIUM': 0},
+            'line': 'PI = 3.14',
+            'line_number': 3,
+            'text': 'Found approximate constant: 3.14',
+        },
+        {
+            'category': 'BEST_PRACTICES',
+            'code': 'WPS446',
+            'column_number': 13,
+            'difficulty': 'MEDIUM',
+            'influence_on_penalty': {'EASY': 0, 'HARD': 0, 'MEDIUM': 0},
+            'line': 'DOUBLE_PI = 6.28',
+            'line_number': 4,
+            'text': 'Found approximate constant: 6.28',
+        },
+        {
+            'category': 'BEST_PRACTICES',
+            'code': 'WPS446',
+            'column_number': 5,
+            'difficulty': 'MEDIUM',
+            'influence_on_penalty': {'EASY': 0, 'HARD': 0, 'MEDIUM': 0},
+            'line': 'E = 2.71',
+            'line_number': 5,
+            'text': 'Found approximate constant: 2.71',
+        },
+        {
+            'category': 'BEST_PRACTICES',
+            'code': 'W0703',
+            'column_number': 12,
+            'difficulty': 'MEDIUM',
+            'influence_on_penalty': {'EASY': 0, 'HARD': 0, 'MEDIUM': 0},
+            'line': 'except Exception:',
+            'line_number': 13,
+            'text': 'Catching too general exception Exception',
+        },
+        {
+            'category': 'BEST_PRACTICES',
+            'code': 'R504',
+            'column_number': 12,
+            'difficulty': 'MEDIUM',
+            'influence_on_penalty': {'EASY': 0, 'HARD': 0, 'MEDIUM': 0},
+            'line': 'return result',
+            'line_number': 16,
+            'text': 'you shouldn`t assign value to variable if it will be use ' 'only as return value',
+        },
+        {
+            'category': 'BEST_PRACTICES',
+            'code': 'R1708',
+            'column_number': 9,
+            'difficulty': 'MEDIUM',
+            'influence_on_penalty': {'EASY': 0, 'HARD': 0, 'MEDIUM': 0},
+            'line': 'raise StopIteration',
+            'line_number': 21,
+            'text': 'Do not raise StopIteration in generator, use return ' 'statement instead',
+        },
+    ],
+}
+
+EASY_ISSUES = {
+    'quality': {
+        'EASY': {'code': 'MODERATE', 'text': 'Code quality (beta): MODERATE'},
+        'MEDIUM': {'code': 'MODERATE', 'text': 'Code quality (beta): MODERATE'},
+        'HARD': {'code': 'MODERATE', 'text': 'Code quality (beta): MODERATE'},
+    },
+    'issues': [
+        {
+            'category': 'CODE_STYLE',
+            'code': 'N802',
+            'column_number': 6,
+            'difficulty': 'EASY',
+            'influence_on_penalty': {'EASY': 0, 'HARD': 0, 'MEDIUM': 0},
+            'line': 'def MAIN(Number):',
+            'line_number': 1,
+            'text': "function name 'MAIN' should be lowercase",
+        },
+        {
+            'category': 'CODE_STYLE',
+            'code': 'N803',
+            'column_number': 11,
+            'difficulty': 'EASY',
+            'influence_on_penalty': {'EASY': 0, 'HARD': 0, 'MEDIUM': 0},
+            'line': 'def MAIN(Number):',
+            'line_number': 1,
+            'text': "argument name 'Number' should be lowercase",
+        },
+        {
+            'category': 'CODE_STYLE',
+            'code': 'E121',
+            'column_number': 7,
+            'difficulty': 'EASY',
+            'influence_on_penalty': {'EASY': 0, 'HARD': 0, 'MEDIUM': 0},
+            'line': '"Hello, World")',
+            'line_number': 10,
+            'text': 'continuation line under-indented for hanging indent',
+        },
+    ],
+}
+
+
+ALL_DIFFICULTY_LEVEL_ISSUES = {
+    'quality': {
+        'EASY': {'code': 'GOOD', 'text': 'Code quality (beta): GOOD'},
+        'MEDIUM': {'code': 'GOOD', 'text': 'Code quality (beta): GOOD'},
+        'HARD': {'code': 'MODERATE', 'text': 'Code quality (beta): MODERATE'},
+    },
+    'issues': [
+        {
+            'category': 'BEST_PRACTICES',
+            'code': 'WPS407',
+            'column_number': 1,
+            'difficulty': 'MEDIUM',
+            'influence_on_penalty': {'EASY': 0, 'HARD': 0, 'MEDIUM': 0},
+            'line': 'MUTABLE_CONSTANT = {"1": 1, "2": 2}',
+            'line_number': 3,
+            'text': 'Found mutable module constant',
+        },
+        {
+            'category': 'COMPLEXITY',
+            'code': 'H601',
+            'column_number': 1,
+            'difficulty': 'HARD',
+            'influence_on_penalty': {'EASY': 0, 'HARD': 0, 'MEDIUM': 0},
+            'line': 'class BadClass:',
+            'line_number': 5,
+            'text': 'class has low (20.00%) cohesion',
+        },
+        {
+            'category': 'CODE_STYLE',
+            'code': 'N802',
+            'column_number': 10,
+            'difficulty': 'EASY',
+            'influence_on_penalty': {'EASY': 0, 'HARD': 0, 'MEDIUM': 0},
+            'line': 'def Length(x: int, y: int) -> float:',
+            'line_number': 11,
+            'text': "function name 'Length' should be lowercase",
+        },
+    ],
+}
+
+
+DIFFICULTY_LEVELS_TEST_DATA = [
+    ('file_without_issues.py', WITHOUT_ISSUES),
+    ('file_with_only_hard_issues.py', HARD_ISSUES),
+    ('file_with_only_medium_issues.py', MEDIUM_ISSUES),
+    ('file_with_only_easy_issues.py', EASY_ISSUES),
+    ('file_with_all_difficulty_levels.py', ALL_DIFFICULTY_LEVEL_ISSUES),
+]
+
+
+@pytest.mark.parametrize(('file', 'expected_json'), DIFFICULTY_LEVELS_TEST_DATA)
+def test_difficulty_levels(local_command: LocalCommandBuilder, file: str, expected_json: Dict):
+    assert _get_output_json(local_command, file) == expected_json
+
+
+HISTORY = {
+    'python': [
+        {
+            'origin_class': 'N802',
+            'number': 5,
+        },
+        {
+            'origin_class': 'WPS407',
+            'number': 10,
+        },
+        {
+            'origin_class': 'H601',
+            'number': 5,
+        },
+    ],
+}
+
+HARD_ISSUES_WITH_INFLUENCE = {
+    'quality': {
+        'EASY': {'code': 'EXCELLENT', 'text': 'Code quality (beta): EXCELLENT'},
+        'MEDIUM': {'code': 'EXCELLENT', 'text': 'Code quality (beta): EXCELLENT'},
+        'HARD': {'code': 'BAD', 'text': 'Code quality (beta): BAD'},
+    },
+    'issues': [
+        {
+            'category': 'COMPLEXITY',
+            'code': 'H601',
+            'column_number': 1,
+            'difficulty': 'HARD',
+            'influence_on_penalty': {'EASY': 0, 'MEDIUM': 0, 'HARD': 100},
+            'line': 'class BadClass:',
+            'line_number': 4,
+            'text': 'class has low (20.00%) cohesion',
+        },
+    ],
+}
+
+MEDIUM_ISSUES_WITH_INFLUENCE = {
+    'quality': {
+        'EASY': {'code': 'EXCELLENT', 'text': 'Code quality (beta): EXCELLENT'},
+        'MEDIUM': {'code': 'BAD', 'text': 'Code quality (beta): BAD'},
+        'HARD': {'code': 'BAD', 'text': 'Code quality (beta): BAD'},
+    },
+    'issues': [
+        {
+            'category': 'BEST_PRACTICES',
+            'code': 'WPS407',
+            'column_number': 1,
+            'difficulty': 'MEDIUM',
+            'influence_on_penalty': {'EASY': 0, 'MEDIUM': 100, 'HARD': 100},
+            'line': 'MUTABLE_CONSTANT = {"1": 1, "2": 2}',
+            'line_number': 1,
+            'text': 'Found mutable module constant',
+        },
+        {
+            'category': 'BEST_PRACTICES',
+            'code': 'WPS446',
+            'column_number': 6,
+            'difficulty': 'MEDIUM',
+            'influence_on_penalty': {'EASY': 0, 'MEDIUM': 0, 'HARD': 0},
+            'line': 'PI = 3.14',
+            'line_number': 3,
+            'text': 'Found approximate constant: 3.14',
+        },
+        {
+            'category': 'BEST_PRACTICES',
+            'code': 'WPS446',
+            'column_number': 13,
+            'difficulty': 'MEDIUM',
+            'influence_on_penalty': {'EASY': 0, 'MEDIUM': 0, 'HARD': 0},
+            'line': 'DOUBLE_PI = 6.28',
+            'line_number': 4,
+            'text': 'Found approximate constant: 6.28',
+        },
+        {
+            'category': 'BEST_PRACTICES',
+            'code': 'WPS446',
+            'column_number': 5,
+            'difficulty': 'MEDIUM',
+            'influence_on_penalty': {'EASY': 0, 'MEDIUM': 0, 'HARD': 0},
+            'line': 'E = 2.71',
+            'line_number': 5,
+            'text': 'Found approximate constant: 2.71',
+        },
+        {
+            'category': 'BEST_PRACTICES',
+            'code': 'W0703',
+            'column_number': 12,
+            'difficulty': 'MEDIUM',
+            'influence_on_penalty': {'EASY': 0, 'MEDIUM': 0, 'HARD': 0},
+            'line': 'except Exception:',
+            'line_number': 13,
+            'text': 'Catching too general exception Exception',
+        },
+        {
+            'category': 'BEST_PRACTICES',
+            'code': 'R504',
+            'column_number': 12,
+            'difficulty': 'MEDIUM',
+            'influence_on_penalty': {'EASY': 0, 'MEDIUM': 0, 'HARD': 0},
+            'line': 'return result',
+            'line_number': 16,
+            'text': 'you shouldn`t assign value to variable if it will be use ' 'only as return value',
+        },
+        {
+            'category': 'BEST_PRACTICES',
+            'code': 'R1708',
+            'column_number': 9,
+            'difficulty': 'MEDIUM',
+            'influence_on_penalty': {'EASY': 0, 'MEDIUM': 0, 'HARD': 0},
+            'line': 'raise StopIteration',
+            'line_number': 21,
+            'text': 'Do not raise StopIteration in generator, use return ' 'statement instead',
+        },
+    ],
+}
+
+EASY_ISSUES_WITH_INFLUENCE = {
+    'quality': {
+        'EASY': {'code': 'BAD', 'text': 'Code quality (beta): BAD'},
+        'MEDIUM': {'code': 'BAD', 'text': 'Code quality (beta): BAD'},
+        'HARD': {'code': 'BAD', 'text': 'Code quality (beta): BAD'},
+    },
+    'issues': [
+        {
+            'category': 'CODE_STYLE',
+            'code': 'N802',
+            'column_number': 6,
+            'difficulty': 'EASY',
+            'influence_on_penalty': {'EASY': 100, 'MEDIUM': 100, 'HARD': 100},
+            'line': 'def MAIN(Number):',
+            'line_number': 1,
+            'text': "function name 'MAIN' should be lowercase",
+        },
+        {
+            'category': 'CODE_STYLE',
+            'code': 'N803',
+            'column_number': 11,
+            'difficulty': 'EASY',
+            'influence_on_penalty': {'EASY': 0, 'MEDIUM': 0, 'HARD': 0},
+            'line': 'def MAIN(Number):',
+            'line_number': 1,
+            'text': "argument name 'Number' should be lowercase",
+        },
+        {
+            'category': 'CODE_STYLE',
+            'code': 'E121',
+            'column_number': 7,
+            'difficulty': 'EASY',
+            'influence_on_penalty': {'EASY': 0, 'MEDIUM': 0, 'HARD': 0},
+            'line': '"Hello, World")',
+            'line_number': 10,
+            'text': 'continuation line under-indented for hanging indent',
+        },
+    ],
+}
+
+ALL_DIFFICULTY_LEVEL_ISSUES_WITH_INFLUENCE = {
+    'quality': {
+        'EASY': {'code': 'BAD', 'text': 'Code quality (beta): BAD'},
+        'MEDIUM': {'code': 'BAD', 'text': 'Code quality (beta): BAD'},
+        'HARD': {'code': 'BAD', 'text': 'Code quality (beta): BAD'},
+    },
+    'issues': [
+        {
+            'category': 'BEST_PRACTICES',
+            'code': 'WPS407',
+            'column_number': 1,
+            'difficulty': 'MEDIUM',
+            'influence_on_penalty': {'EASY': 0, 'MEDIUM': 64, 'HARD': 52},
+            'line': 'MUTABLE_CONSTANT = {"1": 1, "2": 2}',
+            'line_number': 3,
+            'text': 'Found mutable module constant',
+        },
+        {
+            'category': 'COMPLEXITY',
+            'code': 'H601',
+            'column_number': 1,
+            'difficulty': 'HARD',
+            'influence_on_penalty': {'EASY': 0, 'MEDIUM': 0, 'HARD': 17},
+            'line': 'class BadClass:',
+            'line_number': 5,
+            'text': 'class has low (20.00%) cohesion',
+        },
+        {
+            'category': 'CODE_STYLE',
+            'code': 'N802',
+            'column_number': 10,
+            'difficulty': 'EASY',
+            'influence_on_penalty': {'EASY': 100, 'MEDIUM': 35, 'HARD': 29},
+            'line': 'def Length(x: int, y: int) -> float:',
+            'line_number': 11,
+            'text': "function name 'Length' should be lowercase",
+        },
+    ],
+}
+
+DIFFICULTY_LEVELS_WITH_HISTORY_TEST_DATA = [
+    ('file_without_issues.py', WITHOUT_ISSUES),
+    ('file_with_only_hard_issues.py', HARD_ISSUES_WITH_INFLUENCE),
+    ('file_with_only_medium_issues.py', MEDIUM_ISSUES_WITH_INFLUENCE),
+    ('file_with_only_easy_issues.py', EASY_ISSUES_WITH_INFLUENCE),
+    ('file_with_all_difficulty_levels.py', ALL_DIFFICULTY_LEVEL_ISSUES_WITH_INFLUENCE),
+]
+
+
+@pytest.mark.parametrize(('file', 'expected_json'), DIFFICULTY_LEVELS_WITH_HISTORY_TEST_DATA)
+def test_difficulty_levels_with_history(local_command: LocalCommandBuilder, file: str, expected_json: Dict):
+    assert _get_output_json(local_command, file, json.dumps(HISTORY)) == expected_json
diff --git a/test/python/functional_tests/test_json_format.py b/test/python/functional_tests/test_json_format.py
new file mode 100644
index 00000000..9190a4e2
--- /dev/null
+++ b/test/python/functional_tests/test_json_format.py
@@ -0,0 +1,352 @@
+import json
+import subprocess
+from test.python.functional_tests.conftest import DATA_PATH, LocalCommandBuilder
+from typing import Dict
+
+import pytest
+from jsonschema import validate
+
+
+def _get_output_json(local_command: LocalCommandBuilder, new_format: bool, group_by_difficulty: bool) -> str:
+    project_path = DATA_PATH / 'file_or_project' / 'project'
+
+    local_command.verbosity = 0
+    local_command.format = 'json'
+    local_command.path = project_path
+    local_command.new_format = new_format
+    local_command.group_by_difficulty = group_by_difficulty
+
+    process = subprocess.run(
+        local_command.build(),
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+    )
+    stdout = process.stdout.decode()
+
+    return json.loads(stdout)
+
+
+def _get_by_difficulty_schema(item_schema: Dict) -> Dict:
+    return {
+        'type': 'object',
+        'additionalProperties': False,
+        'properties': {
+            'EASY': item_schema,
+            'MEDIUM': item_schema,
+            'HARD': item_schema,
+        },
+    }
+
+
+QUALITY_SCHEMA = {
+    'type': 'object',
+    'additionalProperties': False,
+    'properties': {
+        'code': {'type': 'string'},
+        'text': {'type': 'string'},
+    },
+}
+
+QUALITY_BY_DIFFICULTY_SCHEMA = _get_by_difficulty_schema(QUALITY_SCHEMA)
+
+INFLUENCE_ON_PENALTY_SCHEMA = {'type': 'integer'}
+
+INFLUENCE_ON_PENALTY_BY_DIFFICULTY_SCHEMA = _get_by_difficulty_schema(INFLUENCE_ON_PENALTY_SCHEMA)
+
+
+def _get_issues_schema(influence_in_penalty_schema: Dict) -> Dict:
+    return {
+        'type': 'array',
+        'additionalItems': False,
+        'items': {
+            'type': 'object',
+            'additionalProperties': False,
+            'properties': {
+                'category': {'type': 'string'},
+                'code': {'type': 'string'},
+                'column_number': {'type': 'integer'},
+                'line': {'type': 'string'},
+                'line_number': {'type': 'integer'},
+                'text': {'type': 'string'},
+                'influence_on_penalty': influence_in_penalty_schema,
+                'difficulty': {'type': 'string'},
+            },
+        },
+    }
+
+
+def _get_old_format_schema(quality_schema: Dict, influence_in_penalty_schema: Dict) -> Dict:
+    return {
+        'type': 'object',
+        'additionalProperties': False,
+        'properties': {
+            'quality': quality_schema,
+            'issues': _get_issues_schema(influence_in_penalty_schema),
+        },
+    }
+
+
+def _get_new_format_schema(quality_schema: Dict, influence_in_penalty_schema: Dict) -> Dict:
+    return {
+        'type': 'object',
+        'additionalProperties': False,
+        'properties': {
+            'quality': quality_schema,
+            'file_review_results': {
+                'type': 'array',
+                'additionalItems': False,
+                'items': {
+                    'type': 'object',
+                    'additionalProperties': False,
+                    'properties': {
+                        'file_name': {'type': 'string'},
+                        'quality': quality_schema,
+                        'issues': _get_issues_schema(influence_in_penalty_schema),
+                    },
+                },
+            },
+        },
+    }
+
+
+JSON_FORMAT_SCHEMA_TEST_DATA = [
+    (False, False, _get_old_format_schema(QUALITY_SCHEMA, INFLUENCE_ON_PENALTY_SCHEMA)),
+    (True, False, _get_new_format_schema(QUALITY_SCHEMA, INFLUENCE_ON_PENALTY_SCHEMA)),
+    (False, True, _get_old_format_schema(QUALITY_BY_DIFFICULTY_SCHEMA, INFLUENCE_ON_PENALTY_BY_DIFFICULTY_SCHEMA)),
+    (True, True, _get_new_format_schema(QUALITY_BY_DIFFICULTY_SCHEMA, INFLUENCE_ON_PENALTY_BY_DIFFICULTY_SCHEMA)),
+]
+
+
+@pytest.mark.parametrize(('new_format', 'group_by_difficulty', 'schema'), JSON_FORMAT_SCHEMA_TEST_DATA)
+def test_json_format_schema(
+    local_command: LocalCommandBuilder, new_format: bool, group_by_difficulty: bool, schema: str,
+):
+    validate(_get_output_json(local_command, new_format, group_by_difficulty), schema)
+
+
+# ----------------------------------------------------------------------------------------------------------------------
+
+
+ISSUES = [
+    {
+        'code': 'W0612',
+        'text': 'Unused variable \'a\'',
+        'line': 'a = 1',
+        'line_number': 2,
+        'column_number': 5,
+        'category': 'BEST_PRACTICES',
+        'influence_on_penalty': 0,
+        'difficulty': 'MEDIUM',
+    },
+    {
+        'code': 'W0612',
+        'text': 'Unused variable \'b\'',
+        'line': 'b = 2',
+        'line_number': 3,
+        'column_number': 5,
+        'category': 'BEST_PRACTICES',
+        'influence_on_penalty': 0,
+        'difficulty': 'MEDIUM',
+    },
+    {
+        'code': 'W0612',
+        'text': 'Unused variable \'c\'',
+        'line': 'c = 3',
+        'line_number': 4,
+        'column_number': 5,
+        'category': 'BEST_PRACTICES',
+        'influence_on_penalty': 0,
+        'difficulty': 'MEDIUM',
+    },
+]
+
+OLD_FORMAT_EXPECTED_JSON = {
+    'quality': {
+        'code': 'EXCELLENT',
+        'text': 'Code quality (beta): EXCELLENT',
+    },
+    'issues': ISSUES,
+}
+
+NEW_FORMAT_EXPECTED_JSON = {
+    'quality': {
+        'code': 'EXCELLENT',
+        'text': 'Code quality (beta): EXCELLENT',
+    },
+    'file_review_results': [
+        {
+            'file_name': '__init__.py',
+            'quality': {
+                'code': 'EXCELLENT',
+                'text': 'Code quality (beta): EXCELLENT',
+            },
+            'issues': [],
+        },
+        {
+            'file_name': 'one.py',
+            'quality': {
+                'code': 'EXCELLENT',
+                'text': 'Code quality (beta): EXCELLENT',
+            },
+            'issues': [],
+        },
+        {
+            'file_name': 'other.py',
+            'quality': {
+                'code': 'GOOD',
+                'text': 'Code quality (beta): GOOD',
+            },
+            'issues': ISSUES,
+        },
+    ],
+}
+
+ISSUES_GROUP_BY_DIFFICULTY = [
+    {
+        'code': 'W0612',
+        'text': 'Unused variable \'a\'',
+        'line': 'a = 1',
+        'line_number': 2,
+        'column_number': 5,
+        'category': 'BEST_PRACTICES',
+        'influence_on_penalty': {
+            'EASY': 0,
+            'MEDIUM': 0,
+            'HARD': 0,
+        },
+        'difficulty': 'MEDIUM',
+    },
+    {
+        'code': 'W0612',
+        'text': 'Unused variable \'b\'',
+        'line': 'b = 2',
+        'line_number': 3,
+        'column_number': 5,
+        'category': 'BEST_PRACTICES',
+        'influence_on_penalty': {
+            'EASY': 0,
+            'MEDIUM': 0,
+            'HARD': 0,
+        },
+        'difficulty': 'MEDIUM',
+    },
+    {
+        'code': 'W0612',
+        'text': 'Unused variable \'c\'',
+        'line': 'c = 3',
+        'line_number': 4,
+        'column_number': 5,
+        'category': 'BEST_PRACTICES',
+        'influence_on_penalty': {
+            'EASY': 0,
+            'MEDIUM': 0,
+            'HARD': 0,
+        },
+        'difficulty': 'MEDIUM',
+    },
+]
+
+OLD_FORMAT_GROUPED_BY_DIFFICULTY_EXPECTED_JSON = {
+    'quality': {
+        'EASY': {
+            'code': 'EXCELLENT',
+            'text': 'Code quality (beta): EXCELLENT',
+        },
+        'MEDIUM': {
+            'code': 'EXCELLENT',
+            'text': 'Code quality (beta): EXCELLENT',
+        },
+        'HARD': {
+            'code': 'EXCELLENT',
+            'text': 'Code quality (beta): EXCELLENT',
+        },
+    },
+    'issues': ISSUES_GROUP_BY_DIFFICULTY,
+}
+
+NEW_FORMAT_BY_DIFFICULTY_EXPECTED_JSON = {
+    'quality': {
+        'EASY': {
+            'code': 'EXCELLENT',
+            'text': 'Code quality (beta): EXCELLENT',
+        },
+        'MEDIUM': {
+            'code': 'EXCELLENT',
+            'text': 'Code quality (beta): EXCELLENT',
+        },
+        'HARD': {
+            'code': 'EXCELLENT',
+            'text': 'Code quality (beta): EXCELLENT',
+        },
+    },
+    'file_review_results': [
+        {
+            'file_name': '__init__.py',
+            'quality': {
+                'EASY': {
+                    'code': 'EXCELLENT',
+                    'text': 'Code quality (beta): EXCELLENT',
+                },
+                'MEDIUM': {
+                    'code': 'EXCELLENT',
+                    'text': 'Code quality (beta): EXCELLENT',
+                },
+                'HARD': {
+                    'code': 'EXCELLENT',
+                    'text': 'Code quality (beta): EXCELLENT',
+                },
+            },
+            'issues': [],
+        },
+        {
+            'file_name': 'one.py',
+            'quality': {
+                'EASY': {
+                    'code': 'EXCELLENT',
+                    'text': 'Code quality (beta): EXCELLENT',
+                },
+                'MEDIUM': {
+                    'code': 'EXCELLENT',
+                    'text': 'Code quality (beta): EXCELLENT',
+                },
+                'HARD': {
+                    'code': 'EXCELLENT',
+                    'text': 'Code quality (beta): EXCELLENT',
+                },
+            },
+            'issues': [],
+        },
+        {
+            'file_name': 'other.py',
+            'quality': {
+                'EASY': {
+                    'code': 'EXCELLENT',
+                    'text': 'Code quality (beta): EXCELLENT',
+                },
+                'MEDIUM': {
+                    'code': 'GOOD',
+                    'text': 'Code quality (beta): GOOD',
+                },
+                'HARD': {
+                    'code': 'GOOD',
+                    'text': 'Code quality (beta): GOOD',
+                },
+            },
+            'issues': ISSUES_GROUP_BY_DIFFICULTY,
+        },
+    ],
+}
+
+JSON_FORMAT_TEST_DATA = [
+    (False, False, OLD_FORMAT_EXPECTED_JSON),
+    (True, False, NEW_FORMAT_EXPECTED_JSON),
+    (False, True, OLD_FORMAT_GROUPED_BY_DIFFICULTY_EXPECTED_JSON),
+    (True, True, NEW_FORMAT_BY_DIFFICULTY_EXPECTED_JSON),
+]
+
+
+@pytest.mark.parametrize(('new_format', 'group_by_difficulty', 'expected_json'), JSON_FORMAT_TEST_DATA)
+def test_json_format(
+    local_command: LocalCommandBuilder, new_format: bool, group_by_difficulty: bool, expected_json: str,
+):
+    assert _get_output_json(local_command, new_format, group_by_difficulty) == expected_json
diff --git a/test/python/functional_tests/test_multi_file_project.py b/test/python/functional_tests/test_multi_file_project.py
deleted file mode 100644
index 86a029d1..00000000
--- a/test/python/functional_tests/test_multi_file_project.py
+++ /dev/null
@@ -1,82 +0,0 @@
-import json
-import subprocess
-from test.python.functional_tests.conftest import DATA_PATH, LocalCommandBuilder
-
-EXPECTED_JSON = {
-    'quality': {
-        'code': 'EXCELLENT',
-        'text': 'Code quality (beta): EXCELLENT',
-    },
-    'file_review_results': [
-        {
-            'file_name': '__init__.py',
-            'quality': {
-                'code': 'EXCELLENT',
-                'text': 'Code quality (beta): EXCELLENT',
-            },
-            'issues': [],
-        },
-        {
-            'file_name': 'one.py',
-            'quality': {
-                'code': 'EXCELLENT',
-                'text': 'Code quality (beta): EXCELLENT',
-            },
-            'issues': [],
-        },
-        {
-            'file_name': 'other.py',
-            'quality': {
-                'code': 'GOOD',
-                'text': 'Code quality (beta): GOOD',
-            },
-            'issues': [
-                {
-                    'code': 'W0612',
-                    'text': 'Unused variable \'a\'',
-                    'line': 'a = 1',
-                    'line_number': 2,
-                    'column_number': 5,
-                    'category': 'BEST_PRACTICES',
-                },
-                {
-                    'code': 'W0612',
-                    'text': 'Unused variable \'b\'',
-                    'line': 'b = 2',
-                    'line_number': 3,
-                    'column_number': 5,
-                    'category': 'BEST_PRACTICES',
-                },
-                {
-                    'code': 'W0612',
-                    'text': 'Unused variable \'c\'',
-                    'line': 'c = 3',
-                    'line_number': 4,
-                    'column_number': 5,
-                    'category': 'BEST_PRACTICES',
-                },
-            ],
-        },
-    ],
-}
-
-
-def test_json_format(local_command: LocalCommandBuilder):
-    file_path = DATA_PATH / 'file_or_project' / 'project'
-
-    local_command.verbosity = 0
-    local_command.format = 'json'
-    local_command.path = file_path
-    local_command.new_format = True
-
-    process = subprocess.run(
-        local_command.build(),
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
-    )
-    stdout = process.stdout.decode()
-    print(stdout)
-
-    output_json = json.loads(stdout)
-
-    assert output_json == EXPECTED_JSON
diff --git a/test/python/functional_tests/test_range_of_lines.py b/test/python/functional_tests/test_range_of_lines.py
index 1ef4a8f5..f20b83df 100644
--- a/test/python/functional_tests/test_range_of_lines.py
+++ b/test/python/functional_tests/test_range_of_lines.py
@@ -11,39 +11,47 @@
         'code': 'BAD',
         'text': 'Code quality (beta): BAD',
     },
-    'issues': [{
-        'category': 'CODE_STYLE',
-        'code': 'E225',
-        'column_number': 2,
-        'line': 'a=10',
-        'line_number': 1,
-        'text': 'missing whitespace around operator'},
-        {'category': 'CODE_STYLE',
-         'code': 'E225',
-         'column_number': 2,
-         'line': 'b=20',
-         'line_number': 2,
-         'text': 'missing whitespace around operator'},
-        {'category': 'CODE_STYLE',
-         'code': 'E225',
-         'column_number': 2,
-         'line': 'c=a + b',
-         'line_number': 4,
-         'text': 'missing whitespace around operator',
-         },
+    'issues': [
+        {
+            'category': 'CODE_STYLE',
+            'code': 'E225',
+            'column_number': 2,
+            'line': 'a=10',
+            'line_number': 1,
+            'text': 'missing whitespace around operator',
+            'influence_on_penalty': 0,
+            'difficulty': "EASY",
+        },
+        {
+            'category': 'CODE_STYLE',
+            'code': 'E225',
+            'column_number': 2,
+            'line': 'b=20',
+            'line_number': 2,
+            'text': 'missing whitespace around operator',
+            'influence_on_penalty': 0,
+            'difficulty': "EASY",
+        },
+        {
+            'category': 'CODE_STYLE',
+            'code': 'E225',
+            'column_number': 2,
+            'line': 'c=a + b',
+            'line_number': 4,
+            'text': 'missing whitespace around operator',
+            'influence_on_penalty': 0,
+            'difficulty': "EASY",
+        },
     ],
 }
 
 NO_ISSUES_JSON = {
-    'quality': {
-        'code': 'EXCELLENT',
-        'text': 'Code quality (beta): EXCELLENT'},
+    'quality': {'code': 'EXCELLENT', 'text': 'Code quality (beta): EXCELLENT'},
     'issues': [],
 }
 
 
-def test_range_filter_when_no_range_specified(
-        local_command: LocalCommandBuilder) -> None:
+def test_range_filter_when_no_range_specified(local_command: LocalCommandBuilder) -> None:
     local_command.path = PATH_TO_FILE
     local_command.format = 'json'
 
@@ -53,8 +61,7 @@ def test_range_filter_when_no_range_specified(
     assert output_json == EXPECTED_JSON
 
 
-def test_range_filter_when_start_line_is_first(
-        local_command: LocalCommandBuilder) -> None:
+def test_range_filter_when_start_line_is_first(local_command: LocalCommandBuilder) -> None:
     local_command.path = PATH_TO_FILE
     local_command.format = 'json'
     local_command.start_line = 1
@@ -65,8 +72,7 @@ def test_range_filter_when_start_line_is_first(
     assert output_json == EXPECTED_JSON
 
 
-def test_range_filter_when_start_line_is_not_first(
-        local_command: LocalCommandBuilder) -> None:
+def test_range_filter_when_start_line_is_not_first(local_command: LocalCommandBuilder) -> None:
     local_command.path = PATH_TO_FILE
     local_command.format = 'json'
     local_command.start_line = 3
@@ -75,24 +81,25 @@ def test_range_filter_when_start_line_is_not_first(
     output_json = json.loads(output)
 
     expected_json_with_one_issue = {
-        'quality': {
-            'code': 'MODERATE',
-            'text': 'Code quality (beta): MODERATE'},
-        'issues': [{
-            'code': 'E225',
-            'text': 'missing whitespace around operator',
-            'line': 'c=a + b',
-            'line_number': 4,
-            'column_number': 2,
-            'category': 'CODE_STYLE',
-        }],
+        'quality': {'code': 'MODERATE', 'text': 'Code quality (beta): MODERATE'},
+        'issues': [
+            {
+                'code': 'E225',
+                'text': 'missing whitespace around operator',
+                'line': 'c=a + b',
+                'line_number': 4,
+                'column_number': 2,
+                'category': 'CODE_STYLE',
+                'influence_on_penalty': 0,
+                'difficulty': "EASY",
+            },
+        ],
     }
 
     assert output_json == expected_json_with_one_issue
 
 
-def test_range_filter_when_start_out_of_range(
-        local_command: LocalCommandBuilder) -> None:
+def test_range_filter_when_start_out_of_range(local_command: LocalCommandBuilder) -> None:
     local_command.path = PATH_TO_FILE
     local_command.format = 'json'
     local_command.start_line = 5
@@ -105,8 +112,7 @@ def test_range_filter_when_start_out_of_range(
     assert output_json == expected_json_without_issues
 
 
-def test_range_filter_when_start_line_is_not_positive(
-        local_command: LocalCommandBuilder) -> None:
+def test_range_filter_when_start_line_is_not_positive(local_command: LocalCommandBuilder) -> None:
     local_command.start_line = 0
 
     with pytest.raises(Exception):
@@ -120,8 +126,7 @@ def test_range_filter_when_start_line_is_not_positive(
         json.loads(output)
 
 
-def test_range_filter_when_end_line_is_last(
-        local_command: LocalCommandBuilder) -> None:
+def test_range_filter_when_end_line_is_last(local_command: LocalCommandBuilder) -> None:
     local_command.path = PATH_TO_FILE
     local_command.format = 'json'
     local_command.end_line = 4  # last line with an error
@@ -132,8 +137,7 @@ def test_range_filter_when_end_line_is_last(
     assert output_json == EXPECTED_JSON
 
 
-def test_range_filter_when_end_line_is_first(
-        local_command: LocalCommandBuilder) -> None:
+def test_range_filter_when_end_line_is_first(local_command: LocalCommandBuilder) -> None:
     local_command.path = PATH_TO_FILE
     local_command.format = 'json'
     local_command.end_line = 1
@@ -146,21 +150,24 @@ def test_range_filter_when_end_line_is_first(
             'code': 'MODERATE',
             'text': 'Code quality (beta): MODERATE',
         },
-        'issues': [{
-            'code': 'E225',
-            'text': 'missing whitespace around operator',
-            'line': 'a=10',
-            'line_number': 1,
-            'column_number': 2,
-            'category': 'CODE_STYLE',
-        }],
+        'issues': [
+            {
+                'code': 'E225',
+                'text': 'missing whitespace around operator',
+                'line': 'a=10',
+                'line_number': 1,
+                'column_number': 2,
+                'category': 'CODE_STYLE',
+                'influence_on_penalty': 0,
+                'difficulty': "EASY",
+            },
+        ],
     }
 
     assert output_json == expected_json_with_one_issue
 
 
-def test_range_filter_when_end_line_out_of_range(
-        local_command: LocalCommandBuilder) -> None:
+def test_range_filter_when_end_line_out_of_range(local_command: LocalCommandBuilder) -> None:
     local_command.path = PATH_TO_FILE
     local_command.format = 'json'
     local_command.end_line = 10
@@ -171,8 +178,7 @@ def test_range_filter_when_end_line_out_of_range(
     assert output_json == output_json
 
 
-def test_range_filter_when_both_start_and_end_lines_specified(
-        local_command: LocalCommandBuilder) -> None:
+def test_range_filter_when_both_start_and_end_lines_specified(local_command: LocalCommandBuilder) -> None:
     local_command.path = PATH_TO_FILE
     local_command.format = 'json'
     local_command.start_line = 1
@@ -184,8 +190,7 @@ def test_range_filter_when_both_start_and_end_lines_specified(
     assert output_json == EXPECTED_JSON
 
 
-def test_range_filter_when_equal_start_and_end_lines(
-        local_command: LocalCommandBuilder) -> None:
+def test_range_filter_when_equal_start_and_end_lines(local_command: LocalCommandBuilder) -> None:
     local_command.path = PATH_TO_FILE
     local_command.format = 'json'
     local_command.start_line = 3
@@ -198,7 +203,8 @@ def test_range_filter_when_equal_start_and_end_lines(
 
 
 def test_range_filter_when_both_start_and_end_lines_specified_not_equal_borders(
-        local_command: LocalCommandBuilder) -> None:
+    local_command: LocalCommandBuilder,
+) -> None:
     local_command.path = PATH_TO_FILE
     local_command.format = 'json'
     local_command.start_line = 2
@@ -212,28 +218,34 @@ def test_range_filter_when_both_start_and_end_lines_specified_not_equal_borders(
             'code': 'BAD',
             'text': 'Code quality (beta): BAD',
         },
-        'issues': [{
-            'code': 'E225',
-            'text': 'missing whitespace around operator',
-            'line': 'b=20',
-            'line_number': 2,
-            'column_number': 2,
-            'category': 'CODE_STYLE',
-        }, {
-            'code': 'E225',
-            'text': 'missing whitespace around operator',
-            'line': 'c=a + b',
-            'line_number': 4,
-            'column_number': 2,
-            'category': 'CODE_STYLE',
-        }],
+        'issues': [
+            {
+                'code': 'E225',
+                'text': 'missing whitespace around operator',
+                'line': 'b=20',
+                'line_number': 2,
+                'column_number': 2,
+                'category': 'CODE_STYLE',
+                'influence_on_penalty': 0,
+                'difficulty': "EASY",
+            },
+            {
+                'code': 'E225',
+                'text': 'missing whitespace around operator',
+                'line': 'c=a + b',
+                'line_number': 4,
+                'column_number': 2,
+                'category': 'CODE_STYLE',
+                'influence_on_penalty': 0,
+                'difficulty': "EASY",
+            },
+        ],
     }
 
     assert output_json == expected_json
 
 
-def test_range_filter_when_both_start_and_end_lines_out_of_range(
-        local_command: LocalCommandBuilder) -> None:
+def test_range_filter_when_both_start_and_end_lines_out_of_range(local_command: LocalCommandBuilder) -> None:
     local_command.path = PATH_TO_FILE
     local_command.format = 'json'
     local_command.start_line = 10
diff --git a/test/python/functional_tests/test_single_file_json_format.py b/test/python/functional_tests/test_single_file_json_format.py
deleted file mode 100644
index 85616145..00000000
--- a/test/python/functional_tests/test_single_file_json_format.py
+++ /dev/null
@@ -1,50 +0,0 @@
-import json
-import subprocess
-from test.python.functional_tests.conftest import DATA_PATH, LocalCommandBuilder
-
-from jsonschema import validate
-
-schema = {
-    'type': 'object',
-    'properties': {
-        'quality': {
-            'type': 'object',
-            'properties': {
-                'code': {'type': 'string'},
-                'text': {'type': 'string'},
-            },
-        },
-        'issues': {
-            'type': 'array',
-            'items': {
-                'type': 'object',
-                'properties': {
-                    'category': {'type': 'string'},
-                    'code': {'type': 'string'},
-                    'column_number': {'type': 'number'},
-                    'line': {'type': 'string'},
-                    'line_number': {'type': 'number'},
-                    'text': {'type': 'string'},
-                },
-            },
-        },
-    },
-}
-
-
-def test_json_format(local_command: LocalCommandBuilder):
-    file_path = DATA_PATH / 'json_format' / 'code_with_issues.py'
-
-    local_command.verbosity = 0
-    local_command.format = 'json'
-    local_command.path = file_path
-
-    process = subprocess.run(
-        local_command.build(),
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
-    )
-    stdout = process.stdout.decode()
-
-    output_json = json.loads(stdout)
-    validate(output_json, schema)
diff --git a/test/python/inspectors/__init__.py b/test/python/inspectors/__init__.py
index 7efbda31..88e24f37 100644
--- a/test/python/inspectors/__init__.py
+++ b/test/python/inspectors/__init__.py
@@ -13,3 +13,7 @@
 JS_DATA_FOLDER = CURRENT_TEST_DATA_FOLDER / 'js'
 
 PYTHON_AST_DATA_FOLDER = CURRENT_TEST_DATA_FOLDER / 'python_ast'
+
+CHECKSTYLE_DATA_FOLDER = CURRENT_TEST_DATA_FOLDER / 'checkstyle'
+
+PMD_DATA_FOLDER = CURRENT_TEST_DATA_FOLDER / 'pmd'
diff --git a/test/python/inspectors/test_checkstyle_inspector.py b/test/python/inspectors/test_checkstyle_inspector.py
index ac691ff6..2ba7b3bd 100644
--- a/test/python/inspectors/test_checkstyle_inspector.py
+++ b/test/python/inspectors/test_checkstyle_inspector.py
@@ -1,48 +1,205 @@
-from test.python.inspectors import JAVA_DATA_FOLDER
+from pathlib import Path
+from test.python.inspectors import CHECKSTYLE_DATA_FOLDER, JAVA_DATA_FOLDER
 from test.python.inspectors.conftest import gather_issues_test_info, IssuesTestInfo, use_file_metadata
+from typing import List
 
 import pytest
 from src.python.review.common.language import Language
 from src.python.review.inspectors.checkstyle.checkstyle import CheckstyleInspector
+from src.python.review.inspectors.inspector_type import InspectorType
+from src.python.review.inspectors.issue import (
+    BoolExprLenIssue,
+    CodeIssue,
+    CyclomaticComplexityIssue,
+    FuncLenIssue,
+    IssueDifficulty,
+    IssueType,
+    LineLenIssue,
+)
+from src.python.review.inspectors.parsers.xml_parser import parse_xml_file_result
+from src.python.review.inspectors.tips import (
+    get_bool_expr_len_tip,
+    get_cyclomatic_complexity_tip,
+    get_func_len_tip,
+    get_line_len_tip,
+)
 from src.python.review.reviewers.utils.issues_filter import filter_low_measure_issues
 
+FILE_NAME_AND_ISSUES = [
+    ('empty_file.xml', []),
+    ('single_file_project_without_issues.xml', []),
+    ('multi_file_project_without_issues.xml', []),
+    (
+        'single_file_project_without_metric_issues.xml',
+        [
+            CodeIssue(
+                origin_class='MultipleStringLiteralsCheck', type=IssueType.BEST_PRACTICES,
+                description='The String "Howdy" appears 4 times in the file.',
+                file_path=Path('/home/user/Desktop/some_project/main.java'),
+                line_no=6, column_no=13, inspector_type=InspectorType.CHECKSTYLE,
+                difficulty=IssueDifficulty.MEDIUM,
+            ),
+            CodeIssue(
+                origin_class='WhitespaceAroundCheck', type=IssueType.CODE_STYLE,
+                description="'{' is not followed by whitespace.",
+                file_path=Path('/home/user/Desktop/some_project/main.java'),
+                line_no=12, column_no=32, inspector_type=InspectorType.CHECKSTYLE,
+                difficulty=IssueDifficulty.EASY,
+            ),
+            CodeIssue(
+                origin_class='StringLiteralEqualityCheck', type=IssueType.ERROR_PRONE,
+                description="Literal Strings should be compared using equals(), not '=='.",
+                file_path=Path('/home/user/Desktop/some_project/main.java'),
+                line_no=37, column_no=33, inspector_type=InspectorType.CHECKSTYLE,
+                difficulty=IssueDifficulty.HARD,
+            ),
+        ],
+    ),
+    (
+        'single_file_project_with_metric_issues.xml',
+        [
+            FuncLenIssue(
+                origin_class='JavaNCSSCheck', type=IssueType.FUNC_LEN,
+                description=get_func_len_tip(),
+                file_path=Path('/home/user/Desktop/some_project/main.java'),
+                line_no=5, column_no=5, inspector_type=InspectorType.CHECKSTYLE,
+                func_len=42, difficulty=IssueDifficulty.EASY,
+            ),
+            CyclomaticComplexityIssue(
+                origin_class='CyclomaticComplexityCheck', type=IssueType.CYCLOMATIC_COMPLEXITY,
+                description=get_cyclomatic_complexity_tip(),
+                file_path=Path('/home/user/Desktop/some_project/main.java'),
+                line_no=5, column_no=5, inspector_type=InspectorType.CHECKSTYLE,
+                cc_value=69, difficulty=IssueDifficulty.HARD,
+            ),
+            CodeIssue(
+                origin_class='WhitespaceAroundCheck', type=IssueType.CODE_STYLE,
+                description="'switch' is not followed by whitespace.",
+                file_path=Path('/home/user/Desktop/some_project/main.java'),
+                line_no=31, column_no=25, inspector_type=InspectorType.CHECKSTYLE,
+                difficulty=IssueDifficulty.EASY,
+            ),
+        ],
+    ),
+    (
+        'multi_file_project_without_metric_issues.xml',
+        [
+            CodeIssue(
+                origin_class='EmptyBlockCheck', type=IssueType.BEST_PRACTICES,
+                description='Must have at least one statement.',
+                file_path=Path('/home/user/Desktop/some_project/main1.java'),
+                line_no=62, column_no=38, inspector_type=InspectorType.CHECKSTYLE,
+                difficulty=IssueDifficulty.MEDIUM,
+            ),
+            CodeIssue(
+                origin_class='CovariantEqualsCheck', type=IssueType.ERROR_PRONE,
+                description='covariant equals without overriding equals(java.lang.Object).',
+                file_path=Path('/home/user/Desktop/some_project/main1.java'),
+                line_no=68, column_no=20, inspector_type=InspectorType.CHECKSTYLE,
+                difficulty=IssueDifficulty.HARD,
+            ),
+            CodeIssue(
+                origin_class='IndentationCheck', type=IssueType.CODE_STYLE,
+                description="'if' child has incorrect indentation level 2, expected level should be 12.",
+                file_path=Path('/home/user/Desktop/some_project/main2.java'),
+                line_no=116, column_no=3, inspector_type=InspectorType.CHECKSTYLE,
+                difficulty=IssueDifficulty.EASY,
+            ),
+            CodeIssue(
+                origin_class='UpperEllCheck', type=IssueType.BEST_PRACTICES,
+                description="Should use uppercase 'L'.",
+                file_path=Path('/home/user/Desktop/some_project/main2.java'),
+                line_no=123, column_no=15, inspector_type=InspectorType.CHECKSTYLE,
+                difficulty=IssueDifficulty.MEDIUM,
+            ),
+        ],
+    ),
+    (
+        'multi_file_project_with_metric_issues.xml',
+        [
+            CodeIssue(
+                origin_class='OneStatementPerLineCheck', type=IssueType.CODE_STYLE,
+                description='Only one statement per line allowed.',
+                file_path=Path('/home/user/Desktop/some_project/main1.java'),
+                line_no=69, column_no=31, inspector_type=InspectorType.CHECKSTYLE,
+                difficulty=IssueDifficulty.EASY,
+            ),
+            BoolExprLenIssue(
+                origin_class='BooleanExpressionComplexityCheck', type=IssueType.BOOL_EXPR_LEN,
+                description=get_bool_expr_len_tip(),
+                file_path=Path('/home/user/Desktop/some_project/main1.java'),
+                line_no=112, column_no=9, inspector_type=InspectorType.CHECKSTYLE, bool_expr_len=77,
+                difficulty=IssueDifficulty.EASY,
+            ),
+            LineLenIssue(
+                origin_class='LineLengthCheck', type=IssueType.LINE_LEN,
+                description=get_line_len_tip(),
+                file_path=Path('/home/user/Desktop/some_project/main2.java'),
+                line_no=62, column_no=1, inspector_type=InspectorType.CHECKSTYLE, line_len=228,
+                difficulty=IssueDifficulty.EASY,
+            ),
+            CodeIssue(
+                origin_class='WhitespaceAfterCheck', type=IssueType.CODE_STYLE,
+                description="',' is not followed by whitespace.",
+                file_path=Path('/home/user/Desktop/some_project/main2.java'),
+                line_no=136, column_no=19, inspector_type=InspectorType.CHECKSTYLE,
+                difficulty=IssueDifficulty.EASY,
+            ),
+        ],
+    ),
+]
+
+
+@pytest.mark.parametrize(('file_name', 'expected_issues'), FILE_NAME_AND_ISSUES)
+def test_output_parsing(file_name: str, expected_issues: List[CodeIssue]):
+    path_to_file = CHECKSTYLE_DATA_FOLDER / file_name
+    issues = parse_xml_file_result(
+        path_to_file,
+        InspectorType.CHECKSTYLE,
+        CheckstyleInspector.choose_issue_type,
+        IssueDifficulty.get_by_issue_type,
+        CheckstyleInspector.origin_class_to_pattern,
+    )
+    assert issues == expected_issues
+
+
 FILE_NAMES_AND_N_ISSUES = [
     ('test_simple_valid_program.java', 0),
     ('test_spaces.java', 14),
     ('test_valid_spaces.java', 0),
-    ('test_curly_braces.java', 2),
+    ('test_curly_braces.java', 6),
     ('test_valid_curly_braces.java', 0),
     ('test_invalid_naming.java', 14),
     ('test_valid_naming.java', 0),
     ('test_unused_imports.java', 5),
     ('test_blocks.java', 5),
     ('test_valid_blocks.java', 0),
-    ('test_magic_numbers.java', 0),
+    ('test_magic_numbers.java', 1),
     ('test_ternary_operator.java', 0),
-    ('test_todo.java', 3),
+    ('test_todo.java', 0),
     ('test_upper_ell.java', 1),
     ('test_missing_default.java', 1),
     ('test_valid_default.java', 0),
     ('test_array_type.java', 1),
     ('test_algorithm_with_scanner.java', 0),
     ('test_valid_algorithm_1.java', 0),
-    ('test_nested_blocks.java', 2),
-    ('test_reassigning_example.java', 2),
-    ('test_switch_statement.java', 3),
+    ('test_nested_blocks.java', 5),
+    ('test_reassigning_example.java', 4),
+    ('test_switch_statement.java', 16),
     ('test_when_only_equals_overridden.java', 1),
     ('test_constants.java', 4),
     # ("test_empty_lines_btw_members.java", 2),
     ('test_covariant_equals.java', 1),
-    ('test_multi_statements.java', 4),
-    ('test_boolean_expr.java', 2),
-    ('test_code_with_comments.java', 0),
-    ('test_too_long_method.java', 1),
-    ('test_cyclomatic_complexity.java', 0),
-    ('test_cyclomatic_complexity_bad.java', 1),
+    ('test_multi_statements.java', 7),
+    ('test_boolean_expr.java', 4),
+    ('test_code_with_comments.java', 2),
+    ('test_too_long_method.java', 4),
+    ('test_cyclomatic_complexity.java', 8),
+    ('test_cyclomatic_complexity_bad.java', 22),
     ('test_long_lines.java', 1),
-    ('test_indentation_with_spaces.java', 0),
-    ('test_indentation_with_tabs.java', 0),
-    ('test_indentation_google_style.java', 4),
+    ('test_indentation_with_spaces.java', 5),
+    ('test_indentation_with_tabs.java', 5),
+    ('test_indentation_google_style.java', 6),
     ('test_multiple_literals.java', 1),
 ]
 
diff --git a/test/python/inspectors/test_detekt_inspector.py b/test/python/inspectors/test_detekt_inspector.py
index 99f84f27..e9a650c2 100644
--- a/test/python/inspectors/test_detekt_inspector.py
+++ b/test/python/inspectors/test_detekt_inspector.py
@@ -12,22 +12,22 @@
     ('case2_valid_program.kt', 0),
     ('case3_todo.kt', 0),
     ('case4_semicolons.kt', 6),
-    ('case5_imports.kt', 3),
+    ('case5_imports.kt', 6),
     ('case6_missing_spaces.kt', 6),
     ('case8_needless_blank_line.kt', 3),
-    ('case9_braces.kt', 3),
-    ('case11_bad_ident.kt', 2),
+    ('case9_braces.kt', 8),
+    ('case11_bad_ident.kt', 3),
     ('case13_good_filename.kt', 0),
     ('case14_keyword_spacing.kt', 12),
     ('case15_empty_class_func.kt', 2),
     ('case16_redundant_unit.kt', 1),
-    ('case18_redundant_braces.kt', 3),
+    ('case18_redundant_braces.kt', 6),
     ('case20_cyclomatic_complexity.kt', 0),
     ('case21_cyclomatic_complexity_bad.kt', 2),
     ('case22_too_many_arguments.kt', 1),
-    ('case23_bad_range_performance.kt', 3),
+    ('case23_bad_range_performance.kt', 7),
     ('case24_duplicate_when_bug.kt', 1),
-    ('case25_unreachable_code.kt', 3),
+    ('case25_unreachable_code.kt', 4),
     ('case26_var_could_be_val.kt', 1),
 ]
 
diff --git a/test/python/inspectors/test_filter_duplicate_issues.py b/test/python/inspectors/test_filter_duplicate_issues.py
index 4b3b8887..9f088530 100644
--- a/test/python/inspectors/test_filter_duplicate_issues.py
+++ b/test/python/inspectors/test_filter_duplicate_issues.py
@@ -1,40 +1,52 @@
 from pathlib import Path
 
 from src.python.review.inspectors.inspector_type import InspectorType
-from src.python.review.inspectors.issue import CodeIssue, IssueType
+from src.python.review.inspectors.issue import CodeIssue, IssueDifficulty, IssueType
 from src.python.review.reviewers.utils.issues_filter import filter_duplicate_issues
 
 
 def test_filter_duplicate_issues_when_single_inspector() -> None:
     issues = [
-        CodeIssue(file_path=Path('code.py'),
-                  line_no=10,
-                  description='',
-                  inspector_type=InspectorType.FLAKE8,
-                  type=IssueType.CODE_STYLE,
-                  column_no=1,
-                  origin_class=''),
-        CodeIssue(file_path=Path('code.py'),
-                  line_no=11,
-                  description='',
-                  inspector_type=InspectorType.FLAKE8,
-                  type=IssueType.CODE_STYLE,
-                  column_no=1,
-                  origin_class=''),
-        CodeIssue(file_path=Path('code.py'),
-                  line_no=11,
-                  description='',
-                  inspector_type=InspectorType.FLAKE8,
-                  type=IssueType.CODE_STYLE,
-                  column_no=1,
-                  origin_class=''),
-        CodeIssue(file_path=Path('code.py'),
-                  line_no=11,
-                  description='',
-                  type=IssueType.CODE_STYLE,
-                  inspector_type=InspectorType.FLAKE8,
-                  column_no=1,
-                  origin_class=''),
+        CodeIssue(
+            file_path=Path('code.py'),
+            line_no=10,
+            description='',
+            inspector_type=InspectorType.FLAKE8,
+            type=IssueType.CODE_STYLE,
+            column_no=1,
+            origin_class='',
+            difficulty=IssueDifficulty.EASY,
+        ),
+        CodeIssue(
+            file_path=Path('code.py'),
+            line_no=11,
+            description='',
+            inspector_type=InspectorType.FLAKE8,
+            type=IssueType.CODE_STYLE,
+            column_no=1,
+            origin_class='',
+            difficulty=IssueDifficulty.EASY,
+        ),
+        CodeIssue(
+            file_path=Path('code.py'),
+            line_no=11,
+            description='',
+            inspector_type=InspectorType.FLAKE8,
+            type=IssueType.CODE_STYLE,
+            column_no=1,
+            origin_class='',
+            difficulty=IssueDifficulty.EASY,
+        ),
+        CodeIssue(
+            file_path=Path('code.py'),
+            line_no=11,
+            description='',
+            type=IssueType.CODE_STYLE,
+            inspector_type=InspectorType.FLAKE8,
+            column_no=1,
+            origin_class='',
+            difficulty=IssueDifficulty.EASY,
+        ),
     ]
 
     filtered_issues = filter_duplicate_issues(issues)
@@ -44,107 +56,97 @@ def test_filter_duplicate_issues_when_single_inspector() -> None:
 
 def test_filter_duplicate_issues_when_several_inspectors() -> None:
     issues = [
-        CodeIssue(file_path=Path('code.py'),
-                  line_no=10,
-                  description='',
-                  inspector_type=InspectorType.PYLINT,
-                  column_no=1,
-                  origin_class='',
-                  type=IssueType.COMPLEXITY),
-        CodeIssue(file_path=Path('code.py'),
-                  line_no=10,
-                  description='',
-                  inspector_type=InspectorType.FLAKE8,
-                  column_no=1,
-                  origin_class='',
-                  type=IssueType.COMPLEXITY),
-        CodeIssue(file_path=Path('code.py'),
-                  line_no=10,
-                  description='',
-                  inspector_type=InspectorType.INTELLIJ,
-                  column_no=1,
-                  origin_class='',
-                  type=IssueType.COMPLEXITY),
-        CodeIssue(file_path=Path('code.py'),
-                  line_no=11,
-                  description='',
-                  type=IssueType.CODE_STYLE,
-                  inspector_type=InspectorType.PYLINT,
-                  column_no=1,
-                  origin_class=''),
-        CodeIssue(file_path=Path('code.py'),
-                  line_no=11,
-                  description='',
-                  type=IssueType.BEST_PRACTICES,
-                  inspector_type=InspectorType.FLAKE8,
-                  column_no=1,
-                  origin_class=''),
-        CodeIssue(file_path=Path('code.py'),
-                  line_no=11,
-                  description='',
-                  type=IssueType.ERROR_PRONE,
-                  inspector_type=InspectorType.INTELLIJ,
-                  column_no=1,
-                  origin_class=''),
+        CodeIssue(
+            file_path=Path('code.py'),
+            line_no=10,
+            description='',
+            inspector_type=InspectorType.PYLINT,
+            column_no=1,
+            origin_class='',
+            type=IssueType.COMPLEXITY,
+            difficulty=IssueDifficulty.HARD,
+        ),
+        CodeIssue(
+            file_path=Path('code.py'),
+            line_no=10,
+            description='',
+            inspector_type=InspectorType.FLAKE8,
+            column_no=1,
+            origin_class='',
+            type=IssueType.COMPLEXITY,
+            difficulty=IssueDifficulty.HARD,
+        ),
+        CodeIssue(
+            file_path=Path('code.py'),
+            line_no=11,
+            description='',
+            type=IssueType.CODE_STYLE,
+            inspector_type=InspectorType.PYLINT,
+            column_no=1,
+            origin_class='',
+            difficulty=IssueDifficulty.EASY,
+        ),
+        CodeIssue(
+            file_path=Path('code.py'),
+            line_no=11,
+            description='',
+            type=IssueType.BEST_PRACTICES,
+            inspector_type=InspectorType.FLAKE8,
+            column_no=1,
+            origin_class='',
+            difficulty=IssueDifficulty.MEDIUM,
+        ),
     ]
 
     filtered_issues = filter_duplicate_issues(issues)
 
-    assert set(filtered_issues) == {issues[0],
-                                    issues[3],
-                                    issues[4],
-                                    issues[5]}
+    assert set(filtered_issues) == {issues[0], issues[2], issues[3]}
 
 
 def test_filter_duplicate_issues_when_several_issues_in_line_no() -> None:
     issues = [
-        CodeIssue(file_path=Path('code.py'),
-                  line_no=10,
-                  description='',
-                  type=IssueType.CODE_STYLE,
-                  inspector_type=InspectorType.PYLINT,
-                  column_no=1,
-                  origin_class=''),
-        CodeIssue(file_path=Path('code.py'),
-                  line_no=10,
-                  description='',
-                  type=IssueType.CODE_STYLE,
-                  inspector_type=InspectorType.FLAKE8,
-                  column_no=1,
-                  origin_class=''),
-        CodeIssue(file_path=Path('code.py'),
-                  line_no=10,
-                  description='',
-                  type=IssueType.CODE_STYLE,
-                  inspector_type=InspectorType.FLAKE8,
-                  column_no=1,
-                  origin_class=''),
-        CodeIssue(file_path=Path('code.py'),
-                  line_no=10,
-                  description='',
-                  inspector_type=InspectorType.FLAKE8,
-                  column_no=1,
-                  origin_class='',
-                  type=IssueType.COMPLEXITY),
-        CodeIssue(file_path=Path('code.py'),
-                  line_no=10,
-                  description='',
-                  inspector_type=InspectorType.INTELLIJ,
-                  column_no=1,
-                  origin_class='',
-                  type=IssueType.COMPLEXITY),
-        CodeIssue(file_path=Path('code.py'),
-                  line_no=10,
-                  description='',
-                  inspector_type=InspectorType.INTELLIJ,
-                  column_no=1,
-                  origin_class='',
-                  type=IssueType.COMPLEXITY),
+        CodeIssue(
+            file_path=Path('code.py'),
+            line_no=10,
+            description='',
+            type=IssueType.CODE_STYLE,
+            inspector_type=InspectorType.PYLINT,
+            column_no=1,
+            origin_class='',
+            difficulty=IssueDifficulty.EASY,
+        ),
+        CodeIssue(
+            file_path=Path('code.py'),
+            line_no=10,
+            description='',
+            type=IssueType.CODE_STYLE,
+            inspector_type=InspectorType.FLAKE8,
+            column_no=1,
+            origin_class='',
+            difficulty=IssueDifficulty.EASY,
+        ),
+        CodeIssue(
+            file_path=Path('code.py'),
+            line_no=10,
+            description='',
+            type=IssueType.CODE_STYLE,
+            inspector_type=InspectorType.FLAKE8,
+            column_no=1,
+            origin_class='',
+            difficulty=IssueDifficulty.EASY,
+        ),
+        CodeIssue(
+            file_path=Path('code.py'),
+            line_no=10,
+            description='',
+            inspector_type=InspectorType.FLAKE8,
+            column_no=1,
+            origin_class='',
+            type=IssueType.COMPLEXITY,
+            difficulty=IssueDifficulty.HARD,
+        ),
     ]
 
     filtered_issues = filter_duplicate_issues(issues)
 
-    assert set(filtered_issues) == {issues[1],
-                                    issues[2],
-                                    issues[4],
-                                    issues[5]}
+    assert set(filtered_issues) == {issues[1], issues[2], issues[3]}
diff --git a/test/python/inspectors/test_flake8_inspector.py b/test/python/inspectors/test_flake8_inspector.py
index 2a2ebf26..4f3b6c2a 100644
--- a/test/python/inspectors/test_flake8_inspector.py
+++ b/test/python/inspectors/test_flake8_inspector.py
@@ -11,16 +11,16 @@
 FILE_NAMES_AND_N_ISSUES = [
     ('case0_spaces.py', 5),
     ('case1_simple_valid_program.py', 0),
-    ('case2_boolean_expressions.py', 8),
+    ('case2_boolean_expressions.py', 7),
     ('case3_redefining_builtin.py', 2),
     ('case4_naming.py', 8),
     ('case5_returns.py', 1),
     ('case6_unused_variables.py', 3),
     ('case8_good_class.py', 0),
-    ('case7_empty_lines.py', 2),
+    ('case7_empty_lines.py', 1),
     ('case10_unused_variable_in_loop.py', 1),
     ('case13_complex_logic.py', 12),
-    ('case13_complex_logic_2.py', 3),
+    ('case13_complex_logic_2.py', 2),
     ('case11_redundant_parentheses.py', 0),
     ('case14_returns_errors.py', 4),
     ('case16_comments.py', 0),
@@ -34,8 +34,8 @@
     ('case33_commas.py', 14),
     ('case34_cohesion.py', 1),
     ('case35_line_break.py', 11),
-    ('case36_unpacking.py', 3),
-    ('case37_wildcard_import.py', 7),
+    ('case36_unpacking.py', 0),
+    ('case37_wildcard_import.py', 1),
 ]
 
 
@@ -58,7 +58,7 @@ def test_file_with_issues(file_name: str, n_issues: int):
                                                     n_best_practices=4,
                                                     n_error_prone=1,
                                                     n_cc=8,
-                                                    n_other_complexity=2)),
+                                                    n_other_complexity=1)),
     ('case3_redefining_builtin.py', IssuesTestInfo(n_error_prone=2)),
     ('case4_naming.py', IssuesTestInfo(n_code_style=7, n_cc=5, n_cohesion=1)),
     ('case6_unused_variables.py', IssuesTestInfo(n_best_practices=3,
@@ -68,7 +68,7 @@ def test_file_with_issues(file_name: str, n_issues: int):
     ('case10_unused_variable_in_loop.py', IssuesTestInfo(n_best_practices=1,
                                                          n_cc=1)),
     ('case13_complex_logic.py', IssuesTestInfo(n_cc=5, n_other_complexity=10)),
-    ('case13_complex_logic_2.py', IssuesTestInfo(n_cc=2, n_other_complexity=2)),
+    ('case13_complex_logic_2.py', IssuesTestInfo(n_cc=2, n_other_complexity=1)),
     ('case14_returns_errors.py', IssuesTestInfo(n_best_practices=1,
                                                 n_error_prone=3,
                                                 n_cc=4)),
@@ -78,8 +78,8 @@ def test_file_with_issues(file_name: str, n_issues: int):
     ('case32_string_format.py', IssuesTestInfo(n_error_prone=28, n_other_complexity=6)),
     ('case33_commas.py', IssuesTestInfo(n_code_style=14, n_cc=4)),
     ('case34_cohesion.py', IssuesTestInfo(n_cc=6, n_cohesion=2)),
-    ('case36_unpacking.py', IssuesTestInfo(n_error_prone=2, n_cc=1, n_other_complexity=1)),
-    ('case37_wildcard_import.py', IssuesTestInfo(n_best_practices=1, n_error_prone=3, n_cc=2, n_other_complexity=2)),
+    ('case36_unpacking.py', IssuesTestInfo(n_cc=1)),
+    ('case37_wildcard_import.py', IssuesTestInfo(n_best_practices=1, n_cc=1)),
 ]
 
 
diff --git a/test/python/inspectors/test_local_review.py b/test/python/inspectors/test_local_review.py
index 5b182540..0d5583ee 100644
--- a/test/python/inspectors/test_local_review.py
+++ b/test/python/inspectors/test_local_review.py
@@ -4,7 +4,6 @@
 
 import pytest
 from src.python.review.application_config import ApplicationConfig
-from src.python.review.inspectors.inspector_type import InspectorType
 from src.python.review.quality.model import QualityType
 from src.python.review.reviewers.perform_review import OutputFormat, PathNotExists, perform_and_print_review
 
@@ -20,10 +19,11 @@
 @pytest.fixture
 def config() -> ApplicationConfig:
     return ApplicationConfig(
-        disabled_inspectors={InspectorType.INTELLIJ},
+        disabled_inspectors=set(),
         allow_duplicates=False,
         n_cpu=1,
         inspectors_config={"n_cpu": 1},
+        with_all_categories=False,
     )
 
 
diff --git a/test/python/inspectors/test_out_of_range_issues.py b/test/python/inspectors/test_out_of_range_issues.py
index 3f73d63d..b5751d05 100644
--- a/test/python/inspectors/test_out_of_range_issues.py
+++ b/test/python/inspectors/test_out_of_range_issues.py
@@ -1,20 +1,23 @@
 from pathlib import Path
 
 from src.python.review.inspectors.inspector_type import InspectorType
-from src.python.review.inspectors.issue import BaseIssue, CodeIssue, IssueType
+from src.python.review.inspectors.issue import BaseIssue, CodeIssue, IssueDifficulty, IssueType
 from src.python.review.reviewers.common import filter_out_of_range_issues
 
 DEFAULT_PATH = Path('test_out_of_range_issues.py')
 
 
 def create_code_issue_by_line(line_no: int) -> BaseIssue:
-    return CodeIssue(file_path=DEFAULT_PATH,
-                     line_no=line_no,
-                     description='',
-                     inspector_type=InspectorType.FLAKE8,
-                     type=IssueType.CODE_STYLE,
-                     column_no=1,
-                     origin_class='')
+    return CodeIssue(
+        file_path=DEFAULT_PATH,
+        line_no=line_no,
+        description='',
+        inspector_type=InspectorType.FLAKE8,
+        type=IssueType.CODE_STYLE,
+        column_no=1,
+        origin_class='',
+        difficulty=IssueDifficulty.EASY,
+    )
 
 
 def test_out_of_range_issues_when_no_issues() -> None:
diff --git a/test/python/inspectors/test_pmd_inspector.py b/test/python/inspectors/test_pmd_inspector.py
index 3702a79b..e4688c66 100644
--- a/test/python/inspectors/test_pmd_inspector.py
+++ b/test/python/inspectors/test_pmd_inspector.py
@@ -1,10 +1,94 @@
-from test.python.inspectors import JAVA_DATA_FOLDER
+from pathlib import Path
+from test.python.inspectors import JAVA_DATA_FOLDER, PMD_DATA_FOLDER
+from typing import List
 
 import pytest
+from src.python.review.inspectors.inspector_type import InspectorType
+from src.python.review.inspectors.issue import CodeIssue, IssueDifficulty, IssueType
 from src.python.review.inspectors.pmd.pmd import PMDInspector
 
 from .conftest import use_file_metadata
 
+FILE_NAME_AND_ISSUES = [
+    ('empty_file.csv', []),
+    ('project_without_issues.csv', []),
+    (
+        'single_file_project.csv',
+        [
+            CodeIssue(
+                origin_class='AvoidDuplicateLiterals', type=IssueType.BEST_PRACTICES,
+                description="The String literal 'Howdy' appears 4 times in this file; "
+                            "the first occurrence is on line 6",
+                file_path=Path('/home/user/Desktop/some_project/main.java'),
+                line_no=6, column_no=1, inspector_type=InspectorType.PMD,
+                difficulty=IssueDifficulty.MEDIUM,
+            ),
+            CodeIssue(
+                origin_class='UncommentedEmptyMethodBody', type=IssueType.BEST_PRACTICES,
+                description='Document empty method body',
+                file_path=Path('/home/user/Desktop/some_project/main.java'),
+                line_no=12, column_no=1, inspector_type=InspectorType.PMD,
+                difficulty=IssueDifficulty.MEDIUM,
+            ),
+            CodeIssue(
+                origin_class='UnusedLocalVariable', type=IssueType.BEST_PRACTICES,
+                description="Avoid unused local variables such as 'result'.",
+                file_path=Path('/home/user/Desktop/some_project/main.java'),
+                line_no=31, column_no=1, inspector_type=InspectorType.PMD,
+                difficulty=IssueDifficulty.MEDIUM,
+            ),
+            CodeIssue(
+                origin_class='UnusedPrivateMethod', type=IssueType.BEST_PRACTICES,
+                description="Avoid unused private methods such as 'emptyLoop()'.",
+                file_path=Path('/home/user/Desktop/some_project/main.java'),
+                line_no=61, column_no=1, inspector_type=InspectorType.PMD,
+                difficulty=IssueDifficulty.MEDIUM,
+            ),
+        ],
+    ),
+    (
+        'multi_file_project.csv',
+        [
+            CodeIssue(
+                origin_class='CompareObjectsWithEquals', type=IssueType.ERROR_PRONE,
+                description='Use equals() to compare object references.',
+                file_path=Path('/home/user/Desktop/some_project/main1.java'),
+                line_no=37, column_no=1, inspector_type=InspectorType.PMD,
+                difficulty=IssueDifficulty.HARD,
+            ),
+            CodeIssue(
+                origin_class='SuspiciousEqualsMethodName', type=IssueType.ERROR_PRONE,
+                description='The method name and parameter number are suspiciously close to equals(Object)',
+                file_path=Path('/home/user/Desktop/some_project/main1.java'),
+                line_no=68, column_no=1, inspector_type=InspectorType.PMD,
+                difficulty=IssueDifficulty.HARD,
+            ),
+            CodeIssue(
+                origin_class='UselessParentheses', type=IssueType.CODE_STYLE,
+                description='Useless parentheses.',
+                file_path=Path('/home/user/Desktop/some_project/main2.java'),
+                line_no=113, column_no=1, inspector_type=InspectorType.PMD,
+                difficulty=IssueDifficulty.EASY,
+            ),
+            CodeIssue(
+                origin_class='EmptyIfStmt', type=IssueType.BEST_PRACTICES,
+                description='Avoid empty if statements',
+                file_path=Path('/home/user/Desktop/some_project/main2.java'),
+                line_no=131, column_no=1, inspector_type=InspectorType.PMD,
+                difficulty=IssueDifficulty.MEDIUM,
+            ),
+        ],
+    ),
+]
+
+
+@pytest.mark.parametrize(('file_name', 'expected_issues'), FILE_NAME_AND_ISSUES)
+def test_output_parsing(file_name: str, expected_issues: List[CodeIssue]):
+    path_to_file = PMD_DATA_FOLDER / file_name
+    issues = PMDInspector().parse_output(path_to_file)
+    assert issues == expected_issues
+
+
 FILE_NAMES_AND_N_ISSUES = [
     ('test_algorithm_with_scanner.java', 0),
     ('test_simple_valid_program.java', 0),
@@ -12,7 +96,7 @@
     ('test_class_with_booleans.java', 3),
     ('test_closing_streams.java', 1),
     ('test_code_with_comments.java', 0),
-    ('test_comparing_strings.java', 3),
+    ('test_comparing_strings.java', 4),
     ('test_constants.java', 4),
     ('test_covariant_equals.java', 1),
     ('test_curly_braces.java', 0),
diff --git a/test/python/inspectors/test_spotbugs_inspector.py b/test/python/inspectors/test_spotbugs_inspector.py
deleted file mode 100644
index be8da3d1..00000000
--- a/test/python/inspectors/test_spotbugs_inspector.py
+++ /dev/null
@@ -1,92 +0,0 @@
-from pathlib import Path
-
-from src.python.review.inspectors.inspector_type import InspectorType
-from src.python.review.inspectors.spotbugs.spotbugs import SpotbugsInspector
-
-
-def test_parse_single_line_when_lines_range():
-    line = ('M B HE: Person defines equals and uses Object.hashCode()  '
-            'At test_when_only_equals_overridden.java:[lines 15-27]')
-
-    issue = SpotbugsInspector._parse_single_line(
-        line, {
-            'test_when_only_equals_overridden.java':
-                Path('test_when_only_equals_overridden.java')})
-
-    assert issue.origin_class == 'M B HE'
-    assert issue.file_path == Path('test_when_only_equals_overridden.java')
-    assert issue.description == 'Person defines equals and uses Object.hashCode()'
-    assert issue.line_no == 15
-    assert issue.inspector_type == InspectorType.SPOTBUGS
-
-    print(issue)
-
-
-def test_parse_single_line_when_single_line():
-    line = ('M C UwF: Unwritten field: Person.firstName  '
-            'At test_when_only_equals_overridden.java:[line 27]')
-
-    issue = SpotbugsInspector._parse_single_line(
-        line, {
-            'test_when_only_equals_overridden.java':
-                Path('test_when_only_equals_overridden.java')})
-
-    assert issue.origin_class == 'M C UwF'
-    assert issue.file_path == Path('test_when_only_equals_overridden.java')
-    assert issue.description == 'Unwritten field: Person.firstName'
-    assert issue.line_no == 27
-    assert issue.inspector_type == InspectorType.SPOTBUGS
-
-    print(issue)
-
-
-def test_parse_single_line_when_no_line():
-    line = ('M P UuF: Unused field: Person.testField  '
-            'At test_when_only_equals_overridden.java')
-
-    issue = SpotbugsInspector._parse_single_line(
-        line, {
-            'test_when_only_equals_overridden.java':
-                Path('test_when_only_equals_overridden.java')})
-
-    assert issue.origin_class == 'M P UuF'
-    assert issue.file_path == Path('test_when_only_equals_overridden.java')
-    assert issue.description == 'Unused field: Person.testField'
-    assert issue.line_no == 0
-    assert issue.inspector_type == InspectorType.SPOTBUGS
-
-    print(issue)
-
-
-def test():
-    line = ('M C NP: Read of unwritten field entity in CommandPickItem.execute()  '
-            'At hyperskill39939.java:[line 46]')
-
-    issue = SpotbugsInspector._parse_single_line(
-        line, {'hyperskill39939.java': Path('hyperskill39939.java')})
-
-    assert issue.origin_class == 'M C NP'
-    assert issue.file_path == Path('hyperskill39939.java')
-    assert issue.description == 'Read of unwritten field entity in CommandPickItem.execute()'
-    assert issue.line_no == 46
-    assert issue.inspector_type == InspectorType.SPOTBUGS
-
-    print(issue)
-
-
-def test_parse_with_filename_in_message():
-    line = ('M P UuF: Public class Main should be declared in Main.java  '
-            'In test_when_only_equals_overridden.java')
-
-    issue = SpotbugsInspector._parse_single_line(
-        line, {
-            'test_when_only_equals_overridden.java':
-                Path('test_when_only_equals_overridden.java')})
-
-    assert issue.origin_class == 'M P UuF'
-    assert issue.file_path == Path('test_when_only_equals_overridden.java')
-    assert issue.description == 'Public class Main should be declared in Main.java'
-    assert issue.line_no == 0
-    assert issue.inspector_type == InspectorType.SPOTBUGS
-
-    print(issue)
diff --git a/test/python/inspectors/test_springlint_inspector.py b/test/python/inspectors/test_springlint_inspector.py
deleted file mode 100644
index 673aa30c..00000000
--- a/test/python/inspectors/test_springlint_inspector.py
+++ /dev/null
@@ -1,67 +0,0 @@
-from test.python.inspectors import SPRING_DATA_FOLDER
-
-from src.python.review.inspectors.issue import IssueType
-from src.python.review.inspectors.springlint.springlint import SpringlintInspector
-
-
-def test_controller_with_smells():
-    inspector = SpringlintInspector()
-
-    path_to_file = SPRING_DATA_FOLDER / 'case1'
-    issues = inspector.inspect(path_to_file, {})
-
-    assert len(issues) == 8
-
-    smell_issue = next(x for x in issues if x.type == IssueType.ARCHITECTURE)
-    assert smell_issue.origin_class == 'Promiscuous Controller'
-
-    dit_issue = next(x for x in issues if x.type == IssueType.INHERITANCE_DEPTH)
-    assert dit_issue.inheritance_tree_depth == 1
-
-    noc_issue = next(x for x in issues if x.type == IssueType.CHILDREN_NUMBER)
-    assert noc_issue.children_number == 0
-
-    wmc_issue = next(x for x in issues if x.type == IssueType.WEIGHTED_METHOD)
-    assert wmc_issue.weighted_method == 12
-
-    cbo_issue = next(x for x in issues if x.type == IssueType.COUPLING)
-    assert cbo_issue.class_objects_coupling == 3
-
-    lcom_issue = next(x for x in issues if x.type == IssueType.COHESION)
-    assert lcom_issue.cohesion_lack == 66
-
-    rfc_issue = next(x for x in issues if x.type == IssueType.CLASS_RESPONSE)
-    assert rfc_issue.class_response == 0
-
-    nom_issue = next(x for x in issues if x.type == IssueType.METHOD_NUMBER)
-    assert nom_issue.method_number == 12
-
-
-def test_simple_class():
-    inspector = SpringlintInspector()
-
-    path_to_file = SPRING_DATA_FOLDER / 'case2'
-    issues = inspector.inspect(path_to_file, {})
-
-    assert len(issues) == 7
-
-    dit_issue = next(x for x in issues if x.type == IssueType.INHERITANCE_DEPTH)
-    assert dit_issue.inheritance_tree_depth == 1
-
-    noc_issue = next(x for x in issues if x.type == IssueType.CHILDREN_NUMBER)
-    assert noc_issue.children_number == 0
-
-    wmc_issue = next(x for x in issues if x.type == IssueType.WEIGHTED_METHOD)
-    assert wmc_issue.weighted_method == 8
-
-    cbo_issue = next(x for x in issues if x.type == IssueType.COUPLING)
-    assert cbo_issue.class_objects_coupling == 2
-
-    lcom_issue = next(x for x in issues if x.type == IssueType.COHESION)
-    assert lcom_issue.cohesion_lack == 22
-
-    rfc_issue = next(x for x in issues if x.type == IssueType.CLASS_RESPONSE)
-    assert rfc_issue.class_response == 2
-
-    nom_issue = next(x for x in issues if x.type == IssueType.METHOD_NUMBER)
-    assert nom_issue.method_number == 8
diff --git a/src/python/review/inspectors/intellij/__init__.py b/test/python/quality/__init__.py
similarity index 100%
rename from src/python/review/inspectors/intellij/__init__.py
rename to test/python/quality/__init__.py
diff --git a/test/python/quality/test_penalty.py b/test/python/quality/test_penalty.py
new file mode 100644
index 00000000..70717302
--- /dev/null
+++ b/test/python/quality/test_penalty.py
@@ -0,0 +1,158 @@
+from pathlib import Path
+from typing import List, Set
+
+import pytest
+from src.python.review.inspectors.inspector_type import InspectorType
+from src.python.review.inspectors.issue import BaseIssue, IssueDifficulty, IssueType
+from src.python.review.quality.penalty import categorize, PreviousIssue, Punisher
+
+punisher = Punisher([], [])
+
+CURRENT_ISSUES = [
+    BaseIssue(
+        file_path=Path(""),
+        line_no=1,
+        column_no=1,
+        description="Possibly misspelt word",
+        origin_class="SC200",
+        inspector_type=InspectorType.FLAKE8,
+        type=IssueType.BEST_PRACTICES,
+        difficulty=IssueDifficulty.MEDIUM,
+    ),
+    BaseIssue(
+        file_path=Path(""),
+        line_no=10,
+        column_no=5,
+        description="Lambda may not be necessary",
+        origin_class="W0108",
+        inspector_type=InspectorType.FLAKE8,
+        type=IssueType.CODE_STYLE,
+        difficulty=IssueDifficulty.EASY,
+    ),
+]
+
+PREVIOUS_ISSUES_CURRENT_ISSUES_EXPECTED_CLASSES = [
+    ([], [], set()),
+    ([], CURRENT_ISSUES, set()),
+    ([PreviousIssue("WPS301", 50), PreviousIssue("SC200", 10)], [], set()),
+    ([PreviousIssue("WPS301", 50), PreviousIssue("WPS412", 10)], CURRENT_ISSUES, set()),
+    ([PreviousIssue("SC200", 50), PreviousIssue("WPS412", 10)], CURRENT_ISSUES, {"SC200"}),
+    ([PreviousIssue("SC200", 50), PreviousIssue("W0108", 10)], CURRENT_ISSUES, {"SC200", "W0108"}),
+]
+
+
+@pytest.mark.parametrize(('previous_issues', 'current_issues', 'expected_penalizing_classes'),
+                         PREVIOUS_ISSUES_CURRENT_ISSUES_EXPECTED_CLASSES)
+def test_get_penalizing_classes(previous_issues: List[PreviousIssue],
+                                current_issues: List[BaseIssue],
+                                expected_penalizing_classes: Set[str]):
+    actual = punisher._get_penalizing_classes(current_issues, previous_issues)
+
+    assert actual == expected_penalizing_classes
+
+
+PREVIOUS_ISSUES_CURRENT_ISSUES_EXPECTED_CATEGORIES = [
+    ([], [], []),
+    ([], CURRENT_ISSUES, []),
+    ([PreviousIssue("WPS301", 50), PreviousIssue("WPS412", 10)], [], [None, None]),
+    ([PreviousIssue("WPS301", 50), PreviousIssue("WPS412", 10)], CURRENT_ISSUES, [None, None]),
+    ([PreviousIssue("SC200", 50), PreviousIssue("WPS312", 10)], CURRENT_ISSUES, [IssueType.BEST_PRACTICES, None]),
+    ([PreviousIssue("SC200", 50), PreviousIssue("W0108", 10)], CURRENT_ISSUES,
+     [IssueType.BEST_PRACTICES, IssueType.CODE_STYLE]),
+]
+
+
+@pytest.mark.parametrize(('previous_issues', 'current_issues', 'expected_categories'),
+                         PREVIOUS_ISSUES_CURRENT_ISSUES_EXPECTED_CATEGORIES)
+def test_categorize(previous_issues: List[PreviousIssue],
+                    current_issues: List[BaseIssue],
+                    expected_categories: List[IssueType]):
+    categorize(previous_issues, current_issues)
+
+    for issue, expected_category in zip(previous_issues, expected_categories):
+        assert issue.category == expected_category
+
+
+ISSUE_CLASS_EXPECTED_INFLUENCE = [
+    ("SC200", 63),
+    ("Q146", 0),
+]
+
+
+@pytest.mark.parametrize(('issue_class', 'expected_influence'), ISSUE_CLASS_EXPECTED_INFLUENCE)
+def test_get_issue_influence_on_penalty(issue_class: str, expected_influence: int):
+    punisher._issue_class_to_influence = {"SC200": 0.636, "WPS312": 0.1225}
+
+    actual = punisher.get_issue_influence_on_penalty(issue_class)
+
+    assert actual == expected_influence
+
+
+PENALTY_COEFFICIENT_CURRENT_ISSUES_NORMALIZED_PENALTY_COEFFICIENT = [
+    (8, [], 0),
+    (8, CURRENT_ISSUES, 0.8),
+]
+
+
+@pytest.mark.parametrize(('penalty_coefficient', 'current_issues', 'normalized_penalty_coefficient'),
+                         PENALTY_COEFFICIENT_CURRENT_ISSUES_NORMALIZED_PENALTY_COEFFICIENT)
+def test_get_normalized_penalty_coefficient(penalty_coefficient: float,
+                                            current_issues: List[BaseIssue],
+                                            normalized_penalty_coefficient):
+    punisher._penalty_coefficient = penalty_coefficient
+
+    actual = punisher._get_normalized_penalty_coefficient(current_issues)
+
+    assert actual == normalized_penalty_coefficient
+
+
+CURRENT_ISSUES_PREVIOUS_ISSUES_EXPECTED_COEFFICIENT = [
+    ([], [], 0),
+    (CURRENT_ISSUES, [], 0),
+    ([], [PreviousIssue("WPS301", 50), PreviousIssue("WPS412", 10)], 0),
+    (CURRENT_ISSUES, [PreviousIssue("WPS301", 50), PreviousIssue("WPS123", 10)], 0),
+    (CURRENT_ISSUES, [PreviousIssue("SC200", 50), PreviousIssue("WPS123", 10)], 45),
+    (CURRENT_ISSUES, [PreviousIssue("SC200", 50), PreviousIssue("W0108", 10)], 45 + 10),
+]
+
+
+@pytest.mark.parametrize(('current_issues', 'previous_issues', 'expected_coefficient'),
+                         CURRENT_ISSUES_PREVIOUS_ISSUES_EXPECTED_COEFFICIENT)
+def test_get_penalty_coefficient(current_issues: List[BaseIssue],
+                                 previous_issues: List[PreviousIssue],
+                                 expected_coefficient: float):
+    categorize(previous_issues, current_issues)
+    actual = punisher._get_penalty_coefficient(current_issues, previous_issues)
+
+    assert actual == expected_coefficient
+
+
+CURRENT_ISSUES_PREVIOUS_ISSUES_ISSUE_CLASS_EXPECTED_INFLUENCE = [
+    ([], [], 'WPS312', 0),
+    (CURRENT_ISSUES, [], 'WPS312', 0),
+    (CURRENT_ISSUES, [], 'SC200', 0),
+    ([], [PreviousIssue("WPS301", 50), PreviousIssue("WPS412", 10)], 'WPS312', 0),
+    ([], [PreviousIssue("WPS301", 50), PreviousIssue("WPS412", 10)], 'WPS301', 0),
+    (CURRENT_ISSUES, [PreviousIssue("WPS301", 50), PreviousIssue("WPS412", 10)], 'WPS312', 0),
+    (CURRENT_ISSUES, [PreviousIssue("WPS301", 50), PreviousIssue("WPS412", 10)], 'WPS301', 0),
+    (CURRENT_ISSUES, [PreviousIssue("WPS301", 50), PreviousIssue("WPS412", 10)], 'SC200', 0),
+    (CURRENT_ISSUES, [PreviousIssue("SC200", 50), PreviousIssue("WPS412", 10)], 'WPS301', 0),
+    (CURRENT_ISSUES, [PreviousIssue("SC200", 50), PreviousIssue("WPS412", 10)], 'SC200', 100),
+    (CURRENT_ISSUES, [PreviousIssue("SC200", 50), PreviousIssue("WPS412", 10)], 'WPS412', 0),
+    (CURRENT_ISSUES, [PreviousIssue("SC200", 50), PreviousIssue("W0108", 10)], 'WPS301', 0),
+    (CURRENT_ISSUES, [PreviousIssue("SC200", 50), PreviousIssue("W0108", 10)], 'SC200', 81),
+    (CURRENT_ISSUES, [PreviousIssue("SC200", 50), PreviousIssue("W0108", 10)], 'W0108', 18),
+]
+
+
+@pytest.mark.parametrize(('current_issues', 'previous_issues', 'issue_class', 'expected_influence'),
+                         CURRENT_ISSUES_PREVIOUS_ISSUES_ISSUE_CLASS_EXPECTED_INFLUENCE)
+def test_get_issue_class_to_influence(current_issues: List[BaseIssue],
+                                      previous_issues: List[PreviousIssue],
+                                      issue_class: str,
+                                      expected_influence: int):
+    categorize(previous_issues, current_issues)
+    punisher = Punisher(current_issues, previous_issues)
+    actual = punisher.get_issue_influence_on_penalty(issue_class)
+
+    assert actual == expected_influence
diff --git a/test/resources/functional_tests/difficulty_levels/file_with_all_difficulty_levels.py b/test/resources/functional_tests/difficulty_levels/file_with_all_difficulty_levels.py
new file mode 100644
index 00000000..5a2b0659
--- /dev/null
+++ b/test/resources/functional_tests/difficulty_levels/file_with_all_difficulty_levels.py
@@ -0,0 +1,24 @@
+from math import sqrt
+
+MUTABLE_CONSTANT = {"1": 1, "2": 2}
+
+class BadClass:
+    def __init__(self, x: int, y: int):
+        self.x = x
+        self.y = y
+
+    @staticmethod
+    def Length(x: int, y: int) -> float:
+        return sqrt(x ** 2 + y ** 2)
+
+    @staticmethod
+    def dot(self_x: int, self_y: int, other_x: int, other_y: int) -> int:
+        return self_x * other_x + self_y * other_y
+
+    @staticmethod
+    def plus(self_x: int, self_y: int, other_x: int, other_y: int) -> 'BadClass':
+        return BadClass(self_x + other_x, self_y + other_y)
+
+    @staticmethod
+    def minus(self_x: int, self_y: int, other_x: int, other_y: int) -> 'BadClass':
+        return BadClass(self_x - other_x, self_y - other_y)
\ No newline at end of file
diff --git a/test/resources/functional_tests/difficulty_levels/file_with_only_easy_issues.py b/test/resources/functional_tests/difficulty_levels/file_with_only_easy_issues.py
new file mode 100644
index 00000000..0358a23e
--- /dev/null
+++ b/test/resources/functional_tests/difficulty_levels/file_with_only_easy_issues.py
@@ -0,0 +1,12 @@
+def MAIN(Number):
+    if Number > 0:
+        return Number
+
+    return 0
+
+
+if __name__ == "__main__":
+    print(
+      "Hello, World")
+
+    MAIN(0)
diff --git a/test/resources/functional_tests/difficulty_levels/file_with_only_hard_issues.py b/test/resources/functional_tests/difficulty_levels/file_with_only_hard_issues.py
new file mode 100644
index 00000000..c63a944d
--- /dev/null
+++ b/test/resources/functional_tests/difficulty_levels/file_with_only_hard_issues.py
@@ -0,0 +1,27 @@
+from math import sqrt
+
+
+class BadClass:
+    def __init__(self, x: int, y: int):
+        self.x = x
+        self.y = y
+
+    @staticmethod
+    def length(x: int, y: int) -> float:
+        return sqrt(x ** 2 + y ** 2)
+
+    @staticmethod
+    def dot(self_x: int, self_y: int, other_x: int, other_y: int) -> int:
+        return self_x * other_x + self_y * other_y
+
+    @staticmethod
+    def plus(self_x: int, self_y: int, other_x: int, other_y: int) -> 'BadClass':
+        return BadClass(self_x + other_x, self_y + other_y)
+
+    @staticmethod
+    def minus(self_x: int, self_y: int, other_x: int, other_y: int) -> 'BadClass':
+        return BadClass(self_x - other_x, self_y - other_y)
+
+
+if __name__ == "__main__":
+    print("Hello, World!")
diff --git a/test/resources/functional_tests/difficulty_levels/file_with_only_medium_issues.py b/test/resources/functional_tests/difficulty_levels/file_with_only_medium_issues.py
new file mode 100644
index 00000000..7e160cc5
--- /dev/null
+++ b/test/resources/functional_tests/difficulty_levels/file_with_only_medium_issues.py
@@ -0,0 +1,27 @@
+MUTABLE_CONSTANT = {"1": 1, "2": 2}
+
+PI = 3.14
+DOUBLE_PI = 6.28
+E = 2.71
+
+
+def function_with_bad_try(b, c):
+    result = None
+
+    try:
+        result = b / c
+    except Exception:
+        print("It's fine")
+
+    return result
+
+
+def bad_generator(some_value):
+    if some_value:
+        raise StopIteration
+    yield 1
+
+
+if __name__ == "__main__":
+
+    print("Hello, World!")
diff --git a/test/resources/functional_tests/difficulty_levels/file_without_issues.py b/test/resources/functional_tests/difficulty_levels/file_without_issues.py
new file mode 100644
index 00000000..34bc455b
--- /dev/null
+++ b/test/resources/functional_tests/difficulty_levels/file_without_issues.py
@@ -0,0 +1,2 @@
+if __name__ == '__main__':
+    print("Hello, world")
\ No newline at end of file
diff --git a/test/resources/functional_tests/json_format/code_with_issues.py b/test/resources/functional_tests/json_format/code_with_issues.py
deleted file mode 100644
index ff6359b1..00000000
--- a/test/resources/functional_tests/json_format/code_with_issues.py
+++ /dev/null
@@ -1,7 +0,0 @@
-a, b, c = (input(),input(),input())
-print(f'{a} {b} {c}')
-
-print('1', '2', '3', sep = '|')
-
-result = int(a)+10
-print(result)
\ No newline at end of file
diff --git a/src/python/review/inspectors/spotbugs/__init__.py b/test/resources/inspectors/checkstyle/empty_file.xml
similarity index 100%
rename from src/python/review/inspectors/spotbugs/__init__.py
rename to test/resources/inspectors/checkstyle/empty_file.xml
diff --git a/test/resources/inspectors/checkstyle/multi_file_project_with_metric_issues.xml b/test/resources/inspectors/checkstyle/multi_file_project_with_metric_issues.xml
new file mode 100644
index 00000000..df3e577d
--- /dev/null
+++ b/test/resources/inspectors/checkstyle/multi_file_project_with_metric_issues.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<checkstyle version="8.44">
+    <file name="/home/user/Desktop/some_project/main1.java">
+        <error line="69" column="31" severity="error" message="Only one statement per line allowed."
+               source="com.puppycrawl.tools.checkstyle.checks.coding.OneStatementPerLineCheck"/>
+        <error line="112" column="9" severity="error" message="Boolean expression complexity is 77 (max allowed is 0)."
+               source="com.puppycrawl.tools.checkstyle.checks.metrics.BooleanExpressionComplexityCheck"/>
+    </file>
+    <file name="/home/user/Desktop/some_project/main2.java">
+        <error line="62" severity="error" message="Line is longer than 120 characters (found 228)."
+               source="com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck"/>
+        <error line="136" column="19" severity="error" message="',' is not followed by whitespace."
+               source="com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAfterCheck"/>
+    </file>
+</checkstyle>
diff --git a/test/resources/inspectors/checkstyle/multi_file_project_without_issues.xml b/test/resources/inspectors/checkstyle/multi_file_project_without_issues.xml
new file mode 100644
index 00000000..4af12849
--- /dev/null
+++ b/test/resources/inspectors/checkstyle/multi_file_project_without_issues.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<checkstyle version="8.44">
+    <file name="/home/user/Desktop/some_project/main1.java"></file>
+    <file name="/home/user/Desktop/some_project/main2.java"></file>
+    <file name="/home/user/Desktop/some_project/main3.java"></file>
+    <file name="/home/user/Desktop/some_project/main4.java"></file>
+    <file name="/home/user/Desktop/some_project/main5.java"></file>
+    <file name="/home/user/Desktop/some_project/main6.java"></file>
+</checkstyle>
diff --git a/test/resources/inspectors/checkstyle/multi_file_project_without_metric_issues.xml b/test/resources/inspectors/checkstyle/multi_file_project_without_metric_issues.xml
new file mode 100644
index 00000000..ff8f3ed4
--- /dev/null
+++ b/test/resources/inspectors/checkstyle/multi_file_project_without_metric_issues.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<checkstyle version="8.44">
+    <file name="/home/user/Desktop/some_project/main1.java">
+        <error line="62" column="38" severity="error" message="Must have at least one statement."
+               source="com.puppycrawl.tools.checkstyle.checks.blocks.EmptyBlockCheck"/>
+        <error line="68" column="20" severity="error"
+               message="covariant equals without overriding equals(java.lang.Object)."
+               source="com.puppycrawl.tools.checkstyle.checks.coding.CovariantEqualsCheck"/>
+    </file>
+    <file name="/home/user/Desktop/some_project/main2.java">
+        <error line="116" column="3" severity="error"
+               message="'if' child has incorrect indentation level 2, expected level should be 12."
+               source="com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck"/>
+        <error line="123" column="15" severity="error" message="Should use uppercase 'L'."
+               source="com.puppycrawl.tools.checkstyle.checks.UpperEllCheck"/>
+    </file>
+</checkstyle>
diff --git a/test/resources/inspectors/checkstyle/single_file_project_with_metric_issues.xml b/test/resources/inspectors/checkstyle/single_file_project_with_metric_issues.xml
new file mode 100644
index 00000000..598cf159
--- /dev/null
+++ b/test/resources/inspectors/checkstyle/single_file_project_with_metric_issues.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<checkstyle version="8.44">
+    <file name="/home/user/Desktop/some_project/main.java">
+        <error line="5" column="5" severity="error" message="NCSS for this method is 42 (max allowed is 0)."
+               source="com.puppycrawl.tools.checkstyle.checks.metrics.JavaNCSSCheck"/>
+        <error line="5" column="5" severity="error" message="Cyclomatic Complexity is 69 (max allowed is 0)."
+               source="com.puppycrawl.tools.checkstyle.checks.metrics.CyclomaticComplexityCheck"/>
+        <error line="31" column="25" severity="error" message="&apos;switch&apos; is not followed by whitespace."
+               source="com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAroundCheck"/>
+    </file>
+</checkstyle>
diff --git a/test/resources/inspectors/checkstyle/single_file_project_without_issues.xml b/test/resources/inspectors/checkstyle/single_file_project_without_issues.xml
new file mode 100644
index 00000000..60219b74
--- /dev/null
+++ b/test/resources/inspectors/checkstyle/single_file_project_without_issues.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<checkstyle version="8.44">
+    <file name="/home/user/Desktop/some_project/main.java"></file>
+</checkstyle>
diff --git a/test/resources/inspectors/checkstyle/single_file_project_without_metric_issues.xml b/test/resources/inspectors/checkstyle/single_file_project_without_metric_issues.xml
new file mode 100644
index 00000000..121bbd22
--- /dev/null
+++ b/test/resources/inspectors/checkstyle/single_file_project_without_metric_issues.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<checkstyle version="8.44">
+    <file name="/home/user/Desktop/some_project/main.java">
+        <error line="6" column="13" severity="error" message="The String &quot;Howdy&quot; appears 4 times in the file."
+               source="com.puppycrawl.tools.checkstyle.checks.coding.MultipleStringLiteralsCheck"/>
+        <error line="12" column="32" severity="error" message="&apos;{&apos; is not followed by whitespace."
+               source="com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAroundCheck"/>
+        <error line="37" column="33" severity="error"
+               message="Literal Strings should be compared using equals(), not &apos;==&apos;."
+               source="com.puppycrawl.tools.checkstyle.checks.coding.StringLiteralEqualityCheck"/>
+    </file>
+</checkstyle>
diff --git a/src/python/review/inspectors/springlint/__init__.py b/test/resources/inspectors/pmd/empty_file.csv
similarity index 100%
rename from src/python/review/inspectors/springlint/__init__.py
rename to test/resources/inspectors/pmd/empty_file.csv
diff --git a/test/resources/inspectors/pmd/multi_file_project.csv b/test/resources/inspectors/pmd/multi_file_project.csv
new file mode 100644
index 00000000..bba8268c
--- /dev/null
+++ b/test/resources/inspectors/pmd/multi_file_project.csv
@@ -0,0 +1,5 @@
+"Problem","Package","File","Priority","Line","Description","Rule set","Rule"
+"1","","/home/user/Desktop/some_project/main1.java","3","37","Use equals() to compare object references.","Error Prone","CompareObjectsWithEquals"
+"2","","/home/user/Desktop/some_project/main1.java","2","68","The method name and parameter number are suspiciously close to equals(Object)","Error Prone","SuspiciousEqualsMethodName"
+"3","","/home/user/Desktop/some_project/main2.java","4","113","Useless parentheses.","Code Style","UselessParentheses"
+"4","","/home/user/Desktop/some_project/main2.java","3","131","Avoid empty if statements","Error Prone","EmptyIfStmt"
diff --git a/test/resources/inspectors/pmd/project_without_issues.csv b/test/resources/inspectors/pmd/project_without_issues.csv
new file mode 100644
index 00000000..0a5f43af
--- /dev/null
+++ b/test/resources/inspectors/pmd/project_without_issues.csv
@@ -0,0 +1,1 @@
+"Problem","Package","File","Priority","Line","Description","Rule set","Rule"
diff --git a/test/resources/inspectors/pmd/single_file_project.csv b/test/resources/inspectors/pmd/single_file_project.csv
new file mode 100644
index 00000000..78d15d72
--- /dev/null
+++ b/test/resources/inspectors/pmd/single_file_project.csv
@@ -0,0 +1,5 @@
+"Problem","Package","File","Priority","Line","Description","Rule set","Rule"
+"1","","/home/user/Desktop/some_project/main.java","3","6","The String literal 'Howdy' appears 4 times in this file; the first occurrence is on line 6","Error Prone","AvoidDuplicateLiterals"
+"2","","/home/user/Desktop/some_project/main.java","3","12","Document empty method body","Documentation","UncommentedEmptyMethodBody"
+"3","","/home/user/Desktop/some_project/main.java","3","31","Avoid unused local variables such as 'result'.","Best Practices","UnusedLocalVariable"
+"4","","/home/user/Desktop/some_project/main.java","3","61","Avoid unused private methods such as 'emptyLoop()'.","Best Practices","UnusedPrivateMethod"
\ No newline at end of file
diff --git a/test/resources/inspectors/python/case31_line_break.py b/test/resources/inspectors/python/case31_line_break.py
new file mode 100644
index 00000000..ba718ea8
--- /dev/null
+++ b/test/resources/inspectors/python/case31_line_break.py
@@ -0,0 +1,54 @@
+# Wrong
+from math import exp, \
+    log
+
+# Correct
+from math import (
+    sin,
+    cos,
+)
+
+
+# Wrong
+def do_something_wrong(x: float, y: float):
+    if sin(x) == cos(y) \
+            and exp(x) == log(y):
+        print("Do not do that!")
+
+
+print(do_something_wrong(1, 2))
+
+# Wrong
+wrong_string = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. " \
+               + "Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, " \
+               + "nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. " \
+               + "Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, " \
+               + "vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. " \
+               + "Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. " \
+               + "Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, " \
+               + "porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, " \
+               + "viverra quis, feugiat a,"
+print(wrong_string)
+
+# Correct
+correct_string = ("Lorem ipsum dolor sit amet, consectetuer adipiscing elit. "
+                  + "Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis "
+                  + "parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, "
+                  + "pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, "
+                  + "aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, "
+                  + "venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. "
+                  + "Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. "
+                  + "Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. "
+                  + "Aliquam lorem ante, dapibus in, viverra quis, feugiat a,"
+                  )
+print(correct_string)
+
+other_correct_string = """
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec euismod vitae libero ut consequat. 
+    Fusce quis ultrices sem, vitae viverra mi. Praesent fermentum quam ac volutpat condimentum. 
+    Proin mauris orci, molestie vel fermentum vel, consectetur vel metus. Quisque vitae mollis magna. 
+    In hac habitasse platea dictumst. Pellentesque sed diam eget dolor ultricies faucibus id sed quam. 
+    Nam risus erat, varius ut risus a, tincidunt vulputate magna. Etiam lacinia a eros non faucibus. 
+    In facilisis tempor nisl, sit amet feugiat lacus viverra quis.
+"""
+print(other_correct_string)
diff --git a/test/resources/inspectors/python/case37_wildcard_import.py b/test/resources/inspectors/python/case37_wildcard_import.py
index ed12a4b1..235cb852 100644
--- a/test/resources/inspectors/python/case37_wildcard_import.py
+++ b/test/resources/inspectors/python/case37_wildcard_import.py
@@ -1,33 +1,8 @@
-from numpy import *
+from math import *
 
-n, m = [int(_) for _ in input().split()]
-mat = zeros((n, m))
-s = 1
-for j in range(n):
-    for i in range(j, m - j):
-        if s > n * m:
-            break
-        mat[j][i] = s
-        s += 1
 
-    for i in range(j - n + 1, -j):
-        if s > n * m:
-            break
-        mat[i][-j - 1] = s
-        s += 1
-    for i in range(-j - 2, -m + j - 1, -1):
-        if s > n * m:
-            break
-        mat[-j - 1][i] = s
-        s += 1
-
-    for i in range(-2 - j, -n + j, -1):
-        if s > n * m:
-            break
-        mat[i][j] = s
-        s += 1
-
-for r in range(n):
-    for c in range(m):
-        print(str(int(mat[r][c])).ljust(2), end=' ')
-    print()
+def quick_reversed_sqrt(number):
+    """
+    It's quick. Trust me.
+    """
+    return 1 / sqrt(number)