Skip to content

Commit 84b26b1

Browse files
author
Cameron Mace
committed
several setup fixes and checkstyle supressions added
1 parent 3f1ce9a commit 84b26b1

38 files changed

Lines changed: 715 additions & 414 deletions

File tree

‎build.gradle‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,3 @@ subprojects {
7575
}
7676
}
7777

78-
task copyTestResources(type: Copy) {
79-
from "${projectDir}/src/test/resources"
80-
into "${buildDir}/classes/test"
81-
}
82-

‎config/checkstyle/checkstyle.xml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
<property name="message" value="Line has trailing spaces."/>
3434
</module>
3535

36-
37-
3836
<!--################################################-->
3937
<!--################ Non-AST checks ################-->
4038
<!--################################################-->
@@ -45,6 +43,11 @@
4543
<!--################ NAMING CHECKS ##################################-->
4644
<!--#################################################################-->
4745

46+
<module name="SuppressionFilter">
47+
<property name="file" value="config/checkstyle/suppressions.xml"/>
48+
<property name="optional" value="false"/>
49+
</module>
50+
4851
<!-- allow the dev to switch the checker OFF in a single file or a method -->
4952
<!-- <module name="SuppressionCommentFilter"/> -->
5053

‎config/checkstyle/suppressions.xml‎

