OSDN > ソフトウェアを探す > フォーマットとプロトコル > データフォーマット > JSON > Jovsonz > SCM > git > Jovsonz > コミット

Jovsonz
Fork

R/O
HTTP
SSH
HTTPS

Jovsonz: コミット

Jovsonz is a JSON library for Java

コミットメタ情報

リビジョン	db9b3d569b709d9c581241b11c6e6b0db6a0aac3 (tree)
日時	2016-07-16 22:09:06
作者	olyutorskii <olyutorskii@user...>
コミッター	olyutorskii

ログメッセージ

Maven plugin 更新

変更サマリ

modified: pom.xml (diff)
modified: src/main/assembly/descriptor.xml (diff)
modified: src/main/config/checks.xml (diff)
modified: src/main/config/pmdrules.xml (diff)
modified: src/main/config/suppressions.xml (diff)
modified: src/main/java/jp/sourceforge/jovsonz/JsNumber.java (diff)
modified: src/main/java/jp/sourceforge/jovsonz/JsPair.java (diff)
modified: src/main/java/jp/sourceforge/jovsonz/UnmodIterator.java (diff)

差分

--- a/pom.xml

+++ b/pom.xml

		@@ -1,7 +1,7 @@
1	1	<?xml version="1.0" encoding="UTF-8" ?>
2	2
3	3	<!--
4		- Maven2(or3) POM definition file
	4	+ Maven3 POM definition file
5	5	-->
6	6
7	7	<project

		@@ -36,7 +36,7 @@
36	36	<licenses>
37	37	<license>
38	38	<name>The MIT License</name>
39		- <url>http://www.opensource.org/licenses/mit-license.php</url>
	39	+ <url>https://opensource.org/licenses/mit-license.php</url>
40	40	<distribution>manual</distribution>
41	41	</license>
42	42	</licenses>

		@@ -44,7 +44,7 @@
44	44	<developers>
45	45	<developer>
46	46	<id>olyutorskii</id>
47		- <url>http://sites.google.com/site/olyutorskiipit/</url>
	47	+ <url>https://sites.google.com/site/olyutorskiipit/</url>
48	48	<organization>Jovsonz Partners</organization>
49	49	<organizationUrl>http://sourceforge.jp/projects/jovsonz/</organizationUrl>
50	50	<roles>

		@@ -58,7 +58,7 @@
58	58	<mailingLists/>
59	59
60	60	<prerequisites>
61		- <maven>2.2</maven>
	61	+ <maven>3.0.1</maven>
62	62	</prerequisites>
63	63
64	64	<modules/>

		@@ -120,11 +120,11 @@
120	120	<plugin>
121	121	<groupId>org.apache.maven.plugins</groupId>
122	122	<artifactId>maven-enforcer-plugin</artifactId>
123		- <version>1.1.1</version>
	123	+ <version>1.4.1</version>
124	124	<configuration>
125	125	<rules>
126	126	<requireMavenVersion>
127		- <version>[2.2,)</version>
	127	+ <version>[3.0.1,)</version>
128	128	</requireMavenVersion>
129	129	<requireJavaVersion>
130	130	<version>[1.7,)</version>

		@@ -136,13 +136,13 @@
136	136	<plugin>
137	137	<groupId>org.apache.maven.plugins</groupId>
138	138	<artifactId>maven-install-plugin</artifactId>
139		- <version>2.4</version>
	139	+ <version>2.5.2</version>
140	140	</plugin>
141	141
142	142	<plugin>
143	143	<groupId>org.apache.maven.plugins</groupId>
144	144	<artifactId>maven-clean-plugin</artifactId>
145		- <version>2.5</version>
	145	+ <version>3.0.0</version>
146	146	<configuration>
147	147	<filesets>
148	148	<fileset>

		@@ -164,7 +164,7 @@
164	164	<plugin>
165	165	<groupId>org.apache.maven.plugins</groupId>
166	166	<artifactId>maven-compiler-plugin</artifactId>
167		- <version>3.0</version>
	167	+ <version>3.5.1</version>
168	168	<configuration>
169	169	<source>1.7</source> <!-- for NetBeans IDE -->
170	170	<target>1.7</target>

		@@ -179,7 +179,7 @@
179	179	<plugin>
180	180	<groupId>org.apache.maven.plugins</groupId>
181	181	<artifactId>maven-jar-plugin</artifactId>
182		- <version>2.4</version>
	182	+ <version>3.0.0</version>
183	183	<configuration>
184	184	<archive>
185	185	<manifestEntries>

		@@ -192,8 +192,9 @@
192	192	<plugin>
193	193	<groupId>org.apache.maven.plugins</groupId>
194	194	<artifactId>maven-assembly-plugin</artifactId>
195		- <version>2.4</version>
	195	+ <version>2.6</version>
196	196	<configuration>
	197	+ <archiveBaseDirectory>.</archiveBaseDirectory>
197	198	<descriptors>
198	199	<descriptor>src/main/assembly/descriptor.xml</descriptor>
199	200	</descriptors>

		@@ -203,7 +204,7 @@
203	204	<plugin>
204	205	<groupId>org.apache.maven.plugins</groupId>
205	206	<artifactId>maven-source-plugin</artifactId>
206		- <version>2.2.1</version>
	207	+ <version>3.0.0</version>
207	208	<configuration>
208	209	<includePom>true</includePom>
209	210	<archive>

		@@ -226,13 +227,13 @@
