Skip to content

Commit 458eb00

Browse files
adrienlaueradrienlauer
committed
Fix build
1 parent d91e6a2 commit 458eb00

File tree

5 files changed

+248
-2
lines changed

5 files changed

+248
-2
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Version 3.0.1 (2017-11-30)
1+
# Version 3.0.1 (2019-01-10)
22

33
* [fix] During translation of composite specifications (or, and), set the field for each member (avoid "No field has been set" exception).
44

‎checkstyle.xml‎

Lines changed: 240 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,240 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
4+
Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
5+
6+
This Source Code Form is subject to the terms of the Mozilla Public
7+
License, v. 2.0. If a copy of the MPL was not distributed with this
8+
file, You can obtain one at http://mozilla.org/MPL/2.0/.
9+
10+
-->
11+
<!DOCTYPE module PUBLIC
12+
"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
13+
"http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd">
14+
<module name="Checker">
15+
<property name="charset" value="UTF-8"/>
16+
17+
<property name="severity" value="warning"/>
18+
19+
<property name="fileExtensions" value="java, properties, xml"/>
20+
<!-- Checks for whitespace -->
21+
<!-- See http://checkstyle.sf.net/config_whitespace.html -->
22+
<module name="FileTabCharacter">
23+
<property name="eachLine" value="true"/>
24+
</module>
25+
26+
<module name="TreeWalker">
27+
<module name="OuterTypeFilename"/>
28+
<module name="IllegalTokenText">
29+
<property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
30+
<property name="format"
31+
value="\\u00(09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
32+
<property name="message"
33+
value="Consider using special escape sequence instead of octal value or Unicode escaped value."/>
34+
</module>
35+
<module name="AvoidEscapedUnicodeCharacters">
36+
<property name="allowEscapesForControlCharacters" value="true"/>
37+
<property name="allowByTailComment" value="true"/>
38+
<property name="allowNonPrintableEscapes" value="true"/>
39+
</module>
40+
<module name="LineLength">
41+
<property name="max" value="120"/>
42+
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
43+
</module>
44+
<module name="AvoidStarImport"/>
45+
<module name="OneTopLevelClass"/>
46+
<module name="NoLineWrap"/>
47+
<module name="EmptyBlock">
48+
<property name="option" value="TEXT"/>
49+
<property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
50+
</module>
51+
<module name="NeedBraces"/>
52+
<module name="LeftCurly"/>
53+
<module name="RightCurly">
54+
<property name="id" value="RightCurlySame"/>
55+
<property name="tokens"
56+
value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_DO"/>
57+
</module>
58+
<module name="RightCurly">
59+
<property name="id" value="RightCurlyAlone"/>
60+
<property name="option" value="alone"/>
61+
<property name="tokens"
62+
value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT, INSTANCE_INIT"/>
63+
</module>
64+
<module name="WhitespaceAround">
65+
<property name="allowEmptyConstructors" value="true"/>
66+
<property name="allowEmptyMethods" value="true"/>
67+
<property name="allowEmptyTypes" value="true"/>
68+
<property name="allowEmptyLoops" value="true"/>
69+
<message key="ws.notFollowed"
70+
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)"/>
71+
<message key="ws.notPreceded"
72+
value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
73+
</module>
74+
<module name="OneStatementPerLine"/>
75+
<module name="MultipleVariableDeclarations"/>
76+
<module name="ArrayTypeStyle"/>
77+
<module name="MissingSwitchDefault"/>
78+
<module name="FallThrough"/>
79+
<module name="UpperEll"/>
80+
<module name="ModifierOrder"/>
81+
<module name="EmptyLineSeparator">
82+
<property name="allowNoEmptyLineBetweenFields" value="true"/>
83+
</module>
84+
<module name="SeparatorWrap">
85+
<property name="id" value="SeparatorWrapDot"/>
86+
<property name="tokens" value="DOT"/>
87+
<property name="option" value="nl"/>
88+
</module>
89+
<module name="SeparatorWrap">
90+
<property name="id" value="SeparatorWrapComma"/>
91+
<property name="tokens" value="COMMA"/>
92+
<property name="option" value="EOL"/>
93+
</module>
94+
<module name="SeparatorWrap">
95+
<!-- ELLIPSIS is EOL until https://github.com/google/styleguide/issues/258 -->
96+
<property name="id" value="SeparatorWrapEllipsis"/>
97+
<property name="tokens" value="ELLIPSIS"/>
98+
<property name="option" value="EOL"/>
99+
</module>
100+
<module name="SeparatorWrap">
101+
<!-- ARRAY_DECLARATOR is EOL until https://github.com/google/styleguide/issues/259 -->
102+
<property name="id" value="SeparatorWrapArrayDeclarator"/>
103+
<property name="tokens" value="ARRAY_DECLARATOR"/>
104+
<property name="option" value="EOL"/>
105+
</module>
106+
<module name="SeparatorWrap">
107+
<property name="id" value="SeparatorWrapMethodRef"/>
108+
<property name="tokens" value="METHOD_REF"/>
109+
<property name="option" value="nl"/>
110+
</module>
111+
<module name="PackageName">
112+
<property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
113+
<message key="name.invalidPattern"
114+
value="Package name ''{0}'' must match pattern ''{1}''."/>
115+
</module>
116+
<module name="TypeName">
117+
<message key="name.invalidPattern"
118+
value="Type name ''{0}'' must match pattern ''{1}''."/>
119+
</module>
120+
<module name="MemberName">
121+
<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
122+
<message key="name.invalidPattern"
123+
value="Member name ''{0}'' must match pattern ''{1}''."/>
124+
</module>
125+
<module name="ParameterName">
126+
<property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
127+
<message key="name.invalidPattern"
128+
value="Parameter name ''{0}'' must match pattern ''{1}''."/>
129+
</module>
130+
<module name="CatchParameterName">
131+
<property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
132+
<message key="name.invalidPattern"
133+
value="Catch parameter name ''{0}'' must match pattern ''{1}''."/>
134+
</module>
135+
<module name="LocalVariableName">
136+
<property name="tokens" value="VARIABLE_DEF"/>
137+
<property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
138+
<message key="name.invalidPattern"
139+
value="Local variable name ''{0}'' must match pattern ''{1}''."/>
140+
</module>
141+
<module name="ClassTypeParameterName">
142+
<property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
143+
<message key="name.invalidPattern"
144+
value="Class type name ''{0}'' must match pattern ''{1}''."/>
145+
</module>
146+
<module name="MethodTypeParameterName">
147+
<property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
148+
<message key="name.invalidPattern"
149+
value="Method type name ''{0}'' must match pattern ''{1}''."/>
150+
</module>
151+
<module name="InterfaceTypeParameterName">
152+
<property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
153+
<message key="name.invalidPattern"
154+
value="Interface type name ''{0}'' must match pattern ''{1}''."/>
155+
</module>
156+
<module name="NoFinalizer"/>
157+
<module name="GenericWhitespace">
158+
<message key="ws.followed"
159+
value="GenericWhitespace ''{0}'' is followed by whitespace."/>
160+
<message key="ws.preceded"
161+
value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
162+
<message key="ws.illegalFollow"
163+
value="GenericWhitespace ''{0}'' should followed by whitespace."/>
164+
<message key="ws.notPreceded"
165+
value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
166+
</module>
167+
<module name="Indentation">
168+
<property name="basicOffset" value="4"/>
169+
<property name="braceAdjustment" value="0"/>
170+
<property name="caseIndent" value="4"/>
171+
<property name="throwsIndent" value="4"/>
172+
<property name="lineWrappingIndentation" value="8"/>
173+
<property name="arrayInitIndent" value="4"/>
174+
</module>
175+
<module name="AbbreviationAsWordInName">
176+
<property name="ignoreFinal" value="false"/>
177+
<property name="allowedAbbreviationLength" value="3"/>
178+
</module>
179+
<module name="OverloadMethodsDeclarationOrder"/>
180+
<module name="VariableDeclarationUsageDistance"/>
181+
<module name="CustomImportOrder">
182+
<property name="sortImportsInGroupAlphabetically" value="true"/>
183+
<property name="separateLineBetweenGroups" value="true"/>
184+
<property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
185+
</module>
186+
<module name="MethodParamPad"/>
187+
<module name="NoWhitespaceBefore">
188+
<property name="tokens" value="COMMA, SEMI, POST_INC, POST_DEC, DOT, ELLIPSIS, METHOD_REF"/>
189+
<property name="allowLineBreaks" value="true"/>
190+
</module>
191+
<module name="ParenPad"/>
192+
<module name="OperatorWrap">
193+
<property name="option" value="NL"/>
194+
<property name="tokens"
195+
value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR, METHOD_REF "/>
196+
</module>
197+
<module name="AnnotationLocation">
198+
<property name="id" value="AnnotationLocationMostCases"/>
199+
<property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF"/>
200+
</module>
201+
<module name="AnnotationLocation">
202+
<property name="id" value="AnnotationLocationVariables"/>
203+
<property name="tokens" value="VARIABLE_DEF"/>
204+
<property name="allowSamelineMultipleAnnotations" value="true"/>
205+
</module>
206+
<module name="NonEmptyAtclauseDescription"/>
207+
<module name="JavadocTagContinuationIndentation"/>
208+
<!--<module name="SummaryJavadoc">-->
209+
<!--<property name="forbiddenSummaryFragments"-->
210+
<!--value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>-->
211+
<!--</module>-->
212+
<module name="JavadocParagraph"/>
213+
<module name="AtclauseOrder">
214+
<property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
215+
<property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
216+
</module>
217+
<module name="JavadocMethod">
218+
<property name="scope" value="public"/>
219+
<property name="allowMissingParamTags" value="true"/>
220+
<property name="allowMissingThrowsTags" value="true"/>
221+
<property name="allowMissingReturnTag" value="true"/>
222+
<property name="allowMissingPropertyJavadoc" value="true"/>
223+
<property name="minLineCount" value="2"/>
224+
<property name="allowedAnnotations" value="Override, Test"/>
225+
<property name="allowThrowsTagsForSubclasses" value="true"/>
226+
</module>
227+
<module name="MethodName">
228+
<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
229+
<message key="name.invalidPattern"
230+
value="Method name ''{0}'' must match pattern ''{1}''."/>
231+
</module>
232+
<module name="SingleLineJavadoc">
233+
<property name="ignoreInlineTags" value="false"/>
234+
</module>
235+
<module name="EmptyCatchBlock">
236+
<property name="exceptionVariableName" value="expected"/>
237+
</module>
238+
<module name="CommentsIndentation"/>
239+
</module>
240+
</module>

