Make JavaScript and XML errors non-TeamCity errors; Update JavaScript language level to ES6 in IntelliJ settings (#7541)

* Make JavaScript and XML errors non-TeamCity errors; Update JavaScript language level to ES6 in IntelliJ settings

* Add license comment to assembly-2.0.0.xsd

* Add .idea/README.md with comments
This commit is contained in:
Roman Leventov 2019-04-25 20:21:58 +02:00 committed by Gian Merlino
parent 3ec9fbaa47
commit 6fd6e5de89
7 changed files with 1786 additions and 11 deletions

39
.idea/README.md Normal file
View File

@ -0,0 +1,39 @@
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
~ distributed with this work for additional information
~ regarding copyright ownership. The ASF licenses this file
~ to you under the Apache License, Version 2.0 (the
~ "License"); you may not use this file except in compliance
~ with the License. You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
-->
Comments to various parts of IntelliJ's settings XML files. These comments cannot currently be placed close to the
things that they are about, because IntelliJ keeps removing the comments from settings XML files: see
https://youtrack.jetbrains.com/issue/IDEA-211087. Please vote for this issue to increase the chances that it's fixed
faster. [This Druid's issue](https://github.com/apache/incubator-druid/issues/7549) records the fact that the comments
should be moved when that IntelliJ's issue is fixed.
1) [`inspectionProfiles/Druid.xml`](inspectionProfiles/Druid.xml), `StaticPseudoFunctionalStyleMethod` is turned off
because the current rate of false-positives produced by this inspection is very high, see
https://youtrack.jetbrains.com/issue/IDEA-153047#focus=streamItem-27-3326648.0-0.
2) [`misc.xml`](misc.xml), `ProjectResources` component: this component is needed because IntelliJ verifies XML
documents by the schema. XML documents usually reference those schemas as URLs:
```
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
```
But IntelliJ doesn't automatically go to the internet to download the resource. It needs to know what schema corresponds
to what URL, statically. Hence the `ProjectResources` component.

View File