226	227	<plugin>
227	228	<groupId>org.apache.maven.plugins</groupId>
228	229	<artifactId>maven-resources-plugin</artifactId>
229		- <version>2.6</version>
	230	+ <version>3.0.0</version>
230	231	</plugin>
231	232
232	233	<plugin>
233	234	<groupId>org.apache.maven.plugins</groupId>
234	235	<artifactId>maven-surefire-plugin</artifactId>
235		- <version>2.12.4</version>
	236	+ <version>2.19.1</version>
236	237	<configuration>
237	238	<skipTests>false</skipTests>
238	239	<enableAssertions>true</enableAssertions>

		@@ -242,7 +243,7 @@
242	243	<plugin>
243	244	<groupId>org.apache.maven.plugins</groupId>
244	245	<artifactId>maven-site-plugin</artifactId>
245		- <version>3.2</version>
	246	+ <version>3.5.1</version>
246	247	<configuration>
247	248	<generateReports>true</generateReports>
248	249	<locales>ja</locales>

		@@ -254,14 +255,14 @@
254	255	<plugin>
255	256	<groupId>org.apache.maven.plugins</groupId>
256	257	<artifactId>maven-checkstyle-plugin</artifactId>
257		- <version>2.9.1</version>
	258	+ <version>2.15</version>
258	259	<!-- config from property value -->
259	260	</plugin>
260	261
261	262	<plugin>
262	263	<groupId>org.apache.maven.plugins</groupId>
263	264	<artifactId>maven-pmd-plugin</artifactId>
264		- <version>2.7.1</version>
	265	+ <version>3.6</version>
265	266	<configuration>
266	267	<targetJdk>${maven.compiler.target}</targetJdk>
267	268	<rulesets>

		@@ -273,7 +274,7 @@
273	274	<plugin>
274	275	<groupId>org.codehaus.mojo</groupId>
275	276	<artifactId>findbugs-maven-plugin</artifactId>
276		- <version>2.5.2</version>
	277	+ <version>3.0.3</version>
277	278	<configuration>
278	279	<effort>Max</effort>
279	280	<threshold>Low</threshold>

		@@ -287,7 +288,7 @@
287	288	<plugin>
288	289	<groupId>org.codehaus.mojo</groupId>
289	290	<artifactId>cobertura-maven-plugin</artifactId>
290		- <version>2.5.2</version>
	291	+ <version>2.7</version>
291	292	<configuration>
292	293	<encoding>${project.build.sourceEncoding}</encoding>
293	294	<formats>

		@@ -353,7 +354,7 @@
353	354	<plugin>
354	355	<groupId>org.apache.maven.plugins</groupId>
355	356	<artifactId>maven-project-info-reports-plugin</artifactId>
356		- <version>2.6</version>
	357	+ <version>2.9</version>
357	358	<configuration>
358	359	<linkOnly>true</linkOnly>
359	360	<offline>true</offline>

		@@ -386,13 +387,12 @@
386	387	<plugin>
387	388	<groupId>org.apache.maven.plugins</groupId>
388	389	<artifactId>maven-javadoc-plugin</artifactId>
389		- <version>2.9</version>
	390	+ <version>2.10.3</version>
390	391	<configuration>
391	392	<skip>false</skip>
392	393	<notimestamp>true</notimestamp>
393	394	<quiet>true</quiet>
394	395	<show>protected</show>
395		- <stylesheet>maven</stylesheet>
396	396	</configuration>
397	397	<reportSets>
398	398	<reportSet>

		@@ -406,7 +406,7 @@
406	406	<plugin>
407	407	<groupId>org.apache.maven.plugins</groupId>
408	408	<artifactId>maven-jxr-plugin</artifactId>
409		- <version>2.3</version>
	409	+ <version>2.5</version>
410	410	<configuration>
411	411	<skip>false</skip>
412	412	</configuration>

		@@ -415,7 +415,7 @@
415	415	<plugin>
416	416	<groupId>org.apache.maven.plugins</groupId>
417	417	<artifactId>maven-surefire-report-plugin</artifactId>
418		- <version>2.12.4</version>
	418	+ <version>2.19.1</version>
419	419	<configuration>
420	420	<showSuccess>false</showSuccess>
421	421	</configuration>

		@@ -431,7 +431,7 @@
431	431	<plugin>
432	432	<groupId>org.codehaus.mojo</groupId>
433	433	<artifactId>cobertura-maven-plugin</artifactId>
434		- <version>2.5.2</version>
	434	+ <version>2.7</version>
435	435	<configuration>
436	436	<encoding>${project.build.sourceEncoding}</encoding>
437	437	<formats>

		@@ -444,7 +444,7 @@
444	444	<plugin>
445	445	<groupId>org.apache.maven.plugins</groupId>
446	446	<artifactId>maven-checkstyle-plugin</artifactId>
447		- <version>2.9.1</version>
	447	+ <version>2.15</version>
448	448	<configuration>
449	449	<skip>false</skip>
450	450	<!-- config from property value -->

		@@ -461,7 +461,7 @@
461	461	<plugin>
462	462	<groupId>org.apache.maven.plugins</groupId>
463	463	<artifactId>maven-pmd-plugin</artifactId>
464		- <version>2.7.1</version>
	464	+ <version>3.6</version>
465	465	<configuration>
466	466	<skip>false</skip>
467	467	<targetJdk>${maven.compiler.target}</targetJdk>

		@@ -482,7 +482,7 @@
