Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

URL Cleanup

Browse Source 
This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener).

# Fixed URLs

## Fixed But Review Recommended
These URLs were fixed, but the https status was not OK. However, the https status was the same as the http request or http redirected to an https URL, so they were migrated. Your review is recommended.

* http://www.puppycrawl.com/dtds/configuration_1_2.dtd (404) with 1 occurrences migrated to:
  https://www.puppycrawl.com/dtds/configuration_1_2.dtd ([https](https://www.puppycrawl.com/dtds/configuration_1_2.dtd) result 404).
* http://www.puppycrawl.com/dtds/suppressions_1_1.dtd (404) with 1 occurrences migrated to:
  https://www.puppycrawl.com/dtds/suppressions_1_1.dtd ([https](https://www.puppycrawl.com/dtds/suppressions_1_1.dtd) result 404).

## Fixed Success
These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended.

* http://www.springframework.org/schema/beans/spring-beans.xsd with 2 occurrences migrated to:
  https://www.springframework.org/schema/beans/spring-beans.xsd ([https](https://www.springframework.org/schema/beans/spring-beans.xsd) result 200).
* http://www.springframework.org/schema/context/spring-context.xsd with 1 occurrences migrated to:
  https://www.springframework.org/schema/context/spring-context.xsd ([https](https://www.springframework.org/schema/context/spring-context.xsd) result 200).
* http://www.springframework.org/schema/integration/kafka/spring-integration-kafka.xsd with 2 occurrences migrated to:
  https://www.springframework.org/schema/integration/kafka/spring-integration-kafka.xsd ([https](https://www.springframework.org/schema/integration/kafka/spring-integration-kafka.xsd) result 200).
* http://www.springframework.org/schema/integration/spring-integration.xsd with 1 occurrences migrated to:
  https://www.springframework.org/schema/integration/spring-integration.xsd ([https](https://www.springframework.org/schema/integration/spring-integration.xsd) result 200).

# Ignored
These URLs were intentionally ignored.

* http://www.springframework.org/schema/beans with 4 occurrences
* http://www.springframework.org/schema/context with 2 occurrences
* http://www.springframework.org/schema/integration with 2 occurrences
* http://www.springframework.org/schema/integration/kafka with 4 occurrences
* http://www.w3.org/2001/XMLSchema-instance with 2 occurrences

* Upgrade Checkstyle and its DTDs for HTTPS
This commit is contained in:
Spring Operator
2019-03-19 22:39:58 -05:00
committed by Artem Bilan
parent 7fae571c2d
commit 9b670950a5
4 changed files with 89 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-integration-kafka/src/checkstyle/checkstyle-suppressions.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE suppressions PUBLIC <!DOCTYPE suppressions PUBLIC
"-//Puppy Crawl//DTD Suppressions 1.1//EN" "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd"> "https://checkstyle.org/dtds/suppressions_1_2.dtd">
<suppressions> <suppressions>
<suppress files="package-info\.java" checks=".*" /> <suppress files="package-info\.java" checks=".*"/>
<suppress files="[\\/]test[\\/]" checks="Javadoc*" /> <suppress files="[\\/]test[\\/]" checks="Javadoc*"/>
</suppressions> </suppressions>

156
spring-integration-kafka/src/checkstyle/checkstyle.xml
View File