Lines changed: 109 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,111 @@
1-
<!-- <?xml version="1.0"?>
1+
<?xml version="1.0"?>
22
<!DOCTYPE suppressions PUBLIC
3-
"-//Puppy Crawl//DTD Suppressions 1.1//EN"
4-
"http://checkstyle.sourceforge.net/dtds/suppressions_1_1.dtd">
3+
"-//Puppy Crawl//DTD Suppressions 1.1//EN"
4+
"http://checkstyle.sourceforge.net/dtds/suppressions_1_1.dtd">
5+
6+
57
<suppressions>
6-
<suppress checks="WriteTag" files="generated"/>
7-
</suppressions> -->
8+
<suppress
9+
checks="JavadocStyleCheck"
10+
files="AbstractComplexityCheck.java"
11+
lines="82,108-122"/>
12+
13+
14+
<!--<suppressions>-->
15+
<!--<suppress checks="WriteTag" files="generated"/>-->
16+
<!--</suppressions> -->
17+
18+
19+
<suppress checks="JavadocStyleCheck" files="*Test.java"/>
20+
<suppress checks="MagicNumber" files="*Test.java"/>
21+
22+
</suppressions>
23+
24+
25+
<!---->
26+
27+
<!--<suppressions>-->
28+
<!--<suppress checks="FileLength"-->
29+
<!--files="TokenTypes.java|IndentationCheckTest.java"-->
30+
<!--lines="1"/>-->
31+
32+
33+
<!--&lt;!&ndash; 'Abstract' pattern is used to show it is checking for abstract class name &ndash;&gt;-->
34+
<!--<suppress checks="AbstractClassNameCheck"-->
35+
<!--files="AbstractClassNameCheck.java"/>-->
36+
<!--&lt;!&ndash; test should be named as their main class &ndash;&gt;-->
37+
<!--<suppress checks="AbstractClassNameCheck"-->
38+
<!--files="AbstractCheckTest.java|AbstractClassNameCheckTest.java|AbstractTypeAwareCheckTest.java|AbstractJavadocCheckTest.java|AbstractViolationReporterTest.java|AbstractFileSetCheckTest.java|AbstractLoaderTest.java|AbstractNodeTest.java"/>-->
39+
40+
<!--&lt;!&ndash; Tone down the checking for test code &ndash;&gt;-->
41+
<!--<suppress checks="CyclomaticComplexity" files="[\\/]XdocsPagesTest\.java"/>-->
42+
<!--<suppress checks="NPathComplexity" files="[\\/]XdocsPagesTest\.java"/>-->
43+
<!--<suppress checks="IllegalCatch" files="[\\/]internal[\\/]\w+Util\.java"/>-->
44+
<!--<suppress checks="EmptyBlock" files=".*[\\/]src[\\/]test[\\/]"/>-->
45+
<!--<suppress checks="ImportControl" files=".*[\\/]src[\\/](test|it)[\\/]"/>-->
46+
<!--<suppress checks="Javadoc" files=".*[\\/]src[\\/](test|it)[\\/]"/>-->
47+
<!--<suppress checks="MagicNumber" files=".*[\\/]src[\\/](test|it)[\\/]"/>-->
48+
<!--<suppress checks="AvoidStaticImport" files=".*[\\/]src[\\/](test|it)[\\/]"/>-->
49+
<!--<suppress checks="ClassDataAbstractionCoupling" files="[\\/]IndentationCheckTest.java$|[\\/]SuppressWithNearbyCommentFilterTest.java$|[\\/]SuppressionCommentFilterTest.java|[\\/]DetailASTTest.java$"/>-->
50+
<!--<suppress checks="EqualsAvoidNull" files="[\\/]Int.*FilterTest.java$"/>-->
51+
<!--<suppress checks="VisibilityModifier" files="[\\/]BaseCheckTestSupport.java$|[\\/]AbstractModuleTestSupport.java$"/>-->
52+
<!--<suppress checks="WriteTag" files=".*[\\/]src[\\/](test|it)[\\/]"/>-->
53+
<!--<suppress checks="MethodCount" files=".*[\\/]src[\\/](test|it)[\\/]"/>-->
54+
55+
<!--&lt;!&ndash;The Check generates too many violations, fixing them will make code unmanageable.&ndash;&gt;-->
56+
<!--<suppress checks="MagicNumber" files="(ParseTreeTablePresentation|MainFrame)\.java"/>-->
57+
58+
<!--&lt;!&ndash; Methods that build fake AST are very long&ndash;&gt;-->
59+
<!--<suppress checks="MethodLength" files="src[\\/]test[\\/]java[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]grammars[\\/]comments[\\/]CommentsTest\.java"/>-->
60+
<!--<suppress checks="ExecutableStatementCount" files="src[\\/]test[\\/]java[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]grammars[\\/]comments[\\/]CommentsTest\.java"/>-->
61+
<!--<suppress checks="JavaNCSS" files="src[\\/]test[\\/]java[\\/]com[\\/]puppycrawl[\\/]tools[\\/]checkstyle[\\/]grammars[\\/]comments[\\/]CommentsTest\.java"/>-->
62+
<!--<suppress checks="MethodLength" files=".*GeneratedJavaTokenTypesTest\.java"/>-->
63+
<!--<suppress checks="ExecutableStatementCount" files=".*GeneratedJavaTokenTypesTest\.java"/>-->
64+
<!--<suppress checks="JavaNCSS" files=".*GeneratedJavaTokenTypesTest\.java"/>-->
65+
<!--<suppress checks="ExecutableStatementCount" files=".*IllegalInstantiationCheckTest\.java"/>-->
66+
<!--<suppress checks="ExecutableStatementCount" files=".*Main\.java"/>-->
67+
68+
<!--&lt;!&ndash; till https://github.com/checkstyle/checkstyle/issues/4983 &ndash;&gt;-->
69+
<!--<suppress checks="MissingDeprecated" files=".*JavadocTokenTypes\.java"/>-->
70+
71+
<!--&lt;!&ndash; Till https://github.com/checkstyle/checkstyle/issues/1854 &ndash;&gt;-->
72+
<!--<suppress checks="TrailingComment" files="(InnerAssignmentCheck\.java|OperatorWrapCheck\.java|XMLLoggerTest\.java|AbbreviationAsWordInNameCheckTest\.java)"/>-->
73+
74+
<!--&lt;!&ndash; Fixing these cases will decrease code readability &ndash;&gt;-->
75+
<!--<suppress checks="MultipleStringLiterals" files="JavadocStyleCheck\.java|AbstractTypeAwareCheck\.java|XMLLogger\.java"/>-->
76+
<!--<suppress checks="MultipleStringLiterals" files=".*[\\/]src[\\/](test|it)[\\/]"/>-->
77+
78+
<!--&lt;!&ndash; There are a lot of setters/getters in the Check. A small number of methods is left for Check's logic &ndash;&gt;-->
79+
<!--<suppress checks="MethodCount" files="[\\/]JavadocMethodCheck.java$"/>-->
80+
<!--&lt;!&ndash; Apart from a complex logic there is a lot of small methods for a better readability. &ndash;&gt;-->
81+
<!--<suppress checks="MethodCount" files="[\\/]CommentsIndentationCheck.java$"/>-->
82+
<!--&lt;!&ndash;VisibilityModifierCheck has 7 options which require 7 additional methods (setters)&ndash;&gt;-->
83+
<!--<suppress checks="MethodCount" files="[\\/]VisibilityModifierCheck.java$"/>-->
84+
<!--&lt;!&ndash;RequireThisCheck has a hierarchy of nested classes which contains a lot of methods. &ndash;&gt;-->
85+
<!--<suppress checks="MethodCount" files="[\\/]RequireThisCheck.java$"/>-->
86+
87+
<!--&lt;!&ndash; we need that set of converters &ndash;&gt;-->
88+
<!--<suppress checks="ClassDataAbstractionCoupling" files="AutomaticBean\.java"/>-->
89+
<!--&lt;!&ndash; they are aggregators of logic, usage a several of classes are ok &ndash;&gt;-->
90+
<!--<suppress checks="ClassDataAbstractionCoupling" files="(Checker|TreeWalker|Main|CheckstyleAntTask|JavadocDetailNodeParser)\.java"/>-->
91+
<!--<suppress checks="ClassDataAbstractionCoupling" files="(CheckerTest|TreeWalkerTest|BaseCheckTestSupport|AbstractModuleTestSupport|XdocsPagesTest|CheckstyleAntTaskTest)\.java"/>-->
92+
<!--<suppress checks="ClassDataAbstractionCoupling" files="PropertyCacheFile\.java"/>-->
93+
<!--<suppress checks="ClassDataAbstractionCoupling" files="PropertyCacheFileTest\.java"/>-->
94+
<!--<suppress checks="ClassFanOutComplexity" files="[\\/]Main\.java"/>-->
95+
<!--<suppress checks="ClassFanOutComplexity" files="CheckstyleAntTask\.java"/>-->
96+
<!--<suppress checks="ClassFanOutComplexity" files="CheckerTest\.java"/>-->
97+
<!--&lt;!&ndash; a lot of GUI elements is OK &ndash;&gt;-->
98+
<!--<suppress checks="ClassDataAbstractionCoupling" files="(TreeTable|MainFrame)\.java"/>-->
99+
100+
<!--&lt;!&ndash; Should be fixed after moving https://github.com/sevntu-checkstyle/sevntu.checkstyle/blob/master/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/coding/ReturnCountExtendedCheck.java into the main repo, to allow skip guard sentences(or by topLinesToIgnoreCount) &ndash;&gt;-->
101+
<!--<suppress checks="ReturnCount" files="(ConfigurationLoader|LambdaHandler)\.java"/>-->
102+
103+
<!--&lt;!&ndash; Suppressions from PMD configuration&ndash;&gt;-->
104+
<!--&lt;!&ndash; JavadocMethodCheck, JavadocStyleCheck, JavadocUtils.getJavadocTags() - deprecated &ndash;&gt;-->
105+
<!--<suppress checks="CyclomaticComplexity" files="JavadocMethodCheck\.java"/>-->
106+
<!--<suppress checks="CyclomaticComplexity" files="JavadocStyleCheck\.java"/>-->
107+
<!--<suppress checks="CyclomaticComplexity" files="CustomImportOrderCheck\.java"/>-->
108+
109+
<!--&lt;!&ndash; HandlerFactory crosses allowed limit for executable statements &ndash;&gt;-->
110+
<!--<suppress checks="ExecutableStatementCount" files="HandlerFactory\.java"/>-->
111+
</suppressions>