‎core/src/main/java/org/seedstack/mongodb/internal/AsyncMongoDbManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ private MongoClientSettings buildMongoClientSettings(MongoDbConfig.ClientConfig
5353

5454
// Apply hosts
5555
List<String> hosts = clientConfig.getHosts();
56-
if (hosts != null && hosts.size() > 0) {
56+
if (hosts.size() > 0) {
5757
allSettings.cluster.get().hosts(buildServerAddresses(clientName, hosts));
5858
}
5959

‎morphia/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919

2020
<artifactId>mongodb-morphia</artifactId>
2121

22+
<properties>
23+
<compatibility.skip>true</compatibility.skip>
24+
</properties>
25+
2226
<dependencies>
2327
<dependency>
2428
<groupId>org.seedstack.addons.mongodb</groupId>

‎morphia/src/main/java/org/seedstack/mongodb/morphia/BaseMorphiaRepository.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import static com.google.common.base.Preconditions.checkArgument;
1111

12+
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
1213
import java.util.ArrayList;
1314
import java.util.List;
1415
import java.util.Optional;
@@ -53,6 +54,7 @@ public BaseMorphiaRepository(Class<A> aggregateRootClass, Class<ID> kClass) {
5354
}
5455

5556
@Inject
57+
@SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", justification = "Called by Guice")
5658
private void init(DatastoreFactory datastoreFactory,
5759
SpecificationTranslator<MorphiaTranslationContext, CriteriaContainer> specificationTranslator) {
5860
this.datastore = datastoreFactory.createDatastore(getAggregateRootClass());

0 commit comments

Comments
 (0)