@@ -1,15 +1,17 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd"> <!DOCTYPE module PUBLIC
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
"https://checkstyle.org/dtds/configuration_1_3.dtd">
<module name="Checker"> <module name="Checker">
<module name="SuppressionFilter"> <module name="SuppressionFilter">
<property name="file" value="src/checkstyle/checkstyle-suppressions.xml" /> <property name="file" value="src/checkstyle/checkstyle-suppressions.xml"/>
</module> </module>
<!-- Root Checks --> <!-- Root Checks -->
<module name="RegexpHeader"> <module name="RegexpHeader">
<property name="headerFile" value="src/checkstyle/checkstyle-header.txt" /> <property name="headerFile" value="src/checkstyle/checkstyle-header.txt"/>
<property name="fileExtensions" value="java" /> <property name="fileExtensions" value="java"/>
</module> </module>
<module name="NewlineAtEndOfFile"> <module name="NewlineAtEndOfFile">
<property name="lineSeparator" value="lf"/> <property name="lineSeparator" value="lf"/>
@@ -20,63 +22,63 @@
<!-- Annotations --> <!-- Annotations -->
<module name="AnnotationUseStyle"> <module name="AnnotationUseStyle">
<property name="elementStyle" value="compact" /> <property name="elementStyle" value="compact"/>
</module> </module>
<module name="MissingOverride" /> <module name="MissingOverride"/>
<module name="PackageAnnotation" /> <module name="PackageAnnotation"/>
<module name="AnnotationLocation"> <module name="AnnotationLocation">
<property name="allowSamelineSingleParameterlessAnnotation" <property name="allowSamelineSingleParameterlessAnnotation"
value="false" /> value="false"/>
</module> </module>
<!-- Block Checks --> <!-- Block Checks -->
<module name="EmptyBlock"> <module name="EmptyBlock">
<property name="option" value="text" /> <property name="option" value="text"/>
</module> </module>
<module name="LeftCurly" /> <module name="LeftCurly"/>
<module name="RightCurly"> <module name="RightCurly">
<property name="option" value="alone" /> <property name="option" value="alone"/>
</module> </module>
<module name="NeedBraces" /> <module name="NeedBraces"/>
<module name="AvoidNestedBlocks" /> <module name="AvoidNestedBlocks"/>
<!-- Class Design --> <!-- Class Design -->
<module name="FinalClass" /> <module name="FinalClass"/>
<module name="InterfaceIsType" /> <module name="InterfaceIsType"/>
<module name="HideUtilityClassConstructor" /> <module name="HideUtilityClassConstructor"/>
<module name="MutableException" /> <module name="MutableException"/>
<module name="InnerTypeLast" /> <module name="InnerTypeLast"/>
<module name="OneTopLevelClass" /> <module name="OneTopLevelClass"/>
<!-- Coding --> <!-- Coding -->
<module name="CovariantEquals" /> <module name="CovariantEquals"/>
<module name="EmptyStatement" /> <module name="EmptyStatement"/>
<module name="EqualsHashCode" /> <module name="EqualsHashCode"/>
<module name="InnerAssignment" /> <module name="InnerAssignment"/>
<module name="SimplifyBooleanExpression" /> <module name="SimplifyBooleanExpression"/>
<module name="SimplifyBooleanReturn" /> <module name="SimplifyBooleanReturn"/>
<module name="StringLiteralEquality" /> <module name="StringLiteralEquality"/>
<module name="NestedForDepth"> <module name="NestedForDepth">
<property name="max" value="3" /> <property name="max" value="3"/>
</module> </module>
<module name="NestedIfDepth"> <module name="NestedIfDepth">
<property name="max" value="4" /> <property name="max" value="4"/>
</module> </module>
<module name="NestedTryDepth"> <module name="NestedTryDepth">
<property name="max" value="3" /> <property name="max" value="3"/>
</module> </module>
<module name="MultipleVariableDeclarations" /> <module name="MultipleVariableDeclarations"/>
<module name="RequireThis"> <module name="RequireThis">
<property name="validateOnlyOverlapping" value="false" /> <property name="validateOnlyOverlapping" value="false"/>
<property name="checkMethods" value="false" /> <property name="checkMethods" value="false"/>
</module> </module>
<module name="OneStatementPerLine" /> <module name="OneStatementPerLine"/>
<!-- Imports --> <!-- Imports -->
<module name="AvoidStarImport" /> <module name="AvoidStarImport"/>
<module name="AvoidStaticImport"> <module name="AvoidStaticImport">
<property name="excludes" <property name="excludes"
value="org.assertj.core.api.Assertions.*, value="org.assertj.core.api.Assertions.*,
org.junit.Assert.*, org.junit.Assert.*,
org.junit.Assume.*, org.junit.Assume.*,
org.junit.internal.matchers.ThrowableMessageMatcher.*, org.junit.internal.matchers.ThrowableMessageMatcher.*,
@@ -86,19 +88,19 @@
org.mockito.BDDMockito.*, org.mockito.BDDMockito.*,
org.mockito.ArgumentMatchers.*, org.mockito.ArgumentMatchers.*,
org.springframework.kafka.test.hamcrest.KafkaMatchers.*, org.springframework.kafka.test.hamcrest.KafkaMatchers.*,
org.springframework.kafka.test.assertj.KafkaConditions.*" /> org.springframework.kafka.test.assertj.KafkaConditions.*"/>
</module> </module>
<module name="IllegalImport" /> <module name="IllegalImport"/>
<module name="RedundantImport" /> <module name="RedundantImport"/>
<module name="UnusedImports"> <module name="UnusedImports">
<property name="processJavadoc" value="true" /> <property name="processJavadoc" value="true"/>
</module> </module>
<module name="ImportOrder"> <module name="ImportOrder">
<property name="groups" value="java,/^javax?\./,org,org.springframework,*" /> <property name="groups" value="java,/^javax?\./,org,org.springframework,*"/>
<property name="ordered" value="true" /> <property name="ordered" value="true"/>
<property name="separated" value="true" /> <property name="separated" value="true"/>
<property name="option" value="top" /> <property name="option" value="top"/>
<property name="sortStaticImportsAlphabetically" value="true" /> <property name="sortStaticImportsAlphabetically" value="true"/>
</module> </module>
<!-- Javadoc Comments --> <!-- Javadoc Comments -->
@@ -107,7 +109,7 @@
<property name="authorFormat" value=".+\s.+"/> <property name="authorFormat" value=".+\s.+"/>
</module> </module>
<module name="JavadocMethod"> <module name="JavadocMethod">
<property name="allowMissingJavadoc" value="true" /> <property name="allowMissingJavadoc" value="true"/>
</module> </module>
<module name="JavadocVariable"> <module name="JavadocVariable">
<property name="scope" value="public"/> <property name="scope" value="public"/>
@@ -115,68 +117,68 @@
<module name="JavadocStyle"> <module name="JavadocStyle">
<property name="checkEmptyJavadoc" value="true"/> <property name="checkEmptyJavadoc" value="true"/>
</module> </module>
<module name="NonEmptyAtclauseDescription" /> <module name="NonEmptyAtclauseDescription"/>
<module name="JavadocTagContinuationIndentation"> <module name="JavadocTagContinuationIndentation">
<property name="offset" value="0"/> <property name="offset" value="0"/>
</module> </module>
<module name="AtclauseOrder"> <module name="AtclauseOrder">
<property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF"/> <property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF"/>
<property name="tagOrder" value="@param, @author, @since, @see, @version, @serial, @deprecated"/> <property name="tagOrder" value="@param, @author, @since, @see, @version, @serial, @deprecated"/>
</module> </module>
<module name="AtclauseOrder"> <module name="AtclauseOrder">
<property name="target" value="METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/> <property name="target" value="METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
<property name="tagOrder" value="@param, @return, @throws, @since, @deprecated, @see"/> <property name="tagOrder" value="@param, @return, @throws, @since, @deprecated, @see"/>
</module> </module>
<!-- Miscellaneous --> <!-- Miscellaneous -->
<module name="CommentsIndentation"> <module name="CommentsIndentation">
<property name="tokens" value="BLOCK_COMMENT_BEGIN" /> <property name="tokens" value="BLOCK_COMMENT_BEGIN"/>
</module> </module>
<module name="UpperEll" /> <module name="UpperEll"/>
<module name="ArrayTypeStyle" /> <module name="ArrayTypeStyle"/>
<module name="OuterTypeFilename" /> <module name="OuterTypeFilename"/>
<!-- Modifiers --> <!-- Modifiers -->
<module name="RedundantModifier" /> <module name="RedundantModifier"/>
<!-- Regexp --> <!-- Regexp -->
<module name="RegexpSinglelineJava"> <module name="RegexpSinglelineJava">
<property name="format" value="^\t* +\t*\S" /> <property name="format" value="^\t* +\t*\S"/>
<property name="message" <property name="message"
value="Line has leading space characters; indentation should be performed with tabs only." /> value="Line has leading space characters; indentation should be performed with tabs only."/>
<property name="ignoreComments" value="true" /> <property name="ignoreComments" value="true"/>
</module> </module>
<module name="RegexpSinglelineJava">
<property name="maximum" value="0"/>
<property name="format" value="org\.mockito\..*Mockito\.(when|doThrow|doAnswer)" />
<property name="message"
value="Please use BDDMockito instead of Mockito.(when|doThrow|doAnswer)." />
<property name="ignoreComments" value="true" />
</module>
<module name="RegexpSinglelineJava"> <module name="RegexpSinglelineJava">
<property name="maximum" value="0"/> <property name="maximum" value="0"/>
<property name="format" value="org\.junit\.Assert\.assert" /> <property name="format" value="org\.mockito\..*Mockito\.(when|doThrow|doAnswer)"/>
<property name="message" <property name="message"
value="Please use AssertJ imports." /> value="Please use BDDMockito instead of Mockito.(when|doThrow|doAnswer)."/>
<property name="ignoreComments" value="true" /> <property name="ignoreComments" value="true"/>
</module>
<module name="RegexpSinglelineJava">
<property name="maximum" value="0"/>
<property name="format" value="org\.junit\.Assert\.assert"/>
<property name="message"
value="Please use AssertJ imports."/>
<property name="ignoreComments" value="true"/>
</module> </module>
<module name="Regexp"> <module name="Regexp">
<property name="format" value="[ \t]+$" /> <property name="format" value="[ \t]+$"/>
<property name="illegalPattern" value="true" /> <property name="illegalPattern" value="true"/>
<property name="message" value="Trailing whitespace" /> <property name="message" value="Trailing whitespace"/>
</module> </module>
<!-- Whitespace --> <!-- Whitespace -->
<module name="GenericWhitespace" /> <module name="GenericWhitespace"/>
<module name="MethodParamPad" /> <module name="MethodParamPad"/>
<module name="NoWhitespaceAfter" > <module name="NoWhitespaceAfter">
<property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS, ARRAY_DECLARATOR"/> <property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS, ARRAY_DECLARATOR"/>
</module> </module>
<module name="NoWhitespaceBefore" /> <module name="NoWhitespaceBefore"/>
<module name="ParenPad" /> <module name="ParenPad"/>
<module name="TypecastParenPad" /> <module name="TypecastParenPad"/>
<module name="WhitespaceAfter" /> <module name="WhitespaceAfter"/>
<module name="WhitespaceAround" /> <module name="WhitespaceAround"/>
</module> </module>
</module> </module>