@ -17,7 +17,9 @@
<inspection_tool class="CatchMayIgnoreException" enabled="true" level="WARNING" enabled_by_default="true"> <inspection_tool class="CatchMayIgnoreException" enabled="true" level="WARNING" enabled_by_default="true">
<option name="m_ignoreCatchBlocksWithComments" value="false" /> <option name="m_ignoreCatchBlocksWithComments" value="false" />
</inspection_tool> </inspection_tool>
<inspection_tool class="CheckDtdRefs" enabled="true" level="Non-TeamCity Error" enabled_by_default="true" />
<inspection_tool class="CheckValidXmlInScriptTagBody" enabled="true" level="WARNING" enabled_by_default="true" /> <inspection_tool class="CheckValidXmlInScriptTagBody" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="CheckXmlFileWithXercesValidator" enabled="true" level="Non-TeamCity Error" enabled_by_default="true" />
<inspection_tool class="ClassGetClass" enabled="true" level="ERROR" enabled_by_default="true" /> <inspection_tool class="ClassGetClass" enabled="true" level="ERROR" enabled_by_default="true" />
<inspection_tool class="ClassNewInstance" enabled="true" level="WARNING" enabled_by_default="true" /> <inspection_tool class="ClassNewInstance" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="CollectionAddedToSelf" enabled="true" level="ERROR" enabled_by_default="true" /> <inspection_tool class="CollectionAddedToSelf" enabled="true" level="ERROR" enabled_by_default="true" />
@ -58,6 +60,7 @@
<option name="IGNORE_FIELDS_USED_IN_MULTIPLE_METHODS" value="true" /> <option name="IGNORE_FIELDS_USED_IN_MULTIPLE_METHODS" value="true" />
</inspection_tool> </inspection_tool>
<inspection_tool class="FieldMayBeFinal" enabled="true" level="WARNING" enabled_by_default="true" /> <inspection_tool class="FieldMayBeFinal" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="FlowJSError" enabled="false" level="Non-TeamCity Error" enabled_by_default="false" />
<inspection_tool class="ForCanBeForeach" enabled="true" level="WARNING" enabled_by_default="true"> <inspection_tool class="ForCanBeForeach" enabled="true" level="WARNING" enabled_by_default="true">
<scope name="NonGeneratedFiles" level="ERROR" enabled="true"> <scope name="NonGeneratedFiles" level="ERROR" enabled="true">
<option name="REPORT_INDEXED_LOOP" value="true" /> <option name="REPORT_INDEXED_LOOP" value="true" />
@ -79,10 +82,16 @@
<inspection_tool class="InvalidComparatorMethodReference" enabled="true" level="ERROR" enabled_by_default="true" /> <inspection_tool class="InvalidComparatorMethodReference" enabled="true" level="ERROR" enabled_by_default="true" />
<inspection_tool class="IteratorHasNextCallsIteratorNext" enabled="true" level="ERROR" enabled_by_default="true" /> <inspection_tool class="IteratorHasNextCallsIteratorNext" enabled="true" level="ERROR" enabled_by_default="true" />
<inspection_tool class="IteratorNextDoesNotThrowNoSuchElementException" enabled="true" level="WARNING" enabled_by_default="true" /> <inspection_tool class="IteratorNextDoesNotThrowNoSuchElementException" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="JSAnnotator" enabled="true" level="Non-TeamCity Error" enabled_by_default="true" />
<inspection_tool class="JSHint" enabled="false" level="Non-TeamCity Error" enabled_by_default="false" />
<inspection_tool class="JSLint" enabled="false" level="Non-TeamCity Error" enabled_by_default="false" />
<inspection_tool class="JSRedeclarationOfBlockScope" enabled="true" level="Non-TeamCity Error" enabled_by_default="true" />
<inspection_tool class="JSReferencingArgumentsOutsideOfFunction" enabled="true" level="Non-TeamCity Error" enabled_by_default="true" />
<inspection_tool class="Java8MapForEach" enabled="true" level="ERROR" enabled_by_default="true" /> <inspection_tool class="Java8MapForEach" enabled="true" level="ERROR" enabled_by_default="true" />
<inspection_tool class="JavadocReference" enabled="true" level="ERROR" enabled_by_default="true"> <inspection_tool class="JavadocReference" enabled="true" level="ERROR" enabled_by_default="true">
<option name="REPORT_INACCESSIBLE" value="false" /> <option name="REPORT_INACCESSIBLE" value="false" />
</inspection_tool> </inspection_tool>
<inspection_tool class="Jscs" enabled="false" level="Non-TeamCity Error" enabled_by_default="false" />
<inspection_tool class="JsonDuplicatePropertyKeys" enabled="true" level="ERROR" enabled_by_default="true" /> <inspection_tool class="JsonDuplicatePropertyKeys" enabled="true" level="ERROR" enabled_by_default="true" />
<inspection_tool class="JsonStandardCompliance" enabled="true" level="WARNING" enabled_by_default="true" /> <inspection_tool class="JsonStandardCompliance" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="LengthOneStringInIndexOf" enabled="true" level="ERROR" enabled_by_default="true" /> <inspection_tool class="LengthOneStringInIndexOf" enabled="true" level="ERROR" enabled_by_default="true" />
@ -304,6 +313,7 @@
<option name="processLiterals" value="true" /> <option name="processLiterals" value="true" />
<option name="processComments" value="true" /> <option name="processComments" value="true" />
</inspection_tool> </inspection_tool>
<inspection_tool class="StandardJS" enabled="false" level="Non-TeamCity Error" enabled_by_default="false" />
<inspection_tool class="StaticCallOnSubclass" enabled="true" level="ERROR" enabled_by_default="true" /> <inspection_tool class="StaticCallOnSubclass" enabled="true" level="ERROR" enabled_by_default="true" />
<inspection_tool class="StaticFieldReferenceOnSubclass" enabled="true" level="ERROR" enabled_by_default="true" /> <inspection_tool class="StaticFieldReferenceOnSubclass" enabled="true" level="ERROR" enabled_by_default="true" />
<inspection_tool class="StaticPseudoFunctionalStyleMethod" enabled="true" level="INFORMATION" enabled_by_default="true" /> <inspection_tool class="StaticPseudoFunctionalStyleMethod" enabled="true" level="INFORMATION" enabled_by_default="true" />
@ -361,7 +371,10 @@
<inspection_tool class="UnusedLibrary" enabled="true" level="WARNING" enabled_by_default="true" /> <inspection_tool class="UnusedLibrary" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="UseOfPropertiesAsHashtable" enabled="true" level="WARNING" enabled_by_default="true" /> <inspection_tool class="UseOfPropertiesAsHashtable" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="VariableNotUsedInsideIf" enabled="true" level="WARNING" enabled_by_default="true" /> <inspection_tool class="VariableNotUsedInsideIf" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="XmlDuplicatedId" enabled="true" level="Non-TeamCity Error" enabled_by_default="true" />
<inspection_tool class="XmlHighlighting" enabled="true" level="Non-TeamCity Warning" enabled_by_default="true" /> <inspection_tool class="XmlHighlighting" enabled="true" level="Non-TeamCity Warning" enabled_by_default="true" />
<inspection_tool class="XmlInvalidId" enabled="true" level="Non-TeamCity Error" enabled_by_default="true" />
<inspection_tool class="XmlPathReference" enabled="true" level="Non-TeamCity Error" enabled_by_default="true" />
<inspection_tool class="unused" enabled="true" level="WARNING" enabled_by_default="true"> <inspection_tool class="unused" enabled="true" level="WARNING" enabled_by_default="true">
<scope name="UnusedInspectionsScope" level="ERROR" enabled="true"> <scope name="UnusedInspectionsScope" level="ERROR" enabled="true">
<option name="LOCAL_VARIABLE" value="true" /> <option name="LOCAL_VARIABLE" value="true" />