‎gradle/code-quality.gradle‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ pmd {
3333
}
3434

3535

36+
jacoco {
37+
toolVersion = pluginVersion.jacoco
38+
}
3639

3740
jacocoTestReport {
3841
group = 'Coverage reports'
@@ -59,10 +62,6 @@ pmd {
5962
]
6063
}
6164

62-
jacoco {
63-
toolVersion = pluginVersion.jacoco
64-
}
65-
6665

6766

6867

‎samples/build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ apply plugin: 'java'
55
sourceCompatibility = 1.8
66

77
repositories {
8-
mavenCentral()
8+
mavenCentral()
99
}
1010

1111
dependencies {
12-
compile project(":services")
13-
compile project(":services-directions")
14-
15-
compile project(":services-geocoding")
16-
compile project(":services-optimization")
12+
compile project(":services")
13+
compile project(":services-directions")
14+
compile project(":services-geocoding")
15+
compile project(":services-optimization")
16+
compile project(":services-staticmap")
1717
}

‎samples/src/main/java/com/mapbox/samples/BasicStaticMap.java‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package com.mapbox.samples;
2+
3+
import com.mapbox.staticmap.v1.MapboxStaticMap;
4+
import com.mapbox.staticmap.v1.models.StaticMarkerAnnotation;
5+
6+
public class BasicStaticMap {
7+
public static void main(String[] args) {
8+
MapboxStaticMap mapboxStaticMap = MapboxStaticMap.builder()
9+
.accessToken("pk.eyJ1IjoiY2FtbWFjZSIsImEiOiI5OGQxZjRmZGQ2YjU3Mzk1YjJmZTQ5ZDY2MTg1NDJiOCJ9.hIFoCKGAGOwQkKyVPvrxvQ")
10+
.width(300)
11+
.height(300)
12+
.build();
13+
14+
StaticMarkerAnnotation.builder().name().label("vdjsinv").build();
15+
16+
17+
System.out.println(mapboxStaticMap.url());
18+
}
19+
}