6
spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaMessageDrivenChannelAdapterParserTests-context.xml
View File

@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:int-kafka="http://www.springframework.org/schema/integration/kafka" xmlns:int-kafka="http://www.springframework.org/schema/integration/kafka"
xmlns:context="http://www.springframework.org/schema/context" xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/integration/kafka http://www.springframework.org/schema/integration/kafka/spring-integration-kafka.xsd"> http://www.springframework.org/schema/integration/kafka https://www.springframework.org/schema/integration/kafka/spring-integration-kafka.xsd">
<context:property-placeholder/> <context:property-placeholder/>

6
spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaOutboundAdapterParserTests-context.xml
View File

@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:int="http://www.springframework.org/schema/integration" xmlns:int="http://www.springframework.org/schema/integration"
xmlns:int-kafka="http://www.springframework.org/schema/integration/kafka" xmlns:int-kafka="http://www.springframework.org/schema/integration/kafka"
xsi:schemaLocation="http://www.springframework.org/schema/integration/kafka http://www.springframework.org/schema/integration/kafka/spring-integration-kafka.xsd xsi:schemaLocation="http://www.springframework.org/schema/integration/kafka https://www.springframework.org/schema/integration/kafka/spring-integration-kafka.xsd
http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
<int:channel id="inputToKafka" /> <int:channel id="inputToKafka" />