View File

@ -2,6 +2,16 @@
<settings> <settings>
<option name="PROJECT_PROFILE" value="Druid" /> <option name="PROJECT_PROFILE" value="Druid" />
<version value="1.0" /> <version value="1.0" />
<info color="be1e0e">
<option name="BACKGROUND" value="521717" />
<option name="ERROR_STRIPE_COLOR" value="be1e0e" />
<option name="myName" value="Non-TeamCity Error" />
<option name="myVal" value="50" />
<option name="myExternalName" value="Non-TeamCity Error" />
<option name="myDefaultAttributes">
<option name="ERROR_STRIPE_COLOR" value="be1e0e" />
</option>
</info>
<info color="be9117"> <info color="be9117">
<option name="BACKGROUND" value="52503a" /> <option name="BACKGROUND" value="52503a" />
<option name="ERROR_STRIPE_COLOR" value="be9117" /> <option name="ERROR_STRIPE_COLOR" value="be9117" />
@ -12,15 +22,16 @@
<option name="ERROR_STRIPE_COLOR" value="be9117" /> <option name="ERROR_STRIPE_COLOR" value="be9117" />
</option> </option>
</info> </info>
<list size="8"> <list size="9">
<item index="0" class="java.lang.String" itemvalue="INFORMATION" /> <item index="0" class="java.lang.String" itemvalue="INFORMATION" />
<item index="1" class="java.lang.String" itemvalue="Non-TeamCity Warning" /> <item index="1" class="java.lang.String" itemvalue="Non-TeamCity Error" />
<item index="2" class="java.lang.String" itemvalue="TYPO" /> <item index="2" class="java.lang.String" itemvalue="Non-TeamCity Warning" />
<item index="3" class="java.lang.String" itemvalue="SERVER PROBLEM" /> <item index="3" class="java.lang.String" itemvalue="TYPO" />
<item index="4" class="java.lang.String" itemvalue="WEAK WARNING" /> <item index="4" class="java.lang.String" itemvalue="SERVER PROBLEM" />
<item index="5" class="java.lang.String" itemvalue="INFO" /> <item index="5" class="java.lang.String" itemvalue="WEAK WARNING" />
<item index="6" class="java.lang.String" itemvalue="WARNING" /> <item index="6" class="java.lang.String" itemvalue="INFO" />
<item index="7" class="java.lang.String" itemvalue="ERROR" /> <item index="7" class="java.lang.String" itemvalue="WARNING" />
<item index="8" class="java.lang.String" itemvalue="ERROR" />
</list> </list>
</settings> </settings>
</component> </component>

View File