482	482	<plugin>
483	483	<groupId>org.codehaus.mojo</groupId>
484	484	<artifactId>findbugs-maven-plugin</artifactId>
485		- <version>2.5.2</version>
	485	+ <version>3.0.3</version>
486	486	<configuration>
487	487	<skip>false</skip>
488	488	<effort>Max</effort>

		@@ -498,13 +498,13 @@
498	498	<plugin>
499	499	<groupId>org.codehaus.mojo</groupId>
500	500	<artifactId>javancss-maven-plugin</artifactId>
501		- <version>2.0</version>
	501	+ <version>2.1</version>
502	502	</plugin>
503	503
504	504	<plugin>
505	505	<groupId>org.codehaus.mojo</groupId>
506	506	<artifactId>jdepend-maven-plugin</artifactId>
507		- <version>2.0-beta-2</version>
	507	+ <version>2.0</version>
508	508	</plugin>
509	509
510	510	</plugins>

--- a/src/main/assembly/descriptor.xml

+++ b/src/main/assembly/descriptor.xml

		@@ -1,14 +1,14 @@
1	1	<?xml version="1.0" encoding="UTF-8" ?>
2	2
3	3	<assembly
4		- xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
	4	+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
5	5	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
6		- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
7		- http://maven.apache.org/xsd/assembly-1.1.2.xsd"
	6	+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3
	7	+ http://maven.apache.org/xsd/assembly-1.1.3.xsd"
8	8	>
9	9
10	10	<!--
11		- SourceForge.JP用リリースファイル構成定義ファイル
	11	+ OSDN.JP用リリースファイル構成定義ファイル
12	12	Maven2(or3) assembly用
13	13	-->
14	14

		@@ -20,6 +20,7 @@
20	20
21	21	<fileSets>
22	22	<fileSet>
	23	+ <directory>.</directory>
23	24	<includes>
24	25	<include>pom.xml</include>
25	26	<include>fixcrlf.xml</include>

--- a/src/main/config/checks.xml

+++ b/src/main/config/checks.xml

		@@ -7,7 +7,7 @@
7	7	<!--
8	8	Checkstyle用チェック項目定義。
9	9
10		- Checkstyle 5.3 以降向けに記述。
	10	+ Checkstyle 6.1 以降向けに記述。