services-directions/src/main/java/com/mapbox/directions/v5/models/DirectionsAdapterFactory.java renamed to services-directions/src/main/java/com/mapbox/directions/v5/DirectionsAdapterFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.mapbox.directions.v5.models;
1+
package com.mapbox.directions.v5;
22

33

44
import com.google.gson.TypeAdapterFactory;

‎services-directions/src/main/java/com/mapbox/directions/v5/MapboxDirections.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import com.mapbox.directions.v5.DirectionsCriteria.GeometriesCriteria;
1414
import com.mapbox.directions.v5.DirectionsCriteria.OverviewCriteria;
1515
import com.mapbox.directions.v5.DirectionsCriteria.ProfileCriteria;
16-
import com.mapbox.directions.v5.models.DirectionsAdapterFactory;
1716
import com.mapbox.directions.v5.models.DirectionsResponse;
1817
import com.mapbox.geojson.Point;
1918
import com.mapbox.services.constants.Constants;
@@ -582,7 +581,8 @@ public Builder radiuses(@FloatRange(from = 0) double... radiuses) {
582581
return this;
583582
}
584583

585-
abstract Builder radiuses(@Nullable String radiuses);
584+
@SuppressWarnings("WeakerAccess")
585+
protected abstract Builder radiuses(@Nullable String radiuses);
586586

587587
/**
588588
* Base package name or other simple string identifier. Used inside the calls user agent header.

‎services-directions/src/main/java/com/mapbox/directions/v5/models/StepIntersection.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ public Point location() {
4848
*/
4949
@Nullable
5050
@SerializedName("location")
51-
@SuppressWarnings("mutable")
52-
abstract double[] rawLocation();
51+
@SuppressWarnings( {"mutable", "WeakerAccess"})
52+
protected abstract double[] rawLocation();
5353

5454
/**
5555
* An integer list of bearing values available at the step intersection.

‎services-directions/src/main/java/com/mapbox/directions/v5/models/StepManeuver.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public Point location() {
4848
* @since 3.0.0
4949
*/
5050
@SerializedName("location")
51+
@SuppressWarnings("mutable")
5152
abstract double[] rawLocation();
5253

5354
/**

0 commit comments

Comments
 (0)