@ -31,6 +31,9 @@
<writeAnnotation name="org.powermock.api.easymock.annotation.Mock" /> <writeAnnotation name="org.powermock.api.easymock.annotation.Mock" />
</writeAnnotations> </writeAnnotations>
</component> </component>
<component name="JavaScriptSettings">
<option name="languageLevel" value="ES6" />
</component>
<component name="MavenProjectsManager"> <component name="MavenProjectsManager">
<option name="originalFiles"> <option name="originalFiles">
<list> <list>
@ -43,7 +46,7 @@
<option name="myDefaultNotNull" value="javax.annotation.Nonnull" /> <option name="myDefaultNotNull" value="javax.annotation.Nonnull" />
<option name="myNullables"> <option name="myNullables">
<value> <value>
<list size="10"> <list size="12">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" /> <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" /> <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
<item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" /> <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
@ -54,12 +57,14 @@
<item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" /> <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
<item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" /> <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
<item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" /> <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
<item index="10" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
<item index="11" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
</list> </list>
</value> </value>
</option> </option>
<option name="myNotNulls"> <option name="myNotNulls">
<value> <value>
<list size="9"> <list size="11">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" /> <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" /> <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" /> <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
@ -69,10 +74,16 @@
<item index="6" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" /> <item index="6" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
<item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" /> <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
<item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" /> <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
<item index="9" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
<item index="10" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
</list> </list>
</value> </value>
</option> </option>
</component> </component>
<component name="ProjectResources">
<resource url="http://maven.apache.org/ASSEMBLY/2.0.0" location="$PROJECT_DIR$/.idea/xml-schemas/assembly-2.0.0.xsd" />
<resource url="http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" location="$PROJECT_DIR$/.idea/xml-schemas/svg11.dtd" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/classes" /> <output url="file://$PROJECT_DIR$/classes" />
</component> </component>

File diff suppressed because it is too large Load Diff

333
.idea/xml-schemas/svg11.dtd Normal file
View File

