From 6beeb5618cf06af6e9ad1348f1db1da2f3b41c74 Mon Sep 17 00:00:00 2001 From: Filipe Esperandio Date: Tue, 10 Oct 2017 08:07:23 -0400 Subject: [PATCH 1/5] Extreme make over (#17) Restructures the project using sonar's code as dependency libs, overriding what is needed. --- .gitignore | 12 +- .travis.yml | 26 -- Dockerfile | 60 +-- Makefile | 9 + appveyor.ps1 | 155 ------- appveyor.yml | 21 - assembly.xml | 46 -- bin/codeclimate-sonar | 16 + build.gradle | 51 +++ circle.yml | 6 +- cix.sh | 21 - fixtures/java_lib/main/java/Library.java | 28 ++ fixtures/java_lib/test/java/LibraryTest.java | 12 + it/.gitignore | 1 - it/pom.xml | 83 ---- it/projects/java-no-issues/src/test/Java.txt | 1 - it/projects/java-sample/src/basic/Hello.java | 9 - it/projects/java-sample/src/basic/World.java | 8 - .../multi-language/src/main/java/Hello.java | 2 - .../multi-language/src/main/js/Hello.js | 3 - it/projects/no-files/placeholder.txt | 0 .../it/sonarlint/cli/ConnectedModeTest.java | 103 ----- .../java/it/sonarlint/cli/LanguageTest.java | 105 ----- .../java/it/sonarlint/cli/SonarlintTest.java | 81 ---- .../sonarlint/cli/tools/CommandExecutor.java | 115 ----- .../it/sonarlint/cli/tools/SonarlintCli.java | 136 ------ .../cli/tools/SonarlintInstaller.java | 128 ------ it/src/test/resources/java-sonarlint.xml | 20 - misc/symlink-tester.sh | 59 --- pom.xml | 241 ----------- settings.gradle | 18 + src/main/assembly/bin/sonarlint | 66 --- src/main/assembly/bin/sonarlint.bat | 98 ----- src/main/java/cc/App.java | 9 + src/main/java/cc/JsonReport.java | 84 ++++ .../java/org/sonarlint/cli/CustomMain.java | 105 +++++ .../org/sonarlint/cli/InputFileFinder.java | 168 -------- src/main/java/org/sonarlint/cli/Main.java | 223 ---------- src/main/java/org/sonarlint/cli/Options.java | 199 --------- .../org/sonarlint/cli/SonarProperties.java | 35 -- src/main/java/org/sonarlint/cli/Stats.java | 60 --- .../cli/analysis/ConnectedSonarLint.java | 228 ---------- .../cli/analysis/DefaultLogOutput.java | 53 --- .../cli/analysis/IssueCollector.java | 39 -- .../org/sonarlint/cli/analysis/SonarLint.java | 75 ---- .../cli/analysis/SonarLintFactory.java | 166 -------- .../cli/analysis/StandaloneSonarLint.java | 65 --- .../sonarlint/cli/analysis/package-info.java | 23 - .../cli/config/ConfigurationReader.java | 102 ----- .../cli/config/GlobalConfiguration.java | 33 -- .../cli/config/ProjectConfiguration.java | 37 -- .../sonarlint/cli/config/SonarQubeServer.java | 48 --- .../sonarlint/cli/config/package-info.java | 23 - .../java/org/sonarlint/cli/package-info.java | 23 - .../sonarlint/cli/report/CategoryReport.java | 61 --- .../cli/report/CategoryReportComparator.java | 63 --- .../sonarlint/cli/report/ConsoleReport.java | 150 ------- .../org/sonarlint/cli/report/HtmlReport.java | 159 ------- .../sonarlint/cli/report/IssueCategory.java | 86 ---- .../sonarlint/cli/report/IssueVariation.java | 100 ----- .../sonarlint/cli/report/IssuesReport.java | 263 ------------ .../org/sonarlint/cli/report/JsonReport.java | 106 ----- .../sonarlint/cli/report/ReportFactory.java | 75 ---- .../sonarlint/cli/report/ReportSummary.java | 82 ---- .../org/sonarlint/cli/report/Reporter.java | 32 -- .../sonarlint/cli/report/ResourceReport.java | 136 ------ .../org/sonarlint/cli/report/RichIssue.java | 35 -- .../org/sonarlint/cli/report/Severity.java | 51 --- .../sonarlint/cli/report/package-info.java | 23 - .../cli/report/source/CharactersReader.java | 67 --- .../report/source/DecorationDataHolder.java | 83 ---- .../report/source/HtmlSourceDecorator.java | 44 -- .../cli/report/source/HtmlTextDecorator.java | 133 ------ .../cli/report/source/OpeningHtmlTag.java | 40 -- .../cli/report/source/package-info.java | 23 - .../org/sonarlint/cli/util/HtmlEntities.java | 225 ---------- .../org/sonarlint/cli/util/MutableInt.java | 61 --- .../java/org/sonarlint/cli/util/System2.java | 117 ----- .../org/sonarlint/cli/util/SystemInfo.java | 79 ---- .../java/org/sonarlint/cli/util/Util.java | 49 --- .../org/sonarlint/cli/util/package-info.java | 23 - .../sonarlint/cli/report/sonarlintreport.ftl | 349 --------------- .../cli/report/sonarlintreport_files/DIR.png | Bin 390 -> 0 bytes .../cli/report/sonarlintreport_files/FIL.png | Bin 416 -> 0 bytes .../cli/report/sonarlintreport_files/PRJ.png | Bin 575 -> 0 bytes .../report/sonarlintreport_files/favicon.ico | Bin 5430 -> 0 bytes .../sonarlintreport_files/jquery.min.js | 6 - .../cli/report/sonarlintreport_files/rule.css | 64 --- .../report/sonarlintreport_files/sep12.png | Bin 118 -> 0 bytes .../report/sonarlintreport_files/sonar.css | 400 ------------------ .../report/sonarlintreport_files/sonar.eot | Bin 6468 -> 0 bytes .../report/sonarlintreport_files/sonar.svg | 33 -- .../report/sonarlintreport_files/sonar.ttf | Bin 6312 -> 0 bytes .../report/sonarlintreport_files/sonar.woff | Bin 6904 -> 0 bytes .../sonarlintreport_files/sonarlint.png | Bin 1584 -> 0 bytes src/test/java/cc/SanityCheckTest.java | 53 +++ src/test/java/cc/Shell.java | 44 ++ .../sonarlint/cli/InputFileFinderTest.java | 228 ---------- src/test/java/org/sonarlint/cli/MainTest.java | 222 ---------- .../java/org/sonarlint/cli/OptionsTest.java | 146 ------- .../java/org/sonarlint/cli/StatsTest.java | 60 --- .../java/org/sonarlint/cli/TestUtils.java | 40 -- .../cli/analysis/ConnectedSonarLintTest.java | 367 ---------------- .../cli/analysis/IssueCollectorTest.java | 39 -- .../cli/analysis/SonarLintFactoryTest.java | 215 ---------- .../cli/analysis/StandaloneSonarLintTest.java | 98 ----- .../cli/config/ConfigurationReaderTest.java | 160 ------- .../cli/report/CategoryReportTest.java | 48 --- .../cli/report/ConsoleReportTest.java | 148 ------- .../sonarlint/cli/report/HtmlReportTest.java | 109 ----- .../cli/report/IssueCategoryTest.java | 44 -- .../cli/report/IssueVariationTest.java | 68 --- .../cli/report/IssuesReportTest.java | 161 ------- .../cli/report/ReportFactoryTest.java | 63 --- .../cli/report/ReportSummaryTest.java | 79 ---- .../cli/report/ResourceReportTest.java | 127 ------ .../org/sonarlint/cli/util/LoggerTest.java | 113 ----- .../sonarlint/cli/util/MutableIntTest.java | 63 --- .../org/sonarlint/cli/util/System2Test.java | 46 -- .../sonarlint/cli/util/SystemInfoTest.java | 90 ---- .../java/org/sonarlint/cli/util/UtilTest.java | 34 -- .../cli/config/sonarlint_global.json | 10 - .../cli/config/sonarlint_project.json | 4 - third-party-licenses.sh | 4 - travis.sh | 13 - 125 files changed, 473 insertions(+), 9179 deletions(-) delete mode 100644 .travis.yml create mode 100644 Makefile delete mode 100644 appveyor.ps1 delete mode 100644 appveyor.yml delete mode 100644 assembly.xml create mode 100755 bin/codeclimate-sonar create mode 100644 build.gradle delete mode 100755 cix.sh create mode 100644 fixtures/java_lib/main/java/Library.java create mode 100644 fixtures/java_lib/test/java/LibraryTest.java delete mode 100644 it/.gitignore delete mode 100644 it/pom.xml delete mode 100644 it/projects/java-no-issues/src/test/Java.txt delete mode 100644 it/projects/java-sample/src/basic/Hello.java delete mode 100644 it/projects/java-sample/src/basic/World.java delete mode 100644 it/projects/multi-language/src/main/java/Hello.java delete mode 100644 it/projects/multi-language/src/main/js/Hello.js delete mode 100644 it/projects/no-files/placeholder.txt delete mode 100644 it/src/test/java/it/sonarlint/cli/ConnectedModeTest.java delete mode 100644 it/src/test/java/it/sonarlint/cli/LanguageTest.java delete mode 100644 it/src/test/java/it/sonarlint/cli/SonarlintTest.java delete mode 100644 it/src/test/java/it/sonarlint/cli/tools/CommandExecutor.java delete mode 100644 it/src/test/java/it/sonarlint/cli/tools/SonarlintCli.java delete mode 100644 it/src/test/java/it/sonarlint/cli/tools/SonarlintInstaller.java delete mode 100644 it/src/test/resources/java-sonarlint.xml delete mode 100755 misc/symlink-tester.sh delete mode 100644 pom.xml create mode 100644 settings.gradle delete mode 100755 src/main/assembly/bin/sonarlint delete mode 100644 src/main/assembly/bin/sonarlint.bat create mode 100644 src/main/java/cc/App.java create mode 100644 src/main/java/cc/JsonReport.java create mode 100644 src/main/java/org/sonarlint/cli/CustomMain.java delete mode 100644 src/main/java/org/sonarlint/cli/InputFileFinder.java delete mode 100644 src/main/java/org/sonarlint/cli/Main.java delete mode 100644 src/main/java/org/sonarlint/cli/Options.java delete mode 100644 src/main/java/org/sonarlint/cli/SonarProperties.java delete mode 100644 src/main/java/org/sonarlint/cli/Stats.java delete mode 100644 src/main/java/org/sonarlint/cli/analysis/ConnectedSonarLint.java delete mode 100644 src/main/java/org/sonarlint/cli/analysis/DefaultLogOutput.java delete mode 100644 src/main/java/org/sonarlint/cli/analysis/IssueCollector.java delete mode 100644 src/main/java/org/sonarlint/cli/analysis/SonarLint.java delete mode 100644 src/main/java/org/sonarlint/cli/analysis/SonarLintFactory.java delete mode 100644 src/main/java/org/sonarlint/cli/analysis/StandaloneSonarLint.java delete mode 100644 src/main/java/org/sonarlint/cli/analysis/package-info.java delete mode 100644 src/main/java/org/sonarlint/cli/config/ConfigurationReader.java delete mode 100644 src/main/java/org/sonarlint/cli/config/GlobalConfiguration.java delete mode 100644 src/main/java/org/sonarlint/cli/config/ProjectConfiguration.java delete mode 100644 src/main/java/org/sonarlint/cli/config/SonarQubeServer.java delete mode 100644 src/main/java/org/sonarlint/cli/config/package-info.java delete mode 100644 src/main/java/org/sonarlint/cli/package-info.java delete mode 100644 src/main/java/org/sonarlint/cli/report/CategoryReport.java delete mode 100644 src/main/java/org/sonarlint/cli/report/CategoryReportComparator.java delete mode 100644 src/main/java/org/sonarlint/cli/report/ConsoleReport.java delete mode 100644 src/main/java/org/sonarlint/cli/report/HtmlReport.java delete mode 100644 src/main/java/org/sonarlint/cli/report/IssueCategory.java delete mode 100644 src/main/java/org/sonarlint/cli/report/IssueVariation.java delete mode 100644 src/main/java/org/sonarlint/cli/report/IssuesReport.java delete mode 100644 src/main/java/org/sonarlint/cli/report/JsonReport.java delete mode 100644 src/main/java/org/sonarlint/cli/report/ReportFactory.java delete mode 100644 src/main/java/org/sonarlint/cli/report/ReportSummary.java delete mode 100644 src/main/java/org/sonarlint/cli/report/Reporter.java delete mode 100644 src/main/java/org/sonarlint/cli/report/ResourceReport.java delete mode 100644 src/main/java/org/sonarlint/cli/report/RichIssue.java delete mode 100644 src/main/java/org/sonarlint/cli/report/Severity.java delete mode 100644 src/main/java/org/sonarlint/cli/report/package-info.java delete mode 100644 src/main/java/org/sonarlint/cli/report/source/CharactersReader.java delete mode 100644 src/main/java/org/sonarlint/cli/report/source/DecorationDataHolder.java delete mode 100644 src/main/java/org/sonarlint/cli/report/source/HtmlSourceDecorator.java delete mode 100644 src/main/java/org/sonarlint/cli/report/source/HtmlTextDecorator.java delete mode 100644 src/main/java/org/sonarlint/cli/report/source/OpeningHtmlTag.java delete mode 100644 src/main/java/org/sonarlint/cli/report/source/package-info.java delete mode 100644 src/main/java/org/sonarlint/cli/util/HtmlEntities.java delete mode 100644 src/main/java/org/sonarlint/cli/util/MutableInt.java delete mode 100644 src/main/java/org/sonarlint/cli/util/System2.java delete mode 100644 src/main/java/org/sonarlint/cli/util/SystemInfo.java delete mode 100644 src/main/java/org/sonarlint/cli/util/Util.java delete mode 100644 src/main/java/org/sonarlint/cli/util/package-info.java delete mode 100644 src/main/resources/org/sonarlint/cli/report/sonarlintreport.ftl delete mode 100644 src/main/resources/org/sonarlint/cli/report/sonarlintreport_files/DIR.png delete mode 100644 src/main/resources/org/sonarlint/cli/report/sonarlintreport_files/FIL.png delete mode 100644 src/main/resources/org/sonarlint/cli/report/sonarlintreport_files/PRJ.png delete mode 100644 src/main/resources/org/sonarlint/cli/report/sonarlintreport_files/favicon.ico delete mode 100644 src/main/resources/org/sonarlint/cli/report/sonarlintreport_files/jquery.min.js delete mode 100644 src/main/resources/org/sonarlint/cli/report/sonarlintreport_files/rule.css delete mode 100644 src/main/resources/org/sonarlint/cli/report/sonarlintreport_files/sep12.png delete mode 100644 src/main/resources/org/sonarlint/cli/report/sonarlintreport_files/sonar.css delete mode 100755 src/main/resources/org/sonarlint/cli/report/sonarlintreport_files/sonar.eot delete mode 100755 src/main/resources/org/sonarlint/cli/report/sonarlintreport_files/sonar.svg delete mode 100755 src/main/resources/org/sonarlint/cli/report/sonarlintreport_files/sonar.ttf delete mode 100755 src/main/resources/org/sonarlint/cli/report/sonarlintreport_files/sonar.woff delete mode 100644 src/main/resources/org/sonarlint/cli/report/sonarlintreport_files/sonarlint.png create mode 100644 src/test/java/cc/SanityCheckTest.java create mode 100644 src/test/java/cc/Shell.java delete mode 100644 src/test/java/org/sonarlint/cli/InputFileFinderTest.java delete mode 100644 src/test/java/org/sonarlint/cli/MainTest.java delete mode 100644 src/test/java/org/sonarlint/cli/OptionsTest.java delete mode 100644 src/test/java/org/sonarlint/cli/StatsTest.java delete mode 100644 src/test/java/org/sonarlint/cli/TestUtils.java delete mode 100644 src/test/java/org/sonarlint/cli/analysis/ConnectedSonarLintTest.java delete mode 100644 src/test/java/org/sonarlint/cli/analysis/IssueCollectorTest.java delete mode 100644 src/test/java/org/sonarlint/cli/analysis/SonarLintFactoryTest.java delete mode 100644 src/test/java/org/sonarlint/cli/analysis/StandaloneSonarLintTest.java delete mode 100644 src/test/java/org/sonarlint/cli/config/ConfigurationReaderTest.java delete mode 100644 src/test/java/org/sonarlint/cli/report/CategoryReportTest.java delete mode 100644 src/test/java/org/sonarlint/cli/report/ConsoleReportTest.java delete mode 100644 src/test/java/org/sonarlint/cli/report/HtmlReportTest.java delete mode 100644 src/test/java/org/sonarlint/cli/report/IssueCategoryTest.java delete mode 100644 src/test/java/org/sonarlint/cli/report/IssueVariationTest.java delete mode 100644 src/test/java/org/sonarlint/cli/report/IssuesReportTest.java delete mode 100644 src/test/java/org/sonarlint/cli/report/ReportFactoryTest.java delete mode 100644 src/test/java/org/sonarlint/cli/report/ReportSummaryTest.java delete mode 100644 src/test/java/org/sonarlint/cli/report/ResourceReportTest.java delete mode 100644 src/test/java/org/sonarlint/cli/util/LoggerTest.java delete mode 100644 src/test/java/org/sonarlint/cli/util/MutableIntTest.java delete mode 100644 src/test/java/org/sonarlint/cli/util/System2Test.java delete mode 100644 src/test/java/org/sonarlint/cli/util/SystemInfoTest.java delete mode 100644 src/test/java/org/sonarlint/cli/util/UtilTest.java delete mode 100644 src/test/resources/org/sonarlint/cli/config/sonarlint_global.json delete mode 100644 src/test/resources/org/sonarlint/cli/config/sonarlint_project.json delete mode 100644 third-party-licenses.sh delete mode 100755 travis.sh diff --git a/.gitignore b/.gitignore index ae31f48..a4d0870 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,15 @@ +**/.sonarlint -# ---- Maven +# ---- Build related +.gradle/ +build/ target/ -dependency-reduced-pom.xml +**/*.class # ---- IntellijIDEA -*.iws *.iml *.ipr +*.iws .idea/ # ---- Eclipse @@ -19,12 +22,13 @@ dependency-reduced-pom.xml Icon? # Thumbnails ._* + # Files that might appear on external disk .Spotlight-V100 .Trashes # ---- Windows # Windows image file caches -Thumbs.db +Thumbs.db # Folder config file Desktop.ini diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 5902a3f..0000000 --- a/.travis.yml +++ /dev/null @@ -1,26 +0,0 @@ -language: java -sudo: false - -jdk: - - oraclejdk8 - -install: true -script: ./travis.sh - -cache: - directories: - - '$HOME/.m2/repository' - # for integration tests and analysis - - $HOME/.sonar - -notifications: - email: false - webhooks: - - secure: "LOtncSv54lCHHhLDRJ7tmVqBGWKeEvJNWXRu5oqVDVocJXy65IiaYU5OlfWmc/wn4iQC6dT3DEV4nF3wBdaIFioIp1CLO3ECo2w6LilQ1wra9Kgj47RazbcSkMrxJkz7wnn504JXok0pvX2/r9UCzJEi9D98jKQDCZ3tNw97YisiWevrhd9ExKG5tmlZea7r+AWdTpZ0EOTDOy95P+ZwPjEsArOXtkypK2DI1Bg5FDzU3xUo6CBRtICE3x5VdCmP2IdyK7Ll7ijX0YbkCrU8/BP00URmCWPNP2VmSBFpT/wXVmhjEYnHEKh21tJfMMv32U4z4ORvDlwlzZVpG4R0md3lR5Wnp5bLTqVkhkLAwgrPjNb9KIiVAV1wDMEy8xKpLHj8GXEcU/qZKi2rDxAj3Zv6ZV177QBZDRsWg5tkO8xxqSWVe9AoXhb6nHmYlFsu+dzJ/UgWZoc2s/3zrw3Kj8YwOSN0qmjDKdEE35TbGgQF/P56Vb5LooyEdK2g4RngiIyqF4OTX1AdSx5cgKbj5vDwGYLoLC0VclGpCPJDc6Vt/oDyAx+RyQOlvvgb8vaGXiIh1azE8ArDFqOb0x8vdIVCsCLnI4w+dcHOdqjVA2bOM0/eWadbRacRgP1DTGSCKfn4eUyyJPzmKicSDe4hkCm2xhhvbu5f/5AX0d0QVZs=" - -addons: - apt: - packages: - # upgrade java 8 as the default version 1.8.0_31 prevents from compiling sources - # https://github.com/travis-ci/travis-ci/issues/4042 - - oracle-java8-installer diff --git a/Dockerfile b/Dockerfile index e66c145..3178e50 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,40 +1,42 @@ -FROM maven:3.3.9-jdk-8-alpine +FROM java:8-jdk-alpine MAINTAINER Code Climate -# Create user and app directory RUN adduser -u 9000 -D app -COPY . /usr/src/app -RUN chown -R app:app /usr/src/app +VOLUME /code -# Package the app with Maven -WORKDIR /usr/src/app -RUN mvn package +# Increase Java memory limits +ENV JAVA_OPTS="-XX:+UseParNewGC -XX:MinHeapFreeRatio=5 -XX:MaxHeapFreeRatio=10 -Xss4096k" -# Unzip the packaged app -RUN mkdir /usr/src/app/dest -RUN unzip /usr/src/app/target/sonarlint-cli-*.zip \ - -d /usr/src/app/dest -RUN cp -R /usr/src/app/dest/sonarlint-cli-*/* \ - /usr/src/app/dest +ENV GRADLE_VERSION=4.2.1 +ENV GRADLE_HOME=/opt/gradle +ENV GRADLE_FOLDER=$GRADLE_HOME +ENV GRADLE_USER_HOME=$GRADLE_HOME +ENV PATH=$GRADLE_HOME/bin:$PATH + +RUN mkdir -p $GRADLE_USER_HOME && \ + chown -R app:app $GRADLE_USER_HOME && \ + chmod g+s $GRADLE_USER_HOME && \ + apk update && \ + apk add --virtual .build-dependencies ca-certificates wget && \ + update-ca-certificates && \ + wget https://downloads.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip && \ + unzip gradle-${GRADLE_VERSION}-bin.zip -d /opt && \ + mv /opt/gradle-${GRADLE_VERSION}/* $GRADLE_HOME && \ + rm -f gradle-${GRADLE_VERSION}-bin.zip && \ + apk del .build-dependencies -# Specify the /code volume -# as needed by CC -VOLUME /code +WORKDIR /usr/src/app -# Create a writeable directory for the code -RUN mkdir -p /code-read-write -RUN chown -R app:app /code-read-write -RUN chmod -R 777 /code-read-write +# Cache dependencies +COPY build.gradle ./ +RUN gradle infra -# Increase Java memory limits -ENV JAVA_OPTS="-XX:+UseParNewGC -XX:MinHeapFreeRatio=5 -XX:MaxHeapFreeRatio=10 -Xss4096k" +COPY . ./ +RUN chown -R app:app ./ + +RUN gradle clean build -x test -# Switch to app user, copy code to writable -# directory, and run the engine USER app -ENTRYPOINT [] -WORKDIR /code-read-write -CMD cp -R /code/* . && \ - /usr/src/app/dest/bin/sonarlint \ - --src 'src/main/**/*.java' +WORKDIR /code +CMD cp -R /code /tmp/ && /usr/src/app/build/codeclimate-sonar /tmp/code diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..4b1f083 --- /dev/null +++ b/Makefile @@ -0,0 +1,9 @@ +.PHONY: image test + +IMAGE_NAME ?= codeclimate/codeclimate-sonar-java + +image: + docker build --rm -t $(IMAGE_NAME) . + +test: image + docker run --rm -ti -w /usr/src/app -u root $(IMAGE_NAME) gradle clean test diff --git a/appveyor.ps1 b/appveyor.ps1 deleted file mode 100644 index 4b1dd17..0000000 --- a/appveyor.ps1 +++ /dev/null @@ -1,155 +0,0 @@ -$ErrorActionPreference = "Stop" - -function FetchAndUnzip -{ - param ([string]$Url, [string]$Out) - - $tmp = [System.IO.Path]::GetTempFileName() - [System.Reflection.Assembly]::LoadWithPartialName('System.Net.Http') | Out-Null - $client = (New-Object System.Net.Http.HttpClient) - try - { - if (-not([string]::IsNullOrEmpty($env:GITHUB_TOKEN))) - { - $credentials = [string]::Format([System.Globalization.CultureInfo]::InvariantCulture, "{0}:", $env:GITHUB_TOKEN); - $credentials = [Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes($credentials)); - $client.DefaultRequestHeaders.Authorization = (New-Object System.Net.Http.Headers.AuthenticationHeaderValue("Basic", $credentials)); - } - $contents = $client.GetByteArrayAsync($url).Result; - [System.IO.File]::WriteAllBytes($tmp, $contents); - } - finally - { - $client.Dispose() - } - - if (-not(Test-Path $Out)) - { - mkdir $Out | Out-Null - } - [System.Reflection.Assembly]::LoadWithPartialName('System.IO.Compression.FileSystem') | Out-Null - [System.IO.Compression.ZipFile]::ExtractToDirectory($tmp, $Out) -} - -function InstallAppveyorTools -{ - $travisUtilsVersion = "16" - $localPath = "$env:USERPROFILE\.local" - $travisUtilsPath = "$localPath\travis-utils-$travisUtilsVersion" - if (Test-Path $travisUtilsPath) - { - echo "Reusing the Travis Utils version $travisUtilsVersion already downloaded under $travisUtilsPath" - } - else - { - $url = "https://github.com/SonarSource/travis-utils/archive/v$travisUtilsVersion.zip" - echo "Downloading Travis Utils version $travisUtilsVersion from $url into $localPath" - FetchAndUnzip $url $localPath - } - - $mavenLocalRepository = "$env:USERPROFILE\.m2\repository" - if (-not(Test-Path $mavenLocalRepository)) - { - mkdir $mavenLocalRepository | Out-Null - } - echo "Installating Travis Utils closed source Maven projects into $mavenLocalRepository" - Copy-Item "$travisUtilsPath\m2repo\*" $mavenLocalRepository -Force -Recurse - - $env:ORCHESTRATOR_CONFIG_URL = "" - $env:TRAVIS = "ORCH-332" -} - -function Build -{ - param ([string]$Project, [string]$Sha1) - - $msg = "Fetch [" + $Project + ":" + $Sha1 + "]" - echo $msg - - $url = "https://github.com/$Project/archive/$Sha1.zip" - $tmp = "c:\snapshot" - if (Test-Path $tmp) - { - Cmd /C "rmdir /S /Q $tmp" - } - - FetchAndUnzip $url $tmp - - $msg = "Build [" + $Project + ":" + $Sha1 + "]" - echo $msg - - pushd $tmp\* - try - { - mvn install "--batch-mode" "-DskipTests" "-Pdev" - CheckLastExitCode - } - finally - { - popd - } -} - -function BuildSnapshot -{ - param ([string]$Project) - - echo "Fetch and build latest green snapshot of [$Project]" - - $lastGreenSha1 = (new-object Net.WebClient).DownloadString("http://sonarsource-979.appspot.com/$Project/latestGreen") - - Build $Project $lastGreenSha1 -} - -function CheckLastExitCode -{ - param ([int[]]$SuccessCodes = @(0)) - - if ($SuccessCodes -notcontains $LastExitCode) - { - $msg = @" -EXE RETURNED EXIT CODE $LastExitCode -CALLSTACK:$(Get-PSCallStack | Out-String) -"@ - throw $msg - } -} - -switch ($env:RUN) -{ - "ci" - { - mvn verify "--batch-mode" "-B" "-e" "-V" - CheckLastExitCode - } - - "it" - { - InstallAppveyorTools - BuildSnapshot "SonarSource/orchestrator" - - mvn install "--batch-mode" "-Dsource.skip=true" "-Dmaven.test.skip=true" - CheckLastExitCode - - if ($env:SQ_VERSION -eq "DEV") - { - BuildSnapshot "SonarSource/sonarqube" - } - - pushd it - try - { - mvn install "--batch-mode" "-DsonarRunner.version=""2.5-SNAPSHOT""" "-Dsonar.runtimeVersion=""$env:SQ_VERSION""" "-Dmaven.test.redirectTestOutputToFile=false" - CheckLastExitCode - } - finally - { - popd - } - } - - default - { - throw "Unexpected RUN mode: $env:RUN" - } -} diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index a79be7b..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,21 +0,0 @@ -version: 1.0.{build} - -branches: - only: - - master - -cache: - - C:\Users\appveyor\.m2 -> **\pom.xml - -install: - - set MAVEN_VERSION=3.2.5 - - choco install maven -version %MAVEN_VERSION% - - set PATH=%PATH%;C:\bin\apache-maven-%MAVEN_VERSION%\bin - - set JAVA_HOME=C:\Program Files\Java\jdk1.7.0 - -environment: - matrix: - - RUN: ci - -build_script: - - ps: ./appveyor.ps1 diff --git a/assembly.xml b/assembly.xml deleted file mode 100644 index 2754f89..0000000 --- a/assembly.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - bin - - zip - - true - - - lib - true - true - - org.freemarker:freemarker - org.sonarsource.sonarlint.core:sonarlint-core - - - - - - src/main/assembly/bin - bin - - sonarlint.bat - - dos - true - - - src/main/assembly/bin - bin - - sonarlint - - unix - 0755 - true - - - ${project.build.directory}/plugins - plugins - - - diff --git a/bin/codeclimate-sonar b/bin/codeclimate-sonar new file mode 100755 index 0000000..53d1fda --- /dev/null +++ b/bin/codeclimate-sonar @@ -0,0 +1,16 @@ +#!/usr/bin/env sh + +BUILD_DIR=$(dirname $0) +APP=$(find ${BUILD_DIR}/libs -name "codeclimate*.jar" | tr "\n" ":") +LIBS=$(find ${BUILD_DIR}/libs -name "*.jar" | tr "\n" ":") +CORE=$(find ${BUILD_DIR}/libs -name "sonarlint-core*.jar" -or -name "sonarlint-client-api*.jar" | tr "\n" ":") + +CODE_DIR=$1; shift + +java \ + -cp ${APP}:${CORE}:${LIBS} \ + -Djava.awt.headless=true \ + -Dsonarlint.home="${BUILD_DIR}" \ + -Dproject.home="${CODE_DIR}" \ + -Dorg.freemarker.loggerLibrary=none \ + cc.App --src "**/*.java" $@ diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..49dda12 --- /dev/null +++ b/build.gradle @@ -0,0 +1,51 @@ +apply plugin: "java" + +repositories { + jcenter() +} + +task copyLibs(type: Copy) { + into "${buildDir}/libs" + from configurations.runtime + exclude "sonar-*-plugin*.jar" +} + +task copyTestLibs(type: Copy) { + into "${buildDir}/test" + from configurations.testCompile +} + +task copyPlugins(type: Copy) { + into "${buildDir}/plugins" + from configurations.runtime + include "sonar-*-plugin*.jar" +} + +task copyRunnable(type: Copy) { + into "${buildDir}" + from "bin/codeclimate-sonar" +} + +task infra(dependsOn: ["copyPlugins", "copyLibs", "copyTestLibs", "copyRunnable", "jar"]) + +build.dependsOn(infra) +test.dependsOn(infra) + +dependencies { + compile("org.sonarsource.sonarlint.core:sonarlint-core:2.10.0.367") + compile("org.sonarsource.sonarlint.core:sonarlint-client-api:2.10.0.367") + compile("org.sonarsource.sonarlint:sonarlint-cli:2.1.0.566") + + // Plugins + compile("org.sonarsource.java:sonar-java-plugin:4.3.0.7717") + + testCompile("org.assertj:assertj-core:2.8.0") + testCompile("junit:junit:4.12") +} + +test { + outputs.upToDateWhen { false } + testLogging { + exceptionFormat "full" + } +} diff --git a/circle.yml b/circle.yml index a231d4a..c7dd860 100644 --- a/circle.yml +++ b/circle.yml @@ -12,7 +12,11 @@ dependencies: --env GCR_JSON_KEY --volume /var/run/docker.sock:/var/run/docker.sock codeclimate/patrick pull || true - - docker build --rm --tag codeclimate/codeclimate-checks . + - make image + +test: + override: + - make test deployment: registry: diff --git a/cix.sh b/cix.sh deleted file mode 100755 index a9627b9..0000000 --- a/cix.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -set -euo pipefail - -CURRENT_VERSION=`mvn help:evaluate -Dexpression="project.version" | grep -v '^\[\|Download\w\+\:'` - -if [[ $CURRENT_VERSION =~ "-SNAPSHOT" ]]; then - echo "Running locally" -else - echo "Running for $CI_BUILD_NUMBER" - #deploy the version built by travis - mkdir -p target - cd target - curl --user $ARTIFACTORY_QA_READER_USERNAME:$ARTIFACTORY_QA_READER_PASSWORD -sSLO https://repox.sonarsource.com/sonarsource-public-qa/org/sonarsource/sonarlint/cli/sonarlint-cli/$CURRENT_VERSION/sonarlint-cli-$CURRENT_VERSION.zip - cd .. - mvn install:install-file -Dfile=target/sonarlint-cli-$CURRENT_VERSION.zip -DgroupId=org.sonarsource.sonarlint.cli \ - -DartifactId=sonarlint-cli -Dversion=$CURRENT_VERSION -Dpackaging=zip -fi - -# Run ITs -cd it -mvn test -Dsonarlint.version=$CURRENT_VERSION -Dsonar.runtimeVersion=LATEST_RELEASE -B -e -V diff --git a/fixtures/java_lib/main/java/Library.java b/fixtures/java_lib/main/java/Library.java new file mode 100644 index 0000000..cbeaeb2 --- /dev/null +++ b/fixtures/java_lib/main/java/Library.java @@ -0,0 +1,28 @@ +/* + * This Java source file was generated by the Gradle 'init' task. + */ +// FIXME +public class Library { + public static void main(String[] args) { + } + + public void foo() { + for (int i = 0; i < 10; i++) { + for (int k = 0; k < 20; k++) { + System.out.println("Hello"); + } + } + + for (int i = 0; i < 10; i++) { // only references 'i' + for (int k = 0; k < 20; i++) { // references both 'i' and 'k' + System.out.println("Hello"); + } + for (int k = 0; k < 20; i++) { // references both 'i' and 'k' + System.out.println("Hello"); + } + for (int k = 0; k < 20; i++) { // references both 'i' and 'k' + System.out.println("Hello"); + } + } + } +} diff --git a/fixtures/java_lib/test/java/LibraryTest.java b/fixtures/java_lib/test/java/LibraryTest.java new file mode 100644 index 0000000..645740d --- /dev/null +++ b/fixtures/java_lib/test/java/LibraryTest.java @@ -0,0 +1,12 @@ +/* + * This Java source file was generated by the Gradle 'init' task. + */ +import org.junit.Test; +import static org.junit.Assert.*; + +public class LibraryTest { + @Test public void testSomeLibraryMethod() { + Library classUnderTest = new Library(); + assertTrue("someLibraryMethod should return 'true'", classUnderTest.someLibraryMethod()); + } +} diff --git a/it/.gitignore b/it/.gitignore deleted file mode 100644 index b83d222..0000000 --- a/it/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/it/pom.xml b/it/pom.xml deleted file mode 100644 index 31cdb63..0000000 --- a/it/pom.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - 4.0.0 - - - org.sonarsource.parent - parent - 39 - - - - com.sonarsource.it - it-sonarlint-cli - 1.0-SNAPSHOT - SonarSource :: IT :: SonarLint CLI - 2016 - - - SonarSource - http://www.sonarsource.com - - - - 5.0 - -server - - - - - - junit - junit - 4.11 - - - org.apache.commons - commons-exec - 1.3 - - - org.apache.commons - commons-lang3 - 3.4 - - - net.lingala.zip4j - zip4j - 1.3.2 - - - commons-io - commons-io - 2.4 - - - org.slf4j - slf4j-api - 1.7.2 - - - org.sonarsource.orchestrator - sonar-orchestrator - 3.14.0.887 - - - ch.qos.logback - logback-classic - 1.0.13 - - - com.google.code.findbugs - jsr305 - 3.0.0 - - - org.assertj - assertj-core - 2.1.0 - - - - diff --git a/it/projects/java-no-issues/src/test/Java.txt b/it/projects/java-no-issues/src/test/Java.txt deleted file mode 100644 index a2c3f3f..0000000 --- a/it/projects/java-no-issues/src/test/Java.txt +++ /dev/null @@ -1 +0,0 @@ -No source code diff --git a/it/projects/java-sample/src/basic/Hello.java b/it/projects/java-sample/src/basic/Hello.java deleted file mode 100644 index b9db5a0..0000000 --- a/it/projects/java-sample/src/basic/Hello.java +++ /dev/null @@ -1,9 +0,0 @@ -package basic; - -public class Hello { - - public void hello() { - int i=356; - if (true) i=5658; - } -} diff --git a/it/projects/java-sample/src/basic/World.java b/it/projects/java-sample/src/basic/World.java deleted file mode 100644 index c65d91c..0000000 --- a/it/projects/java-sample/src/basic/World.java +++ /dev/null @@ -1,8 +0,0 @@ -package basic; - -public final class World { - - public void world() { - System.out.println("hello world"); - } -} diff --git a/it/projects/multi-language/src/main/java/Hello.java b/it/projects/multi-language/src/main/java/Hello.java deleted file mode 100644 index 8a94806..0000000 --- a/it/projects/multi-language/src/main/java/Hello.java +++ /dev/null @@ -1,2 +0,0 @@ -public class Hello { -} diff --git a/it/projects/multi-language/src/main/js/Hello.js b/it/projects/multi-language/src/main/js/Hello.js deleted file mode 100644 index 2096104..0000000 --- a/it/projects/multi-language/src/main/js/Hello.js +++ /dev/null @@ -1,3 +0,0 @@ -function hello() { - alert("Hello World"); -} diff --git a/it/projects/no-files/placeholder.txt b/it/projects/no-files/placeholder.txt deleted file mode 100644 index e69de29..0000000 diff --git a/it/src/test/java/it/sonarlint/cli/ConnectedModeTest.java b/it/src/test/java/it/sonarlint/cli/ConnectedModeTest.java deleted file mode 100644 index 66fdb1c..0000000 --- a/it/src/test/java/it/sonarlint/cli/ConnectedModeTest.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * SonarSource :: IT :: SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package it.sonarlint.cli; - -import com.sonar.orchestrator.Orchestrator; -import com.sonar.orchestrator.locator.FileLocation; -import it.sonarlint.cli.tools.SonarlintCli; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Path; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; -import org.junit.rules.TemporaryFolder; - -import static org.assertj.core.api.Assertions.assertThat; - -public class ConnectedModeTest { - private static final String PROJECT_KEY_JAVA = "sample-java"; - - @ClassRule - public static SonarlintCli sonarlint = new SonarlintCli(); - - @ClassRule - public static Orchestrator ORCHESTRATOR = Orchestrator.builderEnv() - .setOrchestratorProperty("javaVersion", "LATEST_RELEASE") - .addPlugin("java") - .restoreProfileAtStartup(FileLocation.ofClasspath("/java-sonarlint.xml")) - .build(); - - @ClassRule - public static TemporaryFolder temp = new TemporaryFolder(); - - @Rule - public ExpectedException exception = ExpectedException.none(); - - @BeforeClass - public static void prepare() throws Exception { - ORCHESTRATOR.getServer().provisionProject(PROJECT_KEY_JAVA, "Sample Java"); - ORCHESTRATOR.getServer().associateProjectToQualityProfile(PROJECT_KEY_JAVA, "java", "SonarLint IT Java"); - } - - @Before - public void setUp() throws IOException { - createGlobalConfig(ORCHESTRATOR.getServer().getUrl()); - sonarlint.install(); - } - - @Test - public void testSimpleJava() throws IOException { - Path projectRoot = sonarlint.deployProject("java-sample"); - - createProjectConfig(projectRoot, PROJECT_KEY_JAVA); - - int code = sonarlint.run(projectRoot, "-u"); - assertThat(code).isEqualTo(0); - - assertThat(sonarlint.getOut()).contains("No storage for server"); - assertThat(sonarlint.getOut()).contains("Updating binding"); - assertThat(sonarlint.getOut()).contains("Using storage for server"); - - assertThat(sonarlint.getOut()).contains("1 issue"); - assertThat(sonarlint.getOut()).contains("1 major"); - assertThat(sonarlint.getOut()).contains("3 files analyzed"); - } - - private void createProjectConfig(Path projectRoot, String projectKey) throws IOException { - Path configFile = projectRoot.resolve("sonarlint.json"); - String json = "{serverId=\"local\", projectKey=" + projectKey + "}"; - Files.write(configFile, json.getBytes(StandardCharsets.UTF_8)); - } - - private void createGlobalConfig(String serverUrl) throws IOException { - Path configDir = temp.getRoot().toPath().resolve(".sonarlint").resolve("conf"); - Files.createDirectories(configDir); - Path configFile = configDir.resolve("global.json"); - String json = "{servers=[{id=\"local\",url=\"" + serverUrl + "\"}]}"; - Files.write(configFile, json.getBytes(StandardCharsets.UTF_8)); - sonarlint.addEnv("SONARLINT_OPTS", "-Duser.home=" + temp.getRoot().toPath().toAbsolutePath().toString()); - } - -} diff --git a/it/src/test/java/it/sonarlint/cli/LanguageTest.java b/it/src/test/java/it/sonarlint/cli/LanguageTest.java deleted file mode 100644 index c2ec325..0000000 --- a/it/src/test/java/it/sonarlint/cli/LanguageTest.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * SonarSource :: IT :: SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package it.sonarlint.cli; - -import it.sonarlint.cli.tools.SonarlintCli; -import java.io.IOException; -import java.nio.file.Path; -import org.apache.commons.io.FileUtils; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; - -import static org.assertj.core.api.Assertions.assertThat; - -public class LanguageTest { - @ClassRule - public static SonarlintCli sonarlint = new SonarlintCli(); - - @Before - public void setUp() { - sonarlint.install(); - } - - @Test - public void testSimpleJava() { - int code = sonarlint.deployAndRunProject("java-sample"); - assertThat(code).isEqualTo(0); - - assertThat(sonarlint.getOut()).contains("6 issues"); - assertThat(sonarlint.getOut()).contains("5 major"); - assertThat(sonarlint.getOut()).contains("1 minor"); - assertThat(sonarlint.getOut()).contains("2 files analyzed"); - } - - @Test - public void testRunTwice() throws IOException { - Path project = sonarlint.deployProject("java-sample"); - int code = sonarlint.run(project); - assertThat(code).isEqualTo(0); - - assertThat(sonarlint.getOut()).contains("6 issues"); - assertThat(sonarlint.getOut()).contains("5 major"); - assertThat(sonarlint.getOut()).contains("1 minor"); - assertThat(sonarlint.getOut()).contains("2 files analyzed"); - - FileUtils.deleteDirectory(project.resolve(".sonarlint").toFile()); - code = sonarlint.run(project); - assertThat(code).isEqualTo(0); - - assertThat(sonarlint.getOut()).contains("6 issues"); - assertThat(sonarlint.getOut()).contains("5 major"); - assertThat(sonarlint.getOut()).contains("1 minor"); - assertThat(sonarlint.getOut()).contains("2 files analyzed"); - } - - @Test - public void testMultiLanguage() { - int code = sonarlint.deployAndRunProject("multi-language", "-X"); - assertThat(code).isEqualTo(0); - - assertThat(sonarlint.getOut()).contains("src/main/js/Hello.js' is detected to be 'js'"); - assertThat(sonarlint.getOut()).contains("src/main/java/Hello.java' is detected to be 'java'"); - - assertThat(sonarlint.getOut()).contains("3 issues"); - assertThat(sonarlint.getOut()).contains("3 minor"); - - // 1 of each lang - assertThat(sonarlint.getOut()).contains("2 files analyzed"); - } - - @Test - public void testNoIssues() { - int code = sonarlint.deployAndRunProject("java-no-issues"); - assertThat(code).isEqualTo(0); - - assertThat(sonarlint.getOut()).contains("No issues to display"); - assertThat(sonarlint.getOut()).contains("1 file analyzed"); - } - - @Test - public void testNoFiles() { - int code = sonarlint.deployAndRunProject("no-files", "-X", "--src", "src/**"); - assertThat(code).isEqualTo(0); - - assertThat(sonarlint.getOut()).contains("No files to analyze"); - } - -} diff --git a/it/src/test/java/it/sonarlint/cli/SonarlintTest.java b/it/src/test/java/it/sonarlint/cli/SonarlintTest.java deleted file mode 100644 index db42049..0000000 --- a/it/src/test/java/it/sonarlint/cli/SonarlintTest.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * SonarSource :: IT :: SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package it.sonarlint.cli; - -import it.sonarlint.cli.tools.SonarlintCli; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; - -import static org.assertj.core.api.Assertions.assertThat; - -public class SonarlintTest { - @ClassRule - public static SonarlintCli sonarlint = new SonarlintCli(); - - @Before - public void setUp() { - sonarlint.install(); - } - - @Test - public void testHelp() { - int code = sonarlint.run(Paths.get(""), "-h"); - assertThat(sonarlint.getOut()).contains("usage: sonarlint"); - assertThat(code).isEqualTo(0); - } - - @Test - public void testVersion() { - int code = sonarlint.run(Paths.get(""), "-v"); - String version = System.getProperty("sonarlint.version"); - assertThat(sonarlint.getOut()).contains(version); - assertThat(code).isEqualTo(0); - } - - @Test - public void testInvalidArg() { - int code = sonarlint.run(Paths.get(""), "-q"); - assertThat(sonarlint.getErr()).contains("Error parsing arguments"); - assertThat(sonarlint.getOut()).contains("usage: sonarlint"); - assertThat(code).isEqualTo(1); - } - - @Test - public void testPluginsInstalled() throws IOException { - Path installation = sonarlint.getSonarlintInstallation(); - Path plugins = installation.resolve("plugins"); - assertThat(Files.isDirectory(plugins)).isTrue(); - assertThat(Files.newDirectoryStream(plugins)).isNotEmpty(); - } - - @Test - public void testNoFilesToAnalyse() throws IOException { - Path empty = Files.createTempDirectory("empty"); - int code = sonarlint.run(empty); - assertThat(code).isEqualTo(0); - assertThat(sonarlint.getOut()).contains("WARN: No files to analyze"); - } -} diff --git a/it/src/test/java/it/sonarlint/cli/tools/CommandExecutor.java b/it/src/test/java/it/sonarlint/cli/tools/CommandExecutor.java deleted file mode 100644 index 4001fb6..0000000 --- a/it/src/test/java/it/sonarlint/cli/tools/CommandExecutor.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * SonarSource :: IT :: SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package it.sonarlint.cli.tools; - -import org.apache.commons.exec.CommandLine; -import org.apache.commons.exec.DefaultExecutor; -import org.apache.commons.exec.ExecuteStreamHandler; -import org.apache.commons.exec.ExecuteWatchdog; -import org.apache.commons.exec.PumpStreamHandler; -import org.apache.commons.io.output.TeeOutputStream; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.annotation.Nullable; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.PipedInputStream; -import java.io.PipedOutputStream; -import java.nio.charset.Charset; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.attribute.PosixFilePermission; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -public class CommandExecutor { - private static final Logger LOG = LoggerFactory.getLogger(CommandExecutor.class); - private static final int TIMEOUT = 60_000; - private Path file; - - private ByteArrayOutputStream out; - private ByteArrayOutputStream err; - private OutputStream in; - - public CommandExecutor(Path file) { - this.file = file; - } - - public int execute(String[] args) throws IOException { - return execute(args, null, Collections.emptyMap()); - } - - public int execute(String[] args, @Nullable Path workingDir, Map addEnv) throws IOException { - if (!Files.isExecutable(file)) { - Set perms = new HashSet(); - perms.add(PosixFilePermission.OWNER_READ); - perms.add(PosixFilePermission.OWNER_EXECUTE); - Files.setPosixFilePermissions(file, perms); - } - - ExecuteWatchdog watchdog = new ExecuteWatchdog(TIMEOUT); - CommandLine cmd = new CommandLine(file.toFile()); - cmd.addArguments(args); - DefaultExecutor exec = new DefaultExecutor(); - exec.setWatchdog(watchdog); - exec.setStreamHandler(createStreamHandler()); - exec.setExitValues(null); - if (workingDir != null) { - exec.setWorkingDirectory(workingDir.toFile()); - } - in.close(); - LOG.info("Executing: {}", cmd.toString()); - Map env = new HashMap<>(System.getenv()); - env.putAll(addEnv); - return exec.execute(cmd, env); - } - - public String getStdOut() { - return getLogs(out); - } - - public String getStdErr() { - return getLogs(err); - } - - private static String getLogs(ByteArrayOutputStream stream) { - return new String(stream.toByteArray(), Charset.defaultCharset()); - } - - private ExecuteStreamHandler createStreamHandler() throws IOException { - out = new ByteArrayOutputStream(); - err = new ByteArrayOutputStream(); - PipedOutputStream outPiped = new PipedOutputStream(); - InputStream inPiped = new PipedInputStream(outPiped); - in = outPiped; - - TeeOutputStream teeOut = new TeeOutputStream(out, System.out); - TeeOutputStream teeErr = new TeeOutputStream(err, System.err); - - return new PumpStreamHandler(teeOut, teeErr, inPiped); - } -} diff --git a/it/src/test/java/it/sonarlint/cli/tools/SonarlintCli.java b/it/src/test/java/it/sonarlint/cli/tools/SonarlintCli.java deleted file mode 100644 index 35384b6..0000000 --- a/it/src/test/java/it/sonarlint/cli/tools/SonarlintCli.java +++ /dev/null @@ -1,136 +0,0 @@ -/* - * SonarSource :: IT :: SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package it.sonarlint.cli.tools; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.HashMap; -import java.util.Map; - -import org.apache.commons.io.FileUtils; -import org.junit.rules.ExternalResource; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class SonarlintCli extends ExternalResource { - private static final Logger LOG = LoggerFactory.getLogger(SonarlintCli.class); - private Path script; - private Path installPath; - private Path project; - private CommandExecutor exec; - private Map env = new HashMap<>(); - - public void install() { - String version = System.getProperty("sonarlint.version"); - if (version == null) { - throw new IllegalStateException("No sonarlint-cli version specified. Use '-Dsonarlint.version'."); - } - install(version); - } - - public void install(String version) { - SonarlintInstaller installer = new SonarlintInstaller(); - this.script = installer.install(installPath, version); - } - - public void addEnv(String key, String value) { - env.put(key, value); - } - - public int run(Path workingDir, String... args) { - LOG.info("Running SonarLint CLI in '{}'", workingDir.toAbsolutePath()); - try { - exec = new CommandExecutor(script); - return exec.execute(args, workingDir.toAbsolutePath(), env); - } catch (IOException e) { - throw new IllegalStateException(e); - } - } - - public int deployAndRunProject(String location, String... args) { - LOG.info("Running SonarLint CLI on project '{}'", location); - try { - Path project = deployProject(location); - exec = new CommandExecutor(script); - return exec.execute(args, project, env); - } catch (IOException e) { - throw new IllegalStateException(e); - } - } - - public Path deployProject(String location) throws IOException { - Path originalLoc = Paths.get("projects").resolve(location); - String projectName = originalLoc.getFileName().toString(); - - if (!Files.isDirectory(originalLoc)) { - throw new IllegalArgumentException("Couldn't find project directory: " + originalLoc.toAbsolutePath().toString()); - } - - cleanProject(); - project = Files.createTempDirectory(projectName); - FileUtils.copyDirectory(originalLoc.toFile(), project.toFile()); - return project; - } - - private void cleanProject() { - if (project != null) { - FileUtils.deleteQuietly(project.toFile()); - project = null; - } - } - - protected void before() throws Throwable { - installPath = Files.createTempDirectory("sonarlint-cli"); - } - - protected void after() { - cleanProject(); - if (installPath != null) { - FileUtils.deleteQuietly(installPath.toFile()); - installPath = null; - } - } - - public String getOut() { - return exec.getStdOut(); - } - - public String[] getOutLines() { - return getOut().split(System.lineSeparator()); - } - - public Path getProject() { - return project; - } - - public Path getSonarlintInstallation() { - return script.getParent().getParent(); - } - - public String getErr() { - return exec.getStdErr(); - } - - public String[] getErrLines() { - return getErr().split(System.lineSeparator()); - } -} diff --git a/it/src/test/java/it/sonarlint/cli/tools/SonarlintInstaller.java b/it/src/test/java/it/sonarlint/cli/tools/SonarlintInstaller.java deleted file mode 100644 index 6a6ecc9..0000000 --- a/it/src/test/java/it/sonarlint/cli/tools/SonarlintInstaller.java +++ /dev/null @@ -1,128 +0,0 @@ -/* - * SonarSource :: IT :: SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package it.sonarlint.cli.tools; - -import net.lingala.zip4j.core.ZipFile; -import org.apache.commons.lang3.SystemUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; - -/** - * Attempts to install a specific version of SonarLint CLI from the local maven repository. - * The location of the local maven repository can be passed with the environmental variable 'MAVEN_LOCAL_REPOSITORY'. - */ -public class SonarlintInstaller { - private static final String GROUP_ID = "org.sonarsource.sonarlint.cli"; - private static final String ARTIFACT_ID = "sonarlint-cli"; - private static final Logger LOG = LoggerFactory.getLogger(SonarlintInstaller.class); - - public Path install(Path installPath, String version) { - if (!isInstalled(installPath, version)) { - Path zipFile = locateZipInLocalMaven(version); - installZip(zipFile, installPath); - } - - return locateScript(version, installPath); - } - - private static Path locateScript(String version, Path installPath) { - String directoryName = "sonarlint-cli-" + version; - String fileName = SystemUtils.IS_OS_WINDOWS ? "sonarlint.bat" : "sonarlint"; - - Path script = installPath.resolve(directoryName).resolve("bin").resolve(fileName); - - if (!Files.exists(script)) { - throw new IllegalStateException("File does not exist: " + script); - } - return script; - } - - private boolean isInstalled(Path installPath, String version) { - String directoryName = "sonarlint-cli-" + version; - - Path sonarlint = installPath.resolve(directoryName); - - if (Files.isDirectory(sonarlint)) { - LOG.debug("SonarLint CLI {} already exists in {}", version, installPath); - return true; - } - return false; - } - - private void installZip(Path zipFilePath, Path toDir) { - try { - ZipFile zipFile = new ZipFile(zipFilePath.toFile()); - zipFile.extractAll(toDir.toString()); - } catch (Exception e) { - throw new IllegalStateException("Fail to unzip sonarlint cli to" + toDir, e); - } - } - - private Path locateZipInLocalMaven(String version) { - String fileName = "sonarlint-cli-" + version + ".zip"; - - LOG.info("Searching for SonarLint CLI {} in maven repositories", version); - - Path mvnRepo = getMavenLocalRepository(); - Path file = getMavenFilePath(mvnRepo, GROUP_ID, ARTIFACT_ID, version, fileName); - - if (!Files.exists(file)) { - throw new IllegalArgumentException("Couldn't find in local repo: sonarlint cli " + file.toString()); - } - return file; - } - - private static Path getMavenFilePath(Path mvnRepo, String groupId, String artifactId, String version, String fileName) { - Path p = mvnRepo; - String[] split = groupId.split("\\."); - - for (String s : split) { - p = p.resolve(s); - } - - p = p.resolve(artifactId); - p = p.resolve(version); - return p.resolve(fileName); - } - - private Path getMavenLocalRepository() { - if (System.getenv("MAVEN_LOCAL_REPOSITORY") != null) { - Path repo = Paths.get(System.getenv("MAVEN_LOCAL_REPOSITORY")); - if (!Files.isDirectory(repo)) { - throw new IllegalArgumentException("Maven local repository is not valid: " + System.getenv("MAVEN_LOCAL_REPOSITORY")); - } - return repo; - } - - String home = System.getProperty("user.home"); - Path repo = Paths.get(home).resolve(".m2").resolve("repository"); - - if (!Files.isDirectory(repo)) { - throw new IllegalArgumentException("Couldn't find maven repository. Please define MAVEN_LOCAL_REPOSITORY in the environment."); - } - - LOG.info("Using maven repository: {}", repo); - return repo; - } -} diff --git a/it/src/test/resources/java-sonarlint.xml b/it/src/test/resources/java-sonarlint.xml deleted file mode 100644 index 2644cac..0000000 --- a/it/src/test/resources/java-sonarlint.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - SonarLint IT Java - java - - - - squid - S106 - MAJOR - - - - squid - S2325 - MAJOR - - - - \ No newline at end of file diff --git a/misc/symlink-tester.sh b/misc/symlink-tester.sh deleted file mode 100755 index dd9bf87..0000000 --- a/misc/symlink-tester.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/usr/bin/env bash - -usage() { - echo usage: $0 path/to/sonarlint - exit 1 -} - -test -f "$1" && test -x "$1" || usage - -sonarlint=$1 - -if type mktemp &>/dev/null; then - tempdir=$(mktemp -d) -else - tempdir=/tmp/"$(basename "$0")-$$" - mkdir -p "$tempdir" -fi - -cleanup() { - rm -fr "$tempdir" -} - -trap 'cleanup; exit 1' 1 2 3 15 - -abspath() { - (cd "$(dirname "$1")"; echo $PWD/"$(basename "$1")") -} - -verify() { - printf '%s -> ' "$1" - shift - "$@" &>/dev/null && echo ok || echo failed -} - -relpath_to_root() { - ( - cd "$1" - relpath=. - while test "$PWD" != /; do - cd .. - relpath=$relpath/.. - done - echo $relpath - ) -} - -ln -s "$(abspath "$sonarlint")" "$tempdir"/sonarlint -verify 'launch from abs symlink to abs path' "$tempdir"/sonarlint -h - -ln -s $(relpath_to_root "$tempdir")/"$(abspath "$sonarlint")" "$tempdir"/sonarlint-rel -verify 'symlink to rel path is valid' test -f "$tempdir"/sonarlint-rel -verify 'launch from abs symlink to rel path' "$tempdir"/sonarlint-rel -h - -mkdir "$tempdir/x" -ln -s ../sonarlint "$tempdir"/x/sonarlint -verify 'symlink to rel symlink is valid' test -f "$tempdir"/x/sonarlint -verify 'launch from abs symlink that is rel symlink to abs path' "$tempdir"/x/sonarlint -h - -cleanup diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 3b6911f..0000000 --- a/pom.xml +++ /dev/null @@ -1,241 +0,0 @@ - - 4.0.0 - - org.sonarsource.parent - parent - 39 - - - org.sonarsource.sonarlint.cli - sonarlint-cli - 2.2-SNAPSHOT - jar - SonarLint CLI - http://www.sonarlint.org - 2016 - - - SonarSource - http://www.sonarsource.com - - - - - GNU LGPL 3 - http://www.gnu.org/licenses/lgpl.txt - repo - - - - - scm:git:git@github.com:SonarSource/sonarlint-cli.git - scm:git:git@github.com:SonarSource/sonarlint-cli.git - https://github.com/SonarSource/sonarlint-cli - HEAD - - - - JIRA - https://jira.sonarsource.com/browse/SLCLI - - - - true - sonarlint-cli - 2.10.0.367 - 4.3.0.7717 - 2.18.0.3454 - 2.9.1.1705 - 1.6 - - ${project.groupId}:${project.artifactId}:zip - - - - - org.sonarsource.sonarlint.core - sonarlint-core - ${sonarlint.version} - - - org.sonarsource.sonarlint.core - sonarlint-client-api - ${sonarlint.version} - - - com.google.code.findbugs - jsr305 - 2.0.1 - provided - - - org.freemarker - freemarker - 2.3.25-incubating - - - - - junit - junit - 4.11 - test - - - org.mockito - mockito-all - 1.10.19 - test - - - org.assertj - assertj-core - 2.3.0 - test - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - false - true - org.sonarlint.cli.Main - - - - - - - org.apache.maven.plugins - maven-shade-plugin - - - package - - shade - - - true - - false - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy - package - - copy - - - - - org.sonarsource.java - sonar-java-plugin - ${sonar.java.version} - jar - false - ${project.build.directory}/plugins - - - org.sonarsource.javascript - sonar-javascript-plugin - ${sonar.javascript.version} - jar - false - ${project.build.directory}/plugins - - - org.sonarsource.php - sonar-php-plugin - ${sonar.php.version} - jar - false - ${project.build.directory}/plugins - - - org.sonarsource.python - sonar-python-plugin - ${sonar.python.version} - jar - false - ${project.build.directory}/plugins - - - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - - - package - - single - - - sonarlint-cli-${project.version} - false - \ - - ${project.basedir}/assembly.xml - - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-distribution-size - - enforce - - verify - - - - 30000000 - 50000000 - - ${project.build.directory}/sonarlint-cli-${project.version}.zip - - - - - - - - - - diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..d3b36c9 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,18 @@ +/* + * This settings file was generated by the Gradle 'init' task. + * + * The settings file is used to specify which projects to include in your build. + * In a single project build this file can be empty or even removed. + * + * Detailed information about configuring a multi-project build in Gradle can be found + * in the user guide at https://docs.gradle.org/4.1/userguide/multi_project_builds.html + */ + +/* +// To declare projects as part of a multi-project build use the 'include' method +include 'shared' +include 'api' +include 'services:webservice' +*/ + +rootProject.name = 'codeclimate-sonar-java' diff --git a/src/main/assembly/bin/sonarlint b/src/main/assembly/bin/sonarlint deleted file mode 100755 index a8cc4e4..0000000 --- a/src/main/assembly/bin/sonarlint +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh -# -# SonarLint Startup Script for Unix -# -# Optional ENV vars: -# SONARLINT_OPTS - parameters passed to the Java VM when running SonarLint - -real_path() { - target=$1 - - ( - while true; do - cd "$(dirname "$target")" - target=$(basename "$target") - link=$(readlink "$target") - test "$link" || break - target=$link - done - - echo "$(pwd -P)/$target" - ) -} - -script_path="$0" - -if [ -h "$script_path" ]; then - # resolve symlinks - script_path=$(real_path "$script_path") -fi - -sonarlint_home=$(dirname "$script_path")/.. - -# make it fully qualified -sonarlint_home=$(cd "$sonarlint_home" && pwd -P) - -# check that the sonarlint_home has been correctly set -if [ ! -f "$sonarlint_home/lib/sonarlint-cli-${project.version}.jar" ] ; then - echo "fatal: detected installation directory is invalid: $sonarlint_home" - echo 'fatal: lib/sonarlint-cli-${project.version}.jar should exist relative from the installation directory' - exit 1 -fi - -if [ -n "$JAVA_HOME" ] -then - java_cmd="$JAVA_HOME/bin/java" -else - java_cmd="$(which java)" -fi - -jar_file="$sonarlint_home"/lib/sonarlint-cli-${project.version}.jar -project_home=$PWD - -#echo "Info: Using sonarlint-cli in $sonarlint_home" -#echo "Info: Using java at $java_cmd" -#echo "Info: Using classpath $jar_file" -#echo "Info: Using project $project_home" - -exec "$java_cmd" \ - -Djava.awt.headless=true \ - $SONARLINT_OPTS \ - -classpath "$jar_file" \ - -Dsonarlint.home="$sonarlint_home" \ - -Dproject.home="$project_home" \ - -Dorg.freemarker.loggerLibrary=none \ - org.sonarlint.cli.Main "$@" - diff --git a/src/main/assembly/bin/sonarlint.bat b/src/main/assembly/bin/sonarlint.bat deleted file mode 100644 index e704af2..0000000 --- a/src/main/assembly/bin/sonarlint.bat +++ /dev/null @@ -1,98 +0,0 @@ -@REM SonarLint Startup Script for Windows -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars: -@REM SONARLINT_HOME - location of SonarLint's installed home dir -@REM SONARLINT_OPTS - parameters passed to the Java VM when running SonarLint - -@echo off - -set ERROR_CODE=0 - -@REM set local scope for the variables with windows NT shell -@setlocal - -@REM ==== START VALIDATION ==== -@REM *** JAVA EXEC VALIDATION *** -if not "%JAVA_HOME%" == "" goto foundJavaHome - -for %%i in (java.exe) do set JAVA_EXEC=%%~$PATH:i - -if not "%JAVA_EXEC%" == "" ( - set JAVA_EXEC="%JAVA_EXEC%" - goto OkJava -) - -if not "%JAVA_EXEC%" == "" goto OkJava - -echo. -echo ERROR: JAVA_HOME not found in your environment, and no Java -echo executable present in the PATH. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation, or add "java.exe" to the PATH -echo. -goto error - -:foundJavaHome -if EXIST "%JAVA_HOME%\bin\java.exe" goto foundJavaExeFromJavaHome - -echo. -echo ERROR: JAVA_HOME exists but does not point to a valid Java home -echo folder. No "\bin\java.exe" file can be found there. -echo. -goto error - -:foundJavaExeFromJavaHome -set JAVA_EXEC="%JAVA_HOME%\bin\java.exe" - -@REM *** SONARLINT HOME VALIDATION *** -:OkJava -if NOT "%SONARLINT_HOME%"=="" goto cleanSonarLintHome -set SONARLINT_HOME=%~dp0.. -goto run - -:cleanSonarLintHome -@REM If the property has a trailing backslash, remove it -if "%SONARLINT_HOME:~-1%"=="\" set SONARLINT_HOME=%SONARLINT_HOME:~0,-1% - -@REM Check if the provided SONARLINT_HOME is a valid install dir -IF EXIST "%SONARLINT_HOME%\lib\sonarlint-cli-${project.version}.jar" goto run - -echo. -echo ERROR: SONARLINT_HOME exists but does not point to a valid install -echo directory: %SONARLINT_HOME% -echo. -goto error - - - -@REM ==== START RUN ==== -:run -echo %SONARLINT_HOME% - -set PROJECT_HOME=%CD% -if not "%SONARLINT_OPTS%"=="" set SONARLINT_OPTS="%SONARLINT_OPTS%" - -%JAVA_EXEC% -Djava.awt.headless=true %SONARLINT_OPTS% -cp "%SONARLINT_HOME%\lib\sonarlint-cli-${project.version}.jar" "-Dsonarlint.home=%SONARLINT_HOME%" "-Dproject.home=%PROJECT_HOME%" -Dorg.freemarker.loggerLibrary=none org.sonarlint.cli.Main %* -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -@REM ==== END EXECUTION ==== - -:end -@REM set local scope for the variables with windows NT shell -@endlocal & set ERROR_CODE=%ERROR_CODE% - -@REM see http://code-bear.com/bearlog/2007/06/01/getting-the-exit-code-from-a-batch-file-that-is-run-from-a-python-program/ -goto exit - -:returncode -exit /B %1 - -:exit -call :returncode %ERROR_CODE% diff --git a/src/main/java/cc/App.java b/src/main/java/cc/App.java new file mode 100644 index 0000000..5ebb316 --- /dev/null +++ b/src/main/java/cc/App.java @@ -0,0 +1,9 @@ +package cc; + +import org.sonarlint.cli.CustomMain; + +public class App { + public static void main(String[] args) { + CustomMain.main(args); + } +} diff --git a/src/main/java/cc/JsonReport.java b/src/main/java/cc/JsonReport.java new file mode 100644 index 0000000..6600db3 --- /dev/null +++ b/src/main/java/cc/JsonReport.java @@ -0,0 +1,84 @@ +package cc; + +import com.google.gson.JsonObject; +import com.google.gson.JsonArray; +import java.io.PrintStream; +import java.util.Collection; +import java.util.Date; +import java.util.List; +import java.util.Arrays; +import java.util.function.Function; +import org.sonarlint.cli.util.Logger; +import org.sonarsource.sonarlint.core.client.api.common.RuleDetails; +import org.sonarsource.sonarlint.core.client.api.common.analysis.AnalysisResults; +import org.sonarsource.sonarlint.core.client.api.common.analysis.Issue; +import org.sonarsource.sonarlint.core.tracking.Trackable; + +public class JsonReport implements org.sonarlint.cli.report.Reporter { + + private static final List VALID_RULE_DETAIL_TYPES = Arrays.asList( + "BUG", + "VULNERABILITY" + ); + + + @Override + public void execute(String projectName, Date date, Collection trackables, AnalysisResults result, Function ruleDescriptionProducer) { + for (Trackable trackable : trackables) { + Issue issue = trackable.getIssue(); + RuleDetails ruleDetails = ruleDescriptionProducer.apply(issue.getRuleKey()); + + if (VALID_RULE_DETAIL_TYPES.contains(ruleDetails.getType())) { + JsonObject json = new JsonObject(); + json.addProperty("type", "issue"); + json.addProperty("check_name", issue.getRuleKey()); + json.addProperty("severity", ruleDetails.getSeverity().toLowerCase()); + json.addProperty("description", issue.getMessage()); + + JsonObject content = new JsonObject(); + json.add("content", content); + content.addProperty("body", ruleDetails.getHtmlDescription()); + // // ruleDetails.getExtendedDescription(); + + JsonObject location = new JsonObject(); + json.add("location", location); + + // Code Climate CLI expects relative path to file + location.addProperty("path", issue.getInputFile().getPath().replaceFirst("^/tmp/code/", "")); + + JsonObject lines = new JsonObject(); + location.add("lines", lines); + + if (issue.getStartLine() != null) { + lines.addProperty("begin", issue.getStartLine()); + + if (issue.getEndLine() != null) { + lines.addProperty("end", issue.getEndLine()); + } else { + lines.addProperty("end", 1); + } + } else { + lines.addProperty("begin", 1); + lines.addProperty("end", 1); + } + + String category; + switch (ruleDetails.getType()) { + case "VULNERABILITY": { + category = "Security"; + break; + } + default: { + category = "Bug Risk"; + break; + } + } + JsonArray categories = new JsonArray(); + categories.add(category); + json.add("categories", categories); + + System.out.println(json.toString() + "\0"); + } + } + } +} diff --git a/src/main/java/org/sonarlint/cli/CustomMain.java b/src/main/java/org/sonarlint/cli/CustomMain.java new file mode 100644 index 0000000..d1f2e2e --- /dev/null +++ b/src/main/java/org/sonarlint/cli/CustomMain.java @@ -0,0 +1,105 @@ +/* + * SonarLint CLI + * Copyright (C) 2016-2017 SonarSource SA + * mailto:info AT sonarsource DOT com + * + * This program 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 3 of the License, or (at your option) any later version. + * + * This program 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 program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.sonarlint.cli; + +import cc.JsonReport; +import org.sonarlint.cli.analysis.SonarLintFactory; +import org.sonarlint.cli.config.ConfigurationReader; +import org.sonarlint.cli.report.ReportFactory; +import org.sonarlint.cli.report.Reporter; +import org.sonarlint.cli.util.Logger; +import org.sonarlint.cli.util.System2; + +import java.nio.charset.Charset; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.text.ParseException; +import java.util.Arrays; +import java.util.List; + +import static org.sonarlint.cli.SonarProperties.PROJECT_HOME; + + +public class CustomMain extends org.sonarlint.cli.Main { + static final int SUCCESS = 0; + static final int ERROR = 1; + private static final Logger LOGGER = Logger.get(); + + public CustomMain(Options opts, SonarLintFactory sonarLintFactory, ReportFactory reportFactory, InputFileFinder fileFinder, Path projectHome) { + super(opts, sonarLintFactory, reportFactory, fileFinder, projectHome); + } + + public static void main(String[] args) { + execute(args, System2.INSTANCE); + } + + static void execute(String[] args, System2 system) { + Options parsedOpts; + try { + parsedOpts = Options.parse(args); + } catch (ParseException e) { + LOGGER.error("Error parsing arguments: " + e.getMessage(), e); + Options.printUsage(); + system.exit(ERROR); + return; + } + + Charset charset; + try { + if (parsedOpts.charset() != null) { + charset = Charset.forName(parsedOpts.charset()); + } else { + charset = Charset.defaultCharset(); + } + } catch (Exception e) { + LOGGER.error("Error creating charset: " + parsedOpts.charset(), e); + system.exit(ERROR); + return; + } + + InputFileFinder fileFinder = new InputFileFinder(parsedOpts.src(), parsedOpts.tests(), parsedOpts.exclusions(), charset); + ReportFactory reportFactory = new CustomReportFactory(charset); + ConfigurationReader reader = new ConfigurationReader(); + SonarLintFactory sonarLintFactory = new SonarLintFactory(reader); + + int ret = new CustomMain(parsedOpts, sonarLintFactory, reportFactory, fileFinder, getProjectHome(system)).run(); + system.exit(ret); + return; + } + + private static Path getProjectHome(System2 system) { + String projectHome = system.getProperty(PROJECT_HOME); + if (projectHome == null) { + throw new IllegalStateException("Can't find project home. System property not set: " + PROJECT_HOME); + } + return Paths.get(projectHome); + } + + private static class CustomReportFactory extends ReportFactory { + public CustomReportFactory(Charset charset) { + super(charset); + } + + @Override + public List createReporters(Path basePath) { + return Arrays.asList(new JsonReport()); + } + } +} diff --git a/src/main/java/org/sonarlint/cli/InputFileFinder.java b/src/main/java/org/sonarlint/cli/InputFileFinder.java deleted file mode 100644 index 67354d0..0000000 --- a/src/main/java/org/sonarlint/cli/InputFileFinder.java +++ /dev/null @@ -1,168 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli; - -import java.io.IOException; -import java.io.InputStream; -import java.nio.charset.Charset; -import java.nio.file.FileSystem; -import java.nio.file.FileSystems; -import java.nio.file.FileVisitResult; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.PathMatcher; -import java.nio.file.SimpleFileVisitor; -import java.nio.file.attribute.BasicFileAttributes; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Nullable; -import org.sonarlint.cli.util.Logger; -import org.sonarsource.sonarlint.core.client.api.common.analysis.ClientInputFile; - -public class InputFileFinder { - private static final String GLOB_PREFIX = "glob:"; - private static final Logger LOGGER = Logger.get(); - private final PathMatcher srcMatcher; - private final PathMatcher testsMatcher; - private final PathMatcher excludeMatcher; - private final Charset charset; - - private static PathMatcher acceptAll = p -> true; - private static PathMatcher refuseAll = p -> false; - - public InputFileFinder(@Nullable String srcGlobPattern, @Nullable String testsGlobPattern, @Nullable String excludeGlobPattern, Charset charset) { - this.charset = charset; - FileSystem fs = FileSystems.getDefault(); - try { - if (srcGlobPattern != null) { - srcMatcher = fs.getPathMatcher(GLOB_PREFIX + srcGlobPattern); - } else { - srcMatcher = acceptAll; - } - } catch (Exception e) { - LOGGER.error("Error creating matcher for sources with pattern: " + srcGlobPattern); - throw e; - } - - try { - if (testsGlobPattern != null) { - testsMatcher = fs.getPathMatcher(GLOB_PREFIX + testsGlobPattern); - } else { - testsMatcher = refuseAll; - } - } catch (Exception e) { - LOGGER.error("Error creating matcher for tests with pattern: " + testsGlobPattern); - throw e; - } - - try { - if (excludeGlobPattern != null) { - excludeMatcher = fs.getPathMatcher(GLOB_PREFIX + excludeGlobPattern); - } else { - excludeMatcher = refuseAll; - } - } catch (Exception e) { - LOGGER.error("Error creating matcher for exclusions with pattern: " + excludeGlobPattern); - throw e; - } - } - - public List collect(Path dir) throws IOException { - final List files = new ArrayList<>(); - Files.walkFileTree(dir, new FileCollector(dir, files)); - return files; - } - - private class FileCollector extends SimpleFileVisitor { - private final List files; - private final Path baseDir; - - private FileCollector(Path baseDir, List files) { - this.baseDir = baseDir; - this.files = files; - } - - @Override - public FileVisitResult visitFile(final Path file, BasicFileAttributes attrs) throws IOException { - Path absoluteFilePath = file; - Path relativeFilePath = baseDir.relativize(absoluteFilePath); - boolean isSrc = srcMatcher.matches(absoluteFilePath) || srcMatcher.matches(relativeFilePath); - boolean isExcluded = excludeMatcher.matches(absoluteFilePath) || excludeMatcher.matches(relativeFilePath); - if (isSrc && !isExcluded) { - boolean isTest = testsMatcher.matches(absoluteFilePath) || testsMatcher.matches(relativeFilePath); - files.add(new DefaultClientInputFile(absoluteFilePath, isTest, charset)); - } - - return super.visitFile(absoluteFilePath, attrs); - } - - @Override - public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException { - if (Files.isHidden(dir)) { - LOGGER.debug("Ignoring hidden directory: " + dir.toString()); - return FileVisitResult.SKIP_SUBTREE; - } - - return super.preVisitDirectory(dir, attrs); - } - } - - public static class DefaultClientInputFile implements ClientInputFile { - private final Path path; - private final boolean test; - private final Charset charset; - - public DefaultClientInputFile(Path path, boolean test, Charset charset) { - this.path = path; - this.test = test; - this.charset = charset; - } - - @Override - public boolean isTest() { - return test; - } - - @Override - public String getPath() { - return path.toString(); - } - - @Override - public Charset getCharset() { - return charset; - } - - @Override - public G getClientObject() { - return null; - } - - @Override - public InputStream inputStream() throws IOException { - return Files.newInputStream(path); - } - - @Override - public String contents() throws IOException { - return new String(Files.readAllBytes(path), charset); - } - } -} diff --git a/src/main/java/org/sonarlint/cli/Main.java b/src/main/java/org/sonarlint/cli/Main.java deleted file mode 100644 index 82823ac..0000000 --- a/src/main/java/org/sonarlint/cli/Main.java +++ /dev/null @@ -1,223 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli; - -import com.google.common.annotations.VisibleForTesting; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.text.ParseException; -import java.util.Map; -import org.sonarlint.cli.analysis.SonarLint; -import org.sonarlint.cli.analysis.SonarLintFactory; -import org.sonarlint.cli.config.ConfigurationReader; -import org.sonarlint.cli.report.ReportFactory; -import org.sonarlint.cli.util.Logger; -import org.sonarlint.cli.util.System2; -import org.sonarlint.cli.util.SystemInfo; -import org.sonarlint.cli.util.Util; - -import static org.sonarlint.cli.SonarProperties.PROJECT_HOME; - -public class Main { - static final int SUCCESS = 0; - static final int ERROR = 1; - - private static final Logger LOGGER = Logger.get(); - - private final Options opts; - private final ReportFactory reportFactory; - private BufferedReader inputReader; - private final InputFileFinder fileFinder; - private final Path projectHome; - private final SonarLintFactory sonarLintFactory; - - public Main(Options opts, SonarLintFactory sonarLintFactory, ReportFactory reportFactory, InputFileFinder fileFinder, Path projectHome) { - this.opts = opts; - this.sonarLintFactory = sonarLintFactory; - this.reportFactory = reportFactory; - this.fileFinder = fileFinder; - this.projectHome = projectHome; - } - - int run() { - if (opts.isHelp()) { - Options.printUsage(); - return SUCCESS; - } - - if (opts.isVersion()) { - Logger.get().info(SystemInfo.getVersion()); - return SUCCESS; - } - - reportFactory.setHtmlPath(opts.htmlReport()); - - LOGGER.setDebugEnabled(opts.isVerbose()); - LOGGER.setDisplayStackTrace(opts.showStack()); - - SystemInfo.print(LOGGER); - - if (opts.showStack()) { - LOGGER.info("Error stacktraces are turned on."); - } - - Stats stats = new Stats(); - try { - SonarLint sonarLint = sonarLintFactory.createSonarLint(projectHome, opts.isUpdate(), opts.isVerbose()); - sonarLint.start(opts.isUpdate()); - - Map props = Util.toMap(opts.properties()); - - if (opts.isInteractive()) { - runInteractive(stats, sonarLint, props, projectHome); - } else { - runOnce(stats, sonarLint, props, projectHome); - } - } catch (Exception e) { - displayExecutionResult(stats, "FAILURE"); - showError("Error executing SonarLint", e, opts.showStack(), opts.isVerbose()); - return ERROR; - } - - return SUCCESS; - } - - private static Path getProjectHome(System2 system) { - String projectHome = system.getProperty(PROJECT_HOME); - if (projectHome == null) { - throw new IllegalStateException("Can't find project home. System property not set: " + PROJECT_HOME); - } - return Paths.get(projectHome); - } - - private void runOnce(Stats stats, SonarLint sonarLint, Map props, Path projectHome) throws IOException { - stats.start(); - sonarLint.runAnalysis(props, reportFactory, fileFinder, projectHome); - sonarLint.stop(); - displayExecutionResult(stats, "SUCCESS"); - } - - private void runInteractive(Stats stats, SonarLint sonarLint, Map props, Path projectHome) throws IOException { - do { - stats.start(); - sonarLint.runAnalysis(props, reportFactory, fileFinder, projectHome); - displayExecutionResult(stats, "SUCCESS"); - } while (waitForUser()); - - sonarLint.stop(); - } - - private boolean waitForUser() throws IOException { - if (inputReader == null) { - inputReader = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8)); - } - LOGGER.info(""); - LOGGER.info(""); - String line = inputReader.readLine(); - return line != null; - } - - public void setIn(InputStream in) { - inputReader = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8)); - } - - public static void main(String[] args) { - execute(args, System2.INSTANCE); - } - - @VisibleForTesting - static void execute(String[] args, System2 system) { - Options parsedOpts; - try { - parsedOpts = Options.parse(args); - } catch (ParseException e) { - LOGGER.error("Error parsing arguments: " + e.getMessage(), e); - Options.printUsage(); - system.exit(ERROR); - return; - } - - Charset charset; - try { - if (parsedOpts.charset() != null) { - charset = Charset.forName(parsedOpts.charset()); - } else { - charset = Charset.defaultCharset(); - } - } catch (Exception e) { - LOGGER.error("Error creating charset: " + parsedOpts.charset(), e); - system.exit(ERROR); - return; - } - - InputFileFinder fileFinder = new InputFileFinder(parsedOpts.src(), parsedOpts.tests(), parsedOpts.exclusions(), charset); - ReportFactory reportFactory = new ReportFactory(charset); - ConfigurationReader reader = new ConfigurationReader(); - SonarLintFactory sonarLintFactory = new SonarLintFactory(reader); - - int ret = new Main(parsedOpts, sonarLintFactory, reportFactory, fileFinder, getProjectHome(system)).run(); - system.exit(ret); - return; - } - - private static void displayExecutionResult(Stats stats, String resultMsg) { - String dashes = "------------------------------------------------------------------------"; - LOGGER.info(dashes); - LOGGER.info("EXECUTION " + resultMsg); - LOGGER.info(dashes); - stats.stop(); - LOGGER.info(dashes); - } - - private static void showError(String message, Throwable e, boolean showStackTrace, boolean debug) { - if (showStackTrace) { - LOGGER.error(message, e); - if (!debug) { - LOGGER.error(""); - suggestDebugMode(); - } - } else { - LOGGER.error(message); - LOGGER.error(e.getMessage()); - String previousMsg = ""; - for (Throwable cause = e.getCause(); cause != null - && cause.getMessage() != null - && !cause.getMessage().equals(previousMsg); cause = cause.getCause()) { - LOGGER.error("Caused by: " + cause.getMessage()); - previousMsg = cause.getMessage(); - } - LOGGER.error(""); - LOGGER.error("To see the full stack trace of the errors, re-run SonarLint with the -e switch."); - if (!debug) { - suggestDebugMode(); - } - } - } - - private static void suggestDebugMode() { - LOGGER.error("Re-run SonarLint using the -X switch to enable full debug logging."); - } -} diff --git a/src/main/java/org/sonarlint/cli/Options.java b/src/main/java/org/sonarlint/cli/Options.java deleted file mode 100644 index aff6000..0000000 --- a/src/main/java/org/sonarlint/cli/Options.java +++ /dev/null @@ -1,199 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli; - -import java.text.ParseException; -import java.util.Properties; -import org.sonarlint.cli.util.Logger; - -public class Options { - private static final Logger LOGGER = Logger.get(); - private Properties props = new Properties(); - private boolean verbose = false; - private boolean help = false; - private boolean version = false; - private boolean showStack = false; - private boolean interactive = false; - private String htmlReport = null; - private String src = null; - private String tests = ""; - private String exclusions = ""; - private String charset = null; - private boolean update = false; - private String task; - - public static Options parse(String[] args) throws ParseException { - Options options = new Options(); - - for (int i = 0; i < args.length; i++) { - String arg = args[i]; - if (i == 0 && !arg.startsWith("-")) { - options.task = arg; - - } else if ("-h".equals(arg) || "--help".equals(arg)) { - options.help = true; - - } else if ("-v".equals(arg) || "--version".equals(arg)) { - options.version = true; - - } else if ("-i".equals(arg) || "--interactive".equals(arg)) { - options.interactive = true; - - } else if ("-e".equals(arg) || "--errors".equals(arg)) { - options.showStack = true; - - } else if ("-X".equals(arg) || "--debug".equals(arg)) { - options.verbose = true; - - } else if ("-u".equals(arg) || "--update".equals(arg)) { - options.update = true; - - } else if (arg.startsWith("-D") && !"-D".equals(arg)) { - arg = arg.substring(2); - appendPropertyTo(arg, options.props); - - } else { - i++; - - if ("--html-report".equals(arg)) { - checkAdditionalArg(i, args.length, arg); - options.htmlReport = args[i]; - - } else if ("--charset".equals(arg)) { - checkAdditionalArg(i, args.length, arg); - options.charset = args[i]; - - } else if ("--src".equals(arg)) { - checkAdditionalArg(i, args.length, arg); - options.src = args[i]; - - } else if ("--tests".equals(arg)) { - checkAdditionalArg(i, args.length, arg); - options.tests = args[i]; - - } else if ("--exclude".equals(arg)) { - checkAdditionalArg(i, args.length, arg); - options.exclusions = args[i]; - - } else if ("-D".equals(arg) || "--define".equals(arg)) { - checkAdditionalArg(i, args.length, arg); - appendPropertyTo(args[i], options.props); - - } else { - throw new ParseException("Unrecognized option: " + arg, i); - } - } - } - - return options; - } - - private static void checkAdditionalArg(int i, int argsLength, String arg) throws ParseException { - if (i >= argsLength) { - throw new ParseException("Missing argument for option " + arg, i); - } - } - - public boolean isVerbose() { - return verbose; - } - - public boolean isInteractive() { - return interactive; - } - - public boolean isHelp() { - return help; - } - - public String charset() { - return charset; - } - - public String htmlReport() { - return htmlReport; - } - - public String src() { - return src; - } - - public String tests() { - return tests; - } - - public String exclusions() { - return exclusions; - } - - public boolean isUpdate() { - return update; - } - - public boolean isVersion() { - return version; - } - - public boolean showStack() { - return showStack; - } - - public Properties properties() { - return props; - } - - public String task() { - return task; - } - - public static void printUsage() { - LOGGER.info(""); - LOGGER.info("usage: sonarlint [options]"); - LOGGER.info(""); - LOGGER.info("Options:"); - LOGGER.info(" -u,--update Update binding with SonarQube server before analysis"); - LOGGER.info(" -D,--define Define property"); - LOGGER.info(" -e,--errors Produce execution error messages"); - LOGGER.info(" -h,--help Display help information"); - LOGGER.info(" -v,--version Display version information"); - LOGGER.info(" -X,--debug Produce execution debug output"); - LOGGER.info(" -i,--interactive Run interactively"); - LOGGER.info(" --html-report HTML report output path (relative or absolute)"); - LOGGER.info(" --src GLOB pattern to identify source files"); - LOGGER.info(" --tests GLOB pattern to identify test files"); - LOGGER.info(" --exclude GLOB pattern to exclude files"); - LOGGER.info(" --charset Character encoding of the source files"); - } - - private static void appendPropertyTo(String arg, Properties props) { - final String key; - final String value; - - int j = arg.indexOf('='); - if (j == -1) { - key = arg; - value = "true"; - } else { - key = arg.substring(0, j); - value = arg.substring(j + 1); - } - props.setProperty(key, value); - } -} diff --git a/src/main/java/org/sonarlint/cli/SonarProperties.java b/src/main/java/org/sonarlint/cli/SonarProperties.java deleted file mode 100644 index 8b27d6a..0000000 --- a/src/main/java/org/sonarlint/cli/SonarProperties.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli; - -public class SonarProperties { - public static final String PROPERTY_PROJECT_CONFIG_FILE = "sonar.projectConfigFile"; - - public static final String SONARLINT_HOME = "sonarlint.home"; - public static final String PROJECT_HOME = "project.home"; - - public static final String DEFAULT_SOURCES = "."; - public static final String DEFAULT_TESTS = "."; - public static final String DEFAULT_TESTS_INCLUSIONS = "**/*Test.*,**/test/**/*"; - - private SonarProperties() { - - } -} diff --git a/src/main/java/org/sonarlint/cli/Stats.java b/src/main/java/org/sonarlint/cli/Stats.java deleted file mode 100644 index 2613c7d..0000000 --- a/src/main/java/org/sonarlint/cli/Stats.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli; - -import org.sonarlint.cli.util.Logger; - -class Stats { - private static final Logger LOGGER = Logger.get(); - private long startTime; - - Stats start() { - startTime = System.currentTimeMillis(); - return this; - } - - Stats stop() { - long stopTime = System.currentTimeMillis() - startTime; - LOGGER.info("Total time: " + formatTime(stopTime)); - - System.gc(); - Runtime r = Runtime.getRuntime(); - long mb = 1024L * 1024; - LOGGER.info("Final Memory: " + (r.totalMemory() - r.freeMemory()) / mb + "M/" + r.totalMemory() / mb + "M"); - - return this; - } - - static String formatTime(long time) { - long h = time / (60 * 60 * 1000); - long m = (time - h * 60 * 60 * 1000) / (60 * 1000); - long s = (time - h * 60 * 60 * 1000 - m * 60 * 1000) / 1000; - long ms = time % 1000; - final String format; - if (h > 0) { - format = "%1$d:%2$02d:%3$02d.%4$03ds"; - } else if (m > 0) { - format = "%2$d:%3$02d.%4$03ds"; - } else { - format = "%3$d.%4$03ds"; - } - return String.format(format, h, m, s, ms); - } -} diff --git a/src/main/java/org/sonarlint/cli/analysis/ConnectedSonarLint.java b/src/main/java/org/sonarlint/cli/analysis/ConnectedSonarLint.java deleted file mode 100644 index a17267a..0000000 --- a/src/main/java/org/sonarlint/cli/analysis/ConnectedSonarLint.java +++ /dev/null @@ -1,228 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli.analysis; - -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import javax.annotation.CheckForNull; -import org.sonarlint.cli.config.SonarQubeServer; -import org.sonarlint.cli.report.ReportFactory; -import org.sonarlint.cli.util.Logger; -import org.sonarlint.cli.util.SystemInfo; -import org.sonarsource.sonarlint.core.client.api.common.RuleDetails; -import org.sonarsource.sonarlint.core.client.api.common.analysis.AnalysisResults; -import org.sonarsource.sonarlint.core.client.api.common.analysis.ClientInputFile; -import org.sonarsource.sonarlint.core.client.api.common.analysis.Issue; -import org.sonarsource.sonarlint.core.client.api.connected.ConnectedAnalysisConfiguration; -import org.sonarsource.sonarlint.core.client.api.connected.ConnectedSonarLintEngine; -import org.sonarsource.sonarlint.core.client.api.connected.GlobalStorageStatus; -import org.sonarsource.sonarlint.core.client.api.connected.ModuleStorageStatus; -import org.sonarsource.sonarlint.core.client.api.connected.ServerConfiguration; -import org.sonarsource.sonarlint.core.tracking.CachingIssueTracker; -import org.sonarsource.sonarlint.core.tracking.CachingIssueTrackerImpl; -import org.sonarsource.sonarlint.core.tracking.Console; -import org.sonarsource.sonarlint.core.tracking.InMemoryIssueTrackerCache; -import org.sonarsource.sonarlint.core.tracking.IssueTrackable; -import org.sonarsource.sonarlint.core.tracking.IssueTrackerCache; -import org.sonarsource.sonarlint.core.tracking.ServerIssueTracker; -import org.sonarsource.sonarlint.core.tracking.Trackable; - -import static org.sonarsource.sonarlint.core.client.api.util.FileUtils.toSonarQubePath; - -public class ConnectedSonarLint extends SonarLint { - private static final Logger LOGGER = Logger.get(); - - private final ConnectedSonarLintEngine engine; - private final String moduleKey; - private final SonarQubeServer server; - - ConnectedSonarLint(ConnectedSonarLintEngine engine, SonarQubeServer server, String moduleKey) { - this.engine = engine; - this.server = server; - this.moduleKey = moduleKey; - } - - @Override - public void start(boolean forceUpdate) { - GlobalStorageStatus globalStorageStatus = engine.getGlobalStorageStatus(); - - if (forceUpdate) { - LOGGER.info("Updating binding.."); - update(); - } else if (globalStorageStatus == null) { - LOGGER.info("No binding storage found. Updating.."); - update(); - } else if (globalStorageStatus.isStale()) { - LOGGER.info("Binding storage is stale. Updating.."); - update(); - } else { - checkModuleStatus(); - } - } - - private void checkModuleStatus() { - engine.allModulesByKey().keySet().stream() - .filter(key -> key.equals(moduleKey)) - .findAny() - .orElseThrow(() -> new IllegalStateException("Project key '" + moduleKey + "' not found in the binding storage. Maybe an update of the storage is needed with '-u'?")); - - ModuleStorageStatus moduleStorageStatus = engine.getModuleStorageStatus(moduleKey); - if (moduleStorageStatus == null) { - LOGGER.info("Updating data for module.."); - engine.updateModule(getServerConfiguration(server), moduleKey); - LOGGER.info("Module updated"); - } else if (moduleStorageStatus.isStale()) { - LOGGER.info("Module's data is stale. Updating.."); - engine.updateModule(getServerConfiguration(server), moduleKey); - LOGGER.info("Module updated"); - } - } - - private void update() { - engine.update(getServerConfiguration(server)); - engine.allModulesByKey().keySet().stream() - .filter(key -> key.equals(moduleKey)) - .findAny() - .orElseThrow(() -> new IllegalStateException("Project key '" + moduleKey + "' not found in the SonarQube server")); - updateModule(); - LOGGER.info("Binding updated"); - } - - private void updateModule() { - engine.updateModule(getServerConfiguration(server), moduleKey); - } - - private static ServerConfiguration getServerConfiguration(SonarQubeServer server) { - ServerConfiguration.Builder serverConfigBuilder = ServerConfiguration.builder() - .url(server.url()) - .userAgent("SonarLint CLI " + SystemInfo.getVersion()); - - String token = server.token(); - if (token != null) { - serverConfigBuilder.token(token); - } else { - serverConfigBuilder.credentials(server.login(), server.password()); - } - return serverConfigBuilder.build(); - } - - @Override - protected void doAnalysis(Map properties, ReportFactory reportFactory, List inputFiles, Path baseDirPath) { - Date start = new Date(); - ConnectedAnalysisConfiguration config = new ConnectedAnalysisConfiguration(moduleKey, baseDirPath, baseDirPath.resolve(".sonarlint"), - inputFiles, properties); - IssueCollector collector = new IssueCollector(); - AnalysisResults result = engine.analyze(config, collector); - engine.downloadServerIssues(getServerConfiguration(server), moduleKey); - Collection trackables = matchAndTrack(baseDirPath, collector.get()); - generateReports(trackables, result, reportFactory, baseDirPath.getFileName().toString(), baseDirPath, start); - } - - Collection matchAndTrack(Path baseDirPath, Collection issues) { - Collection issuesWithFile = issues.stream().filter(issue -> issue.getInputFile() != null).collect(Collectors.toList()); - Collection relativePaths = getRelativePaths(baseDirPath, issuesWithFile); - Map> trackablesPerFile = getTrackablesPerFile(baseDirPath, issuesWithFile); - IssueTrackerCache cache = createCurrentIssueTrackerCache(relativePaths, trackablesPerFile); - return getCurrentTrackables(relativePaths, cache); - } - - private IssueTrackerCache createCurrentIssueTrackerCache(Collection relativePaths, Map> trackablesPerFile) { - IssueTrackerCache cache = new InMemoryIssueTrackerCache(); - CachingIssueTracker issueTracker = new CachingIssueTrackerImpl(cache); - trackablesPerFile.entrySet().forEach(entry -> issueTracker.matchAndTrackAsNew(entry.getKey(), entry.getValue())); - ServerIssueTracker serverIssueTracker = new ServerIssueTracker(new MyLogger(), new MyConsole(), issueTracker); - serverIssueTracker.update(engine, moduleKey, relativePaths); - return cache; - } - - private static List getCurrentTrackables(Collection relativePaths, IssueTrackerCache cache) { - return relativePaths.stream().flatMap(f -> cache.getCurrentTrackables(f).stream()) - .filter(trackable -> !trackable.isResolved()) - .collect(Collectors.toList()); - } - - private Map> getTrackablesPerFile(Path baseDirPath, Collection issues) { - return issues.stream() - .collect(Collectors.groupingBy(issue -> getRelativePath(baseDirPath, issue), Collectors.toList())) - .entrySet().stream() - .collect(Collectors.toMap( - Map.Entry::getKey, - entry -> entry.getValue().stream() - .map(IssueTrackable::new) - .collect(Collectors.toCollection(ArrayList::new)))); - } - - private Collection getRelativePaths(Path baseDirPath, Collection issues) { - return issues.stream() - .map(issue -> getRelativePath(baseDirPath, issue)) - .collect(Collectors.toSet()); - } - - // note: engine.downloadServerIssues correctly figures out correct moduleKey and fileKey - @CheckForNull - String getRelativePath(Path baseDirPath, Issue issue) { - ClientInputFile inputFile = issue.getInputFile(); - if (inputFile == null) { - return null; - } - - return toSonarQubePath(baseDirPath.relativize(Paths.get(inputFile.getPath())).toString()); - } - - @Override - protected RuleDetails getRuleDetails(String ruleKey) { - return engine.getRuleDetails(ruleKey); - } - - @Override - public void stop() { - engine.stop(false); - } - - private static class MyLogger implements org.sonarsource.sonarlint.core.tracking.Logger { - @Override public void error(String message, Exception e) { - LOGGER.error(message, e); - } - - @Override public void debug(String message, Exception e) { - LOGGER.debug(message, e); - } - - @Override public void debug(String message) { - LOGGER.debug(message); - } - } - - private static class MyConsole implements Console { - @Override public void info(String message) { - LOGGER.info(message); - } - - @Override public void error(String message, Throwable t) { - LOGGER.error(message, t); - } - } -} diff --git a/src/main/java/org/sonarlint/cli/analysis/DefaultLogOutput.java b/src/main/java/org/sonarlint/cli/analysis/DefaultLogOutput.java deleted file mode 100644 index 95097bf..0000000 --- a/src/main/java/org/sonarlint/cli/analysis/DefaultLogOutput.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli.analysis; - -import org.sonarlint.cli.util.Logger; -import org.sonarsource.sonarlint.core.client.api.common.LogOutput; - -class DefaultLogOutput implements LogOutput { - - private final Logger logger; - private final boolean verbose; - - public DefaultLogOutput(Logger logger, boolean verbose) { - this.logger = logger; - this.verbose = verbose; - } - - @Override - public void log(String formattedMessage, Level level) { - switch (level) { - case TRACE: - case DEBUG: - if (verbose) { - logger.debug(formattedMessage); - } - break; - case ERROR: - logger.error(formattedMessage); - break; - case INFO: - case WARN: - default: - logger.info(formattedMessage); - } - } -} diff --git a/src/main/java/org/sonarlint/cli/analysis/IssueCollector.java b/src/main/java/org/sonarlint/cli/analysis/IssueCollector.java deleted file mode 100644 index ac6340a..0000000 --- a/src/main/java/org/sonarlint/cli/analysis/IssueCollector.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli.analysis; - -import java.util.LinkedList; -import java.util.List; - -import org.sonarsource.sonarlint.core.client.api.common.analysis.Issue; -import org.sonarsource.sonarlint.core.client.api.common.analysis.IssueListener; - -public class IssueCollector implements IssueListener { - private List issues = new LinkedList<>(); - - @Override - public void handle(Issue issue) { - issues.add(issue); - } - - public List get() { - return issues; - } -} diff --git a/src/main/java/org/sonarlint/cli/analysis/SonarLint.java b/src/main/java/org/sonarlint/cli/analysis/SonarLint.java deleted file mode 100644 index 048dc1a..0000000 --- a/src/main/java/org/sonarlint/cli/analysis/SonarLint.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli.analysis; - -import java.io.IOException; -import java.nio.file.Path; -import java.util.Collection; -import java.util.Date; -import java.util.List; -import java.util.Map; -import org.sonarlint.cli.InputFileFinder; -import org.sonarlint.cli.report.ReportFactory; -import org.sonarlint.cli.report.Reporter; -import org.sonarlint.cli.util.Logger; -import org.sonarsource.sonarlint.core.client.api.common.RuleDetails; -import org.sonarsource.sonarlint.core.client.api.common.analysis.AnalysisResults; -import org.sonarsource.sonarlint.core.client.api.common.analysis.ClientInputFile; -import org.sonarsource.sonarlint.core.tracking.Trackable; - -public abstract class SonarLint { - private static final Logger LOGGER = Logger.get(); - - public void start(boolean forceUpdate) { - // do nothing by default - } - - public void runAnalysis(Map properties, ReportFactory reportFactory, InputFileFinder finder, Path projectHome) { - List inputFiles; - try { - inputFiles = finder.collect(projectHome); - } catch (IOException e) { - throw new IllegalStateException("Error preparing list of files to analyze", e); - } - - if (inputFiles.isEmpty()) { - LOGGER.warn("No files to analyze"); - return; - } else { - LOGGER.debug(String.format("Submitting %d files for analysis", inputFiles.size())); - } - - doAnalysis(properties, reportFactory, inputFiles, projectHome); - } - - protected abstract RuleDetails getRuleDetails(String ruleKey); - - protected abstract void doAnalysis(Map properties, ReportFactory reportFactory, List inputFiles, Path baseDirPath); - - public abstract void stop(); - - protected void generateReports(Collection trackables, AnalysisResults result, ReportFactory reportFactory, String projectName, Path baseDir, Date date) { - List reporters = reportFactory.createReporters(baseDir); - - for (Reporter r : reporters) { - r.execute(projectName, date, trackables, result, this::getRuleDetails); - } - } -} diff --git a/src/main/java/org/sonarlint/cli/analysis/SonarLintFactory.java b/src/main/java/org/sonarlint/cli/analysis/SonarLintFactory.java deleted file mode 100644 index c300408..0000000 --- a/src/main/java/org/sonarlint/cli/analysis/SonarLintFactory.java +++ /dev/null @@ -1,166 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli.analysis; - -import com.google.common.annotations.VisibleForTesting; -import java.io.IOException; -import java.net.URL; -import java.nio.file.DirectoryStream; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Optional; -import org.sonarlint.cli.SonarProperties; -import org.sonarlint.cli.config.ConfigurationReader; -import org.sonarlint.cli.config.GlobalConfiguration; -import org.sonarlint.cli.config.ProjectConfiguration; -import org.sonarlint.cli.config.SonarQubeServer; -import org.sonarlint.cli.util.Logger; -import org.sonarsource.sonarlint.core.ConnectedSonarLintEngineImpl; -import org.sonarsource.sonarlint.core.StandaloneSonarLintEngineImpl; -import org.sonarsource.sonarlint.core.client.api.connected.ConnectedGlobalConfiguration; -import org.sonarsource.sonarlint.core.client.api.standalone.StandaloneGlobalConfiguration; -import org.sonarsource.sonarlint.core.client.api.standalone.StandaloneSonarLintEngine; - -public class SonarLintFactory { - private static final Logger LOGGER = Logger.get(); - - private static final Path GLOBAL_CONFIGURATION_FILEPATH; - - private static final String GLOBAL_CONFIGURATION_FILENAME = "global.json"; - private static final String PROJECT_CONFIGURATION_FILENAME = "sonarlint.json"; - - private final ConfigurationReader configurationReader; - - static { - String home = System.getProperty("user.home"); - GLOBAL_CONFIGURATION_FILEPATH = Paths.get(home) - .resolve(".sonarlint") - .resolve("conf") - .resolve(GLOBAL_CONFIGURATION_FILENAME); - } - - public SonarLintFactory(ConfigurationReader configurationReader) { - this.configurationReader = configurationReader; - } - - public SonarLint createSonarLint(Path projectHome, boolean mustBeConnected, boolean verbose) { - return createSonarLint(GLOBAL_CONFIGURATION_FILEPATH, projectHome.resolve(PROJECT_CONFIGURATION_FILENAME), mustBeConnected, verbose); - } - - public SonarLint createSonarLint(Path globalConfigPath, Path projectConfigPath, boolean mustBeConnected, boolean verbose) { - if (!Files.exists(projectConfigPath)) { - if (mustBeConnected) { - throw new IllegalStateException("Can't update project - no binding defined in: " + projectConfigPath.toAbsolutePath()); - } - return createStandalone(verbose); - } - - ProjectConfiguration project = configurationReader.readProject(projectConfigPath); - - if (!Files.exists(globalConfigPath)) { - throw new IllegalStateException("Found project binding but there is no SonarQube server configured in: " + globalConfigPath.toAbsolutePath()); - } - - GlobalConfiguration global = configurationReader.readGlobal(globalConfigPath); - List servers = getServers(global); - - String projectKey = project.projectKey(); - SonarQubeServer server; - - if (project.serverId() == null) { - if (servers.size() > 1) { - throw new IllegalStateException( - String.format("No SonarQube server id is defined in the project binding (%s) and there are multiple servers defined in the global configuration", - projectConfigPath.toAbsolutePath())); - } - server = servers.get(0); - } else { - Optional optionalServer = servers.stream().filter(s -> s.id().equals(project.serverId())).findFirst(); - server = optionalServer - .orElseThrow(() -> new IllegalStateException(String.format("No SonarQube server configuration found in '%s' for the server id defined in the project binding: '%s'", - globalConfigPath.toAbsolutePath(), project.serverId()))); - } - - return createConnected(server, projectKey, verbose); - } - - private static List getServers(GlobalConfiguration conf) { - List servers = conf.servers(); - if (servers == null) { - return Collections.emptyList(); - } - - return servers; - } - - private static SonarLint createConnected(SonarQubeServer server, String projectKey, boolean verbose) { - LOGGER.info(String.format("Connected mode (%s)", projectKey)); - ConnectedGlobalConfiguration config = ConnectedGlobalConfiguration.builder() - .setLogOutput(new DefaultLogOutput(LOGGER, verbose)) - .setServerId(server.id()) - .build(); - ConnectedSonarLintEngineImpl engine = new ConnectedSonarLintEngineImpl(config); - return new ConnectedSonarLint(engine, server, projectKey); - } - - private static SonarLint createStandalone(boolean verbose) { - LOGGER.info("Standalone mode"); - URL[] plugins; - - try { - plugins = loadPlugins(); - } catch (Exception e) { - throw new IllegalStateException("Error loading plugins", e); - } - - StandaloneGlobalConfiguration config = StandaloneGlobalConfiguration.builder() - .addPlugins(plugins) - .setLogOutput(new DefaultLogOutput(LOGGER, verbose)) - .build(); - - StandaloneSonarLintEngine engine = new StandaloneSonarLintEngineImpl(config); - return new StandaloneSonarLint(engine); - } - - @VisibleForTesting - static URL[] loadPlugins() throws IOException { - String sonarlintHome = System.getProperty(SonarProperties.SONARLINT_HOME); - - if (sonarlintHome == null) { - throw new IllegalStateException("Can't find SonarLint home. System property not set: " + SonarProperties.SONARLINT_HOME); - } - - Path sonarLintHomePath = Paths.get(sonarlintHome); - Path pluginDir = sonarLintHomePath.resolve("plugins"); - - List pluginsUrls = new ArrayList<>(); - try (DirectoryStream directoryStream = Files.newDirectoryStream(pluginDir)) { - for (Path path : directoryStream) { - pluginsUrls.add(path.toUri().toURL()); - } - } - return pluginsUrls.toArray(new URL[pluginsUrls.size()]); - } - -} diff --git a/src/main/java/org/sonarlint/cli/analysis/StandaloneSonarLint.java b/src/main/java/org/sonarlint/cli/analysis/StandaloneSonarLint.java deleted file mode 100644 index 525f23f..0000000 --- a/src/main/java/org/sonarlint/cli/analysis/StandaloneSonarLint.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli.analysis; - -import java.nio.file.Path; -import java.util.Collection; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import org.sonarlint.cli.report.ReportFactory; -import org.sonarsource.sonarlint.core.client.api.common.RuleDetails; -import org.sonarsource.sonarlint.core.client.api.common.analysis.AnalysisResults; -import org.sonarsource.sonarlint.core.client.api.common.analysis.ClientInputFile; -import org.sonarsource.sonarlint.core.client.api.standalone.StandaloneAnalysisConfiguration; -import org.sonarsource.sonarlint.core.client.api.standalone.StandaloneSonarLintEngine; -import org.sonarsource.sonarlint.core.tracking.IssueTrackable; -import org.sonarsource.sonarlint.core.tracking.Trackable; - -public class StandaloneSonarLint extends SonarLint { - private final StandaloneSonarLintEngine engine; - - public StandaloneSonarLint(StandaloneSonarLintEngine engine) { - this.engine = engine; - } - - @Override - protected void doAnalysis(Map properties, ReportFactory reportFactory, List inputFiles, Path baseDirPath) { - Date start = new Date(); - - IssueCollector collector = new IssueCollector(); - StandaloneAnalysisConfiguration config = new StandaloneAnalysisConfiguration(baseDirPath, baseDirPath.resolve(".sonarlint"), - inputFiles, properties); - AnalysisResults result = engine.analyze(config, collector); - Collection trackables = collector.get().stream().map(IssueTrackable::new).collect(Collectors.toList()); - generateReports(trackables, result, reportFactory, baseDirPath.getFileName().toString(), baseDirPath, start); - } - - @Override - protected RuleDetails getRuleDetails(String ruleKey) { - return engine.getRuleDetails(ruleKey); - } - - @Override - public void stop() { - engine.stop(); - } -} diff --git a/src/main/java/org/sonarlint/cli/analysis/package-info.java b/src/main/java/org/sonarlint/cli/analysis/package-info.java deleted file mode 100644 index 61a3875..0000000 --- a/src/main/java/org/sonarlint/cli/analysis/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonarlint.cli.analysis; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/org/sonarlint/cli/config/ConfigurationReader.java b/src/main/java/org/sonarlint/cli/config/ConfigurationReader.java deleted file mode 100644 index b8f5cea..0000000 --- a/src/main/java/org/sonarlint/cli/config/ConfigurationReader.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli.config; - -import com.google.common.base.Charsets; -import com.google.common.io.Files; -import com.google.gson.GsonBuilder; -import java.io.IOException; -import java.nio.file.Path; -import java.util.HashSet; -import java.util.Set; - -import javax.annotation.Nullable; - -import org.apache.commons.lang.StringUtils; - -public class ConfigurationReader { - private static final String FAIL_PARSE_JSON = "Failed to parse JSON file: "; - - public GlobalConfiguration readGlobal(Path configFilePath) { - String contents = getContents(configFilePath); - GlobalConfiguration config; - - try { - config = new GsonBuilder().create().fromJson(contents, GlobalConfiguration.class); - } catch (RuntimeException ex) { - throw new IllegalStateException(FAIL_PARSE_JSON + configFilePath, ex); - } - - return validate(config, configFilePath); - } - - public ProjectConfiguration readProject(Path configFilePath) { - String contents = getContents(configFilePath); - ProjectConfiguration config; - - try { - config = new GsonBuilder().create().fromJson(contents, ProjectConfiguration.class); - } catch (RuntimeException ex) { - throw new IllegalStateException(FAIL_PARSE_JSON + configFilePath, ex); - } - - return validate(config, configFilePath); - } - - private static String getContents(Path filePath) { - try { - return Files.toString(filePath.toFile(), Charsets.UTF_8); - } catch (IOException e) { - throw new IllegalStateException("Error reading configuration file: " + filePath.toAbsolutePath(), e); - } - } - - private static ProjectConfiguration validate(@Nullable ProjectConfiguration projectConfig, Path configFilePath) { - if (projectConfig == null) { - throw new IllegalStateException(FAIL_PARSE_JSON + configFilePath.toAbsolutePath()); - } - if (StringUtils.isEmpty(projectConfig.projectKey())) { - throw new IllegalStateException("Project binding must have a project key defined. Check the configuration in: " + configFilePath.toAbsolutePath()); - } - return projectConfig; - } - - private static GlobalConfiguration validate(@Nullable GlobalConfiguration globalConfig, Path configFilePath) { - Set serverUrls = new HashSet<>(); - - if (globalConfig == null) { - throw new IllegalStateException(FAIL_PARSE_JSON + configFilePath.toAbsolutePath()); - } - if (globalConfig.servers() != null) { - for (SonarQubeServer s : globalConfig.servers()) { - if (StringUtils.isEmpty(s.url())) { - throw new IllegalStateException("Invalid SonarQube servers configuration: server URL must be defined. Check the configuration in: " + configFilePath); - } - - if (serverUrls.contains(s.url())) { - throw new IllegalStateException("Invalid SonarQube servers configuration: Each server configured must have a unique URL. Check the configuration in: " + configFilePath); - } - - serverUrls.add(s.url()); - } - } - return globalConfig; - } -} diff --git a/src/main/java/org/sonarlint/cli/config/GlobalConfiguration.java b/src/main/java/org/sonarlint/cli/config/GlobalConfiguration.java deleted file mode 100644 index 62f124a..0000000 --- a/src/main/java/org/sonarlint/cli/config/GlobalConfiguration.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli.config; - -import java.util.List; - -import javax.annotation.CheckForNull; - -public class GlobalConfiguration { - private List servers; - - @CheckForNull - public List servers() { - return servers; - } -} diff --git a/src/main/java/org/sonarlint/cli/config/ProjectConfiguration.java b/src/main/java/org/sonarlint/cli/config/ProjectConfiguration.java deleted file mode 100644 index 321162b..0000000 --- a/src/main/java/org/sonarlint/cli/config/ProjectConfiguration.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli.config; - -import javax.annotation.CheckForNull; - -public class ProjectConfiguration { - private String serverId; - private String projectKey; - - @CheckForNull - public String serverId() { - return serverId; - } - - @CheckForNull - public String projectKey() { - return projectKey; - } -} diff --git a/src/main/java/org/sonarlint/cli/config/SonarQubeServer.java b/src/main/java/org/sonarlint/cli/config/SonarQubeServer.java deleted file mode 100644 index 3681393..0000000 --- a/src/main/java/org/sonarlint/cli/config/SonarQubeServer.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli.config; - -public class SonarQubeServer { - private String id; - private String url; - private String token; - private String login; - private String password; - - public String id() { - return id; - } - - public String url() { - return url; - } - - public String token() { - return token; - } - - public String login() { - return login; - } - - public String password() { - return password; - } -} diff --git a/src/main/java/org/sonarlint/cli/config/package-info.java b/src/main/java/org/sonarlint/cli/config/package-info.java deleted file mode 100644 index ef18cc6..0000000 --- a/src/main/java/org/sonarlint/cli/config/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonarlint.cli.config; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/org/sonarlint/cli/package-info.java b/src/main/java/org/sonarlint/cli/package-info.java deleted file mode 100644 index 02080bc..0000000 --- a/src/main/java/org/sonarlint/cli/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonarlint.cli; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/org/sonarlint/cli/report/CategoryReport.java b/src/main/java/org/sonarlint/cli/report/CategoryReport.java deleted file mode 100644 index ede135a..0000000 --- a/src/main/java/org/sonarlint/cli/report/CategoryReport.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli.report; - -public final class CategoryReport { - private final IssueCategory category; - private final IssueVariation total = new IssueVariation(); - - CategoryReport(IssueCategory category) { - this.category = category; - } - - public IssueVariation getTotal() { - return total; - } - - public IssueCategory getCategory() { - return category; - } - - public String getName() { - return category.getName(); - } - - public Severity getSeverity() { - return category.getSeverity(); - } - - public String getRuleKey() { - return category.getRuleKey(); - } - - @Override - public String toString() { - return new StringBuilder() - .append(super.toString()) - .append("[reportRuleKey=") - .append(category) - .append(",total=") - .append(total) - .append("]") - .toString(); - } -} diff --git a/src/main/java/org/sonarlint/cli/report/CategoryReportComparator.java b/src/main/java/org/sonarlint/cli/report/CategoryReportComparator.java deleted file mode 100644 index 89c616e..0000000 --- a/src/main/java/org/sonarlint/cli/report/CategoryReportComparator.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli.report; - -import java.util.Comparator; - -class CategoryReportComparator implements Comparator { - @Override - public int compare(CategoryReport o1, CategoryReport o2) { - if (bothHaveNoNewIssue(o1, o2)) { - return compareByRuleSeverityAndKey(o1, o2); - } else if (bothHaveNewIssues(o1, o2)) { - if (sameSeverity(o1, o2) && !sameNewIssueCount(o1, o2)) { - return compareNewIssueCount(o1, o2); - } else { - return compareByRuleSeverityAndKey(o1, o2); - } - } else { - return compareNewIssueCount(o1, o2); - } - } - - private static int compareByRuleSeverityAndKey(CategoryReport o1, CategoryReport o2) { - return o1.getCategory().compareTo(o2.getCategory()); - } - - private static boolean sameNewIssueCount(CategoryReport o1, CategoryReport o2) { - return o2.getTotal().getNewIssuesCount() == o1.getTotal().getNewIssuesCount(); - } - - private static boolean sameSeverity(CategoryReport o1, CategoryReport o2) { - return o1.getSeverity().equals(o2.getSeverity()); - } - - private static int compareNewIssueCount(CategoryReport o1, CategoryReport o2) { - return o2.getTotal().getNewIssuesCount() - o1.getTotal().getNewIssuesCount(); - } - - private static boolean bothHaveNewIssues(CategoryReport o1, CategoryReport o2) { - return o1.getTotal().getNewIssuesCount() > 0 && o2.getTotal().getNewIssuesCount() > 0; - } - - private static boolean bothHaveNoNewIssue(CategoryReport o1, CategoryReport o2) { - return o1.getTotal().getNewIssuesCount() == 0 && o2.getTotal().getNewIssuesCount() == 0; - } -} diff --git a/src/main/java/org/sonarlint/cli/report/ConsoleReport.java b/src/main/java/org/sonarlint/cli/report/ConsoleReport.java deleted file mode 100644 index c82c40f..0000000 --- a/src/main/java/org/sonarlint/cli/report/ConsoleReport.java +++ /dev/null @@ -1,150 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli.report; - -import java.util.Collection; -import java.util.Date; -import java.util.function.Function; -import org.sonarlint.cli.util.Logger; -import org.sonarsource.sonarlint.core.client.api.common.RuleDetails; -import org.sonarsource.sonarlint.core.client.api.common.analysis.AnalysisResults; -import org.sonarsource.sonarlint.core.client.api.common.analysis.Issue; -import org.sonarsource.sonarlint.core.tracking.Trackable; - -public class ConsoleReport implements Reporter { - - public static final String HEADER = "------------- SonarLint Report -------------"; - private static final Logger LOGGER = Logger.get(); - - public static final String CONSOLE_REPORT_ENABLED_KEY = "sonar.issuesReport.console.enable"; - private static final int LEFT_PAD = 10; - - ConsoleReport() { - - } - - private static class Report { - int totalIssues = 0; - int blockerIssues = 0; - int criticalIssues = 0; - int majorIssues = 0; - int minorIssues = 0; - int infoIssues = 0; - - public void process(Issue issue) { - totalIssues++; - switch (issue.getSeverity()) { - case "BLOCKER": - blockerIssues++; - break; - case "CRITICAL": - criticalIssues++; - break; - case "MAJOR": - majorIssues++; - break; - case "MINOR": - minorIssues++; - break; - case "INFO": - infoIssues++; - break; - default: - throw new IllegalStateException("Unknown severity: " + issue.getSeverity()); - } - } - - public boolean hasNoIssues() { - return totalIssues == 0; - } - } - - @Override - public void execute(String projectName, Date date, Collection trackables, AnalysisResults result, Function ruleDescriptionProducer) { - Report r = new Report(); - for (Trackable trackable : trackables) { - r.process(trackable.getIssue()); - } - printReport(r, result); - } - - public void printReport(Report r, AnalysisResults result) { - StringBuilder sb = new StringBuilder(); - - sb.append("\n\n" + HEADER + "\n\n"); - if (result.fileCount() == 0) { - sb.append(" No files analyzed\n"); - } else if (r.hasNoIssues()) { - sb.append(" No issues to display "); - filesAnalyzed(sb, result.fileCount()); - sb.append("\n"); - } else { - printIssues(r, sb, result.fileCount()); - } - sb.append("\n-------------------------------------------\n\n"); - - LOGGER.info(sb.toString()); - } - - private static void filesAnalyzed(StringBuilder sb, int num) { - sb.append("(").append(num); - if (num > 1) { - sb.append(" files analyzed"); - } else { - sb.append(" file analyzed"); - } - sb.append(")"); - } - - private static void printIssues(Report r, StringBuilder sb, int filesAnalyzed) { - int issues = r.totalIssues; - sb.append(leftPad(Integer.toString(issues), LEFT_PAD)) - .append(" issue"); - if (issues > 1) { - sb.append("s"); - } - sb.append(" "); - - filesAnalyzed(sb, filesAnalyzed); - sb.append("\n\n"); - printIssues(sb, r.blockerIssues, "blocker"); - printIssues(sb, r.criticalIssues, "critical"); - printIssues(sb, r.majorIssues, "major"); - printIssues(sb, r.minorIssues, "minor"); - printIssues(sb, r.infoIssues, "info"); - } - - private static void printIssues(StringBuilder sb, int issueCount, String severityLabel) { - if (issueCount > 0) { - sb.append(leftPad(Integer.toString(issueCount), LEFT_PAD)).append(" ").append(severityLabel).append("\n"); - } - } - - private static String leftPad(String str, int spaces) { - StringBuilder sb = new StringBuilder(); - - for (int i = spaces; i > 0; i--) { - sb.append(" "); - } - - sb.append(str); - return sb.toString(); - } -} diff --git a/src/main/java/org/sonarlint/cli/report/HtmlReport.java b/src/main/java/org/sonarlint/cli/report/HtmlReport.java deleted file mode 100644 index 39888c5..0000000 --- a/src/main/java/org/sonarlint/cli/report/HtmlReport.java +++ /dev/null @@ -1,159 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli.report; - -import freemarker.template.Configuration; -import freemarker.template.Template; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStreamWriter; -import java.io.Writer; -import java.net.URISyntaxException; -import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.StandardCopyOption; -import java.util.Collection; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; -import java.util.function.Function; -import org.apache.commons.io.FileUtils; -import org.sonarlint.cli.util.Logger; -import org.sonarlint.cli.util.Util; -import org.sonarsource.sonarlint.core.client.api.common.RuleDetails; -import org.sonarsource.sonarlint.core.client.api.common.analysis.AnalysisResults; -import org.sonarsource.sonarlint.core.tracking.Trackable; - -public class HtmlReport implements Reporter { - private static final Logger LOGGER = Logger.get(); - private final Path reportFile; - private final Path reportDir; - private final Charset charset; - private final Path basePath; - - HtmlReport(Path basePath, Path reportFile, Charset charset) { - this.basePath = basePath; - this.charset = charset; - this.reportDir = reportFile.getParent().toAbsolutePath(); - this.reportFile = reportFile.toAbsolutePath(); - } - - @Override - public void execute(String projectName, Date date, Collection trackables, AnalysisResults result, Function ruleDescriptionProducer) { - IssuesReport report = new IssuesReport(basePath, charset); - for (Trackable trackable : trackables) { - report.addIssue(trackable); - } - report.setTitle(projectName); - report.setDate(date); - report.setFilesAnalyzed(result.fileCount()); - copyRuleHtmlDescriptions(ruleDescriptionProducer, report); - print(report); - } - - private void copyRuleHtmlDescriptions(Function ruleDescriptionProducer, IssuesReport report) { - try { - Set ruleKeys = report.getSummary().getTotalByRuleKey().keySet(); - Path target = reportDir.resolve("sonarlintreport_rules"); - Files.createDirectories(target); - copyDependency(target, "rule.css"); - for (String ruleKey : ruleKeys) { - RuleDetails ruleDetails = ruleDescriptionProducer.apply(ruleKey); - String htmlDescription = ruleDetails.getHtmlDescription(); - String extendedDescription = ruleDetails.getExtendedDescription(); - if (!extendedDescription.isEmpty()) { - htmlDescription += "\n
" + extendedDescription + "
"; - } - FileUtils.write(target.resolve(Util.escapeFileName(ruleKey) + ".html").toFile(), - "

" + ruleDetails.getName() + " (" - + ruleKey - + ")

" + htmlDescription - + "
", - StandardCharsets.UTF_8); - } - } catch (IOException e) { - throw new IllegalStateException("Unable to copy rule descriptions", e); - } - } - - public void print(IssuesReport report) { - LOGGER.debug("Generating SonarLint Report to: " + reportFile); - writeToFile(report, reportFile); - LOGGER.info("SonarLint HTML Report generated: " + reportFile); - try { - copyDependencies(reportDir); - } catch (Exception e) { - throw new IllegalStateException("Fail to copy HTML report resources to: " + reportDir, e); - } - } - - private static void writeToFile(IssuesReport report, Path toFile) { - try { - Configuration cfg = new Configuration(Configuration.VERSION_2_3_25); - cfg.setClassForTemplateLoading(HtmlReport.class, ""); - - Map root = new HashMap<>(); - root.put("report", report); - - Template template = cfg.getTemplate("sonarlintreport.ftl"); - - try (FileOutputStream fos = new FileOutputStream(toFile.toFile()); - Writer writer = new OutputStreamWriter(fos, StandardCharsets.UTF_8)) { - template.process(root, writer); - writer.flush(); - } - } catch (Exception e) { - throw new IllegalStateException("Fail to generate HTML Issues Report to: " + toFile, e); - } - } - - private void copyDependencies(Path toDir) throws URISyntaxException, IOException { - Path target = toDir.resolve("sonarlintreport_files"); - Files.createDirectories(target); - - // I don't know how to extract a directory from classpath, that's why an exhaustive list of files is provided here : - copyDependency(target, "sonar.eot"); - copyDependency(target, "sonar.svg"); - copyDependency(target, "sonar.ttf"); - copyDependency(target, "sonar.woff"); - copyDependency(target, "favicon.ico"); - copyDependency(target, "PRJ.png"); - copyDependency(target, "DIR.png"); - copyDependency(target, "FIL.png"); - copyDependency(target, "jquery.min.js"); - copyDependency(target, "sep12.png"); - copyDependency(target, "sonar.css"); - copyDependency(target, "sonarlint.png"); - } - - private void copyDependency(Path target, String filename) { - String resource = "sonarlintreport_files/" + filename; - try (InputStream in = getClass().getResourceAsStream(resource)) { - Files.copy(in, target.resolve(filename), StandardCopyOption.REPLACE_EXISTING); - - } catch (IOException e) { - throw new IllegalStateException("Fail to copy file " + filename + " to " + target, e); - } - } -} diff --git a/src/main/java/org/sonarlint/cli/report/IssueCategory.java b/src/main/java/org/sonarlint/cli/report/IssueCategory.java deleted file mode 100644 index fb272ff..0000000 --- a/src/main/java/org/sonarlint/cli/report/IssueCategory.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli.report; - -import java.util.Objects; - -/** - * A same rule can be present with different severity if severity was manually changed so we categorize by rule key and severity - * - */ -public class IssueCategory implements Comparable { - private final String ruleKey; - private final Severity severity; - private final String name; - - IssueCategory(String ruleKey, Severity severity, String name) { - this.ruleKey = ruleKey; - this.severity = severity; - this.name = name; - } - - public String getRuleKey() { - return ruleKey; - } - - public String getName() { - return name; - } - - public Severity getSeverity() { - return severity; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - IssueCategory that = (IssueCategory) o; - return Objects.equals(ruleKey, that.ruleKey) && Objects.equals(severity, that.severity); - } - - @Override - public int hashCode() { - int result = ruleKey.hashCode(); - result = 31 * result + severity.hashCode(); - return result; - } - - @Override - public int compareTo(IssueCategory o) { - if (severity == o.getSeverity()) { - return getRuleKey().compareTo(o.getRuleKey()); - } - return o.getSeverity().compareTo(severity); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - return sb.append(super.toString()) - .append("[") - .append("rule=").append(ruleKey).append(",severity=").append(severity) - .append("]").toString(); - } -} diff --git a/src/main/java/org/sonarlint/cli/report/IssueVariation.java b/src/main/java/org/sonarlint/cli/report/IssueVariation.java deleted file mode 100644 index 2a96bf5..0000000 --- a/src/main/java/org/sonarlint/cli/report/IssueVariation.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli.report; - -public class IssueVariation { - - private int countInCurrentAnalysis; - private int newIssuesCount; - private int resolvedIssuesCount; - - IssueVariation() { - } - - IssueVariation(int currentCount, int newCount, int resolvedCount) { - this.countInCurrentAnalysis = currentCount; - this.newIssuesCount = newCount; - this.resolvedIssuesCount = resolvedCount; - } - - public int getCountInCurrentAnalysis() { - return countInCurrentAnalysis; - } - - public void incrementCountInCurrentAnalysis() { - this.countInCurrentAnalysis++; - } - - public int getNewIssuesCount() { - return newIssuesCount; - } - - public void incrementNewIssuesCount() { - this.newIssuesCount++; - } - - public int getResolvedIssuesCount() { - return resolvedIssuesCount; - } - - public void incrementResolvedIssuesCount() { - this.resolvedIssuesCount++; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + countInCurrentAnalysis; - result = prime * result + newIssuesCount; - result = prime * result + resolvedIssuesCount; - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (obj == null || getClass() != obj.getClass()) { - return false; - } - IssueVariation other = (IssueVariation) obj; - - return countInCurrentAnalysis == other.countInCurrentAnalysis - && newIssuesCount == other.newIssuesCount - && resolvedIssuesCount == other.resolvedIssuesCount; - } - - @Override - public String toString() { - return new StringBuilder() - .append(super.toString()) - .append("[countInCurrentAnalysis=") - .append(countInCurrentAnalysis) - .append(",newIssuesCount=") - .append(newIssuesCount) - .append(",resolvedIssuesCount=") - .append(resolvedIssuesCount) - .append("]") - .toString(); - } - -} diff --git a/src/main/java/org/sonarlint/cli/report/IssuesReport.java b/src/main/java/org/sonarlint/cli/report/IssuesReport.java deleted file mode 100644 index ae8807e..0000000 --- a/src/main/java/org/sonarlint/cli/report/IssuesReport.java +++ /dev/null @@ -1,263 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli.report; - -import java.io.IOException; -import java.nio.charset.Charset; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -import javax.annotation.Nullable; - -import org.sonarlint.cli.report.source.HtmlSourceDecorator; -import org.sonarlint.cli.util.Util; -import org.sonarsource.sonarlint.core.client.api.common.analysis.ClientInputFile; -import org.sonarsource.sonarlint.core.client.api.common.analysis.Issue; -import org.sonarsource.sonarlint.core.tracking.Trackable; - -public class IssuesReport { - - private String title; - private Date date; - private int filesAnalyzed; - private final ReportSummary summary = new ReportSummary(); - private final Map resourceReportsByFilePath = new HashMap<>(); - private final Map ruleNameByKey = new HashMap<>(); - private final Charset charset; - private int id = 0; - private Path basePath; - - IssuesReport(Path basePath, Charset charset) { - this.basePath = basePath; - this.charset = charset; - } - - public boolean noIssues() { - return summary.getTotal().getCountInCurrentAnalysis() == 0; - } - - public ReportSummary getSummary() { - return summary; - } - - public boolean noFiles() { - return filesAnalyzed == 0; - } - - public int getFilesAnalyzed() { - return filesAnalyzed; - } - - public void setFilesAnalyzed(int num) { - this.filesAnalyzed = num; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public Date getDate() { - return date; - } - - public void setDate(Date date) { - this.date = date; - } - - public Map getResourceReportsByResource() { - return resourceReportsByFilePath; - } - - public List getResourceReports() { - return new ArrayList<>(resourceReportsByFilePath.values()); - } - - public List getResourcesWithReport() { - return new ArrayList<>(resourceReportsByFilePath.keySet()); - } - - public String getRuleName(String ruleKey) { - return ruleNameByKey.get(ruleKey); - } - - public void addIssue(Trackable trackable) { - Issue issue = trackable.getIssue(); - Long millis = trackable.getServerIssueKey() != null ? trackable.getCreationDate() : null; - RichIssue richIssue = new RichIssueImpl(issue, id, millis); - id++; - ruleNameByKey.put(issue.getRuleKey(), issue.getRuleName()); - - Path filePath; - ClientInputFile inputFile = issue.getInputFile(); - if (inputFile == null) { - // issue on project (no specific file) - filePath = Paths.get(""); - } else { - filePath = Paths.get(inputFile.getPath()); - } - ResourceReport report = getOrCreate(filePath); - summary.addIssue(richIssue); - report.addIssue(richIssue); - } - - private static class RichIssueImpl implements RichIssue { - - private static final DateFormat DATE_FORMAT = new SimpleDateFormat("MMMMM d, y K:m a"); - - private final Issue wrapped; - private final int id; - private final String creationDate; - - public RichIssueImpl(Issue wrapped, int id, @Nullable Long creationDateMillis) { - this.wrapped = wrapped; - this.id = id; - this.creationDate = creationDateMillis != null ? DATE_FORMAT.format(new Date(creationDateMillis)) : null; - } - - @Override - public String getSeverity() { - return wrapped.getSeverity(); - } - - @Override - public String getType() { - return wrapped.getType(); - } - - @Override - public Integer getStartLine() { - return wrapped.getStartLine() != null ? wrapped.getStartLine() : 1; - } - - @Override - public Integer getStartLineOffset() { - return wrapped.getStartLineOffset(); - } - - @Override - public Integer getEndLine() { - return wrapped.getEndLine() != null ? wrapped.getEndLine() : getStartLine(); - } - - @Override - public Integer getEndLineOffset() { - return wrapped.getEndLineOffset(); - - } - - @Override - public List flows() { - return wrapped.flows(); - } - - @Override - public String getMessage() { - return wrapped.getMessage(); - } - - @Override - public String getRuleKey() { - return wrapped.getRuleKey(); - } - - @Override - public String getRuleName() { - return wrapped.getRuleName(); - } - - @Override - public ClientInputFile getInputFile() { - return wrapped.getInputFile(); - } - - @Override - public int id() { - return id; - } - - @Override - public String ruleDescriptionFileName() { - return Util.escapeFileName(wrapped.getRuleKey()) + ".html"; - } - - @Override - public String creationDate() { - return creationDate; - } - } - - private ResourceReport getOrCreate(Path filePath) { - ResourceReport report = resourceReportsByFilePath.get(filePath); - if (report != null) { - return report; - } - report = new ResourceReport(basePath, filePath); - resourceReportsByFilePath.put(filePath, report); - return report; - } - - public List getEscapedSource(@Nullable Path filePath) { - if (filePath == null) { - return Collections.emptyList(); - } - List lines; - try { - if (!filePath.toFile().exists()) { - // invalid, directory, project issue, ... - return Collections.emptyList(); - } - - lines = Files.readAllLines(filePath, charset); - } catch (IOException e) { - throw new IllegalStateException("unable to read source code of file: " + filePath, e); - } - - ResourceReport resourceReport = resourceReportsByFilePath.get(filePath); - if (resourceReport == null) { - throw new IllegalStateException("file has no associated report: " + filePath); - } - - List escapedLines = new ArrayList<>(lines.size()); - for (int i = 0; i < lines.size(); i++) { - String line = lines.get(i); - final int currentLineIdx = i + 1; - List issuesAtLine = resourceReport.getIssues().stream() - .filter(issue -> issue.getStartLine() <= currentLineIdx && currentLineIdx <= issue.getEndLine()) - .collect(Collectors.toList()); - - escapedLines.add(HtmlSourceDecorator.getDecoratedSourceAsHtml(line, currentLineIdx, issuesAtLine)); - } - return escapedLines; - } -} diff --git a/src/main/java/org/sonarlint/cli/report/JsonReport.java b/src/main/java/org/sonarlint/cli/report/JsonReport.java deleted file mode 100644 index ef8950f..0000000 --- a/src/main/java/org/sonarlint/cli/report/JsonReport.java +++ /dev/null @@ -1,106 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli.report; - -import com.google.gson.JsonObject; -import com.google.gson.JsonArray; -import java.io.PrintStream; -import java.util.Collection; -import java.util.Date; -import java.util.List; -import java.util.Arrays; -import java.util.function.Function; -import org.sonarlint.cli.util.Logger; -import org.sonarsource.sonarlint.core.client.api.common.RuleDetails; -import org.sonarsource.sonarlint.core.client.api.common.analysis.AnalysisResults; -import org.sonarsource.sonarlint.core.client.api.common.analysis.Issue; -import org.sonarsource.sonarlint.core.tracking.Trackable; - -public class JsonReport implements Reporter { - - private static final List VALID_RULE_DETAIL_TYPES = Arrays.asList( - "BUG", - "VULNERABILITY" - ); - - JsonReport() { - - } - - @Override - public void execute(String projectName, Date date, Collection trackables, AnalysisResults result, Function ruleDescriptionProducer) { - for (Trackable trackable : trackables) { - Issue issue = trackable.getIssue(); - RuleDetails ruleDetails = ruleDescriptionProducer.apply(issue.getRuleKey()); - - if (VALID_RULE_DETAIL_TYPES.contains(ruleDetails.getType())) { - JsonObject json = new JsonObject(); - json.addProperty("type", "issue"); - json.addProperty("check_name", issue.getRuleKey()); - json.addProperty("severity", ruleDetails.getSeverity().toLowerCase()); - json.addProperty("description", issue.getMessage()); - - JsonObject content = new JsonObject(); - json.add("content", content); - content.addProperty("body", ruleDetails.getHtmlDescription()); - // // ruleDetails.getExtendedDescription(); - - JsonObject location = new JsonObject(); - json.add("location", location); - - // Code Climate CLI expects relative path to file - location.addProperty("path", issue.getInputFile().getPath().replaceFirst("^/code-read-write/", "")); - - JsonObject lines = new JsonObject(); - location.add("lines", lines); - - if (issue.getStartLine() != null) { - lines.addProperty("begin", issue.getStartLine()); - - if (issue.getEndLine() != null) { - lines.addProperty("end", issue.getEndLine()); - } else { - lines.addProperty("end", 1); - } - } else { - lines.addProperty("begin", 1); - lines.addProperty("end", 1); - } - - String category; - switch (ruleDetails.getType()) { - case "VULNERABILITY": { - category = "Security"; - break; - } - default: { - category = "Bug Risk"; - break; - } - } - JsonArray categories = new JsonArray(); - categories.add(category); - json.add("categories", categories); - - System.out.println(json.toString() + "\0"); - } - } - } -} diff --git a/src/main/java/org/sonarlint/cli/report/ReportFactory.java b/src/main/java/org/sonarlint/cli/report/ReportFactory.java deleted file mode 100644 index 1150a54..0000000 --- a/src/main/java/org/sonarlint/cli/report/ReportFactory.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli.report; - -import java.io.IOException; -import java.nio.charset.Charset; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.LinkedList; -import java.util.List; -import javax.annotation.Nullable; - -public class ReportFactory { - private static final String DEFAULT_REPORT_PATH = ".sonarlint/sonarlint-report.html"; - private String htmlPath = null; - private Charset charset; - - public ReportFactory(Charset charset) { - this.charset = charset; - } - - public List createReporters(Path basePath) { - List list = new LinkedList<>(); - - list.add(new ConsoleReport()); - list.add(new HtmlReport(basePath, getReportFile(basePath), charset)); - list.add(new JsonReport()); - - return list; - } - - public void setHtmlPath(@Nullable String path) { - htmlPath = path; - } - - Path getReportFile(Path basePath) { - Path reportPath; - - if (htmlPath != null) { - reportPath = Paths.get(htmlPath); - - if (!reportPath.isAbsolute()) { - reportPath = basePath.resolve(reportPath).toAbsolutePath(); - } - } else { - reportPath = basePath.resolve(DEFAULT_REPORT_PATH); - } - - try { - Files.createDirectories(reportPath.getParent()); - } catch (IOException e) { - throw new IllegalStateException("Fail to create the directory " + reportPath.getParent(), e); - } - - return reportPath; - } -} diff --git a/src/main/java/org/sonarlint/cli/report/ReportSummary.java b/src/main/java/org/sonarlint/cli/report/ReportSummary.java deleted file mode 100644 index 62778df..0000000 --- a/src/main/java/org/sonarlint/cli/report/ReportSummary.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli.report; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import org.sonarlint.cli.util.Util; - -public class ReportSummary { - - private final IssueVariation total = new IssueVariation(); - - private final Map reportByCategory = new LinkedHashMap<>(); - private final Map totalByRuleKey = new LinkedHashMap<>(); - private final Map totalBySeverity = new LinkedHashMap<>(); - - ReportSummary() { - } - - public void addIssue(RichIssue issue) { - Severity severity = Severity.create(issue.getSeverity()); - IssueCategory category = new IssueCategory(issue.getRuleKey(), severity, issue.getRuleName()); - - IssueVariation byRuleKey = Util.getOrCreate(totalByRuleKey, issue.getRuleKey(), IssueVariation::new); - CategoryReport byCategory = getOrCreate(reportByCategory, category); - IssueVariation bySeverity = Util.getOrCreate(totalBySeverity, issue.getSeverity(), IssueVariation::new); - - total.incrementCountInCurrentAnalysis(); - byCategory.getTotal().incrementCountInCurrentAnalysis(); - byRuleKey.incrementCountInCurrentAnalysis(); - bySeverity.incrementCountInCurrentAnalysis(); - } - - public IssueVariation getTotal() { - return total; - } - - public Map getTotalBySeverity() { - return totalBySeverity; - } - - public Map getTotalByRuleKey() { - return totalByRuleKey; - } - - private static CategoryReport getOrCreate(Map m, IssueCategory key) { - CategoryReport report = m.get(key); - if (report != null) { - return report; - } - - report = new CategoryReport(key); - m.put(key, report); - return report; - } - - public List getCategoryReports() { - List result = new ArrayList<>(reportByCategory.values()); - Collections.sort(result, new CategoryReportComparator()); - return result; - } -} diff --git a/src/main/java/org/sonarlint/cli/report/Reporter.java b/src/main/java/org/sonarlint/cli/report/Reporter.java deleted file mode 100644 index 957d249..0000000 --- a/src/main/java/org/sonarlint/cli/report/Reporter.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli.report; - -import java.util.Collection; -import java.util.Date; -import java.util.function.Function; -import org.sonarsource.sonarlint.core.client.api.common.RuleDetails; -import org.sonarsource.sonarlint.core.client.api.common.analysis.AnalysisResults; -import org.sonarsource.sonarlint.core.tracking.Trackable; - -@FunctionalInterface -public interface Reporter { - void execute(String projectName, Date date, Collection trackables, AnalysisResults result, Function ruleDescriptionProducer); -} diff --git a/src/main/java/org/sonarlint/cli/report/ResourceReport.java b/src/main/java/org/sonarlint/cli/report/ResourceReport.java deleted file mode 100644 index 18c76d7..0000000 --- a/src/main/java/org/sonarlint/cli/report/ResourceReport.java +++ /dev/null @@ -1,136 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli.report; - -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.Collections; -import java.util.EnumMap; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import javax.annotation.CheckForNull; -import javax.annotation.Nullable; -import org.sonarlint.cli.util.MutableInt; - -import static org.sonarlint.cli.util.Util.getOrCreate; - -public final class ResourceReport { - private final Path filePath; - private final IssueVariation total = new IssueVariation(); - private final List issues = new ArrayList<>(); - - private final Map reportByCategory = new HashMap<>(); - private final Map> issuesPerLine = new HashMap<>(); - - private final Map issuesByRule = new HashMap<>(); - private final EnumMap issuesBySeverity = new EnumMap<>(Severity.class); - private Path basePath; - - ResourceReport(Path basePath, @Nullable Path filePath) { - this.basePath = basePath; - this.filePath = filePath; - } - - @CheckForNull - public Path getPath() { - return filePath; - } - - public String getName() { - return basePath.toAbsolutePath().relativize(filePath.toAbsolutePath()).toString(); - } - - public String getType() { - if (filePath == null || filePath.equals(Paths.get(""))) { - return "PRJ"; - } else { - return "FIL"; - } - } - - public IssueVariation getTotal() { - return total; - } - - public List getIssues() { - return issues; - } - - public Map> getIssuesPerLine() { - return issuesPerLine; - } - - public List getIssuesAtLine(int lineId) { - if (issuesPerLine.containsKey(lineId)) { - return issuesPerLine.get(lineId); - } - return Collections.emptyList(); - } - - public void addIssue(RichIssue issue) { - Severity severity = Severity.create(issue.getSeverity()); - String ruleKey = issue.getRuleKey(); - IssueCategory reportRuleKey = new IssueCategory(ruleKey, severity, issue.getRuleName()); - - initMaps(reportRuleKey); - issues.add(issue); - Integer line = issue.getStartLine(); - line = line != null ? line : 0; - - getOrCreate(issuesPerLine, line, LinkedList::new).add(issue); - getOrCreate(issuesByRule, ruleKey, MutableInt::new).inc(); - getOrCreate(issuesBySeverity, severity, MutableInt::new).inc(); - - reportByCategory.get(reportRuleKey).getTotal().incrementCountInCurrentAnalysis(); - total.incrementCountInCurrentAnalysis(); - } - - private void initMaps(IssueCategory reportRuleKey) { - if (!reportByCategory.containsKey(reportRuleKey)) { - reportByCategory.put(reportRuleKey, new CategoryReport(reportRuleKey)); - } - } - - public boolean isDisplayableLine(@Nullable Integer lineNumber) { - if (lineNumber == null || lineNumber < 1) { - return false; - } - for (int i = lineNumber - 2; i <= lineNumber + 2; i++) { - if (hasIssues(i)) { - return true; - } - } - return false; - } - - private boolean hasIssues(Integer lineId) { - List issuesAtLine = issuesPerLine.get(lineId); - return issuesAtLine != null && !issuesAtLine.isEmpty(); - } - - public List getCategoryReports() { - List result = new ArrayList<>(reportByCategory.values()); - Collections.sort(result, new CategoryReportComparator()); - return result; - } -} diff --git a/src/main/java/org/sonarlint/cli/report/RichIssue.java b/src/main/java/org/sonarlint/cli/report/RichIssue.java deleted file mode 100644 index 32f9030..0000000 --- a/src/main/java/org/sonarlint/cli/report/RichIssue.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli.report; - -import org.sonarsource.sonarlint.core.client.api.common.analysis.Issue; - -/** - * Issue, enriched with additional information. - */ -public interface RichIssue extends Issue { - - int id(); - - String ruleDescriptionFileName(); - - String creationDate(); - -} diff --git a/src/main/java/org/sonarlint/cli/report/Severity.java b/src/main/java/org/sonarlint/cli/report/Severity.java deleted file mode 100644 index 34b900f..0000000 --- a/src/main/java/org/sonarlint/cli/report/Severity.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli.report; - -import java.util.HashMap; -import java.util.Map; - -enum Severity { - INFO, - MINOR, - MAJOR, - CRITICAL, - BLOCKER; - - private static final Map MAP; - - Severity() { - } - - static { - MAP = new HashMap<>(); - for (Severity s : Severity.values()) { - MAP.put(s.name(), s); - } - } - - static Severity create(String severity) { - Severity s = MAP.get(severity); - if (s == null) { - throw new IllegalArgumentException("Invalid severity: " + severity); - } - return s; - } -} diff --git a/src/main/java/org/sonarlint/cli/report/package-info.java b/src/main/java/org/sonarlint/cli/report/package-info.java deleted file mode 100644 index d34c03d..0000000 --- a/src/main/java/org/sonarlint/cli/report/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonarlint.cli.report; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/org/sonarlint/cli/report/source/CharactersReader.java b/src/main/java/org/sonarlint/cli/report/source/CharactersReader.java deleted file mode 100644 index 445393d..0000000 --- a/src/main/java/org/sonarlint/cli/report/source/CharactersReader.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli.report.source; - -import java.io.BufferedReader; -import java.io.IOException; -import java.util.ArrayDeque; -import java.util.Deque; - -class CharactersReader { - - static final int END_OF_STREAM = -1; - - private final BufferedReader stringBuffer; - private final Deque openTags; - - private int currentValue; - private int currentIndex = -1; - - public CharactersReader(BufferedReader stringBuffer) { - this.stringBuffer = stringBuffer; - this.openTags = new ArrayDeque<>(); - } - - boolean readNextChar() throws IOException { - currentValue = stringBuffer.read(); - currentIndex++; - return currentValue != END_OF_STREAM; - } - - int getCurrentValue() { - return currentValue; - } - - int getCurrentIndex() { - return currentIndex; - } - - void registerOpenTag(String textType) { - openTags.push(textType); - } - - void removeLastOpenTag() { - openTags.remove(); - } - - Deque getOpenTags() { - return openTags; - } -} diff --git a/src/main/java/org/sonarlint/cli/report/source/DecorationDataHolder.java b/src/main/java/org/sonarlint/cli/report/source/DecorationDataHolder.java deleted file mode 100644 index fcdeb73..0000000 --- a/src/main/java/org/sonarlint/cli/report/source/DecorationDataHolder.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli.report.source; - -import com.google.common.collect.Lists; -import java.util.Iterator; -import java.util.List; -import org.sonarlint.cli.report.RichIssue; - -class DecorationDataHolder { - - private List openingTagsEntries; - private int openingTagsIndex; - private List closingTagsOffsets; - private int closingTagsIndex; - - DecorationDataHolder() { - openingTagsEntries = Lists.newArrayList(); - closingTagsOffsets = Lists.newArrayList(); - } - - void loadIssues(List issues, int currentLineIdx, int currentLineLength) { - for (RichIssue issue : issues) { - int startOffset = issue.getStartLine() == currentLineIdx && issue.getStartLineOffset() != null ? issue.getStartLineOffset() : 0; - int endOffset = issue.getEndLine() == currentLineIdx && issue.getEndLineOffset() != null ? issue.getEndLineOffset() : currentLineLength; - if (startOffset < endOffset) { - insertAndPreserveOrder(new OpeningHtmlTag(startOffset, "issue-" + issue.id()), openingTagsEntries); - insertAndPreserveOrder(endOffset, closingTagsOffsets); - } - } - } - - OpeningHtmlTag getCurrentOpeningTagEntry() { - return openingTagsIndex < openingTagsEntries.size() ? openingTagsEntries.get(openingTagsIndex) : null; - } - - void nextOpeningTagEntry() { - openingTagsIndex++; - } - - int getCurrentClosingTagOffset() { - return closingTagsIndex < closingTagsOffsets.size() ? closingTagsOffsets.get(closingTagsIndex) : -1; - } - - void nextClosingTagOffset() { - closingTagsIndex++; - } - - private static void insertAndPreserveOrder(OpeningHtmlTag newEntry, List openingHtmlTags) { - int insertionIndex = 0; - Iterator tagIterator = openingHtmlTags.iterator(); - while (tagIterator.hasNext() && tagIterator.next().getStartOffset() <= newEntry.getStartOffset()) { - insertionIndex++; - } - openingHtmlTags.add(insertionIndex, newEntry); - } - - private static void insertAndPreserveOrder(int newOffset, List orderedOffsets) { - int insertionIndex = 0; - Iterator entriesIterator = orderedOffsets.iterator(); - while (entriesIterator.hasNext() && entriesIterator.next() <= newOffset) { - insertionIndex++; - } - orderedOffsets.add(insertionIndex, newOffset); - } -} diff --git a/src/main/java/org/sonarlint/cli/report/source/HtmlSourceDecorator.java b/src/main/java/org/sonarlint/cli/report/source/HtmlSourceDecorator.java deleted file mode 100644 index 852e0ee..0000000 --- a/src/main/java/org/sonarlint/cli/report/source/HtmlSourceDecorator.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli.report.source; - -import java.util.List; -import javax.annotation.CheckForNull; -import javax.annotation.Nullable; -import org.sonarlint.cli.report.RichIssue; - -public class HtmlSourceDecorator { - - private HtmlSourceDecorator() { - // utility class, forbidden constructor - } - - @CheckForNull - public static String getDecoratedSourceAsHtml(@Nullable String sourceLine, int currentLineIdx, List issues) { - if (sourceLine == null) { - return null; - } - DecorationDataHolder decorationDataHolder = new DecorationDataHolder(); - decorationDataHolder.loadIssues(issues, currentLineIdx, sourceLine.length()); - HtmlTextDecorator textDecorator = new HtmlTextDecorator(); - return textDecorator.decorateLineWithHtml(sourceLine, decorationDataHolder); - } - -} diff --git a/src/main/java/org/sonarlint/cli/report/source/HtmlTextDecorator.java b/src/main/java/org/sonarlint/cli/report/source/HtmlTextDecorator.java deleted file mode 100644 index f907045..0000000 --- a/src/main/java/org/sonarlint/cli/report/source/HtmlTextDecorator.java +++ /dev/null @@ -1,133 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli.report.source; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.StringReader; -import java.util.Collection; - -import static com.google.common.collect.Lists.newArrayList; - -class HtmlTextDecorator { - - static final char HTML_OPENING = '<'; - static final char HTML_CLOSING = '>'; - static final char AMPERSAND = '&'; - static final String ENCODED_HTML_OPENING = "<"; - static final String ENCODED_HTML_CLOSING = ">"; - static final String ENCODED_AMPERSAND = "&"; - - String decorateLineWithHtml(String line, DecorationDataHolder decorationDataHolder) { - - StringBuilder currentHtmlLine = new StringBuilder(); - - BufferedReader stringBuffer = new BufferedReader(new StringReader(line)); - - CharactersReader charsReader = new CharactersReader(stringBuffer); - - try { - while (charsReader.readNextChar()) { - addCharToCurrentLine(charsReader, currentHtmlLine, decorationDataHolder); - } - } catch (IOException e) { - throw new IllegalStateException("Error when decorating source", e); - } - - closeCurrentSyntaxTags(charsReader, currentHtmlLine); - - return currentHtmlLine.toString(); - - } - - private static void addCharToCurrentLine(CharactersReader charsReader, StringBuilder currentHtmlLine, DecorationDataHolder decorationDataHolder) { - int numberOfTagsToClose = getNumberOfTagsToClose(charsReader.getCurrentIndex(), decorationDataHolder); - closeCompletedTags(charsReader, numberOfTagsToClose, currentHtmlLine); - - Collection tagsToOpen = getTagsToOpen(charsReader.getCurrentIndex(), decorationDataHolder); - openNewTags(charsReader, tagsToOpen, currentHtmlLine); - - char currentChar = (char) charsReader.getCurrentValue(); - currentHtmlLine.append(normalize(currentChar)); - } - - private static char[] normalize(char currentChar) { - char[] normalizedChars; - if (currentChar == HTML_OPENING) { - normalizedChars = ENCODED_HTML_OPENING.toCharArray(); - } else if (currentChar == HTML_CLOSING) { - normalizedChars = ENCODED_HTML_CLOSING.toCharArray(); - } else if (currentChar == AMPERSAND) { - normalizedChars = ENCODED_AMPERSAND.toCharArray(); - } else { - normalizedChars = new char[] {currentChar}; - } - return normalizedChars; - } - - private static int getNumberOfTagsToClose(int currentIndex, DecorationDataHolder dataHolder) { - int numberOfTagsToClose = 0; - - while (currentIndex == dataHolder.getCurrentClosingTagOffset()) { - numberOfTagsToClose++; - dataHolder.nextClosingTagOffset(); - } - return numberOfTagsToClose; - } - - private static Collection getTagsToOpen(int currentIndex, DecorationDataHolder dataHolder) { - Collection tagsToOpen = newArrayList(); - while (dataHolder.getCurrentOpeningTagEntry() != null && currentIndex == dataHolder.getCurrentOpeningTagEntry().getStartOffset()) { - tagsToOpen.add(dataHolder.getCurrentOpeningTagEntry().getCssClass()); - dataHolder.nextOpeningTagEntry(); - } - return tagsToOpen; - } - - private static void closeCompletedTags(CharactersReader charactersReader, int numberOfTagsToClose, - StringBuilder decoratedText) { - for (int i = 0; i < numberOfTagsToClose; i++) { - injectClosingHtml(decoratedText); - charactersReader.removeLastOpenTag(); - } - } - - private static void openNewTags(CharactersReader charactersReader, Collection tagsToOpen, - StringBuilder decoratedText) { - for (String tagToOpen : tagsToOpen) { - injectOpeningHtmlForRule(tagToOpen, decoratedText); - charactersReader.registerOpenTag(tagToOpen); - } - } - - private static void closeCurrentSyntaxTags(CharactersReader charactersReader, StringBuilder decoratedText) { - for (int i = 0; i < charactersReader.getOpenTags().size(); i++) { - injectClosingHtml(decoratedText); - } - } - - private static void injectOpeningHtmlForRule(String textType, StringBuilder decoratedText) { - decoratedText.append(""); - } - - private static void injectClosingHtml(StringBuilder decoratedText) { - decoratedText.append(""); - } -} diff --git a/src/main/java/org/sonarlint/cli/report/source/OpeningHtmlTag.java b/src/main/java/org/sonarlint/cli/report/source/OpeningHtmlTag.java deleted file mode 100644 index 13c12d1..0000000 --- a/src/main/java/org/sonarlint/cli/report/source/OpeningHtmlTag.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli.report.source; - -class OpeningHtmlTag { - - private final int startOffset; - private final String cssClass; - - OpeningHtmlTag(int startOffset, String cssClass) { - this.startOffset = startOffset; - this.cssClass = cssClass; - } - - int getStartOffset() { - return startOffset; - } - - String getCssClass() { - return cssClass; - } - -} diff --git a/src/main/java/org/sonarlint/cli/report/source/package-info.java b/src/main/java/org/sonarlint/cli/report/source/package-info.java deleted file mode 100644 index 0052819..0000000 --- a/src/main/java/org/sonarlint/cli/report/source/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonarlint.cli.report.source; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/org/sonarlint/cli/util/HtmlEntities.java b/src/main/java/org/sonarlint/cli/util/HtmlEntities.java deleted file mode 100644 index 218c938..0000000 --- a/src/main/java/org/sonarlint/cli/util/HtmlEntities.java +++ /dev/null @@ -1,225 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli.util; - -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -/** - * This class offers methods to decode and encode html entities. - * @author Michael Yagudaev - * @version 1.2 April 9, 2011 - */ -public class HtmlEntities { - private static Map map = new LinkedHashMap<>(); - - static { - map.put(""", (char) 34); - map.put("&", (char) 38); - map.put("<", (char) 60); - map.put(">", (char) 62); - map.put(" ", (char) 160); - map.put("¡", (char) 161); - map.put("¢", (char) 162); - map.put("£", (char) 163); - map.put("¤", (char) 164); - map.put("¥", (char) 165); - map.put("¦", (char) 166); - map.put("§", (char) 167); - map.put("¨", (char) 168); - map.put("©", (char) 169); - map.put("ª", (char) 170); - map.put("«", (char) 171); - map.put("¬", (char) 172); - map.put("­", (char) 173); - map.put("®", (char) 174); - map.put("¯", (char) 175); - map.put("°", (char) 176); - map.put("±", (char) 177); - map.put("²", (char) 178); - map.put("³", (char) 179); - map.put("´", (char) 180); - map.put("µ", (char) 181); - map.put("¶", (char) 182); - map.put("·", (char) 183); - map.put("¸", (char) 184); - map.put("¹", (char) 185); - map.put("º", (char) 186); - map.put("»", (char) 187); - map.put("¼", (char) 188); - map.put("½", (char) 189); - map.put("¾", (char) 190); - map.put("¿", (char) 191); - map.put("×", (char) 215); - map.put("÷", (char) 247); - map.put("À", (char) 192); - map.put("Á", (char) 193); - map.put("Â", (char) 194); - map.put("Ã", (char) 195); - map.put("Ä", (char) 196); - map.put("Å", (char) 197); - map.put("Æ", (char) 198); - map.put("Ç", (char) 199); - map.put("È", (char) 200); - map.put("É", (char) 201); - map.put("Ê", (char) 202); - map.put("Ë", (char) 203); - map.put("Ì", (char) 204); - map.put("Í", (char) 205); - map.put("Î", (char) 206); - map.put("Ï", (char) 207); - map.put("Ð", (char) 208); - map.put("Ñ", (char) 209); - map.put("Ò", (char) 210); - map.put("Ó", (char) 211); - map.put("Ô", (char) 212); - map.put("Õ", (char) 213); - map.put("Ö", (char) 214); - map.put("Ø", (char) 216); - map.put("Ù", (char) 217); - map.put("Ú", (char) 218); - map.put("Û", (char) 219); - map.put("Ü", (char) 220); - map.put("Ý", (char) 221); - map.put("Þ", (char) 222); - map.put("ß", (char) 223); - map.put("à", (char) 224); - map.put("á", (char) 225); - map.put("â", (char) 226); - map.put("ã", (char) 227); - map.put("ä", (char) 228); - map.put("å", (char) 229); - map.put("æ", (char) 230); - map.put("ç", (char) 231); - map.put("è", (char) 232); - map.put("é", (char) 233); - map.put("ê", (char) 234); - map.put("ë", (char) 235); - map.put("ì", (char) 236); - map.put("í", (char) 237); - map.put("î", (char) 238); - map.put("ï", (char) 239); - map.put("ð", (char) 240); - map.put("ñ", (char) 241); - map.put("ò", (char) 242); - map.put("ó", (char) 243); - map.put("ô", (char) 244); - map.put("õ", (char) 245); - map.put("ö", (char) 246); - map.put("ø", (char) 248); - map.put("ù", (char) 249); - map.put("ú", (char) 250); - map.put("û", (char) 251); - map.put("ü", (char) 252); - map.put("ý", (char) 253); - map.put("þ", (char) 254); - map.put("ÿ", (char) 255); - } - - private HtmlEntities() { - - } - - /** - * Find the Html Entity and convert it back to a regular character if the - * entity exists, otherwise return the same string. - * @param str - * @return Character represented by HTML Entity or the same string if unknown entity. - */ - private static String fromHtmlEntity(String str) { - Character ch = map.get(str); - return (ch != null) ? ch.toString() : str; - } - - /** - * Finds the value and returns the key that corresponds to that value. If value not found - * returns null. - * @param value The value to be found. - * @return The key corresponding to the value that was found or null if value not found. - */ - private static String findValue(char value) { - Set keySet = map.keySet(); - Iterator i = keySet.iterator(); - String key = i.next(); // key - boolean found = false; - String result = null; - - while (i.hasNext() && !found) { - if (map.get(key).charValue() == value) { - found = true; - result = key; - } - - key = i.next(); - } - - return result; - } - - /** - * Converts special characters in ASCII into html entities (e.g. & -> &) - * @param encode The string to be encoded. - * @return The encoded string with HTML entities. - */ - public static String encode(String encode) { - StringBuilder str = new StringBuilder(encode); - String key; - int i = 0; - - // loop over all the characters in the string - while (i < str.length()) { - // try matching a character to an entity - key = findValue(str.charAt(i)); - if (key != null) { - str.replace(i, i + 1, key); - i += key.length(); - } else { - i++; - } - } - - return str.toString(); - } - - /** - * Converts html entities (e.g. &) into real characters (ASCII characters, e.g. & -> &) - * @param decode A string to be decoded. - * @return The string decoded with no HTML entities. - */ - public static String decode(String decode) { - StringBuilder str = new StringBuilder(decode); - Matcher m = Pattern.compile("&[A-Za-z]+;").matcher(str); - String replaceStr; - - int matchPointer = 0; - while (m.find(matchPointer)) { - // check if we have a corresponding key in our map - replaceStr = fromHtmlEntity(m.group()); - str.replace(m.start(), m.end(), replaceStr); - matchPointer = m.start() + replaceStr.length(); - } - - return str.toString(); - } -} diff --git a/src/main/java/org/sonarlint/cli/util/MutableInt.java b/src/main/java/org/sonarlint/cli/util/MutableInt.java deleted file mode 100644 index 9793cd9..0000000 --- a/src/main/java/org/sonarlint/cli/util/MutableInt.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli.util; - -public class MutableInt { - private int value; - - public MutableInt() { - this(0); - } - - public MutableInt(int value) { - this.value = value; - } - - public void set(int value) { - this.value = value; - } - - public int get() { - return value; - } - - public void inc() { - value++; - } - - @Override - public int hashCode() { - return value; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (obj == null || getClass() != obj.getClass()) { - return false; - } - MutableInt other = (MutableInt) obj; - return value == other.value; - } -} diff --git a/src/main/java/org/sonarlint/cli/util/System2.java b/src/main/java/org/sonarlint/cli/util/System2.java deleted file mode 100644 index 287bfb4..0000000 --- a/src/main/java/org/sonarlint/cli/util/System2.java +++ /dev/null @@ -1,117 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli.util; - -import javax.annotation.CheckForNull; - -import java.util.Map; -import java.util.Properties; - -/** - * Proxy over {@link java.lang.System}. It aims to improve testability of classes - * that interact with low-level system methods, for example : - *

- * 

- * public class MyClass {
- *   private final System2 system;
- *
- *   public MyClass(System2 s) {
- *     this.system = s;
- *   }
- *
- *   public long xxx() {
- *     return system.now();
- *   }
- * }
- *
- * {@literal @}Test
- * public void should_return_xxx() {
- *   // using Mockito
- *   System2 system = mock(System2.class);
- *   long now = 123456789L;
- *   doReturn(now).when(system).now();
- *   assertThat(new MyClass(system).xxx()).isEqualTo(now);
- * }
- *
- *

- * Note that the name System2 was chosen to not conflict with {@link java.lang.System}. - *

- */ -public class System2 { - - public static final System2 INSTANCE = new System2(); - - /** - * Shortcut for {@link System#currentTimeMillis()} - */ - public long now() { - return System.currentTimeMillis(); - } - - /** - * Shortcut for {@link System#getProperties()} - */ - public Properties properties() { - return System.getProperties(); - } - - /** - * Shortcut for {@link System#getProperty(String)} - */ - @CheckForNull - public String property(String key) { - return System.getProperty(key); - } - - /** - * Shortcut for {@link System#getProperty(String)} - */ - @CheckForNull - public String getProperty(String key) { - return System.getProperty(key); - } - - /** - * Shortcut for {@link System#getenv(String)} - */ - @CheckForNull - public String getenv(String key) { - return System.getenv(key); - } - - public void exit(int code) { - System.exit(code); - } - - /** - * Shortcut for {@link System#getenv()} - */ - public Map envVariables() { - return System.getenv(); - } - - /** - * Shortcut for {@link System#getenv(String)} - */ - @CheckForNull - public String envVariable(String key) { - return System.getenv(key); - } -} diff --git a/src/main/java/org/sonarlint/cli/util/SystemInfo.java b/src/main/java/org/sonarlint/cli/util/SystemInfo.java deleted file mode 100644 index 4964a48..0000000 --- a/src/main/java/org/sonarlint/cli/util/SystemInfo.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli.util; - -public class SystemInfo { - private static System2 system = new System2(); - - private SystemInfo() { - } - - public static void setSystem(System2 system) { - SystemInfo.system = system; - } - - public static void print(Logger logger) { - logger.info(java()); - logger.info(os()); - String runnerOpts = system.getenv("SONARLINT_OPTS"); - if (runnerOpts != null) { - logger.info("SONARLINT_OPTS=" + runnerOpts); - } - } - - public static String getVersion() { - String version = "unknown"; - - Package p = SystemInfo.class.getPackage(); - if (p != null) { - String implVersion = p.getImplementationVersion(); - if (implVersion != null) { - version = implVersion; - } - } - - return version; - } - - public static String java() { - StringBuilder sb = new StringBuilder(); - sb - .append("Java ") - .append(system.getProperty("java.version")) - .append(" ") - .append(system.getProperty("java.vendor")); - String bits = system.getProperty("sun.arch.data.model"); - if ("32".equals(bits) || "64".equals(bits)) { - sb.append(" (").append(bits).append("-bit)"); - } - return sb.toString(); - } - - public static String os() { - StringBuilder sb = new StringBuilder(); - sb - .append(system.getProperty("os.name")) - .append(" ") - .append(system.getProperty("os.version")) - .append(" ") - .append(system.getProperty("os.arch")); - return sb.toString(); - } -} diff --git a/src/main/java/org/sonarlint/cli/util/Util.java b/src/main/java/org/sonarlint/cli/util/Util.java deleted file mode 100644 index 649f817..0000000 --- a/src/main/java/org/sonarlint/cli/util/Util.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarlint.cli.util; - -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; -import java.util.function.Supplier; - -public class Util { - private Util() { - // static only - } - - public static U getOrCreate(Map map, T key, Supplier f) { - U value = map.get(key); - if (value != null) { - return value; - } - value = f.get(); - map.put(key, value); - return value; - } - - public static Map toMap(Properties properties) { - return new HashMap<>((Map) properties); - } - - public static String escapeFileName(String fileName) { - return fileName.replaceAll("[^a-zA-Z0-9.-]", "_"); - } -} diff --git a/src/main/java/org/sonarlint/cli/util/package-info.java b/src/main/java/org/sonarlint/cli/util/package-info.java deleted file mode 100644 index 463f810..0000000 --- a/src/main/java/org/sonarlint/cli/util/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SonarLint CLI - * Copyright (C) 2016-2017 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program 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 3 of the License, or (at your option) any later version. - * - * This program 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 program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -package org.sonarlint.cli.util; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/resources/org/sonarlint/cli/report/sonarlintreport.ftl b/src/main/resources/org/sonarlint/cli/report/sonarlintreport.ftl deleted file mode 100644 index 7e01d20..0000000 --- a/src/main/resources/org/sonarlint/cli/report/sonarlintreport.ftl +++ /dev/null @@ -1,349 +0,0 @@ -<#assign component_id_prefix = 'comp'> - - - - - SonarLint report of ${report.getTitle()?html} - - - - - - -

- -
SonarLint Report
-
${report.getTitle()?html} - ${report.getDate()?datetime}
-
- -<#if report.noIssues()> -
- -
-<#else> -
- -
- - - - <#assign size = '33'> - - - -
-

Issues

- <#if report.getSummary().getTotal().getCountInCurrentAnalysis() gt 0> - ${report.getSummary().getTotal().getCountInCurrentAnalysis()?c} - <#else> - 0 - -
-
- - - - - - - - - <#list report.getSummary().getCategoryReports() as categoryReport> - - - - - - - -
- Issues per Rule - Issues
- - - ${categoryReport.getName()?html} - - <#if categoryReport.getTotal().getCountInCurrentAnalysis() gt 0> - ${categoryReport.getTotal().getCountInCurrentAnalysis()?c} - <#else> - 0 - -
-
- -
- - - -
- <#list report.getResourceReports() as resourceReport> - - - - - - - - - <#list resourceReport.getCategoryReports() as categoryReport> - - - - - - - <#assign colspan = '3'> - <#assign issues=resourceReport.getIssuesAtLine(0)> - <#if issues?has_content> - - - - - - - - -
-
- - ${resourceReport.getName()} -
- 		- <#if resourceReport.getTotal().getCountInCurrentAnalysis() gt 0> - ${resourceReport.getTotal().getCountInCurrentAnalysis()?c} - <#else> - 0 - -
Issues -
- - - ${categoryReport.getName()?html} - - ${categoryReport.getTotal().getCountInCurrentAnalysis()?c} -
- <#list issues as issue> -
-
- - <#if issue.getMessage()?has_content> - ${issue.getMessage()?html} - <#else> - ${issue.getRuleName()} - -   -   - ${issue.getRuleKey()} -
-
- ${issue.getRuleName()} -
-
- -
- - <#list report.getEscapedSource(resourceReport.getPath()) as line> - <#assign lineIndex=line_index+1> - <#if resourceReport.isDisplayableLine(lineIndex)> - - - - - - - - <#assign issues=resourceReport.getIssuesAtLine(lineIndex)> - <#if issues?has_content> - - - - - - - -
${lineIndex?c} - 
${line}
-
- <#list issues as issue> -
-
- - <#if issue.getMessage()?has_content> - ${issue.getMessage()?html} - <#else> - ${issue.getRuleName()} - -   -   - ${issue.getRuleKey()} - <#if issue.creationDate()?has_content> -   -   - ${issue.creationDate()} - -
-
- ${issue.getRuleName()} -
-
- -
-
- -
-
- - - - diff --git a/src/main/resources/org/sonarlint/cli/report/sonarlintreport_files/DIR.png b/src/main/resources/org/sonarlint/cli/report/sonarlintreport_files/DIR.png deleted file mode 100644 index b135ef92eec475ae36f421425b852ff3eb339b1e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 390 zcmV;10eSw3P)D;i>g+kXb7A zAt@;}b=`J;Ib*xx2Z$JSco^n|=b2$(H~?HP^dz%@O_;LtZl5ZMyB2g$u?fzRzWz~; zVhZNooN>G;t83u`ZZk#;{IWmM?$pM>qO8sxMKQm1iJ8p{OnT2TzOFFFHUi*XQk-|m zadUMnNQ{B$ZKoBWH^`R_lyrh(g`iL+rxARX2|h{$*&@Mff#5kukjNTPk{TvFzGOq- z?Ta9iHY~!aZ?*;>bOfp>2_2{L3Ql4bh-azRK!yfhYGUX~uZ#C}@mSSxaHBN^L^(D=@UO?;ZB| klif17bU6Drf8pN)Kje1&o&U^8g8%>k07*qoM6N<$f&iYU3;+NC diff --git a/src/main/resources/org/sonarlint/cli/report/sonarlintreport_files/FIL.png b/src/main/resources/org/sonarlint/cli/report/sonarlintreport_files/FIL.png deleted file mode 100644 index 1664e25c8b50160089710e75cc105b218bbd1e49..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 416 zcmV;R0bl-!P)V{QECN z^Isq*BUP8-56Hm33=G1&%nZ5JM;P&X;V)2Q`SeR*zkm$+55^2&dQzSN1HnK9dAlJ= z8y*fI@B9T4fB!*TM1%qV8ER);2HW@#$@c$1gC-Uj5;g#2OI5r!(BJ>ThW-7EaLFHH zTmVwoI2RTM2-`t)Kd~+-iGhRxJUahD0vDPr2#0~B04qE}fx`ftEg&w!YrvgH4`208 z-SF+px4#U3e*XohL{J#~{sW25kDtH&5fNqjhSPv;3rlrL&CURrVDUeLPi`#$0000< KMNUMnLSTaHU$YSa diff --git a/src/main/resources/org/sonarlint/cli/report/sonarlintreport_files/PRJ.png b/src/main/resources/org/sonarlint/cli/report/sonarlintreport_files/PRJ.png deleted file mode 100644 index b32e51c5f42a15a7b1223e3b66e53c87cb986e45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 575 zcmV-F0>J%=P)(o*%)Aj(A$XSu?(=)j;T(^uvYF=t2wojnb}Oo0fYIl} zHRDh3FKq|_a5Hq$58(4c--B8Fdn&$m500?CbhjCPHoa)mhIBlQH5Mo3kclqn$l#4i z-|t{W6|S{EBI5{Ki@bbaaWF)DHHQxcUd$QRK1ayJ)5K!yq*v#@{9zypB3V#t^Kn=4 zV#^qBhsL;9OF*^Bp=^@!m%E# z6*s^ISW$W&FA_@{M8R6c=78k!2EgYh#(sZ_sIhBl);M9d~XU-b%)z^?f?o{D>xY`1Xxi{*YBn0!)rv9(Any2 zE0X`*&{2XP!n-o2Uez8V`}N+f=of)*~E zsHF4m3|5rOXZ9hvRMBhz5N&Lz+tt`mS74yGx*jgq?GNlsBr`rE>b>4Sh2+vzpyPb) zzgIcjda68McsV)0EP}rySew(&FPZ-T7V<9=S@B&7^{j668auD6usVgB4NA_=dW4O9BVSq5jcH zUS{Uad%yYEnK!>#hDl+rU=}W9AWvtWox?Dz8HPzuzfk`W^d8XN20AE$#RWZN3S`5j7_2A5z#NRYKK?`s)(f5)|=^iTcyA>k7JEb=mK8IN&2r zBZb^tG5GHaJM1fU!T!!PT$y%9#`T(jbiEuc)+Ah_JJJ2q@mB?QUr1n|35dD3sxqph zz7dD*x_B60ys++SO<+G#1te2j82`t9C%ak|xqA!+ub<4H+UO!`hVS({wSzJ2Rwee4 z_WI(vp!fM*nWfwD+FIRNjixxxQ&ubFet2()YQC|@`RhfIx>PyRpWM5)Pg-c9* zsEl3F>O(b#gr8Gi=B^EhYvyZmj$2c5)|obw<(;r@*8M@}s(QGklldgtMhL@<${^%a zXuTigEJzQ?0gyWxW~7s0hM=sy#4zWn{vSUYXVO6mL1;W0O*HUaPXF2pz_&<&{c*!o z&g5(is#~xv2urAs#+KQ@kB6ylkL+5bf)u zZcHFX7sa!kjrIVnd(_R5h+tbj8~E`sRRJG{d#RJu7hf6AHreg;elgtKAlxrIl8rqT zJWXLYe7iG`05`dp+S9wHLCl>$72jmos3Hz(5__t>IAbow(vTr&EY2!nD;h_(I` zmHeM@=CY_AP>~dPSG1@idvGGZWa*v;cZDvq-vCDrMSy>seFOy@guAfZtj{F>%E{)pdT~crbsjzEub5a(j>0)%2_Fc1 z@EJIV%S?U9!#)LPpp(WyQTPdOh{xOFm=<-!!G+uLqc0)3hwKyf;lVr{ZAYh=SRzi%&DzjuJ4F5d+e;y z^#}f=(>LOD`lRm@_@=8so`yH(e#&F$oFfW%Fd(A4tyq3|w;uCxKej0R$uHlsXIR@b z8SM#5NbPYHUSrjdFVi^DRh6fNBvb=^9#UoYG|YvxZwLM+qqA_AR6!i&t$vLVZ(#q` zz?mm4@V5JW+}jWK`fg1`Cz~Ahu{W62-&%&dX=^v^C0$_qp|9g%H&+j9ToRLUVco{8 zc~;v)WoT6h-it9W-w%7ByQPAE$l6ZlstNYJfb(_4mp3KuLw)=^GgI5-ta?70sk1>_8#lsBBId_CB@Y<Z zhCu$RC1jw9klq49Vx@$<_ZlI~ddbM{FaOI)#n@6wi+9vv)[^>]*|#([\w-]*))$/,k=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,E=/^[\],:{}\s]*$/,S=/(?:^|:|,)(?:\s*\[)+/g,A=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,j=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,D=/^-ms-/,L=/-([\da-z])/gi,H=function(e,t){return t.toUpperCase()},q=function(e){(a.addEventListener||"load"===e.type||"complete"===a.readyState)&&(_(),x.ready())},_=function(){a.addEventListener?(a.removeEventListener("DOMContentLoaded",q,!1),e.removeEventListener("load",q,!1)):(a.detachEvent("onreadystatechange",q),e.detachEvent("onload",q))};x.fn=x.prototype={jquery:f,constructor:x,init:function(e,n,r){var i,o;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof x?n[0]:n,x.merge(this,x.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:a,!0)),k.test(i[1])&&x.isPlainObject(n))for(i in n)x.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(o=a.getElementById(i[2]),o&&o.parentNode){if(o.id!==i[2])return r.find(e);this.length=1,this[0]=o}return this.context=a,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):x.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),x.makeArray(e,this))},selector:"",length:0,toArray:function(){return g.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=x.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return x.each(this,e,t)},ready:function(e){return x.ready.promise().done(e),this},slice:function(){return this.pushStack(g.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(x.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:h,sort:[].sort,splice:[].splice},x.fn.init.prototype=x.fn,x.extend=x.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},l=1,u=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},l=2),"object"==typeof s||x.isFunction(s)||(s={}),u===l&&(s=this,--l);u>l;l++)if(null!=(o=arguments[l]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(x.isPlainObject(r)||(n=x.isArray(r)))?(n?(n=!1,a=e&&x.isArray(e)?e:[]):a=e&&x.isPlainObject(e)?e:{},s[i]=x.extend(c,a,r)):r!==t&&(s[i]=r));return s},x.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),noConflict:function(t){return e.$===x&&(e.$=u),t&&e.jQuery===x&&(e.jQuery=l),x},isReady:!1,readyWait:1,holdReady:function(e){e?x.readyWait++:x.ready(!0)},ready:function(e){if(e===!0?!--x.readyWait:!x.isReady){if(!a.body)return setTimeout(x.ready);x.isReady=!0,e!==!0&&--x.readyWait>0||(n.resolveWith(a,[x]),x.fn.trigger&&x(a).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===x.type(e)},isArray:Array.isArray||function(e){return"array"===x.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?c[y.call(e)]||"object":typeof e},isPlainObject:function(e){var n;if(!e||"object"!==x.type(e)||e.nodeType||x.isWindow(e))return!1;try{if(e.constructor&&!v.call(e,"constructor")&&!v.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(r){return!1}if(x.support.ownLast)for(n in e)return v.call(e,n);for(n in e);return n===t||v.call(e,n)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||a;var r=k.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=x.buildFragment([e],t,i),i&&x(i).remove(),x.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=x.trim(n),n&&E.test(n.replace(A,"@").replace(j,"]").replace(S,"")))?Function("return "+n)():(x.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||x.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&x.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(D,"ms-").replace(L,H)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:b&&!b.call("\ufeff\u00a0")?function(e){return null==e?"":b.call(e)}:function(e){return null==e?"":(e+"").replace(C,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?x.merge(n,"string"==typeof e?[e]:e):h.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(m)return m.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else while(n[o]!==t)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return d.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),x.isFunction(e)?(r=g.call(arguments,2),i=function(){return e.apply(n||this,r.concat(g.call(arguments)))},i.guid=e.guid=e.guid||x.guid++,i):t},access:function(e,n,r,i,o,a,s){var l=0,u=e.length,c=null==r;if("object"===x.type(r)){o=!0;for(l in r)x.access(e,n,l,r[l],!0,a,s)}else if(i!==t&&(o=!0,x.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(x(e),n)})),n))for(;u>l;l++)n(e[l],r,s?i:i.call(e[l],l,n(e[l],r)));return o?e:c?n.call(e):u?n(e[0],r):a},now:function(){return(new Date).getTime()},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),x.ready.promise=function(t){if(!n)if(n=x.Deferred(),"complete"===a.readyState)setTimeout(x.ready);else if(a.addEventListener)a.addEventListener("DOMContentLoaded",q,!1),e.addEventListener("load",q,!1);else{a.attachEvent("onreadystatechange",q),e.attachEvent("onload",q);var r=!1;try{r=null==e.frameElement&&a.documentElement}catch(i){}r&&r.doScroll&&function o(){if(!x.isReady){try{r.doScroll("left")}catch(e){return setTimeout(o,50)}_(),x.ready()}}()}return n.promise(t)},x.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){c["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=x.type(e);return x.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=x(a),function(e,t){var n,r,i,o,a,s,l,u,c,p,f,d,h,g,m,y,v,b="sizzle"+-new Date,w=e.document,T=0,C=0,N=lt(),k=lt(),E=lt(),S=!1,A=function(){return 0},j=typeof t,D=1<<31,L={}.hasOwnProperty,H=[],q=H.pop,_=H.push,M=H.push,O=H.slice,F=H.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},B="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",P="[\\x20\\t\\r\\n\\f]",R="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",W=R.replace("w","w#"),$="\\["+P+"*("+R+")"+P+"*(?:([*^$|!~]?=)"+P+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+W+")|)|)"+P+"*\\]",I=":("+R+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+$.replace(3,8)+")*)|.*)\\)|)",z=RegExp("^"+P+"+|((?:^|[^\\\\])(?:\\\\.)*)"+P+"+$","g"),X=RegExp("^"+P+"*,"+P+"*"),U=RegExp("^"+P+"*([>+~]|"+P+")"+P+"*"),V=RegExp(P+"*[+~]"),Y=RegExp("="+P+"*([^\\]'\"]*)"+P+"*\\]","g"),J=RegExp(I),G=RegExp("^"+W+"$"),Q={ID:RegExp("^#("+R+")"),CLASS:RegExp("^\\.("+R+")"),TAG:RegExp("^("+R.replace("w","w*")+")"),ATTR:RegExp("^"+$),PSEUDO:RegExp("^"+I),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+P+"*(even|odd|(([+-]|)(\\d*)n|)"+P+"*(?:([+-]|)"+P+"*(\\d+)|))"+P+"*\\)|)","i"),bool:RegExp("^(?:"+B+")$","i"),needsContext:RegExp("^"+P+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+P+"*((?:-\\d)?\\d*)"+P+"*\\)|)(?=[^-]|$)","i")},K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,et=/^(?:input|select|textarea|button)$/i,tt=/^h\d$/i,nt=/'|\\/g,rt=RegExp("\\\\([\\da-f]{1,6}"+P+"?|("+P+")|.)","ig"),it=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:0>r?String.fromCharCode(r+65536):String.fromCharCode(55296|r>>10,56320|1023&r)};try{M.apply(H=O.call(w.childNodes),w.childNodes),H[w.childNodes.length].nodeType}catch(ot){M={apply:H.length?function(e,t){_.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function at(e,t,n,i){var o,a,s,l,u,c,d,m,y,x;if((t?t.ownerDocument||t:w)!==f&&p(t),t=t||f,n=n||[],!e||"string"!=typeof e)return n;if(1!==(l=t.nodeType)&&9!==l)return[];if(h&&!i){if(o=Z.exec(e))if(s=o[1]){if(9===l){if(a=t.getElementById(s),!a||!a.parentNode)return n;if(a.id===s)return n.push(a),n}else if(t.ownerDocument&&(a=t.ownerDocument.getElementById(s))&&v(t,a)&&a.id===s)return n.push(a),n}else{if(o[2])return M.apply(n,t.getElementsByTagName(e)),n;if((s=o[3])&&r.getElementsByClassName&&t.getElementsByClassName)return M.apply(n,t.getElementsByClassName(s)),n}if(r.qsa&&(!g||!g.test(e))){if(m=d=b,y=t,x=9===l&&e,1===l&&"object"!==t.nodeName.toLowerCase()){c=bt(e),(d=t.getAttribute("id"))?m=d.replace(nt,"\\$&"):t.setAttribute("id",m),m="[id='"+m+"'] ",u=c.length;while(u--)c[u]=m+xt(c[u]);y=V.test(e)&&t.parentNode||t,x=c.join(",")}if(x)try{return M.apply(n,y.querySelectorAll(x)),n}catch(T){}finally{d||t.removeAttribute("id")}}}return At(e.replace(z,"$1"),t,n,i)}function st(e){return K.test(e+"")}function lt(){var e=[];function t(n,r){return e.push(n+=" ")>o.cacheLength&&delete t[e.shift()],t[n]=r}return t}function ut(e){return e[b]=!0,e}function ct(e){var t=f.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function pt(e,t,n){e=e.split("|");var r,i=e.length,a=n?null:t;while(i--)(r=o.attrHandle[e[i]])&&r!==t||(o.attrHandle[e[i]]=a)}function ft(e,t){var n=e.getAttributeNode(t);return n&&n.specified?n.value:e[t]===!0?t.toLowerCase():null}function dt(e,t){return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}function ht(e){return"input"===e.nodeName.toLowerCase()?e.defaultValue:t}function gt(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||D)-(~e.sourceIndex||D);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function mt(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function yt(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function vt(e){return ut(function(t){return t=+t,ut(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}s=at.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},r=at.support={},p=at.setDocument=function(e){var n=e?e.ownerDocument||e:w,i=n.parentWindow;return n!==f&&9===n.nodeType&&n.documentElement?(f=n,d=n.documentElement,h=!s(n),i&&i.frameElement&&i.attachEvent("onbeforeunload",function(){p()}),r.attributes=ct(function(e){return e.innerHTML="",pt("type|href|height|width",dt,"#"===e.firstChild.getAttribute("href")),pt(B,ft,null==e.getAttribute("disabled")),e.className="i",!e.getAttribute("className")}),r.input=ct(function(e){return e.innerHTML="",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")}),pt("value",ht,r.attributes&&r.input),r.getElementsByTagName=ct(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),r.getElementsByClassName=ct(function(e){return e.innerHTML="
",e.firstChild.className="i",2===e.getElementsByClassName("i").length}),r.getById=ct(function(e){return d.appendChild(e).id=b,!n.getElementsByName||!n.getElementsByName(b).length}),r.getById?(o.find.ID=function(e,t){if(typeof t.getElementById!==j&&h){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){return e.getAttribute("id")===t}}):(delete o.find.ID,o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){var n=typeof e.getAttributeNode!==j&&e.getAttributeNode("id");return n&&n.value===t}}),o.find.TAG=r.getElementsByTagName?function(e,n){return typeof n.getElementsByTagName!==j?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},o.find.CLASS=r.getElementsByClassName&&function(e,n){return typeof n.getElementsByClassName!==j&&h?n.getElementsByClassName(e):t},m=[],g=[],(r.qsa=st(n.querySelectorAll))&&(ct(function(e){e.innerHTML="",e.querySelectorAll("[selected]").length||g.push("\\["+P+"*(?:value|"+B+")"),e.querySelectorAll(":checked").length||g.push(":checked")}),ct(function(e){var t=n.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("t",""),e.querySelectorAll("[t^='']").length&&g.push("[*^$]="+P+"*(?:''|\"\")"),e.querySelectorAll(":enabled").length||g.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),g.push(",.*:")})),(r.matchesSelector=st(y=d.webkitMatchesSelector||d.mozMatchesSelector||d.oMatchesSelector||d.msMatchesSelector))&&ct(function(e){r.disconnectedMatch=y.call(e,"div"),y.call(e,"[s!='']:x"),m.push("!=",I)}),g=g.length&&RegExp(g.join("|")),m=m.length&&RegExp(m.join("|")),v=st(d.contains)||d.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},r.sortDetached=ct(function(e){return 1&e.compareDocumentPosition(n.createElement("div"))}),A=d.compareDocumentPosition?function(e,t){if(e===t)return S=!0,0;var i=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t);return i?1&i||!r.sortDetached&&t.compareDocumentPosition(e)===i?e===n||v(w,e)?-1:t===n||v(w,t)?1:c?F.call(c,e)-F.call(c,t):0:4&i?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var r,i=0,o=e.parentNode,a=t.parentNode,s=[e],l=[t];if(e===t)return S=!0,0;if(!o||!a)return e===n?-1:t===n?1:o?-1:a?1:c?F.call(c,e)-F.call(c,t):0;if(o===a)return gt(e,t);r=e;while(r=r.parentNode)s.unshift(r);r=t;while(r=r.parentNode)l.unshift(r);while(s[i]===l[i])i++;return i?gt(s[i],l[i]):s[i]===w?-1:l[i]===w?1:0},n):f},at.matches=function(e,t){return at(e,null,null,t)},at.matchesSelector=function(e,t){if((e.ownerDocument||e)!==f&&p(e),t=t.replace(Y,"='$1']"),!(!r.matchesSelector||!h||m&&m.test(t)||g&&g.test(t)))try{var n=y.call(e,t);if(n||r.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(i){}return at(t,f,null,[e]).length>0},at.contains=function(e,t){return(e.ownerDocument||e)!==f&&p(e),v(e,t)},at.attr=function(e,n){(e.ownerDocument||e)!==f&&p(e);var i=o.attrHandle[n.toLowerCase()],a=i&&L.call(o.attrHandle,n.toLowerCase())?i(e,n,!h):t;return a===t?r.attributes||!h?e.getAttribute(n):(a=e.getAttributeNode(n))&&a.specified?a.value:null:a},at.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},at.uniqueSort=function(e){var t,n=[],i=0,o=0;if(S=!r.detectDuplicates,c=!r.sortStable&&e.slice(0),e.sort(A),S){while(t=e[o++])t===e[o]&&(i=n.push(o));while(i--)e.splice(n[i],1)}return e},a=at.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=a(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=a(t);return n},o=at.selectors={cacheLength:50,createPseudo:ut,match:Q,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(rt,it),e[3]=(e[4]||e[5]||"").replace(rt,it),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||at.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&at.error(e[0]),e},PSEUDO:function(e){var n,r=!e[5]&&e[2];return Q.CHILD.test(e[0])?null:(e[3]&&e[4]!==t?e[2]=e[4]:r&&J.test(r)&&(n=bt(r,!0))&&(n=r.indexOf(")",r.length-n)-r.length)&&(e[0]=e[0].slice(0,n),e[2]=r.slice(0,n)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(rt,it).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=N[e+" "];return t||(t=RegExp("(^|"+P+")"+e+"("+P+"|$)"))&&N(e,function(e){return t.test("string"==typeof e.className&&e.className||typeof e.getAttribute!==j&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=at.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,l){var u,c,p,f,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!l&&!s;if(m){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){c=m[b]||(m[b]={}),u=c[e]||[],d=u[0]===T&&u[1],f=u[0]===T&&u[2],p=d&&m.childNodes[d];while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[T,d,f];break}}else if(v&&(u=(t[b]||(t[b]={}))[e])&&u[0]===T)f=u[1];else while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(v&&((p[b]||(p[b]={}))[e]=[T,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=o.pseudos[e]||o.setFilters[e.toLowerCase()]||at.error("unsupported pseudo: "+e);return r[b]?r(t):r.length>1?(n=[e,e,"",t],o.setFilters.hasOwnProperty(e.toLowerCase())?ut(function(e,n){var i,o=r(e,t),a=o.length;while(a--)i=F.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:ut(function(e){var t=[],n=[],r=l(e.replace(z,"$1"));return r[b]?ut(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:ut(function(e){return function(t){return at(e,t).length>0}}),contains:ut(function(e){return function(t){return(t.textContent||t.innerText||a(t)).indexOf(e)>-1}}),lang:ut(function(e){return G.test(e||"")||at.error("unsupported lang: "+e),e=e.replace(rt,it).toLowerCase(),function(t){var n;do if(n=h?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===d},focus:function(e){return e===f.activeElement&&(!f.hasFocus||f.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!o.pseudos.empty(e)},header:function(e){return tt.test(e.nodeName)},input:function(e){return et.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:vt(function(){return[0]}),last:vt(function(e,t){return[t-1]}),eq:vt(function(e,t,n){return[0>n?n+t:n]}),even:vt(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:vt(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:vt(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:vt(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}};for(n in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})o.pseudos[n]=mt(n);for(n in{submit:!0,reset:!0})o.pseudos[n]=yt(n);function bt(e,t){var n,r,i,a,s,l,u,c=k[e+" "];if(c)return t?0:c.slice(0);s=e,l=[],u=o.preFilter;while(s){(!n||(r=X.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),l.push(i=[])),n=!1,(r=U.exec(s))&&(n=r.shift(),i.push({value:n,type:r[0].replace(z," ")}),s=s.slice(n.length));for(a in o.filter)!(r=Q[a].exec(s))||u[a]&&!(r=u[a](r))||(n=r.shift(),i.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?at.error(e):k(e,l).slice(0)}function xt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function wt(e,t,n){var r=t.dir,o=n&&"parentNode"===r,a=C++;return t.first?function(t,n,i){while(t=t[r])if(1===t.nodeType||o)return e(t,n,i)}:function(t,n,s){var l,u,c,p=T+" "+a;if(s){while(t=t[r])if((1===t.nodeType||o)&&e(t,n,s))return!0}else while(t=t[r])if(1===t.nodeType||o)if(c=t[b]||(t[b]={}),(u=c[r])&&u[0]===p){if((l=u[1])===!0||l===i)return l===!0}else if(u=c[r]=[p],u[1]=e(t,n,s)||i,u[1]===!0)return!0}}function Tt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function Ct(e,t,n,r,i){var o,a=[],s=0,l=e.length,u=null!=t;for(;l>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),u&&t.push(s));return a}function Nt(e,t,n,r,i,o){return r&&!r[b]&&(r=Nt(r)),i&&!i[b]&&(i=Nt(i,o)),ut(function(o,a,s,l){var u,c,p,f=[],d=[],h=a.length,g=o||St(t||"*",s.nodeType?[s]:s,[]),m=!e||!o&&t?g:Ct(g,f,e,s,l),y=n?i||(o?e:h||r)?[]:a:m;if(n&&n(m,y,s,l),r){u=Ct(y,d),r(u,[],s,l),c=u.length;while(c--)(p=u[c])&&(y[d[c]]=!(m[d[c]]=p))}if(o){if(i||e){if(i){u=[],c=y.length;while(c--)(p=y[c])&&u.push(m[c]=p);i(null,y=[],u,l)}c=y.length;while(c--)(p=y[c])&&(u=i?F.call(o,p):f[c])>-1&&(o[u]=!(a[u]=p))}}else y=Ct(y===a?y.splice(h,y.length):y),i?i(null,a,y,l):M.apply(a,y)})}function kt(e){var t,n,r,i=e.length,a=o.relative[e[0].type],s=a||o.relative[" "],l=a?1:0,c=wt(function(e){return e===t},s,!0),p=wt(function(e){return F.call(t,e)>-1},s,!0),f=[function(e,n,r){return!a&&(r||n!==u)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;i>l;l++)if(n=o.relative[e[l].type])f=[wt(Tt(f),n)];else{if(n=o.filter[e[l].type].apply(null,e[l].matches),n[b]){for(r=++l;i>r;r++)if(o.relative[e[r].type])break;return Nt(l>1&&Tt(f),l>1&&xt(e.slice(0,l-1).concat({value:" "===e[l-2].type?"*":""})).replace(z,"$1"),n,r>l&&kt(e.slice(l,r)),i>r&&kt(e=e.slice(r)),i>r&&xt(e))}f.push(n)}return Tt(f)}function Et(e,t){var n=0,r=t.length>0,a=e.length>0,s=function(s,l,c,p,d){var h,g,m,y=[],v=0,b="0",x=s&&[],w=null!=d,C=u,N=s||a&&o.find.TAG("*",d&&l.parentNode||l),k=T+=null==C?1:Math.random()||.1;for(w&&(u=l!==f&&l,i=n);null!=(h=N[b]);b++){if(a&&h){g=0;while(m=e[g++])if(m(h,l,c)){p.push(h);break}w&&(T=k,i=++n)}r&&((h=!m&&h)&&v--,s&&x.push(h))}if(v+=b,r&&b!==v){g=0;while(m=t[g++])m(x,y,l,c);if(s){if(v>0)while(b--)x[b]||y[b]||(y[b]=q.call(p));y=Ct(y)}M.apply(p,y),w&&!s&&y.length>0&&v+t.length>1&&at.uniqueSort(p)}return w&&(T=k,u=C),x};return r?ut(s):s}l=at.compile=function(e,t){var n,r=[],i=[],o=E[e+" "];if(!o){t||(t=bt(e)),n=t.length;while(n--)o=kt(t[n]),o[b]?r.push(o):i.push(o);o=E(e,Et(i,r))}return o};function St(e,t,n){var r=0,i=t.length;for(;i>r;r++)at(e,t[r],n);return n}function At(e,t,n,i){var a,s,u,c,p,f=bt(e);if(!i&&1===f.length){if(s=f[0]=f[0].slice(0),s.length>2&&"ID"===(u=s[0]).type&&r.getById&&9===t.nodeType&&h&&o.relative[s[1].type]){if(t=(o.find.ID(u.matches[0].replace(rt,it),t)||[])[0],!t)return n;e=e.slice(s.shift().value.length)}a=Q.needsContext.test(e)?0:s.length;while(a--){if(u=s[a],o.relative[c=u.type])break;if((p=o.find[c])&&(i=p(u.matches[0].replace(rt,it),V.test(s[0].type)&&t.parentNode||t))){if(s.splice(a,1),e=i.length&&xt(s),!e)return M.apply(n,i),n;break}}}return l(e,f)(i,t,!h,n,V.test(e)),n}o.pseudos.nth=o.pseudos.eq;function jt(){}jt.prototype=o.filters=o.pseudos,o.setFilters=new jt,r.sortStable=b.split("").sort(A).join("")===b,p(),[0,0].sort(A),r.detectDuplicates=S,x.find=at,x.expr=at.selectors,x.expr[":"]=x.expr.pseudos,x.unique=at.uniqueSort,x.text=at.getText,x.isXMLDoc=at.isXML,x.contains=at.contains}(e);var O={};function F(e){var t=O[e]={};return x.each(e.match(T)||[],function(e,n){t[n]=!0}),t}x.Callbacks=function(e){e="string"==typeof e?O[e]||F(e):x.extend({},e);var n,r,i,o,a,s,l=[],u=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=l.length,n=!0;l&&o>a;a++)if(l[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,l&&(u?u.length&&c(u.shift()):r?l=[]:p.disable())},p={add:function(){if(l){var t=l.length;(function i(t){x.each(t,function(t,n){var r=x.type(n);"function"===r?e.unique&&p.has(n)||l.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=l.length:r&&(s=t,c(r))}return this},remove:function(){return l&&x.each(arguments,function(e,t){var r;while((r=x.inArray(t,l,r))>-1)l.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?x.inArray(e,l)>-1:!(!l||!l.length)},empty:function(){return l=[],o=0,this},disable:function(){return l=u=r=t,this},disabled:function(){return!l},lock:function(){return u=t,r||p.disable(),this},locked:function(){return!u},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],!l||i&&!u||(n?u.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},x.extend({Deferred:function(e){var t=[["resolve","done",x.Callbacks("once memory"),"resolved"],["reject","fail",x.Callbacks("once memory"),"rejected"],["notify","progress",x.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return x.Deferred(function(n){x.each(t,function(t,o){var a=o[0],s=x.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&x.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?x.extend(e,r):r}},i={};return r.pipe=r.then,x.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=g.call(arguments),r=n.length,i=1!==r||e&&x.isFunction(e.promise)?r:0,o=1===i?e:x.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?g.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,l,u;if(r>1)for(s=Array(r),l=Array(r),u=Array(r);r>t;t++)n[t]&&x.isFunction(n[t].promise)?n[t].promise().done(a(t,u,n)).fail(o.reject).progress(a(t,l,s)):--i;return i||o.resolveWith(u,n),o.promise()}}),x.support=function(t){var n,r,o,s,l,u,c,p,f,d=a.createElement("div");if(d.setAttribute("className","t"),d.innerHTML="
a",n=d.getElementsByTagName("*")||[],r=d.getElementsByTagName("a")[0],!r||!r.style||!n.length)return t;s=a.createElement("select"),u=s.appendChild(a.createElement("option")),o=d.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t.getSetAttribute="t"!==d.className,t.leadingWhitespace=3===d.firstChild.nodeType,t.tbody=!d.getElementsByTagName("tbody").length,t.htmlSerialize=!!d.getElementsByTagName("link").length,t.style=/top/.test(r.getAttribute("style")),t.hrefNormalized="/a"===r.getAttribute("href"),t.opacity=/^0.5/.test(r.style.opacity),t.cssFloat=!!r.style.cssFloat,t.checkOn=!!o.value,t.optSelected=u.selected,t.enctype=!!a.createElement("form").enctype,t.html5Clone="<:nav>"!==a.createElement("nav").cloneNode(!0).outerHTML,t.inlineBlockNeedsLayout=!1,t.shrinkWrapBlocks=!1,t.pixelPosition=!1,t.deleteExpando=!0,t.noCloneEvent=!0,t.reliableMarginRight=!0,t.boxSizingReliable=!0,o.checked=!0,t.noCloneChecked=o.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!u.disabled;try{delete d.test}catch(h){t.deleteExpando=!1}o=a.createElement("input"),o.setAttribute("value",""),t.input=""===o.getAttribute("value"),o.value="t",o.setAttribute("type","radio"),t.radioValue="t"===o.value,o.setAttribute("checked","t"),o.setAttribute("name","t"),l=a.createDocumentFragment(),l.appendChild(o),t.appendChecked=o.checked,t.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,d.attachEvent&&(d.attachEvent("onclick",function(){t.noCloneEvent=!1}),d.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})d.setAttribute(c="on"+f,"t"),t[f+"Bubbles"]=c in e||d.attributes[c].expando===!1;d.style.backgroundClip="content-box",d.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===d.style.backgroundClip;for(f in x(t))break;return t.ownLast="0"!==f,x(function(){var n,r,o,s="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",l=a.getElementsByTagName("body")[0];l&&(n=a.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",l.appendChild(n).appendChild(d),d.innerHTML="
t
",o=d.getElementsByTagName("td"),o[0].style.cssText="padding:0;margin:0;border:0;display:none",p=0===o[0].offsetHeight,o[0].style.display="",o[1].style.display="none",t.reliableHiddenOffsets=p&&0===o[0].offsetHeight,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",x.swap(l,null!=l.style.zoom?{zoom:1}:{},function(){t.boxSizing=4===d.offsetWidth}),e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(d,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(d,null)||{width:"4px"}).width,r=d.appendChild(a.createElement("div")),r.style.cssText=d.style.cssText=s,r.style.marginRight=r.style.width="0",d.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),typeof d.style.zoom!==i&&(d.innerHTML="",d.style.cssText=s+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.innerHTML="
",d.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==d.offsetWidth,t.inlineBlockNeedsLayout&&(l.style.zoom=1)),l.removeChild(n),n=d=o=r=null) -}),n=s=l=u=r=o=null,t}({});var B=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,P=/([A-Z])/g;function R(e,n,r,i){if(x.acceptData(e)){var o,a,s=x.expando,l=e.nodeType,u=l?x.cache:e,c=l?e[s]:e[s]&&s;if(c&&u[c]&&(i||u[c].data)||r!==t||"string"!=typeof n)return c||(c=l?e[s]=p.pop()||x.guid++:s),u[c]||(u[c]=l?{}:{toJSON:x.noop}),("object"==typeof n||"function"==typeof n)&&(i?u[c]=x.extend(u[c],n):u[c].data=x.extend(u[c].data,n)),a=u[c],i||(a.data||(a.data={}),a=a.data),r!==t&&(a[x.camelCase(n)]=r),"string"==typeof n?(o=a[n],null==o&&(o=a[x.camelCase(n)])):o=a,o}}function W(e,t,n){if(x.acceptData(e)){var r,i,o=e.nodeType,a=o?x.cache:e,s=o?e[x.expando]:x.expando;if(a[s]){if(t&&(r=n?a[s]:a[s].data)){x.isArray(t)?t=t.concat(x.map(t,x.camelCase)):t in r?t=[t]:(t=x.camelCase(t),t=t in r?[t]:t.split(" ")),i=t.length;while(i--)delete r[t[i]];if(n?!I(r):!x.isEmptyObject(r))return}(n||(delete a[s].data,I(a[s])))&&(o?x.cleanData([e],!0):x.support.deleteExpando||a!=a.window?delete a[s]:a[s]=null)}}}x.extend({cache:{},noData:{applet:!0,embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return e=e.nodeType?x.cache[e[x.expando]]:e[x.expando],!!e&&!I(e)},data:function(e,t,n){return R(e,t,n)},removeData:function(e,t){return W(e,t)},_data:function(e,t,n){return R(e,t,n,!0)},_removeData:function(e,t){return W(e,t,!0)},acceptData:function(e){if(e.nodeType&&1!==e.nodeType&&9!==e.nodeType)return!1;var t=e.nodeName&&x.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),x.fn.extend({data:function(e,n){var r,i,o=null,a=0,s=this[0];if(e===t){if(this.length&&(o=x.data(s),1===s.nodeType&&!x._data(s,"parsedAttrs"))){for(r=s.attributes;r.length>a;a++)i=r[a].name,0===i.indexOf("data-")&&(i=x.camelCase(i.slice(5)),$(s,i,o[i]));x._data(s,"parsedAttrs",!0)}return o}return"object"==typeof e?this.each(function(){x.data(this,e)}):arguments.length>1?this.each(function(){x.data(this,e,n)}):s?$(s,e,x.data(s,e)):null},removeData:function(e){return this.each(function(){x.removeData(this,e)})}});function $(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(P,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:B.test(r)?x.parseJSON(r):r}catch(o){}x.data(e,n,r)}else r=t}return r}function I(e){var t;for(t in e)if(("data"!==t||!x.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}x.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=x._data(e,n),r&&(!i||x.isArray(r)?i=x._data(e,n,x.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=x.queue(e,t),r=n.length,i=n.shift(),o=x._queueHooks(e,t),a=function(){x.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return x._data(e,n)||x._data(e,n,{empty:x.Callbacks("once memory").add(function(){x._removeData(e,t+"queue"),x._removeData(e,n)})})}}),x.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?x.queue(this[0],e):n===t?this:this.each(function(){var t=x.queue(this,e,n);x._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&x.dequeue(this,e)})},dequeue:function(e){return this.each(function(){x.dequeue(this,e)})},delay:function(e,t){return e=x.fx?x.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=x.Deferred(),a=this,s=this.length,l=function(){--i||o.resolveWith(a,[a])};"string"!=typeof e&&(n=e,e=t),e=e||"fx";while(s--)r=x._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(l));return l(),o.promise(n)}});var z,X,U=/[\t\r\n\f]/g,V=/\r/g,Y=/^(?:input|select|textarea|button|object)$/i,J=/^(?:a|area)$/i,G=/^(?:checked|selected)$/i,Q=x.support.getSetAttribute,K=x.support.input;x.fn.extend({attr:function(e,t){return x.access(this,x.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){x.removeAttr(this,e)})},prop:function(e,t){return x.access(this,x.prop,e,t,arguments.length>1)},removeProp:function(e){return e=x.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,l="string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).addClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=x.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,l=0===arguments.length||"string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).removeClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?x.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e,r="boolean"==typeof t;return x.isFunction(e)?this.each(function(n){x(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var o,a=0,s=x(this),l=t,u=e.match(T)||[];while(o=u[a++])l=r?l:!s.hasClass(o),s[l?"addClass":"removeClass"](o)}else(n===i||"boolean"===n)&&(this.className&&x._data(this,"__className__",this.className),this.className=this.className||e===!1?"":x._data(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(U," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=x.isFunction(e),this.each(function(n){var o;1===this.nodeType&&(o=i?e.call(this,n,x(this).val()):e,null==o?o="":"number"==typeof o?o+="":x.isArray(o)&&(o=x.map(o,function(e){return null==e?"":e+""})),r=x.valHooks[this.type]||x.valHooks[this.nodeName.toLowerCase()],r&&"set"in r&&r.set(this,o,"value")!==t||(this.value=o))});if(o)return r=x.valHooks[o.type]||x.valHooks[o.nodeName.toLowerCase()],r&&"get"in r&&(n=r.get(o,"value"))!==t?n:(n=o.value,"string"==typeof n?n.replace(V,""):null==n?"":n)}}}),x.extend({valHooks:{option:{get:function(e){var t=x.find.attr(e,"value");return null!=t?t:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,l=0>i?s:o?i:0;for(;s>l;l++)if(n=r[l],!(!n.selected&&l!==i||(x.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&x.nodeName(n.parentNode,"optgroup"))){if(t=x(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n,r,i=e.options,o=x.makeArray(t),a=i.length;while(a--)r=i[a],(r.selected=x.inArray(x(r).val(),o)>=0)&&(n=!0);return n||(e.selectedIndex=-1),o}}},attr:function(e,n,r){var o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return typeof e.getAttribute===i?x.prop(e,n,r):(1===s&&x.isXMLDoc(e)||(n=n.toLowerCase(),o=x.attrHooks[n]||(x.expr.match.bool.test(n)?X:z)),r===t?o&&"get"in o&&null!==(a=o.get(e,n))?a:(a=x.find.attr(e,n),null==a?t:a):null!==r?o&&"set"in o&&(a=o.set(e,r,n))!==t?a:(e.setAttribute(n,r+""),r):(x.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(T);if(o&&1===e.nodeType)while(n=o[i++])r=x.propFix[n]||n,x.expr.match.bool.test(n)?K&&Q||!G.test(n)?e[r]=!1:e[x.camelCase("default-"+n)]=e[r]=!1:x.attr(e,n,""),e.removeAttribute(Q?n:r)},attrHooks:{type:{set:function(e,t){if(!x.support.radioValue&&"radio"===t&&x.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{"for":"htmlFor","class":"className"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!x.isXMLDoc(e),a&&(n=x.propFix[n]||n,o=x.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var t=x.find.attr(e,"tabindex");return t?parseInt(t,10):Y.test(e.nodeName)||J.test(e.nodeName)&&e.href?0:-1}}}}),X={set:function(e,t,n){return t===!1?x.removeAttr(e,n):K&&Q||!G.test(n)?e.setAttribute(!Q&&x.propFix[n]||n,n):e[x.camelCase("default-"+n)]=e[n]=!0,n}},x.each(x.expr.match.bool.source.match(/\w+/g),function(e,n){var r=x.expr.attrHandle[n]||x.find.attr;x.expr.attrHandle[n]=K&&Q||!G.test(n)?function(e,n,i){var o=x.expr.attrHandle[n],a=i?t:(x.expr.attrHandle[n]=t)!=r(e,n,i)?n.toLowerCase():null;return x.expr.attrHandle[n]=o,a}:function(e,n,r){return r?t:e[x.camelCase("default-"+n)]?n.toLowerCase():null}}),K&&Q||(x.attrHooks.value={set:function(e,n,r){return x.nodeName(e,"input")?(e.defaultValue=n,t):z&&z.set(e,n,r)}}),Q||(z={set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},x.expr.attrHandle.id=x.expr.attrHandle.name=x.expr.attrHandle.coords=function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&""!==i.value?i.value:null},x.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&r.specified?r.value:t},set:z.set},x.attrHooks.contenteditable={set:function(e,t,n){z.set(e,""===t?!1:t,n)}},x.each(["width","height"],function(e,n){x.attrHooks[n]={set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}}})),x.support.hrefNormalized||x.each(["href","src"],function(e,t){x.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}}),x.support.style||(x.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),x.support.optSelected||(x.propHooks.selected={get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}}),x.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){x.propFix[this.toLowerCase()]=this}),x.support.enctype||(x.propFix.enctype="encoding"),x.each(["radio","checkbox"],function(){x.valHooks[this]={set:function(e,n){return x.isArray(n)?e.checked=x.inArray(x(e).val(),n)>=0:t}},x.support.checkOn||(x.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;function it(){return!0}function ot(){return!1}function at(){try{return a.activeElement}catch(e){}}x.event={global:{},add:function(e,n,r,o,a){var s,l,u,c,p,f,d,h,g,m,y,v=x._data(e);if(v){r.handler&&(c=r,r=c.handler,a=c.selector),r.guid||(r.guid=x.guid++),(l=v.events)||(l=v.events={}),(f=v.handle)||(f=v.handle=function(e){return typeof x===i||e&&x.event.triggered===e.type?t:x.event.dispatch.apply(f.elem,arguments)},f.elem=e),n=(n||"").match(T)||[""],u=n.length;while(u--)s=rt.exec(n[u])||[],g=y=s[1],m=(s[2]||"").split(".").sort(),g&&(p=x.event.special[g]||{},g=(a?p.delegateType:p.bindType)||g,p=x.event.special[g]||{},d=x.extend({type:g,origType:y,data:o,handler:r,guid:r.guid,selector:a,needsContext:a&&x.expr.match.needsContext.test(a),namespace:m.join(".")},c),(h=l[g])||(h=l[g]=[],h.delegateCount=0,p.setup&&p.setup.call(e,o,m,f)!==!1||(e.addEventListener?e.addEventListener(g,f,!1):e.attachEvent&&e.attachEvent("on"+g,f))),p.add&&(p.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),a?h.splice(h.delegateCount++,0,d):h.push(d),x.event.global[g]=!0);e=null}},remove:function(e,t,n,r,i){var o,a,s,l,u,c,p,f,d,h,g,m=x.hasData(e)&&x._data(e);if(m&&(c=m.events)){t=(t||"").match(T)||[""],u=t.length;while(u--)if(s=rt.exec(t[u])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){p=x.event.special[d]||{},d=(r?p.delegateType:p.bindType)||d,f=c[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),l=o=f.length;while(o--)a=f[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,p.remove&&p.remove.call(e,a));l&&!f.length&&(p.teardown&&p.teardown.call(e,h,m.handle)!==!1||x.removeEvent(e,d,m.handle),delete c[d])}else for(d in c)x.event.remove(e,d+t[u],n,r,!0);x.isEmptyObject(c)&&(delete m.handle,x._removeData(e,"events"))}},trigger:function(n,r,i,o){var s,l,u,c,p,f,d,h=[i||a],g=v.call(n,"type")?n.type:n,m=v.call(n,"namespace")?n.namespace.split("."):[];if(u=f=i=i||a,3!==i.nodeType&&8!==i.nodeType&&!nt.test(g+x.event.triggered)&&(g.indexOf(".")>=0&&(m=g.split("."),g=m.shift(),m.sort()),l=0>g.indexOf(":")&&"on"+g,n=n[x.expando]?n:new x.Event(g,"object"==typeof n&&n),n.isTrigger=o?2:3,n.namespace=m.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:x.makeArray(r,[n]),p=x.event.special[g]||{},o||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!o&&!p.noBubble&&!x.isWindow(i)){for(c=p.delegateType||g,nt.test(c+g)||(u=u.parentNode);u;u=u.parentNode)h.push(u),f=u;f===(i.ownerDocument||a)&&h.push(f.defaultView||f.parentWindow||e)}d=0;while((u=h[d++])&&!n.isPropagationStopped())n.type=d>1?c:p.bindType||g,s=(x._data(u,"events")||{})[n.type]&&x._data(u,"handle"),s&&s.apply(u,r),s=l&&u[l],s&&x.acceptData(u)&&s.apply&&s.apply(u,r)===!1&&n.preventDefault();if(n.type=g,!o&&!n.isDefaultPrevented()&&(!p._default||p._default.apply(h.pop(),r)===!1)&&x.acceptData(i)&&l&&i[g]&&!x.isWindow(i)){f=i[l],f&&(i[l]=null),x.event.triggered=g;try{i[g]()}catch(y){}x.event.triggered=t,f&&(i[l]=f)}return n.result}},dispatch:function(e){e=x.event.fix(e);var n,r,i,o,a,s=[],l=g.call(arguments),u=(x._data(this,"events")||{})[e.type]||[],c=x.event.special[e.type]||{};if(l[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){s=x.event.handlers.call(this,e,u),n=0;while((o=s[n++])&&!e.isPropagationStopped()){e.currentTarget=o.elem,a=0;while((i=o.handlers[a++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(i.namespace))&&(e.handleObj=i,e.data=i.data,r=((x.event.special[i.origType]||{}).handle||i.handler).apply(o.elem,l),r!==t&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],l=n.delegateCount,u=e.target;if(l&&u.nodeType&&(!e.button||"click"!==e.type))for(;u!=this;u=u.parentNode||this)if(1===u.nodeType&&(u.disabled!==!0||"click"!==e.type)){for(o=[],a=0;l>a;a++)i=n[a],r=i.selector+" ",o[r]===t&&(o[r]=i.needsContext?x(r,this).index(u)>=0:x.find(r,this,null,[u]).length),o[r]&&o.push(i);o.length&&s.push({elem:u,handlers:o})}return n.length>l&&s.push({elem:this,handlers:n.slice(l)}),s},fix:function(e){if(e[x.expando])return e;var t,n,r,i=e.type,o=e,s=this.fixHooks[i];s||(this.fixHooks[i]=s=tt.test(i)?this.mouseHooks:et.test(i)?this.keyHooks:{}),r=s.props?this.props.concat(s.props):this.props,e=new x.Event(o),t=r.length;while(t--)n=r[t],e[n]=o[n];return e.target||(e.target=o.srcElement||a),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,o):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,o,s=n.button,l=n.fromElement;return null==e.pageX&&null!=n.clientX&&(i=e.target.ownerDocument||a,o=i.documentElement,r=i.body,e.pageX=n.clientX+(o&&o.scrollLeft||r&&r.scrollLeft||0)-(o&&o.clientLeft||r&&r.clientLeft||0),e.pageY=n.clientY+(o&&o.scrollTop||r&&r.scrollTop||0)-(o&&o.clientTop||r&&r.clientTop||0)),!e.relatedTarget&&l&&(e.relatedTarget=l===e.target?n.toElement:l),e.which||s===t||(e.which=1&s?1:2&s?3:4&s?2:0),e}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==at()&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===at()&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},click:{trigger:function(){return x.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t},_default:function(e){return x.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=x.extend(new x.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?x.event.trigger(i,null,t):x.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},x.removeEvent=a.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]===i&&(e[r]=null),e.detachEvent(r,n))},x.Event=function(e,n){return this instanceof x.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?it:ot):this.type=e,n&&x.extend(this,n),this.timeStamp=e&&e.timeStamp||x.now(),this[x.expando]=!0,t):new x.Event(e,n)},x.Event.prototype={isDefaultPrevented:ot,isPropagationStopped:ot,isImmediatePropagationStopped:ot,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=it,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=it,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=it,this.stopPropagation()}},x.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){x.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return(!i||i!==r&&!x.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),x.support.submitBubbles||(x.event.special.submit={setup:function(){return x.nodeName(this,"form")?!1:(x.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=x.nodeName(n,"input")||x.nodeName(n,"button")?n.form:t;r&&!x._data(r,"submitBubbles")&&(x.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),x._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&x.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return x.nodeName(this,"form")?!1:(x.event.remove(this,"._submit"),t)}}),x.support.changeBubbles||(x.event.special.change={setup:function(){return Z.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(x.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),x.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),x.event.simulate("change",this,e,!0)})),!1):(x.event.add(this,"beforeactivate._change",function(e){var t=e.target;Z.test(t.nodeName)&&!x._data(t,"changeBubbles")&&(x.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||x.event.simulate("change",this.parentNode,e,!0)}),x._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return x.event.remove(this,"._change"),!Z.test(this.nodeName)}}),x.support.focusinBubbles||x.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){x.event.simulate(t,e.target,x.event.fix(e),!0)};x.event.special[t]={setup:function(){0===n++&&a.addEventListener(e,r,!0)},teardown:function(){0===--n&&a.removeEventListener(e,r,!0)}}}),x.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(a in e)this.on(a,n,r,e[a],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=ot;else if(!i)return this;return 1===o&&(s=i,i=function(e){return x().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=x.guid++)),this.each(function(){x.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,x(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=ot),this.each(function(){x.event.remove(this,e,r,n)})},trigger:function(e,t){return this.each(function(){x.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?x.event.trigger(e,n,r,!0):t}});var st=/^.[^:#\[\.,]*$/,lt=/^(?:parents|prev(?:Until|All))/,ut=x.expr.match.needsContext,ct={children:!0,contents:!0,next:!0,prev:!0};x.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(x(e).filter(function(){for(t=0;i>t;t++)if(x.contains(r[t],this))return!0}));for(t=0;i>t;t++)x.find(e,r[t],n);return n=this.pushStack(i>1?x.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},has:function(e){var t,n=x(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(x.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e||[],!0))},filter:function(e){return this.pushStack(ft(this,e||[],!1))},is:function(e){return!!ft(this,"string"==typeof e&&ut.test(e)?x(e):e||[],!1).length},closest:function(e,t){var n,r=0,i=this.length,o=[],a=ut.test(e)||"string"!=typeof e?x(e,t||this.context):0;for(;i>r;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(11>n.nodeType&&(a?a.index(n)>-1:1===n.nodeType&&x.find.matchesSelector(n,e))){n=o.push(n);break}return this.pushStack(o.length>1?x.unique(o):o)},index:function(e){return e?"string"==typeof e?x.inArray(this[0],x(e)):x.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?x(e,t):x.makeArray(e&&e.nodeType?[e]:e),r=x.merge(this.get(),n);return this.pushStack(x.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function pt(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}x.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return x.dir(e,"parentNode")},parentsUntil:function(e,t,n){return x.dir(e,"parentNode",n)},next:function(e){return pt(e,"nextSibling")},prev:function(e){return pt(e,"previousSibling")},nextAll:function(e){return x.dir(e,"nextSibling")},prevAll:function(e){return x.dir(e,"previousSibling")},nextUntil:function(e,t,n){return x.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return x.dir(e,"previousSibling",n)},siblings:function(e){return x.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return x.sibling(e.firstChild)},contents:function(e){return x.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:x.merge([],e.childNodes)}},function(e,t){x.fn[e]=function(n,r){var i=x.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=x.filter(r,i)),this.length>1&&(ct[e]||(i=x.unique(i)),lt.test(e)&&(i=i.reverse())),this.pushStack(i)}}),x.extend({filter:function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?x.find.matchesSelector(r,e)?[r]:[]:x.find.matches(e,x.grep(t,function(e){return 1===e.nodeType}))},dir:function(e,n,r){var i=[],o=e[n];while(o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!x(o).is(r)))1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function ft(e,t,n){if(x.isFunction(t))return x.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return x.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(st.test(t))return x.filter(t,e,n);t=x.filter(t,e)}return x.grep(e,function(e){return x.inArray(e,t)>=0!==n})}function dt(e){var t=ht.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}var ht="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gt=/ jQuery\d+="(?:null|\d+)"/g,mt=RegExp("<(?:"+ht+")[\\s/>]","i"),yt=/^\s+/,vt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,xt=/\s*$/g,At={option:[1,""],legend:[1,"
","
"],area:[1,"",""],param:[1,"",""],thead:[1,"","
"],tr:[2,"","
"],col:[2,"","
"],td:[3,"","
"],_default:x.support.htmlSerialize?[0,"",""]:[1,"X
","
"]},jt=dt(a),Dt=jt.appendChild(a.createElement("div"));At.optgroup=At.option,At.tbody=At.tfoot=At.colgroup=At.caption=At.thead,At.th=At.td,x.fn.extend({text:function(e){return x.access(this,function(e){return e===t?x.text(this):this.empty().append((this[0]&&this[0].ownerDocument||a).createTextNode(e))},null,e,arguments.length)},append:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.appendChild(e)}})},prepend:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=e?x.filter(e,this):this,i=0;for(;null!=(n=r[i]);i++)t||1!==n.nodeType||x.cleanData(Ft(n)),n.parentNode&&(t&&x.contains(n.ownerDocument,n)&&_t(Ft(n,"script")),n.parentNode.removeChild(n));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++){1===e.nodeType&&x.cleanData(Ft(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&x.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return x.clone(this,e,t)})},html:function(e){return x.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(gt,""):t;if(!("string"!=typeof e||Tt.test(e)||!x.support.htmlSerialize&&mt.test(e)||!x.support.leadingWhitespace&&yt.test(e)||At[(bt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(vt,"<$1>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(x.cleanData(Ft(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=x.map(this,function(e){return[e.nextSibling,e.parentNode]}),t=0;return this.domManip(arguments,function(n){var r=e[t++],i=e[t++];i&&(r&&r.parentNode!==i&&(r=this.nextSibling),x(this).remove(),i.insertBefore(n,r))},!0),t?this:this.remove()},detach:function(e){return this.remove(e,!0)},domManip:function(e,t,n){e=d.apply([],e);var r,i,o,a,s,l,u=0,c=this.length,p=this,f=c-1,h=e[0],g=x.isFunction(h);if(g||!(1>=c||"string"!=typeof h||x.support.checkClone)&&Nt.test(h))return this.each(function(r){var i=p.eq(r);g&&(e[0]=h.call(this,r,i.html())),i.domManip(e,t,n)});if(c&&(l=x.buildFragment(e,this[0].ownerDocument,!1,!n&&this),r=l.firstChild,1===l.childNodes.length&&(l=r),r)){for(a=x.map(Ft(l,"script"),Ht),o=a.length;c>u;u++)i=l,u!==f&&(i=x.clone(i,!0,!0),o&&x.merge(a,Ft(i,"script"))),t.call(this[u],i,u);if(o)for(s=a[a.length-1].ownerDocument,x.map(a,qt),u=0;o>u;u++)i=a[u],kt.test(i.type||"")&&!x._data(i,"globalEval")&&x.contains(s,i)&&(i.src?x._evalUrl(i.src):x.globalEval((i.text||i.textContent||i.innerHTML||"").replace(St,"")));l=r=null}return this}});function Lt(e,t){return x.nodeName(e,"table")&&x.nodeName(1===t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function Ht(e){return e.type=(null!==x.find.attr(e,"type"))+"/"+e.type,e}function qt(e){var t=Et.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function _t(e,t){var n,r=0;for(;null!=(n=e[r]);r++)x._data(n,"globalEval",!t||x._data(t[r],"globalEval"))}function Mt(e,t){if(1===t.nodeType&&x.hasData(e)){var n,r,i,o=x._data(e),a=x._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)x.event.add(t,n,s[n][r])}a.data&&(a.data=x.extend({},a.data))}}function Ot(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!x.support.noCloneEvent&&t[x.expando]){i=x._data(t);for(r in i.events)x.removeEvent(t,r,i.handle);t.removeAttribute(x.expando)}"script"===n&&t.text!==e.text?(Ht(t).text=e.text,qt(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),x.support.html5Clone&&e.innerHTML&&!x.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Ct.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}x.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){x.fn[e]=function(e){var n,r=0,i=[],o=x(e),a=o.length-1;for(;a>=r;r++)n=r===a?this:this.clone(!0),x(o[r])[t](n),h.apply(i,n.get());return this.pushStack(i)}});function Ft(e,n){var r,o,a=0,s=typeof e.getElementsByTagName!==i?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==i?e.querySelectorAll(n||"*"):t;if(!s)for(s=[],r=e.childNodes||e;null!=(o=r[a]);a++)!n||x.nodeName(o,n)?s.push(o):x.merge(s,Ft(o,n));return n===t||n&&x.nodeName(e,n)?x.merge([e],s):s}function Bt(e){Ct.test(e.type)&&(e.defaultChecked=e.checked)}x.extend({clone:function(e,t,n){var r,i,o,a,s,l=x.contains(e.ownerDocument,e);if(x.support.html5Clone||x.isXMLDoc(e)||!mt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Dt.innerHTML=e.outerHTML,Dt.removeChild(o=Dt.firstChild)),!(x.support.noCloneEvent&&x.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||x.isXMLDoc(e)))for(r=Ft(o),s=Ft(e),a=0;null!=(i=s[a]);++a)r[a]&&Ot(i,r[a]);if(t)if(n)for(s=s||Ft(e),r=r||Ft(o),a=0;null!=(i=s[a]);a++)Mt(i,r[a]);else Mt(e,o);return r=Ft(o,"script"),r.length>0&&_t(r,!l&&Ft(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){var i,o,a,s,l,u,c,p=e.length,f=dt(t),d=[],h=0;for(;p>h;h++)if(o=e[h],o||0===o)if("object"===x.type(o))x.merge(d,o.nodeType?[o]:o);else if(wt.test(o)){s=s||f.appendChild(t.createElement("div")),l=(bt.exec(o)||["",""])[1].toLowerCase(),c=At[l]||At._default,s.innerHTML=c[1]+o.replace(vt,"<$1>")+c[2],i=c[0];while(i--)s=s.lastChild;if(!x.support.leadingWhitespace&&yt.test(o)&&d.push(t.createTextNode(yt.exec(o)[0])),!x.support.tbody){o="table"!==l||xt.test(o)?""!==c[1]||xt.test(o)?0:s:s.firstChild,i=o&&o.childNodes.length;while(i--)x.nodeName(u=o.childNodes[i],"tbody")&&!u.childNodes.length&&o.removeChild(u)}x.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),x.support.appendChecked||x.grep(Ft(d,"input"),Bt),h=0;while(o=d[h++])if((!r||-1===x.inArray(o,r))&&(a=x.contains(o.ownerDocument,o),s=Ft(f.appendChild(o),"script"),a&&_t(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,l=x.expando,u=x.cache,c=x.support.deleteExpando,f=x.event.special;for(;null!=(n=e[s]);s++)if((t||x.acceptData(n))&&(o=n[l],a=o&&u[o])){if(a.events)for(r in a.events)f[r]?x.event.remove(n,r):x.removeEvent(n,r,a.handle); - u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(l):n[l]=null,p.push(o))}},_evalUrl:function(e){return x.ajax({url:e,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})}}),x.fn.extend({wrapAll:function(e){if(x.isFunction(e))return this.each(function(t){x(this).wrapAll(e.call(this,t))});if(this[0]){var t=x(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&1===e.firstChild.nodeType)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return x.isFunction(e)?this.each(function(t){x(this).wrapInner(e.call(this,t))}):this.each(function(){var t=x(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=x.isFunction(e);return this.each(function(n){x(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){x.nodeName(this,"body")||x(this).replaceWith(this.childNodes)}).end()}});var Pt,Rt,Wt,$t=/alpha\([^)]*\)/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+w+")(.*)$","i"),Yt=RegExp("^("+w+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+w+")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===x.css(e,"display")||!x.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=x._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=x._data(r,"olddisplay",ln(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&x._data(r,"olddisplay",i?n:x.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}x.fn.extend({css:function(e,n){return x.access(this,function(e,n,r){var i,o,a={},s=0;if(x.isArray(n)){for(o=Rt(e),i=n.length;i>s;s++)a[n[s]]=x.css(e,n[s],!1,o);return a}return r!==t?x.style(e,n,r):x.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){var t="boolean"==typeof e;return this.each(function(){(t?e:nn(this))?x(this).show():x(this).hide()})}}),x.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":x.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,l=x.camelCase(n),u=e.style;if(n=x.cssProps[l]||(x.cssProps[l]=tn(u,l)),s=x.cssHooks[n]||x.cssHooks[l],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:u[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(x.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||x.cssNumber[l]||(r+="px"),x.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(u[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{u[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,l=x.camelCase(n);return n=x.cssProps[l]||(x.cssProps[l]=tn(e.style,l)),s=x.cssHooks[n]||x.cssHooks[l],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||x.isNumeric(o)?o||0:a):a}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s.getPropertyValue(n)||s[n]:t,u=e.style;return s&&(""!==l||x.contains(e.ownerDocument,e)||(l=x.style(e,n)),Yt.test(l)&&Ut.test(n)&&(i=u.width,o=u.minWidth,a=u.maxWidth,u.minWidth=u.maxWidth=u.width=l,l=s.width,u.width=i,u.minWidth=o,u.maxWidth=a)),l}):a.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s[n]:t,u=e.style;return null==l&&u&&u[n]&&(l=u[n]),Yt.test(l)&&!zt.test(n)&&(i=u.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),u.left="fontSize"===n?"1em":l,l=u.pixelLeft+"px",u.left=i,a&&(o.left=a)),""===l?"auto":l});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=x.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=x.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=x.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=x.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=x.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(x.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+an(e,t,n||(a?"border":"content"),r,o)+"px"}function ln(e){var t=a,n=Gt[e];return n||(n=un(e,t),"none"!==n&&n||(Pt=(Pt||x("