11	11
12	12	[ http://checkstyle.sourceforge.net/ ]
13	13

		@@ -25,23 +25,19 @@
25	25
26	26	<!-- Filters -->
27	27	<module name="SeverityMatchFilter" />
	28	+ <module name="SuppressionCommentFilter" />
28	29	<module name="SuppressionFilter">
29	30	<property name="file" value="src/main/config/suppressions.xml" />
30	31	</module>
31		- <module name="SuppressionCommentFilter" />
	32	+ <module name="SuppressWarningsFilter" />
32	33	<module name="SuppressWithNearbyCommentFilter" />
33	34
34	35
35		- <!-- Duplicate Code -->
36		- <module name="StrictDuplicateCode">
37		- <property name="min" value="20" />
38		- </module>
39		-
40		-
41	36	<!-- Headers -->
42	37	<module name="RegexpHeader">
43	38	<property name="header" value="^/\$\n^ \( .)?$\n^ \/$\n" />
44	39	<property name="multiLines" value="2" />
	40	+ <property name="fileExtensions" value="java" />
45	41	</module>
46	42
47	43

		@@ -50,20 +46,31 @@
50	46
51	47
52	48	<!-- Miscellaneous -->
53		- <module name="NewlineAtEndOfFile" />
	49	+ <module name="NewlineAtEndOfFile">
	50	+ <property name="fileExtensions" value="java" />
	51	+ </module>
54	52	<module name="Translation" />
	53	+ <module name="UniqueProperties" />
55	54
56	55
57	56	<!-- Regexp -->
	57	+ <module name="RegexpMultiline">
	58	+ <property name="format" value="[\u000b\f\u001a]" />
	59	+ </module>
	60	+<!--<module name="RegexpOnFilename" /> 6.15 or later -->
58	61	<module name="RegexpSingleline">
59	62	<property name="format" value="\s+$" />
60		- <property name="minimum" value="0" />
61		- <property name="maximum" value="0" />
	63	+ </module>
	64	+ <module name="RegexpSingleline">
	65	+ <!-- scm conflict -->
	66	+ <property name="format" value="<<<<<" />
62	67	</module>
63	68
64	69
65	70	<!-- Size Violations -->
66		- <module name="FileLength" />
	71	+ <module name="FileLength">
	72	+ <property name="max" value="2000"/>
	73	+ </module>
67	74
68	75
69	76	<!-- Whitespace -->

		@@ -72,41 +79,44 @@
72	79
73	80	<module name="TreeWalker">
74	81
75		- <module name="FileContentsHolder" />
	82	+ <property name="tabWidth" value="8"/>
76	83
77	84
78	85	<!-- Annotations -->
79	86
	87	+ <module name="AnnotationLocation" />
80	88	<module name="AnnotationUseStyle" />
81	89	<module name="MissingDeprecated" />
82	90	<module name="MissingOverride" />
83	91	<module name="PackageAnnotation" />
84	92	<module name="SuppressWarnings" />
	93	+ <module name="SuppressWarningsHolder" />
85	94
86	95
87	96	<!-- Block Checks -->
88		-
	97	+ <module name="AvoidNestedBlocks" />
89	98	<module name="EmptyBlock" />
	99	+<!-- <module name="EmptyCatchBlock" /> 6.4 or later -->
90	100	<module name="LeftCurly" />
91	101	<module name="NeedBraces">
92	102	<property name="tokens" value="LITERAL_DO" />
93	103	</module>
94	104	<module name="RightCurly" />
95		- <module name="AvoidNestedBlocks" />
96	105
97	106
98	107	<!-- Class Design -->
99	108
100		- <module name="VisibilityModifier" />
	109	+ <module name="DesignForExtension" />
101	110	<module name="FinalClass" />
102		- <module name="InterfaceIsType" />
103	111	<module name="HideUtilityClassConstructor" />
104		-<!-- <module name="DesignForExtension" /> -->
	112	+ <module name="InnerTypeLast" />
	113	+ <module name="InterfaceIsType" />
105	114	<module name="MutableException" />
	115	+ <module name="OneTopLevelClass" />
106	116	<module name="ThrowsCount">
107		- <property name="max" value="3" />
	117	+ <property name="max" value="4" />
108	118	</module>
109		- <module name="InnerTypeLast" />
	119	+ <module name="VisibilityModifier" />
110	120
111	121
112	122	<!-- Coding -->

		@@ -114,33 +124,38 @@
114	124	<module name="ArrayTrailingComma" />
115	125	<module name="AvoidInlineConditionals" />
116	126	<module name="CovariantEquals" />
117		- <module name="DoubleCheckedLocking" />
	127	+ <module name="DeclarationOrder" />
	128	+ <module name="DefaultComesLast" />
118	129	<module name="EmptyStatement" />
119	130	<module name="EqualsAvoidNull" />
120	131	<module name="EqualsHashCode" />
121		-<!-- <module name="FinalLocalVariable" /> -->
	132	+ <module name="ExplicitInitialization" />
	133	+ <module name="FallThrough" />
	134	+ <module name="FinalLocalVariable" />
122	135	<module name="HiddenField">
123	136	<property name="ignoreConstructorParameter" value="true" />
124	137	<property name="ignoreSetter" value="true" />
125	138	<property name="ignoreAbstractMethods" value="true" />
126	139	</module>
	140	+ <module name="IllegalCatch" />
127	141	<module name="IllegalInstantiation" />
	142	+ <module name="IllegalThrows" />
128	143	<module name="IllegalToken">
129		- <property name="tokens" value="LITERAL_NATIVE, STATIC_IMPORT" />
	144	+ <property name="tokens" value="LITERAL_NATIVE" />
130	145	</module>
131	146	<module name="IllegalTokenText">
132	147	<property name="tokens" value="NUM_INT, NUM_LONG" />
133		- <property name="format" value="^0[^lx]" />
134		- <property name="ignoreCase" value="true" />
	148	+ <property name="format" value="^0_*[0-7]" />
	149	+ <property name="message" value="inhibit octal number" />
135	150	</module>
	151	+ <module name="IllegalType" />
136	152	<module name="InnerAssignment" />
137	153	<module name="MagicNumber" />
	154	+ <module name="MissingCtor" />
138	155	<module name="MissingSwitchDefault" />
139	156	<module name="ModifiedControlVariable" />
140		- <module name="RedundantThrows">
141		- <property name="allowUnchecked" value="true" />
142		- <property name="allowSubclasses" value="true" />
143		- </module>
	157	+ <module name="MultipleStringLiterals" />
	158	+ <module name="MultipleVariableDeclarations" />
144	159	<module name="SimplifyBooleanExpression" />
145	160	<module name="SimplifyBooleanReturn" />
146	161	<module name="StringLiteralEquality" />

		@@ -149,51 +164,44 @@
149	164	<module name="NestedTryDepth" />
150	165	<module name="NoClone" />
151	166	<module name="NoFinalizer" />
152		- <module name="SuperClone" />
153		- <module name="SuperFinalize" />
154		- <module name="IllegalCatch" />
155		- <module name="IllegalThrows" />
	167	+ <module name="OneStatementPerLine" />
	168	+ <module name="OverloadMethodsDeclarationOrder" />
156	169	<module name="PackageDeclaration" />
157		- <module name="JUnitTestCase" />
	170	+ <module name="ParameterAssignment" />
	171	+ <module name="RequireThis">
	172	+ <property name="checkMethods" value="false" />
	173	+ </module>
158	174	<module name="ReturnCount">
159	175	<property name="max" value="5" />
160	176	</module>
161		- <module name="IllegalType" />
162		- <module name="DeclarationOrder" />
163		- <module name="ParameterAssignment" />
164		-<!-- <module name="ExplicitInitialization" /> -->
165		- <module name="DefaultComesLast" />
166		- <module name="MissingCtor" />
167		- <module name="FallThrough" />
168		- <module name="MultipleStringLiterals">
169		- <property
170		- name="ignoreStringsRegexp"
171		- value="^""$\|^"."$"
172		- />
173		- </module>
174		- <module name="MultipleVariableDeclarations" />
	177	+ <module name="SimplifyBooleanExpression" />
	178	+ <module name="SimplifyBooleanReturn" />
	179	+ <module name="StringLiteralEquality" />
	180	+ <module name="SuperClone" />
	181	+ <module name="SuperFinalize" />
175	182	<module name="UnnecessaryParentheses" />
176		- <module name="OneStatementPerLine" />
	183	+ <module name="VariableDeclarationUsageDistance">
	184	+ <property name="allowedDistance" value="5" />
	185	+ </module>
177	186
178	187
179	188	<!-- Imports -->
180	189
181	190	<module name="AvoidStarImport" />
182	191	<module name="AvoidStaticImport" />
	192	+ <module name="CustomImportOrder" />
183	193	<module name="IllegalImport" />
	194	+ <module name="ImportControl" />
	195	+ <module name="ImportOrder" />
184	196	<module name="RedundantImport" />
185	197	<module name="UnusedImports" />
186		- <module name="ImportOrder" />
187		-<!-- <module name="ImportControl" /> -->
188	198
189	199
190	200	<!-- Javadoc Comments -->
191	201
192		- <module name="JavadocType" />
	202	+ <module name="AtclauseOrder" />
193	203	<module name="JavadocMethod" />
194		- <module name="JavadocVariable">
195		- <property name="scope" value="protected" />
196		- </module>
	204	+ <module name="JavadocParagraph" />
197	205	<module name="JavadocStyle">
198	206	<property
199	207	name="endOfSentenceFormat"

		@@ -201,7 +209,15 @@
201	209	<property name="checkEmptyJavadoc" value="true" />
202	210	<property name="checkHtml" value="true" />
203	211	</module>
204		-<!-- <module name="WriteTag" /> -->
	212	+ <module name="JavadocTagContinuationIndentation" />
	213	+ <module name="JavadocType" />
	214	+ <module name="JavadocVariable">
	215	+ <property name="scope" value="protected" />
	216	+ </module>
	217	+ <module name="NonEmptyAtclauseDescription" />
	218	+ <module name="SingleLineJavadoc" />
	219	+ <module name="SummaryJavadocCheck" />
	220	+ <module name="WriteTag" />
205	221
206	222
207	223	<!-- Metrics -->

		@@ -210,38 +226,33 @@
210	226	<module name="ClassDataAbstractionCoupling" />
211	227	<module name="ClassFanOutComplexity" />
212	228	<module name="CyclomaticComplexity" />
213		- <module name="NPathComplexity" />
214	229	<module name="JavaNCSS" />
	230	+ <module name="NPathComplexity" />
215	231
216	232
217	233	<!-- Miscellaneous -->
218	234
219		- <module name="TodoComment">
220		- <property name="format" value="TODO" />
221		- </module>
222		- <module name="UncommentedMain" />
223		- <module name="UpperEll" />
224	235	<module name="ArrayTypeStyle" />
225		-<!-- <module name="FinalParameters" /> -->
226		-<!-- <module name="DescendantToken" /> -->
227		-<!--
	236	+ <module name="AvoidEscapedUnicodeCharacters">
	237	+ <property name="allowEscapesForControlCharacters" value="true"/>
	238	+ <property name="allowByTailComment" value="true"/>
	239	+ <property name="allowIfAllCharactersEscaped" value="true"/>
	240	+ <property name="allowNonPrintableEscapes" value="true"/>
	241	+ </module>
	242	+<!-- <module name="CommentsIndentation" /> 6.10 or later -->
	243	+ <module name="DescendantToken" />
	244	+ <module name="FileContentsHolder" />
	245	+ <module name="FinalParameters" />
228	246	<module name="Indentation">
229	247	<property name="caseIndent" value="0" />
230	248	</module>
231		--->
232		-<!-- <module name="TrailingComment" /> -->
233		- <module name="Regexp">
234		- <property name="format" value="@author" />
235		- <property name="illegalPattern" value="true" />
236		- </module>
237		- <module name="Regexp">
238		- <property name="format" value="^ \* Copyright$c$" />
239		- </module>
240		- <module name="Regexp">
241		- <property name="format" value="^ \* License : The MIT License" />
242		- <property name="duplicateLimit" value="1" />
243		- </module>
244	249	<module name="OuterTypeFilename" />
	250	+ <module name="TodoComment">
	251	+ <property name="format" value="TODO" />
	252	+ </module>
	253	+ <module name="TrailingComment" />
	254	+ <module name="UncommentedMain" />
	255	+ <module name="UpperEll" />
245	256
246	257
247	258	<!-- Modifiers -->

		@@ -252,14 +263,17 @@
252	263
253	264	<!-- Naming Conventions -->
254	265
	266	+ <module name="AbbreviationAsWordInName" />
255	267	<module name="AbstractClassName">
256	268	<property
257	269	name="format"
258	270	value="^Abstract.$\|^.Factory$\|^.Builder$\|^.Adapter$"
259	271	/>
260	272	</module>
	273	+<!-- <module name="CatchParameterName" /> 6.14 or later -->
261	274	<module name="ClassTypeParameterName" />
262	275	<module name="ConstantName" />
	276	+ <module name="InterfaceTypeParameterName" />
263	277	<module name="LocalFinalVariableName">
264	278	<property name="format" value="^[a-z][_a-zA-Z0-9]*$" />
265	279	</module>

		@@ -275,41 +289,77 @@
275	289	<module name="ParameterName">
276	290	<property name="format" value="^[a-z][_a-zA-Z0-9]*$" />
277	291	</module>
278		- <module name="StaticVariableName" />
	292	+ <module name="StaticVariableName">
	293	+ <property name="format" value="^[a-z][_a-zA-Z0-9]*$" />
	294	+ </module>
279	295	<module name="TypeName" />
280	296
281	297
	298	+ <!-- Regex -->
	299	+
	300	+ <module name="Regexp">
	301	+ <property name="format" value="@author" />
	302	+ <property name="illegalPattern" value="true" />
	303	+ </module>
	304	+ <module name="Regexp">
	305	+ <property name="format" value="^ \* Copyright$c$" />
	306	+ </module>
	307	+ <module name="Regexp">
	308	+ <property name="format" value="^ \* License : The MIT License" />
	309	+ <property name="duplicateLimit" value="1" />
	310	+ </module>
	311	+ <module name="RegexpSinglelineJava">
	312	+ <property name="format" value="\u0000" />
	313	+ </module>
	314	+
	315	+
282	316	<!-- Size Violations -->
283	317
	318	+ <module name="AnonInnerLength" />
284	319	<module name="ExecutableStatementCount" />
285	320	<module name="LineLength">
286	321	<property name="max" value="78" />
287	322	</module>
	323	+ <module name="MethodCount" />
288	324	<module name="MethodLength" />
289		- <module name="AnonInnerLength" />
290		- <module name="ParameterNumber" />
291	325	<module name="OuterTypeNumber" />
292		- <module name="MethodCount" />
	326	+ <module name="ParameterNumber" />
293	327
294	328
295	329	<!-- Whitespace -->
296	330
297		- <module name="GenericWhitespace" />
298	331	<module name="EmptyForInitializerPad" />
299	332	<module name="EmptyForIteratorPad" />
	333	+ <module name="EmptyLineSeparator">
	334	+ <property
	335	+ name="tokens"
	336	+ value="PACKAGE_DEF,
	337	+ IMPORT,
	338	+ CLASS_DEF,
	339	+ INTERFACE_DEF,
	340	+ ENUM_DEF,
	341	+ STATIC_INIT,
	342	+ INSTANCE_INIT,
	343	+ METHOD_DEF,
	344	+ CTOR_DEF,
	345	+ "
	346	+ />
	347	+ </module>
	348	+ <module name="GenericWhitespace" />
300	349	<module name="MethodParamPad">
301	350	<property
302	351	name="tokens"
303	352	value="CTOR_DEF, LITERAL_NEW, METHOD_DEF, SUPER_CTOR_CALL"
304	353	/>
305	354	</module>
	355	+ <module name="NoLineWrap" />
306	356	<module name="NoWhitespaceAfter">
307	357	<property name="allowLineBreaks" value="false" />
308		- <property name="tokens" value="DEC, DOT, INC" />
	358	+ <property name="tokens" value="INC, DEC, DOT" />
309	359	</module>
310	360	<module name="NoWhitespaceBefore">
311	361	<property name="allowLineBreaks" value="false" />
312		- <property name="tokens" value="POST_DEC, POST_INC" />
	362	+ <property name="tokens" value="COMMA, POST_INC, POST_DEC" />
313	363	</module>
314	364	<module name="NoWhitespaceBefore">
315	365	<property name="allowLineBreaks" value="true" />

		@@ -323,17 +373,18 @@
323	373	BAND_ASSIGN, BOR_ASSIGN, BXOR_ASSIGN,
324	374	PLUS_ASSIGN, MINUS_ASSIGN,
325	375	STAR_ASSIGN, DIV_ASSIGN, MOD_ASSIGN,
326		- SL_ASSIGN, SR_ASSIGN"
	376	+ SL_ASSIGN, SR_ASSIGN, BSR_ASSIGN"
327	377	/>
328	378	</module>
329	379	<module name="OperatorWrap">
330	380	<property name="option" value="nl" />
331	381	<property
332	382	name="tokens"
333		- value="BAND, BOR, BXOR,
334		- MINUS, STAR, DIV, MOD,
	383	+ value="QUESTION,
	384	+ BAND, BOR, BXOR,
	385	+ PLUS, MINUS, STAR, DIV, MOD,
335	386	LAND, LOR,
336		- EQUAL"
	387	+ EQUAL, NOT_EQUAL"
337	388	/>
338	389	</module>
339	390	<module name="ParenPad">

		@@ -343,10 +394,12 @@
343	394	value="CTOR_CALL, METHOD_CALL, SUPER_CTOR_CALL"
344	395	/>
345	396	</module>
346		- <module name="TypecastParenPad" />
347		- <module name="WhitespaceAfter">
348		- <property name="tokens" value="COMMA, SEMI" />
	397	+ <module name="SeparatorWrap">
	398	+ <property name="tokens" value="DOT" />
	399	+ <property name="option" value="nl" />
349	400	</module>
	401	+ <module name="TypecastParenPad" />
	402	+ <module name="WhitespaceAfter" />
350	403	<module name="WhitespaceAround">
351	404	<property
352	405	name="tokens"

		@@ -365,21 +418,6 @@
365	418	</module>
366	419
367	420
368		-<!-- 代用品で解決
369		- <module name="Header" />
370		- <module name="RegexpSingleline" />
371		- <module name="RegexpMultiline" />
372		- <module name="RegexpSinglelineJava" />
373		--->
374		-
375		-<!-- バグ？
376		- <module name="RequireThis" />
377		--->
378		-
379		-<!-- Obsolated
380		- <module name="TabCharacter" />
381		--->
382		-
383	421	</module>
384	422
385	423	</module>

--- a/src/main/config/pmdrules.xml

+++ b/src/main/config/pmdrules.xml

		@@ -3,17 +3,16 @@
3	3	<!--
4	4	PMD用ルールセット定義
5	5
6		- PMD [ http://pmd.sourceforge.net/ ] 4.2.5 以降用に記述されています。
	6	+ PMD [ https://pmd.github.io/ ] 5.3 以降用に記述されています。
7	7
8		- Copyright(c) 2010 olyutorskii
	8	+ Copyright(c) 2016 olyutorskii
9	9	-->
10	10
11	11	<ruleset
12		- xmlns="http://pmd.sf.net/ruleset/1.0.0"
	12	+ xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
13	13	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
14		- xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0
15		- http://pmd.sf.net/ruleset_xml_schema.xsd"
16		- xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd"
	14	+ xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0
	15	+ http://pmd.sourceforge.net/ruleset_2_0_0.xsd"
17	16	name="Custom ruleset"
18	17	>
19	18

		@@ -21,77 +20,122 @@
21	20	custom rulesets for project
22	21	</description>
23	22
24		- <rule ref="rulesets/basic.xml">
25		- <exclude name="UnnecessaryReturn" />
26		- </rule>
	23	+<!--
	24	+ <rule ref="rulesets/java/android.xml" />
	25	+-->
27	26
28		- <rule ref="rulesets/braces.xml">
	27	+ <rule ref="rulesets/java/basic.xml" />
	28	+
	29	+ <rule ref="rulesets/java/braces.xml">
29	30	<exclude name="IfElseStmtsMustUseBraces" />
30	31	<exclude name="IfStmtsMustUseBraces" />
31	32	</rule>
32	33
33		- <rule ref="rulesets/codesize.xml">
	34	+ <rule ref="rulesets/java/clone.xml" />
	35	+
	36	+ <rule ref="rulesets/java/codesize.xml">
34	37	<exclude name="TooManyMethods" />
35	38	</rule>
36		- <rule ref="rulesets/codesize.xml/TooManyMethods">
	39	+ <rule ref="rulesets/java/codesize.xml/TooManyMethods">
37	40	<properties>
38	41	<property name="maxmethods" value="25"/>
39	42	</properties>
40	43	</rule>
41	44
42		- <rule ref="rulesets/clone.xml" />
	45	+ <rule ref="rulesets/java/comments.xml">
	46	+ <exclude name="CommentRequired" />
	47	+ <exclude name="CommentSize" />
	48	+ </rule>
	49	+ <rule ref="rulesets/java/comments.xml/CommentRequired" >
	50	+ <properties>
	51	+ <property name="fieldCommentRequirement" value="Ignored"/>
	52	+ </properties>
	53	+ </rule>
	54	+ <rule ref="rulesets/java/comments.xml/CommentSize" >
	55	+ <properties>
	56	+ <property name="maxLines" value="25"/>
	57	+ </properties>
	58	+ </rule>
43	59
44		- <rule ref="rulesets/controversial.xml">
	60	+ <rule ref="rulesets/java/controversial.xml">
45	61	<exclude name="NullAssignment" />
46	62	<exclude name="OnlyOneReturn" />
47	63	<exclude name="DefaultPackage" />
48	64	<exclude name="DataflowAnomalyAnalysis" />
49	65	<exclude name="AvoidUsingShortType" />
	66	+ <exclude name="AvoidLiteralsInIfCondition" />
	67	+ <exclude name="UseConcurrentHashMap" />
50	68	</rule>
51	69
52		- <rule ref="rulesets/coupling.xml" />
	70	+ <rule ref="rulesets/java/coupling.xml">
	71	+ <exclude name="LoosePackageCoupling" />
	72	+ <exclude name="LawOfDemeter" />
	73	+ </rule>
53	74
54		- <rule ref="rulesets/design.xml">
	75	+ <rule ref="rulesets/java/design.xml">
	76	+ <exclude name="SimplifyBooleanReturns" />
55	77	<exclude name="ConfusingTernary" />
56	78	<exclude name="UnnecessaryLocalBeforeReturn" />
	79	+ <exclude name="FieldDeclarationsShouldBeAtStartOfClass" />
57	80	</rule>
58	81
59		- <rule ref="rulesets/finalizers.xml" />
	82	+ <rule ref="rulesets/java/empty.xml" />
60	83
61		- <rule ref="rulesets/imports.xml" />
	84	+ <rule ref="rulesets/java/finalizers.xml" />
62	85
63		- <rule ref="rulesets/logging-java.xml" />
	86	+ <rule ref="rulesets/java/imports.xml" />
64	87
65		- <rule ref="rulesets/migrating.xml" />
66		- <rule ref="rulesets/migrating_to_15.xml" />
	88	+<!--
	89	+ <rule ref="rulesets/java/j2ee.xml" />
	90	+ <rule ref="rulesets/java/javabeans.xml" />
	91	+-->
	92	+
	93	+ <rule ref="rulesets/java/junit.xml" />
	94	+
	95	+<!--
	96	+ <rule ref="rulesets/java/logging-jakarta-commons.xml" />
	97	+-->
	98	+
	99	+ <rule ref="rulesets/java/logging-java.xml" />
67	100
68		- <rule ref="rulesets/naming.xml">
	101	+ <rule ref="rulesets/java/migrating.xml" />
	102	+<!--
	103	+ <rule ref="rulesets/java/migrating_to_XX.xml" />
	104	+-->
	105	+
	106	+ <rule ref="rulesets/java/naming.xml">
69	107	<exclude name="ShortVariable" />
70	108	<exclude name="LongVariable" />
71	109	<exclude name="AvoidFieldNameMatchingMethodName" />
72	110	</rule>
73		- <rule ref="rulesets/naming.xml/LongVariable">
	111	+ <rule ref="rulesets/java/naming.xml/LongVariable">
74	112	<properties>
75	113	<property name="minimum" value="25"/>
76	114	</properties>
77	115	</rule>
78	116
79		- <rule ref="rulesets/optimizations.xml">
	117	+ <rule ref="rulesets/java/optimizations.xml">
80	118	<exclude name="LocalVariableCouldBeFinal" />
81	119	<exclude name="MethodArgumentCouldBeFinal" />
	120	+ <exclude name="RedundantFieldInitializer" />
82	121	</rule>
83	122
84		- <rule ref="rulesets/strictexception.xml">
	123	+ <rule ref="rulesets/java/strictexception.xml">
85	124	<exclude name="AvoidThrowingNullPointerException" />
86	125	</rule>
87	126
88		- <rule ref="rulesets/strings.xml" />
	127	+ <rule ref="rulesets/java/strings.xml" />
89	128
90		- <rule ref="rulesets/sunsecure.xml" />
	129	+ <rule ref="rulesets/java/sunsecure.xml" />
91	130
92		- <rule ref="rulesets/typeresolution.xml" />
	131	+ <rule ref="rulesets/java/typeresolution.xml" />
	132	+
	133	+ <rule ref="rulesets/java/unnecessary.xml">
	134	+ <exclude name="UnnecessaryReturn" />
	135	+ <exclude name="UselessParentheses" />
	136	+ </rule>
93	137
94		- <rule ref="rulesets/unusedcode.xml" />
	138	+ <rule ref="rulesets/java/unusedcode.xml" />
95	139
96	140	</ruleset>
97	141

--- a/src/main/config/suppressions.xml

+++ b/src/main/config/suppressions.xml

		@@ -16,20 +16,26 @@
16	16
17	17	<suppressions>
18	18
19		-<!--
20		- <suppress files="" checks="ExecutableStatementCount" />
21		-
22		- <suppress files="" checks="ClassDataAbstractionCoupling" />
23		- <suppress files="" checks="ClassFanOutComplexity" />
24		- <suppress files="" checks="CyclomaticComplexity" />
25		- <suppress files="" checks="NPathComplexity" />
26		- <suppress files="" checks="JavaNCSS" />
27		--->
	19	+ <!-- Class Design -->
	20	+ <suppress files="" checks="DesignForExtension" />
28	21
29		-<!--
	22	+ <!-- Coding -->
	23	+ <suppress files="" checks="ExplicitInitialization" />
	24	+ <suppress files="" checks="FinalLocalVariable" />
30	25	<suppress files="" checks="MagicNumber" />
31		- <suppress files="" checks="MultipleStringLiterals" />
32		--->
	26	+
	27	+ <!-- Imports -->
	28	+ <suppress files="" checks="ImportControl" />
	29	+
	30	+ <!-- Javadoc Comments -->
	31	+ <suppress files="" checks="SummaryJavadocCheck" />
	32	+ <!-- 句読点対応待ち -->
	33	+ <suppress files="" checks="SingleLineJavadoc" />
	34	+ <!-- ignoredTagsプロパティ対応待ち -->
	35	+
	36	+ <!-- Miscellaneous -->
	37	+ <suppress files="" checks="FinalParameters" />
	38	+ <suppress files="" checks="TrailingComment" />
33	39
34	40	</suppressions>
35	41

--- a/src/main/java/jp/sourceforge/jovsonz/JsNumber.java

+++ b/src/main/java/jp/sourceforge/jovsonz/JsNumber.java

		@@ -397,7 +397,7 @@ public class JsNumber
397	397	* スケール値を返す。
398	398	* このインスタンスが整数文字列表記に由来する場合、
399	399	* スケール値は0になるはず。
400		- * <p>
	400	+ *
401	401	* <ul>
402	402	* <li>"99"のスケール値は0
403	403	* <li>"99.0"のスケール値は1

		@@ -405,7 +405,7 @@ public class JsNumber
405	405	* <li>"99E+3"のスケール値は-3
406	406	* <li>"99.0E+3"のスケール値は-2
407	407	* </ul>
408		- * </p>
	408	+ *
409	409	* @return スケール値
410	410	* @see java.math.BigDecimal#scale()
411	411	*/

--- a/src/main/java/jp/sourceforge/jovsonz/JsPair.java

+++ b/src/main/java/jp/sourceforge/jovsonz/JsPair.java

		@@ -12,16 +12,14 @@ import java.io.IOException;
12	12	/**
13	13	* OBJECT型Value内に列挙される、名前の付いたValueとの組(PAIR)。
14	14	* PAIRはValueではない。
15		- * <p>
16		- * <code>
	15	+ *
17	16	* <pre>
18	17	* {
19	18	* "PairName1" : 99.9 ,
20	19	* "PairName2" : "textValue"
21	20	* }
22	21	* </pre>
23		- * </code>
24		- * </p>
	22	+ *
25	23	*/
26	24	public class JsPair {
27	25

--- a/src/main/java/jp/sourceforge/jovsonz/UnmodIterator.java

+++ b/src/main/java/jp/sourceforge/jovsonz/UnmodIterator.java

		@@ -102,7 +102,7 @@ public class UnmodIterator<E> implements Iterator<E> {
102	102	/**
103	103	* {@inheritDoc}
104	104	* 必ず失敗し例外を投げる。
105		- * @throws UnsupportedOperationException
	105	+ * @throws UnsupportedOperationException {@inheritDoc}
106	106	*/
107	107	@Override
108	108	public void remove() throws UnsupportedOperationException{

旧リポジトリブラウザで表示

Jovsonz Fork

Jovsonz: コミット

コミットメタ情報

ログメッセージ

変更サマリ

差分

Jovsonz
Fork