@ -0,0 +1,333 @@
<!-- ....................................................................... -->
<!-- SVG 1.1 DTD ........................................................... -->
<!-- file: svg11.dtd
-->
<!-- SVG 1.1 DTD
This is SVG, a language for describing two-dimensional graphics in XML.
The Scalable Vector Graphics (SVG)
Copyright 2001, 2002, 2011 World Wide Web Consortium
(Massachusetts Institute of Technology, Institut National de
Recherche en Informatique et en Automatique, Keio University).
All Rights Reserved.
Permission to use, copy, modify and distribute the SVG DTD and its
accompanying documentation for any purpose and without fee is hereby
granted in perpetuity, provided that the above copyright notice and
this paragraph appear in all copies. The copyright holders make no
representation about the suitability of the DTD for any purpose.
It is provided "as is" without expressed or implied warranty.
Author: Jun Fujisawa <fujisawa.jun@canon.co.jp>
Revision: $Id: svg11.dtd,v 1.15 2011/07/08 03:20:22 cmccorma Exp $
-->
<!-- This is the driver file for version 1.1 of the SVG DTD.
This DTD is identified by the PUBLIC and SYSTEM identifiers:
PUBLIC "-//W3C//DTD SVG 1.1//EN"
SYSTEM "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"
-->
<!ENTITY % SVG.version "-//W3C//DTD SVG 1.1//EN" >
<!-- Use this URI to identify the default namespace:
"http://www.w3.org/2000/svg"
See the Qualified Names module for information
on the use of namespace prefixes in the DTD.
-->
<!ENTITY % NS.prefixed "IGNORE" >
<!ENTITY % SVG.prefix "" >
<!-- reserved for future use with document profiles -->
<!ENTITY % SVG.profile "" >
<!-- ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -->
<!-- Pre-Framework Redeclaration Placeholder ..................... -->
<!ENTITY % svg-prefw-redecl.module "IGNORE" >
<![%svg-prefw-redecl.module;[
%svg-prefw-redecl.mod;]]>
<!-- Document Model Module ....................................... -->
<!ENTITY % svg-model.mod
PUBLIC "-//W3C//ENTITIES SVG 1.1 Document Model//EN"
"svg11-model.mod" >
<!-- Attribute Collection Module ................................. -->
<!ENTITY % svg-attribs.mod
PUBLIC "-//W3C//ENTITIES SVG 1.1 Attribute Collection//EN"
"svg11-attribs.mod" >
<!-- Modular Framework Module .................................... -->
<!ENTITY % svg-framework.module "INCLUDE" >
<![%svg-framework.module;[
<!ENTITY % svg-framework.mod
PUBLIC "-//W3C//ENTITIES SVG 1.1 Modular Framework//EN"
"svg-framework.mod" >
%svg-framework.mod;]]>
<!-- Post-Framework Redeclaration Placeholder .................... -->
<!ENTITY % svg-postfw-redecl.module "IGNORE" >
<![%svg-postfw-redecl.module;[
%svg-postfw-redecl.mod;]]>
<!-- ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -->
<!-- Core Attribute Module ....................................... -->
<!ENTITY % svg-core-attrib.module "INCLUDE" >
<![%svg-core-attrib.module;[
<!ENTITY % svg-core-attrib.mod
PUBLIC "-//W3C//ENTITIES SVG 1.1 Core Attribute//EN"
"svg-core-attrib.mod" >
%svg-core-attrib.mod;]]>
<!-- Container Attribute Module .................................. -->
<!ENTITY % svg-container-attrib.module "INCLUDE" >
<![%svg-container-attrib.module;[
<!ENTITY % svg-container-attrib.mod
PUBLIC "-//W3C//ENTITIES SVG 1.1 Container Attribute//EN"
"svg-container-attrib.mod" >
%svg-container-attrib.mod;]]>
<!-- Viewport Attribute Module ................................... -->
<!ENTITY % svg-viewport-attrib.module "INCLUDE" >
<![%svg-viewport-attrib.module;[
<!ENTITY % svg-viewport-attrib.mod
PUBLIC "-//W3C//ENTITIES SVG 1.1 Viewport Attribute//EN"
"svg-viewport-attrib.mod" >
%svg-viewport-attrib.mod;]]>
<!-- Paint Attribute Module ...................................... -->
<!ENTITY % svg-paint-attrib.module "INCLUDE" >
<![%svg-paint-attrib.module;[
<!ENTITY % svg-paint-attrib.mod
PUBLIC "-//W3C//ENTITIES SVG 1.1 Paint Attribute//EN"
"svg-paint-attrib.mod" >
%svg-paint-attrib.mod;]]>
<!-- Paint Opacity Attribute Module .............................. -->
<!ENTITY % svg-opacity-attrib.module "INCLUDE" >
<![%svg-opacity-attrib.module;[
<!ENTITY % svg-opacity-attrib.mod
PUBLIC "-//W3C//ENTITIES SVG 1.1 Paint Opacity Attribute//EN"
"svg-opacity-attrib.mod" >
%svg-opacity-attrib.mod;]]>
<!-- Graphics Attribute Module ................................... -->
<!ENTITY % svg-graphics-attrib.module "INCLUDE" >
<![%svg-graphics-attrib.module;[
<!ENTITY % svg-graphics-attrib.mod
PUBLIC "-//W3C//ENTITIES SVG 1.1 Graphics Attribute//EN"
"svg-graphics-attrib.mod" >
%svg-graphics-attrib.mod;]]>
<!-- Document Events Attribute Module ............................ -->
<!ENTITY % svg-docevents-attrib.module "INCLUDE" >
<![%svg-docevents-attrib.module;[
<!ENTITY % svg-docevents-attrib.mod
PUBLIC "-//W3C//ENTITIES SVG 1.1 Document Events Attribute//EN"
"svg-docevents-attrib.mod" >
%svg-docevents-attrib.mod;]]>
<!-- Graphical Element Events Attribute Module ................... -->
<!ENTITY % svg-graphevents-attrib.module "INCLUDE" >
<![%svg-graphevents-attrib.module;[
<!ENTITY % svg-graphevents-attrib.mod
PUBLIC "-//W3C//ENTITIES SVG 1.1 Graphical Element Events Attribute//EN"
"svg-graphevents-attrib.mod" >
%svg-graphevents-attrib.mod;]]>
<!-- Animation Events Attribute Module ........................... -->
<!ENTITY % svg-animevents-attrib.module "INCLUDE" >
<![%svg-animevents-attrib.module;[
<!ENTITY % svg-animevents-attrib.mod
PUBLIC "-//W3C//ENTITIES SVG 1.1 Animation Events Attribute//EN"
"svg-animevents-attrib.mod" >
%svg-animevents-attrib.mod;]]>
<!-- XLink Attribute Module ...................................... -->
<!ENTITY % svg-xlink-attrib.module "INCLUDE" >
<![%svg-xlink-attrib.module;[
<!ENTITY % svg-xlink-attrib.mod
PUBLIC "-//W3C//ENTITIES SVG 1.1 XLink Attribute//EN"
"svg-xlink-attrib.mod" >
%svg-xlink-attrib.mod;]]>
<!-- External Resources Attribute Module ......................... -->
<!ENTITY % svg-extresources-attrib.module "INCLUDE" >
<![%svg-extresources-attrib.module;[
<!ENTITY % svg-extresources-attrib.mod
PUBLIC "-//W3C//ENTITIES SVG 1.1 External Resources Attribute//EN"
"svg-extresources-attrib.mod" >
%svg-extresources-attrib.mod;]]>
<!-- ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -->
<!-- Structure Module ............................................ -->
<!ENTITY % svg-structure.module "INCLUDE" >
<![%svg-structure.module;[
<!ENTITY % svg-structure.mod
PUBLIC "-//W3C//ELEMENTS SVG 1.1 Structure//EN"
"svg-structure.mod" >
%svg-structure.mod;]]>
<!-- Conditional Processing Module ............................... -->
<!ENTITY % svg-conditional.module "INCLUDE" >
<![%svg-conditional.module;[
<!ENTITY % svg-conditional.mod
PUBLIC "-//W3C//ELEMENTS SVG 1.1 Conditional Processing//EN"
"svg-conditional.mod" >
%svg-conditional.mod;]]>
<!-- Image Module ................................................ -->
<!ENTITY % svg-image.module "INCLUDE" >
<![%svg-image.module;[
<!ENTITY % svg-image.mod
PUBLIC "-//W3C//ELEMENTS SVG 1.1 Image//EN"
"svg-image.mod" >
%svg-image.mod;]]>
<!-- Style Module ................................................ -->
<!ENTITY % svg-style.module "INCLUDE" >
<![%svg-style.module;[
<!ENTITY % svg-style.mod
PUBLIC "-//W3C//ELEMENTS SVG 1.1 Style//EN"
"svg-style.mod" >
%svg-style.mod;]]>
<!-- Shape Module ................................................ -->
<!ENTITY % svg-shape.module "INCLUDE" >
<![%svg-shape.module;[
<!ENTITY % svg-shape.mod
PUBLIC "-//W3C//ELEMENTS SVG 1.1 Shape//EN"
"svg-shape.mod" >
%svg-shape.mod;]]>
<!-- Text Module ................................................. -->
<!ENTITY % svg-text.module "INCLUDE" >
<![%svg-text.module;[
<!ENTITY % svg-text.mod
PUBLIC "-//W3C//ELEMENTS SVG 1.1 Text//EN"
"svg-text.mod" >
%svg-text.mod;]]>
<!-- Marker Module ............................................... -->
<!ENTITY % svg-marker.module "INCLUDE" >
<![%svg-marker.module;[
<!ENTITY % svg-marker.mod
PUBLIC "-//W3C//ELEMENTS SVG 1.1 Marker//EN"
"svg-marker.mod" >
%svg-marker.mod;]]>
<!-- Color Profile Module ........................................ -->
<!ENTITY % svg-profile.module "INCLUDE" >
<![%svg-profile.module;[
<!ENTITY % svg-profile.mod
PUBLIC "-//W3C//ELEMENTS SVG 1.1 Color Profile//EN"
"svg-profile.mod" >
%svg-profile.mod;]]>
<!-- Gradient Module ............................................. -->
<!ENTITY % svg-gradient.module "INCLUDE" >
<![%svg-gradient.module;[
<!ENTITY % svg-gradient.mod
PUBLIC "-//W3C//ELEMENTS SVG 1.1 Gradient//EN"
"svg-gradient.mod" >
%svg-gradient.mod;]]>
<!-- Pattern Module .............................................. -->
<!ENTITY % svg-pattern.module "INCLUDE" >
<![%svg-pattern.module;[
<!ENTITY % svg-pattern.mod
PUBLIC "-//W3C//ELEMENTS SVG 1.1 Pattern//EN"
"svg-pattern.mod" >
%svg-pattern.mod;]]>
<!-- Clip Module ................................................. -->
<!ENTITY % svg-clip.module "INCLUDE" >
<![%svg-clip.module;[
<!ENTITY % svg-clip.mod
PUBLIC "-//W3C//ELEMENTS SVG 1.1 Clip//EN"
"svg-clip.mod" >
%svg-clip.mod;]]>
<!-- Mask Module ................................................. -->
<!ENTITY % svg-mask.module "INCLUDE" >
<![%svg-mask.module;[
<!ENTITY % svg-mask.mod
PUBLIC "-//W3C//ELEMENTS SVG 1.1 Mask//EN"
"svg-mask.mod" >
%svg-mask.mod;]]>
<!-- Filter Module ............................................... -->
<!ENTITY % svg-filter.module "INCLUDE" >
<![%svg-filter.module;[
<!ENTITY % svg-filter.mod
PUBLIC "-//W3C//ELEMENTS SVG 1.1 Filter//EN"
"svg-filter.mod" >
%svg-filter.mod;]]>
<!-- Cursor Module ............................................... -->
<!ENTITY % svg-cursor.module "INCLUDE" >
<![%svg-cursor.module;[
<!ENTITY % svg-cursor.mod
PUBLIC "-//W3C//ELEMENTS SVG 1.1 Cursor//EN"
"svg-cursor.mod" >
%svg-cursor.mod;]]>
<!-- Hyperlinking Module ......................................... -->
<!ENTITY % svg-hyperlink.module "INCLUDE" >
<![%svg-hyperlink.module;[
<!ENTITY % svg-hyperlink.mod
PUBLIC "-//W3C//ELEMENTS SVG 1.1 Hyperlinking//EN"
"svg-hyperlink.mod" >
%svg-hyperlink.mod;]]>
<!-- View Module ................................................. -->
<!ENTITY % svg-view.module "INCLUDE" >
<![%svg-view.module;[
<!ENTITY % svg-view.mod
PUBLIC "-//W3C//ELEMENTS SVG 1.1 View//EN"
"svg-view.mod" >
%svg-view.mod;]]>
<!-- Scripting Module ............................................ -->
<!ENTITY % svg-script.module "INCLUDE" >
<![%svg-script.module;[
<!ENTITY % svg-script.mod
PUBLIC "-//W3C//ELEMENTS SVG 1.1 Scripting//EN"
"svg-script.mod" >
%svg-script.mod;]]>
<!-- Animation Module ............................................ -->
<!ENTITY % svg-animation.module "INCLUDE" >
<![%svg-animation.module;[
<!ENTITY % svg-animation.mod
PUBLIC "-//W3C//ELEMENTS SVG 1.1 Animation//EN"
"svg-animation.mod" >
%svg-animation.mod;]]>
<!-- Font Module ................................................. -->
<!ENTITY % svg-font.module "INCLUDE" >
<![%svg-font.module;[
<!ENTITY % svg-font.mod
PUBLIC "-//W3C//ELEMENTS SVG 1.1 Font//EN"
"svg-font.mod" >
%svg-font.mod;]]>
<!-- Extensibility Module ........................................ -->
<!ENTITY % svg-extensibility.module "INCLUDE" >
<![%svg-extensibility.module;[
<!ENTITY % svg-extensibility.mod
PUBLIC "-//W3C//ELEMENTS SVG 1.1 Extensibility//EN"
"svg-extensibility.mod" >
%svg-extensibility.mod;]]>
<!-- end of SVG 1.1 DTD .................................................... -->
<!-- ....................................................................... -->

View File

@ -134,7 +134,7 @@ public class TopNQueryQueryToolChestTest
} }
@Test @Test
public void testComputeResultLevelCacheKeyWithDifferentPostAgg() throws IOException public void testComputeResultLevelCacheKeyWithDifferentPostAgg()
{ {
final TopNQuery query1 = new TopNQuery( final TopNQuery query1 = new TopNQuery(
new TableDataSource("dummy"), new TableDataSource("dummy"),