Skip to content
This repository was archived by the owner on Feb 27, 2023. It is now read-only.

Commit a109411

Browse files
author
Scott Stafford
committed
Merge branch 'bug/163-fixCheckstyle' into dev
2 parents 205491d + ff1527d commit a109411

File tree

19 files changed

+25
-218
lines changed

19 files changed

+25
-218
lines changed

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ subprojects {
3636

3737
checkstyle {
3838
configFile = file("${project.rootDir}/dev-tools/checkstyle/checkstyle.xml")
39-
toolVersion = '6.19'
39+
toolVersion = '7.1.2'
4040
}
4141

4242
task sourcesJar(type: Jar, dependsOn: classes) {

‎core/src/main/java/com/marklogic/client/io/MarkLogicWriteHandle.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.marklogic.client.io;
22

3-
import com.marklogic.client.document.DocumentUriTemplate;
43
import com.marklogic.client.document.DocumentWriteOperation;
54
import com.marklogic.client.io.marker.AbstractWriteHandle;
65
import com.marklogic.client.io.marker.DocumentMetadataWriteHandle;

‎core/src/main/java/com/marklogic/spring/batch/Main.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.springframework.context.annotation.Configuration;
2323
import org.springframework.core.env.JOptCommandLinePropertySource;
2424
import org.springframework.core.type.filter.AnnotationTypeFilter;
25-
import org.springframework.core.type.filter.RegexPatternTypeFilter;
2625

2726
import java.io.File;
2827
import java.io.FileReader;

‎core/src/main/java/com/marklogic/spring/batch/core/repository/dao/AbstractMarkLogicBatchMetadataDao.java‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,25 @@
77

88
public abstract class AbstractMarkLogicBatchMetadataDao extends LoggingObject {
99

10-
protected DatabaseClient databaseClient;
11-
12-
protected DataFieldMaxValueIncrementer incrementer;
10+
protected DatabaseClient databaseClient;
1311

14-
protected final long LOWER_RANGE = 0;
12+
protected DataFieldMaxValueIncrementer incrementer;
13+
14+
protected final long LOWER_RANGE = 0;
1515
protected final long UPPER_RANGE = 9999999;
16-
16+
1717
public final String SEARCH_OPTIONS_NAME = "spring-batch";
18-
19-
public final String SPRING_BATCH_DIR = "/projects.spring.io/spring-batch/";
20-
21-
public final String COLLECTION_JOB_INSTANCE = "http://marklogic.com/spring-batch/job-instance";
22-
23-
public DatabaseClient getDatabaseClient() {
24-
return databaseClient;
25-
}
26-
27-
public void setIncrementer(DataFieldMaxValueIncrementer incrementer) {
28-
this.incrementer = incrementer;
29-
}
18+
19+
public final String SPRING_BATCH_DIR = "/projects.spring.io/spring-batch/";
20+
21+
public final String COLLECTION_JOB_INSTANCE = "http://marklogic.com/spring-batch/job-instance";
22+
23+
public DatabaseClient getDatabaseClient() {
24+
return databaseClient;
25+
}
26+
27+
public void setIncrementer(DataFieldMaxValueIncrementer incrementer) {
28+
this.incrementer = incrementer;
29+
}
3030

3131
}

‎core/src/main/java/com/marklogic/spring/batch/item/AbstractDocumentWriter.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
import com.marklogic.client.io.DocumentMetadataHandle;
88
import com.marklogic.client.io.DocumentMetadataHandle.Capability;
99

10-
import java.io.File;
11-
1210
/**
1311
* Base class for writing documents. Should be able to support both the Client API and XCC.
1412
*/

‎core/src/main/java/com/marklogic/uri/DefaultUriGenerator.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.marklogic.uri;
22

3-
import java.io.File;
43
import java.util.UUID;
54

65
public class DefaultUriGenerator implements UriGenerator<String>{

‎core/src/test/java/com/marklogic/spring/batch/bind/MarshallSpringBatchPojoToXmlTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.marklogic.spring.batch.bind;
22

3-
import com.marklogic.client.spring.BasicConfig;
43
import com.marklogic.junit.Fragment;
54
import com.marklogic.junit.NamespaceProvider;
65
import com.marklogic.spring.batch.*;

‎core/src/test/java/com/marklogic/spring/batch/core/explore/support/SimpleJobExplorerTests.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
import org.junit.Before;
1010
import org.junit.Test;
1111
import org.springframework.batch.core.*;
12-
import org.springframework.batch.core.explore.JobExplorer;
1312
import org.springframework.batch.core.launch.NoSuchJobException;
14-
import org.springframework.beans.factory.annotation.Autowired;
1513

1614
public class SimpleJobExplorerTests extends AbstractSpringBatchTest {
1715

‎core/src/test/java/com/marklogic/spring/batch/core/repository/dao/MarkLogicJobInstanceDaoTests.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import org.springframework.batch.core.JobInstance;
1010
import org.springframework.batch.core.JobParameters;
1111
import org.springframework.batch.core.JobParametersBuilder;
12-
import org.springframework.batch.core.repository.dao.JobInstanceDao;
1312
import org.springframework.transaction.annotation.Transactional;
1413

1514
public class MarkLogicJobInstanceDaoTests extends AbstractSpringBatchTest {

‎dev-tools/checkstyle/checkstyle.xml‎

Lines changed: 6 additions & 178 deletions
Original file line numberDiff line numberDiff line change
@@ -12,192 +12,20 @@
1212
<!-- Checks for whitespace -->
1313
<!-- See http://checkstyle.sf.net/config_whitespace.html -->
1414

15-
<module name="FileTabCharacter">
16-
<property name="eachLine" value="false"/>
17-
</module>
1815

1916
<module name="TreeWalker">
20-
<module name="OuterTypeFilename"/>
21-
<module name="IllegalTokenText">
22-
<property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
23-
<property name="format" value="\\u00(08|09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
24-
<property name="message" value="Avoid using corresponding octal or Unicode escape."/>
25-
</module>
26-
<module name="AvoidEscapedUnicodeCharacters">
27-
<property name="allowEscapesForControlCharacters" value="true"/>
28-
<property name="allowByTailComment" value="true"/>
29-
<property name="allowNonPrintableEscapes" value="true"/>
30-
</module>
31-
<module name="LineLength">
32-
<property name="max" value="100"/>
33-
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
34-
</module>
35-
<module name="AvoidStarImport"/>
36-
<module name="OneTopLevelClass"/>
37-
<module name="NoLineWrap"/>
38-
<module name="EmptyBlock">
39-
<property name="option" value="TEXT"/>
40-
<property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
41-
</module>
42-
<module name="NeedBraces"/>
43-
<module name="LeftCurly">
44-
<property name="maxLineLength" value="100"/>
45-
</module>
46-
<module name="RightCurly"/>
47-
<module name="RightCurly">
48-
<property name="option" value="alone"/>
49-
<property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/>
50-
</module>
51-
<module name="WhitespaceAround">
52-
<property name="allowEmptyConstructors" value="true"/>
53-
<property name="allowEmptyMethods" value="true"/>
54-
<property name="allowEmptyTypes" value="true"/>
55-
<property name="allowEmptyLoops" value="true"/>
56-
<message key="ws.notFollowed"
57-
value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
58-
<message key="ws.notPreceded"
59-
value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
60-
</module>
61-
<module name="OneStatementPerLine"/>
62-
<module name="MultipleVariableDeclarations"/>
63-
<module name="ArrayTypeStyle"/>
64-
<module name="MissingSwitchDefault"/>
65-
<module name="FallThrough"/>
66-
<module name="UpperEll"/>
67-
<module name="ModifierOrder"/>
68-
<module name="EmptyLineSeparator">
69-
<property name="allowNoEmptyLineBetweenFields" value="true"/>
70-
</module>
71-
<module name="SeparatorWrap">
72-
<property name="tokens" value="DOT"/>
73-
<property name="option" value="nl"/>
74-
</module>
75-
<module name="SeparatorWrap">
76-
<property name="tokens" value="COMMA"/>
77-
<property name="option" value="EOL"/>
78-
</module>
79-
<module name="PackageName">
80-
<property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
81-
<message key="name.invalidPattern"
82-
value="Package name ''{0}'' must match pattern ''{1}''."/>
83-
</module>
84-
<module name="TypeName">
85-
<message key="name.invalidPattern"
86-
value="Type name ''{0}'' must match pattern ''{1}''."/>
87-
</module>
88-
<module name="MemberName">
89-
<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
90-
<message key="name.invalidPattern"
91-
value="Member name ''{0}'' must match pattern ''{1}''."/>
92-
</module>
93-
<module name="ParameterName">
94-
<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
95-
<message key="name.invalidPattern"
96-
value="Parameter name ''{0}'' must match pattern ''{1}''."/>
97-
</module>
98-
<module name="CatchParameterName">
99-
<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
100-
<message key="name.invalidPattern"
101-
value="Catch parameter name ''{0}'' must match pattern ''{1}''."/>
102-
</module>
103-
<module name="LocalVariableName">
104-
<property name="tokens" value="VARIABLE_DEF"/>
105-
<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
106-
<property name="allowOneCharVarInForLoop" value="true"/>
107-
<message key="name.invalidPattern"
108-
value="Local variable name ''{0}'' must match pattern ''{1}''."/>
109-
</module>
110-
<module name="ClassTypeParameterName">
111-
<property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
112-
<message key="name.invalidPattern"
113-
value="Class type name ''{0}'' must match pattern ''{1}''."/>
114-
</module>
115-
<module name="MethodTypeParameterName">
116-
<property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
117-
<message key="name.invalidPattern"
118-
value="Method type name ''{0}'' must match pattern ''{1}''."/>
119-
</module>
120-
<module name="InterfaceTypeParameterName">
121-
<property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
122-
<message key="name.invalidPattern"
123-
value="Interface type name ''{0}'' must match pattern ''{1}''."/>
124-
</module>
125-
<module name="NoFinalizer"/>
126-
<module name="GenericWhitespace">
127-
<message key="ws.followed"
128-
value="GenericWhitespace ''{0}'' is followed by whitespace."/>
129-
<message key="ws.preceded"
130-
value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
131-
<message key="ws.illegalFollow"
132-
value="GenericWhitespace ''{0}'' should followed by whitespace."/>
133-
<message key="ws.notPreceded"
134-
value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
135-
</module>
17+
<module name="UnusedImports"/>
18+
<module name="RedundantImport"/>
13619
<!--
137-
<module name="Indentation">
138-
<property name="basicOffset" value="2"/>
139-
<property name="braceAdjustment" value="0"/>
140-
<property name="caseIndent" value="2"/>
141-
<property name="throwsIndent" value="4"/>
142-
<property name="lineWrappingIndentation" value="4"/>
143-
<property name="arrayInitIndent" value="2"/>
144-
</module>
145-
-->
146-
<module name="AbbreviationAsWordInName">
147-
<property name="ignoreFinal" value="false"/>
148-
<property name="allowedAbbreviationLength" value="1"/>
149-
</module>
150-
<module name="OverloadMethodsDeclarationOrder"/>
151-
<module name="VariableDeclarationUsageDistance"/>
152-
<module name="CustomImportOrder">
153-
<property name="specialImportsRegExp" value="com.google"/>
154-
<property name="sortImportsInGroupAlphabetically" value="true"/>
155-
<property name="customImportOrderRules" value="STATIC###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE"/>
156-
</module>
157-
<module name="MethodParamPad"/>
158-
<module name="OperatorWrap">
159-
<property name="option" value="NL"/>
160-
<property name="tokens" value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR "/>
161-
</module>
162-
<module name="AnnotationLocation">
163-
<property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF"/>
164-
</module>
20+
<module name="AvoidStarImport"/>
16521
166-
<module name="AnnotationLocation">
167-
<property name="tokens" value="VARIABLE_DEF"/>
168-
<property name="allowSamelineMultipleAnnotations" value="true"/>
169-
</module>
17022
171-
<module name="NonEmptyAtclauseDescriptionCheck"/>
172-
<module name="JavadocTagContinuationIndentation"/>
173-
<module name="SummaryJavadoc">
174-
<property name="forbiddenSummaryFragments" value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
175-
</module>
176-
<module name="JavadocParagraph"/>
177-
<module name="AtclauseOrder">
178-
<property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
179-
<property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
180-
</module>
181-
<module name="JavadocMethod">
182-
<property name="scope" value="public"/>
183-
<property name="allowMissingParamTags" value="true"/>
184-
<property name="allowMissingThrowsTags" value="true"/>
185-
<property name="allowMissingReturnTag" value="true"/>
186-
<property name="minLineCount" value="2"/>
187-
<property name="allowedAnnotations" value="Override, Test"/>
188-
<property name="allowThrowsTagsForSubclasses" value="true"/>
189-
</module>
190-
<module name="MethodName">
191-
<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
192-
<message key="name.invalidPattern"
193-
value="Method name ''{0}'' must match pattern ''{1}''."/>
194-
</module>
195-
<module name="SingleLineJavadoc">
196-
<property name="ignoreInlineTags" value="false"/>
197-
</module>
23+
<module name="OneTopLevelClass"/>
24+
<module name="NoLineWrap"/>
19825
<module name="EmptyCatchBlock">
19926
<property name="exceptionVariableName" value="expected"/>
20027
</module>
20128
<module name="CommentsIndentation"/>
29+
-->
20230
</module>
20331
</module>

0 commit comments

Comments
 (0)