Bug #61136 - Improve Common SS formula evaluation speed by implementing lazy evaluation

git-svn-id: https://svn.apache.org/repos/asf/poi/tags/REL_4_0_1@1847495 13f79535-47bb-0310-9956-ffa450edef68

.classpath

@@ -15,22 +15,34 @@
 	<classpathentry kind="src" path="src/excelant/testcases"/>
 	<classpathentry kind="src" path="src/excelant/resources"/>
 	<classpathentry kind="src" path="src/integrationtest"/>
-	<classpathentry kind="lib" path="lib/ant-1.9.4.jar"/>
-	<classpathentry kind="lib" path="lib/ant-launcher-1.9.4.jar"/>
+	<classpathentry kind="lib" path="lib/ant-1.10.1.jar"/>
+	<classpathentry kind="lib" path="lib/ant-launcher-1.10.1.jar"/>
 	<classpathentry kind="lib" path="lib/log4j-1.2.17.jar"/>
-	<classpathentry exported="true" kind="lib" path="ooxml-lib/xmlbeans-2.6.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="ooxml-lib/xmlbeans-3.0.2.jar" sourcepath="ooxml-lib/xmlbeans-3.0.2.jar"/>
 	<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
 	<classpathentry kind="lib" path="lib/junit-4.12.jar"/>
-	<classpathentry kind="lib" path="ooxml-lib/curvesapi-1.04.jar"/>
-	<classpathentry exported="true" kind="lib" path="ooxml-lib/ooxml-schemas-1.3.jar" sourcepath="ooxml-lib/ooxml-schemas-1.3-sources.jar"/>
+	<classpathentry kind="lib" path="ooxml-lib/curvesapi-1.05.jar"/>
+	<classpathentry exported="true" kind="lib" path="ooxml-lib/ooxml-schemas-1.4.jar" sourcepath="ooxml-lib/ooxml-schemas-1.4-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="ooxml-lib/ooxml-security-1.1.jar" sourcepath="ooxml-lib/ooxml-security-1.1-sources.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry exported="true" kind="lib" path="compile-lib/slf4j-api-1.7.12.jar"/>
-	<classpathentry kind="lib" path="compile-lib/bcpkix-jdk15on-1.54.jar"/>
-	<classpathentry kind="lib" path="compile-lib/bcprov-ext-jdk15on-1.54.jar"/>
-	<classpathentry exported="true" kind="lib" path="compile-lib/xmlsec-2.0.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-codec-1.10.jar"/>
+	<classpathentry kind="lib" path="lib/jmh-core-1.19.jar"/>
+	<classpathentry kind="lib" path="lib/jmh-generator-annprocess-1.19.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry exported="true" kind="lib" path="compile-lib/slf4j-api-1.7.25.jar"/>
+	<classpathentry kind="lib" path="compile-lib/bcpkix-jdk15on-1.60.jar"/>
+	<classpathentry kind="lib" path="compile-lib/bcprov-ext-jdk15on-1.60.jar"/>
+	<classpathentry kind="lib" path="ooxml-testlib/reflections.jar"/>
+	<classpathentry kind="lib" path="ooxml-testlib/guava.jar"/>
+	<classpathentry kind="lib" path="ooxml-testlib/javassist.jar"/>
+	<classpathentry exported="true" kind="lib" path="compile-lib/xmlsec-2.1.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/commons-codec-1.11.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-collections4-4.1.jar"/>
-	<classpathentry kind="output" path="build/eclipse"/>
+	<classpathentry exported="true" kind="lib" path="lib/commons-collections4-4.2.jar"/>
+	<classpathentry kind="lib" path="lib/commons-math3-3.6.1.jar"/>
+	<classpathentry kind="lib" path="lib/xmlunit-core-2.5.1.jar"/>
+	<classpathentry kind="lib" path="lib/mockito-core-2.21.0.jar"/>
+	<classpathentry kind="lib" path="lib/byte-buddy-1.7.9.jar"/>
+	<classpathentry kind="lib" path="lib/byte-buddy-agent-1.7.9.jar"/>
+	<classpathentry kind="lib" path="lib/objenesis-2.6.jar"/>
+	<classpathentry kind="lib" path="lib/commons-compress-1.18.jar"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>

.gitattributes

@@ -0,0 +1 @@
+test-data/hmef/quick-contents/quick.html text eol=lf

.gitignore

@@ -1,21 +1,49 @@
 classes
 workbook.xls
 bak
-*.iws
 build.number
 *.el
-TEST-org.apache.poi*.xml
-build
-.settings
 scripts
-*.ipr
 untitled1.jpx
-*.iml
 log*.*
-dist
 *.log
-bin
-.ant-targets-build.xml
-out
+
+forrest.properties
+compile-lib/
+ooxml-lib/
+ooxml-testlib/
+
+# Eclipse
+/bin
+.settings
+
+# Tests
+junit*.properties
+TEST-org.apache.poi*.xml
+
+# Sonar
+.sonar
+sonar/main/src/
+sonar/ooxml/src/
+sonar/scratchpad/src/
+sonar/ooxml-schema-security/src/
+sonar/examples/src/
+sonar/excelant/src/
+sonar/target
+sonar/*/target
+
+# IntelliJ
+/out/
 .idea
+*.iml
+*.iws
+*.ipr
+
+# Gradle
 .gradle
+
+# Ant
+.ant-targets-build.xml
+build
+dist
+lib/

.settings/org.eclipse.jdt.core.prefs

@@ -12,14 +12,17 @@ org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -110,7 +113,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
@@ -124,8 +128,10 @@ org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
@@ -135,6 +141,8 @@ org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0
+org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0
 org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
 org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
 org.eclipse.jdt.core.formatter.blank_lines_after_package=1
@@ -193,6 +201,7 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
 org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
@@ -387,11 +396,24 @@ org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
 org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
 org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
 org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
 org.eclipse.jdt.core.formatter.tabulation.char=space
 org.eclipse.jdt.core.formatter.tabulation.size=4
 org.eclipse.jdt.core.formatter.use_on_off_tags=false
 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
 org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter

KEYS

@@ -1762,13 +1762,13 @@ W45jdvBkYoPdQtS+8Vy+q0997zobctz8i5hfXzxg51/IuSU4uNtgr26XapsoLDur
 =/Vu1
 -----END PGP PUBLIC KEY BLOCK-----
 
-pub   rsa2048/26062CE3 2014-08-17 [expires: 2018-08-21]
-uid       [ultimate] Andreas Beeker <kiwiwings@apache.org>
-uid       [ultimate] Andreas Beeker (kiwiwings) <andreas.beeker@gmx.de>
-sub   rsa2048/EE864ED6 2014-08-17 [expires: 2018-08-21]
+pub   rsa2048 2014-08-17 [SC] [expires: 2020-07-06]
+      24188560524400B142BE3386A93E1C4B26062CE3
+uid           [ultimate] Andreas Beeker <kiwiwings@apache.org>
+uid           [ultimate] Andreas Beeker (kiwiwings) <andreas.beeker@gmx.de>
+sub   rsa2048 2014-08-17 [E] [expires: 2020-07-06]
 
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2
 
 mQENBFPwtjQBCADWg7jYCGq+QFGfB8nLLQs/WEw4XJiAY9q65qWX1clNuVgTF9Nn
 ABBOy4KiSDR9XWmARZlC2trKfdoFEnNJ6EnFkLhOjzZKiy4jkyxCctKfbV+sMzCm
@@ -1776,52 +1776,90 @@ ODjjNQtn+nYmOu7a8Xg3g3vTnikkuHZqWvK0O0VYouW/p1NHelUejQbOPuUKukD1
 omzskuYgteTZ9Jn8efJMIymg9dGubuvN4HvUdEO0/u6K2MCZjIqNEPeqWIuZXeMb
 +4nGv2r0jSQAU94g3hueooqbUf+Mk2+H5O1d/h2Cii9qVvi6gELdVw9H+5Ir9AFc
 ynsmvxrPIxraBMPgrXmvPFOTlqlizyFv2O7pABEBAAG0JUFuZHJlYXMgQmVla2Vy
-IDxraXdpd2luZ3NAYXBhY2hlLm9yZz6JAUEEEwECACsCGwMGCwkIBwMCBhUIAgkK
-CwQWAgMBAh4BAheAAhkBBQJXuYpTBQkHizsfAAoJEKk+HEsmBizjNa0H/AjJPguQ
-WIn9AV/jstRN4OPM6eY7VUMG1DYoABRQSVsksPki5jZii0bI9VB3AUFgfXj0y6qk
-CwQyKCJwZjcP3JuciJ5brQr/7D12hoTkYSCzCaECIpMoB7HWCpdoFusrgU2PUUwJ
-i8xBTC+sLxIn3h5abTU68tnynCYhlA0mJ8zZ8CTvQJyEjidY1UgSohXClG2k/mo7
-z/IyW16x4dlpdkNfiBhL2v/5Ol7Vuz9g1lXvWvMdNQZ2PVK6w5dmCziCkih/qRgK
-SUzn65ASEKiCN7afzUkCTdzrI71r3rOkJtlT1NWn2RAv6xT6AuhCPZzH2I3ImuFI
-mkUKYhKzRN6AdmCJAT4EEwECACgFAlPxECkCGwMFCQPCZwAGCwkIBwMCBhUIAgkK
-CwQWAgMBAh4BAheAAAoJEKk+HEsmBizjvfYIALS1vlaqN/f7/YzpnOwlH2Wo4jpI
-jBrG7SqcdVQk3NGsXTXzzq5p7uTTzpEJW8ReZLGeYaTzqh1vH97uAPR6wL3GjHMZ
-F2jkC0wSHXxvh9Gyrdx3LA8NSO+BAG9ZfD6OGklsl7tFFEplLpfR1EsAKfbi0bAY
-86SfVwTmCQfFStoSTzg8qLr3OcJQtqw85XVfjrFTaPjY36/RcLcXVmAVN6y8E+E7
-019qP30afGkvw+ZbIq8qbxJItObMuhn5xdI0YaMm2yudCfm2aGYSCnkrgNfuWzH6
-WZ8n1fv45TGBUd2R6zPr13eH73AG1WXpapoD45yf/TFavRfnknU6xb7U3ZK0MkFu
-ZHJlYXMgQmVla2VyIChraXdpd2luZ3MpIDxhbmRyZWFzLmJlZWtlckBnbXguZGU+
-iQE+BBMBAgAoAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAUCV7mKXAUJB4s7
-HwAKCRCpPhxLJgYs4zheCACgc3m2FH5kmXtYO44BdYYwdV2dyLMCxvVl7GUWqJF8
-wKmDWlUxBwrpzDBQXpmHyb+rqX/kvfEkH2wb9TZwginLecbZbMKubNUWUqGJBHQo
-CaV8o6L/iEUJa5NXzY2OJCp32CHsmpefYkU+WgAnmTVe8Se7JEmJeu+2OfStV5m6
-zVK5xzlciYSc29LpA3dsv5hxE6YZ8kJBJaFyv2AvVzaouSR7nPNrdw3/jXaOz+Hb
-VpP/CEf5IdvF/o37sv8o7WWcH1AjvMdGQNp6Zr5Te2E35V8PmpqLH4Z8W0/PXij2
-67i565JZc1Kmpqxm59jg1vs2X7rHNn0k+r9BFiCQC1LKiQIcBBABCgAGBQJV5hIJ
-AAoJEOGWdUUnufY1qh8P/03uvjuU1V9UZY9t/4J/K0wbU8Re9c/HfgmJrCn+wvDI
-OtxpOg3m07ZoIrosYEA2CIm+kLCYuNbzGSz6ZPZlpoq5FvxzO9OAYMO76r3ktxUw
-Snbxd9TCkjCCQ8RMxT/JGDBU77nAJPyhCUZF2/SyrXnexloNP9TR/IDQZNOXzlxR
-gu+zIrpl/ihfqxozqXYFIlhlP+k3GhiQt6e5yw+bLRiJZPR+NLzS4vfTeYEvWT2d
-tQJ8FFyJF2HypiVcFFF0AwskiVRR9xxkdbONeJ0DnOHfRmnStfl14EDXUNDZ34Qn
-IgMkw8vydc1GeQQE44BZYlN1d4J/h6eSji5Ftex1nbRuTeesXg5AzAHi/zWn8dRU
-KCdKxjjn+t7k1SQEK1+h6Ja+CwBTZpHWpHPEbFzVSTXcoC0qU+QULD9eq1Av4OTi
-Bnrf1/qYGZas6K0KYL84ZTH7JAZtgkXrn1sDiOMEMB8Hdqpw57wPaSt/6mbtmkCd
-bCTWigBIWSY9FGfSTZdRk/KoIIK+VqxCPkS++RQ5ltwwq7Y6rcEsMFdUwMWc3hCD
-Qu9C+djVRZrsSo6nLUGKGjoKYb1xmcqr03VquVVH36XNRmy3TC/8RqSstP/Q4dtx
-a0bgqi+iu9vwLVUWtgLSQJr2OxTcU640DlVCJdvqTfS4SUP5Zht1HOkVzh3l3KiM
-uQENBFPwtjQBCACln6mHC8Js3T3KJgNydimOCAFhLmS4e0ur03Y1nckB9zB/pMTL
-ulDgtZwWSin3Kd40VZDyKi6mqOp5ldz6AsZ2CSx1GfI9iVhfuFqOaiBLqpNpdvf9
-nGL9OVoy1SdwTXgnboiIFtbTG3sVwD4x4qTRbmT22Ln/mIAICR2wxFBkzpbIQ7Mf
-R/zEgRh2VlRUUrWUsnYdOh0xfxuYgsnPCjpTY8hvEno3H6kzXKmj2GQJtawMVs5b
-Ro/GCM9lBBR/PAhB65ACzLmUUSsxjlmjZw0tCcOufg1RyAF/l6YVw1UOJaqXBfSP
-eZkLQBj9p8VNpasX/acIfpEaZLE8QhoO11ajABEBAAGJASUEGAECAA8CGwwFAle5
-inIFCQeLOz4ACgkQqT4cSyYGLOMvsAf+J2EyV9+GNqT8UmEU6OFnw/sdR1oE+vZ9
-fe4mifAfjQ+SKYf+MS0lU3lTuwcQKwFklePoYsvJEO7jNEgjTQ+zKiDSlV5yufSn
-Idy8+sCYygPn5fSjGdRaMpCCfs5xrljLUPK5U8+vjeteRJW0o2/wmsYdHRz6A74B
-kRq8kYu1M8VgZ6JD1YI/mp0mHTTB+H69/DNo6cA+7W/CibeTrffbJ35+OXGsJxqJ
-b/QH/4lqsceNJtJThkHPQeM18R7/4t7Vhb5htOk2eB7coKzdYRKpHMzkm7elm8bI
-uwsky9+6hIUMKD5hhc8G7g9lWOLSXCeNRUdqWTOfZaU5KOK70kKUeQ==
-=PCbZ
+IDxraXdpd2luZ3NAYXBhY2hlLm9yZz6JAVgEEwECAEICGwMGCwkIBwMCBhUIAgkK
+CwQWAgMBAh4BAheAAhkBFiEEJBiFYFJEALFCvjOGqT4cSyYGLOMFAltBCHsFCQsS
+uUcACgkQqT4cSyYGLONeTAgAx/618v7nrYdQlbKz/Ywf8v9rhE6EHUrwylwkQRHA
+fVrBhEiMVRJnOnmkxUBijDTK1MMMslN0TNu5iI3GFMZ6luQTmP6gu4Dbq3ot/tjm
+3Dnshf26Hg0DnrP7wj3fNPsjVpcfMk3tZ7GN+l/czPIwqrBiidYPsAOmhhJ0CDTk
+ZzO1fsLL8rYxy+LvhyS/djuxUChCaT/veoNAhZH4r4AHVz+0Y2BdRDnOufUa+SA2
+zv5RKy1D2dXMIwqYpw2NfiPptZf/lezOvjbRyE0V3tFl2fo5vqfrbSnDi8e8zCtA
+dfsCWjlubhCnKjF06V6HQxxFXvLkzOjnvATpilf278ydjokBPgQTAQIAKAUCU/EQ
+KQIbAwUJA8JnAAYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQqT4cSyYGLOO9
+9ggAtLW+Vqo39/v9jOmc7CUfZajiOkiMGsbtKpx1VCTc0axdNfPOrmnu5NPOkQlb
+xF5ksZ5hpPOqHW8f3u4A9HrAvcaMcxkXaOQLTBIdfG+H0bKt3HcsDw1I74EAb1l8
+Po4aSWyXu0UUSmUul9HUSwAp9uLRsBjzpJ9XBOYJB8VK2hJPODyouvc5wlC2rDzl
+dV+OsVNo+Njfr9FwtxdWYBU3rLwT4TvTX2o/fRp8aS/D5lsirypvEki05sy6GfnF
+0jRhoybbK50J+bZoZhIKeSuA1+5bMfpZnyfV+/jlMYFR3ZHrM+vXd4fvcAbVZelq
+mgPjnJ/9MVq9F+eSdTrFvtTdkokBQQQTAQIAKwIbAwUJA8JnAAYLCQgHAwIGFQgC
+CQoLBBYCAwECHgECF4AFAlRLpLMCGQEACgkQqT4cSyYGLOON1ggAsfe2uG3olN8/
+PZSyW0VNyPOotcb8jxWrmGSvSzh7HVXug0NesFEFvVYLWlwR7XGq9CahPI91Shfy
+ULIs6u3chGmCOcf/gALJ6d87DrIeXpppdfce+x4vegdBMynOSfL7FWytTMnBUJFU
+AI8zj0vqdGPhhFhpmoCfjbHal5gc1x8Wu8qwO1Oe3hJsVAGWa6IO2V48zpr3DOpc
+wWRf72Fwen9KA7ANqWlqZ6hFD8i1/XDaE313Fi5pRaiOjpvRekKHOQIcqLG4Qq2M
+ldOi9GVzoPPFPZnkkw+EBOI3dkKjzyV93+QrxoxmBXh+u5qr9BBGM0r8eCfp8/2M
+8BGdxIUeQIkCHAQRAQIABgUCV+cXowAKCRDmZ3rGi6vdbEhdD/0Rp045xULKBxnt
+jhYINF7rttKfcR0KIC+DB4ruaz51e9SCXlTtvdKjRltuIxTzQ3cfDk+mk013Yh3w
+RIIRe8SdaDPr5Z+3mWi0bAyKHZX22IZFa3/9Kg4wSJt8OoT1ng2EsQL+Wj8xQc/U
+MdIAkz2tems4ELvi+ZaHgDMQAHgDqajRjk4/sqd5hd57k5zDmrfycPeUJPa69wtE
+XXV3sXhj1xief/ZgVMKnOg4PJkpLi7fM0wTY4UGx9A3ZYhrUrcEpQBmYjFDpegvf
+LbXfGYfqsmjLfqA+vIw8VPLIQvftQaYZW1p60DZf0GzvEm3i9ZDiItM4+vNUByrJ
+wp9AFujSq1M65oR+RIDPz0LnApHXzkxrS6a8KZaxO0mZ7SQmKn7V134X5X7lLug6
+Nr9wSS5RJjGkYgo8D0nxWnWC+cEusodzdZgm+mpnSbEYoadeXt9pxlNOXlAX5xp+
+N1dm0w+otwR4pnTTDORzpjmcs/BB7zY4BASF5jKcYYBeY6h6Q9wkx4FPo7s7LJj+
+Qjn1xALZaYHGpGdKZJWsgmKRWEtAdtIylml05DvYzUTAS1ok6egxVX/59h11RlvJ
+XILoP/5jNbY0OFYD8AR9rQqbxeumjtkxG4BrngTnYCy3sbS5f/9gc/1jFCALRHL0
+SdOLLB/8Wbb5+ruv+JYUgeu9oLjDorQyQW5kcmVhcyBCZWVrZXIgKGtpd2l3aW5n
+cykgPGFuZHJlYXMuYmVla2VyQGdteC5kZT6JAVUEEwECAD8CGwMGCwkIBwMCBhUI
+AgkKCwQWAgMBAh4BAheAFiEEJBiFYFJEALFCvjOGqT4cSyYGLOMFAltBCHsFCQsS
+uUcACgkQqT4cSyYGLONkjgf/bxTNXgEPKbt9/rGj7h2KagQ8E+4NiCQ/TOxa6O58
+KFFOJ5yIhXHcAUFjgXrbXSZJK8RqMRU4stQB1y6eNjvBYG53WuUpxXkt3WR8C4zz
+0J6UISZQbDJ9txvk4aheWn7ti0wirpdWikXwzz5fFAWFgGQ4VGELQaYKadCNa8vs
+yXTQw0H07xkO+PkGEKR9gmpn9yP7+j9PdVuEUU3RvYw1oOP6pq8V1hOjzXte5R6E
+MDww/UuXy3TMnYkAVKUYpKmtggYe0vSHk3b8WTzT3eXvDq4yka6lKZVD7GI0viSV
+6+MqtnBGasbE7rNn2v5qB7WF/NmS4yS2DbCQkLqcTva7YIkCHAQQAQoABgUCVeYS
+CQAKCRDhlnVFJ7n2NaofD/9N7r47lNVfVGWPbf+CfytMG1PEXvXPx34Jiawp/sLw
+yDrcaToN5tO2aCK6LGBANgiJvpCwmLjW8xks+mT2ZaaKuRb8czvTgGDDu+q95LcV
+MEp28XfUwpIwgkPETMU/yRgwVO+5wCT8oQlGRdv0sq153sZaDT/U0fyA0GTTl85c
+UYLvsyK6Zf4oX6saM6l2BSJYZT/pNxoYkLenucsPmy0YiWT0fjS80uL303mBL1k9
+nbUCfBRciRdh8qYlXBRRdAMLJIlUUfccZHWzjXidA5zh30Zp0rX5deBA11DQ2d+E
+JyIDJMPL8nXNRnkEBOOAWWJTdXeCf4enko4uRbXsdZ20bk3nrF4OQMwB4v81p/HU
+VCgnSsY45/re5NUkBCtfoeiWvgsAU2aR1qRzxGxc1Uk13KAtKlPkFCw/XqtQL+Dk
+4gZ639f6mBmWrOitCmC/OGUx+yQGbYJF659bA4jjBDAfB3aqcOe8D2krf+pm7ZpA
+nWwk1ooASFkmPRRn0k2XUZPyqCCCvlasQj5EvvkUOZbcMKu2Oq3BLDBXVMDFnN4Q
+g0LvQvnY1UWa7EqOpy1Biho6CmG9cZnKq9N1arlVR9+lzUZst0wv/EakrLT/0OHb
+cWtG4Kovorvb8C1VFrYC0kCa9jsU3FOuNA5VQiXb6k30uElD+WYbdRzpFc4d5dyo
+jIkBPgQTAQIAKAUCU/C2NAIbAwUJA8JnAAYLCQgHAwIGFQgCCQoLBBYCAwECHgEC
+F4AACgkQqT4cSyYGLOMLxQf/YRFfC8x1KQ9F/7zPaX1tWW05dhjYmX7jIevypagd
+wuIC90iy0ZZOJhDzN6pWVgqmYllaec89Qv4//gSyVt3Po96wlBALKG7Eeh5MQa+z
+dC1J7q2zF8ojr3YOJQEuNlYtSa8nRXYodRwiNzYhjBwFf/DRHbZi7e1HvDqcdNUe
+q8FwaJl+QRyV5822UWwm3aK/1JzvH3+SuI8HesoWNAVfmyNrg/rxqvZzJXdCRo+1
+u6gfh8zgMaSDbR5LEIbU1fzwVox0wjYTnRodc8qMryUrIZtTZL8AVWWDLP9LowKX
+KsQF8rRl6Jy4jJmTBAjo8QIoKYfE+DwhCnSKnbFcZAtsm4kCHAQRAQIABgUCV+cX
+sAAKCRDmZ3rGi6vdbI4eEACiAFDr6ZAWSJJ1ndS65MsAi4zyqi/HZPxuZ/ay9NKW
+bOTYkTW14idZsykrtWRkdacWVIPjNtAxanqJNs79dC7hqmdDeokfiU6oi6/UkzYG
+vwmFROH9Rcwx1eJgHZeeq0PD7Qc0B6y+2Bm74yEkL7NYREmZz0qfFElDUphr/yEj
+6SMs056JEq5V0G9SAkOHUKZzBsyYYnnxqVOwg6MVX5bipJq0MoeSkV17Cw+1oXY/
+wt0hMVyPJ/x5cdke4c4ZKZtMsfAGFhQawRtxVWcwwHEI22hN9Mz3E8cqxYYnS4jY
+dzPpg1vTC3bdDQZKgJphtsQDOV43UzzGD83HW2Ovm/JIhmAUUsOjEvGbzBwmUZOx
+dFFQLHpVzMZ3M0ffhJaZEF0Mdmj2ydr/cwdbQJpcSOx5+rveUuOJVKFeIqD2RcjL
+x9orYxwwAbH3MQ3IGaghkmrLCHC7OoqTpcFMl0lIRutubc5Z72NGZqkz+6QAZWHr
+M7vZUfX1w44Wa5MfYeiY5rmIZ9EOh0yVQN4yq8eZ9hHGxSXChEhl345XyuCOPqLU
+vUD3PhHho428r4Ffelv7ReBkrZTL7Bu38ZgzTwXG0ts9tuuS7OY6fXiwuIPNHtNA
+DVT8GwtjxIJZcWID2kk70eqlSwvTuAKZFgT9diY5ObVkcdNjURa3vGRbiBDcakxL
+a7kBDQRT8LY0AQgApZ+phwvCbN09yiYDcnYpjggBYS5kuHtLq9N2NZ3JAfcwf6TE
+y7pQ4LWcFkop9yneNFWQ8ioupqjqeZXc+gLGdgksdRnyPYlYX7hajmogS6qTaXb3
+/Zxi/TlaMtUncE14J26IiBbW0xt7FcA+MeKk0W5k9ti5/5iACAkdsMRQZM6WyEOz
+H0f8xIEYdlZUVFK1lLJ2HTodMX8bmILJzwo6U2PIbxJ6Nx+pM1ypo9hkCbWsDFbO
+W0aPxgjPZQQUfzwIQeuQAsy5lFErMY5Zo2cNLQnDrn4NUcgBf5emFcNVDiWqlwX0
+j3mZC0AY/afFTaWrF/2nCH6RGmSxPEIaDtdWowARAQABiQE8BBgBAgAmAhsMFiEE
+JBiFYFJEALFCvjOGqT4cSyYGLOMFAltBCJsFCQsSuWcACgkQqT4cSyYGLOOhIwf7
+BBY881X8VsZxSn6zc4y+mXzNOjaxYwjEaifHaxfOMoZn8tFDd2bWyjGRinMKLliT
+j2RJkN5zGZ1f89LFyclV181NRGlQ4eMyv+SWVDLIxodmdToJ9AopHooehvbnQDhz
+8htUur7fWx1qRM5U9ZpFHMJp3OF27BCbzPGwFW0Q7fqhliGsV5ae26+AXwn0DsLT
+/+w5eJ4Xk+m2FcJoSOTkurZBPOx3wAaPpNZA+qKvOmYsAgzAbYriFIakFJV4l35+
+/MDXnpv/VIUPzxUoHjV7BtnBlM2KdA4cGZBq4jXSM2ZdvTquu7tJPJ6FLgWWCWF+
+qy0PB4IyWnDgpw6jbn794A==
+=doz3
 -----END PGP PUBLIC KEY BLOCK-----
 
 pub   4096R/B4812553 2014-02-26 [expires: 2019-02-25]
@@ -2493,3 +2531,48 @@ bpjAhwE2YmGQ7oB+3V798HtAmceRNf8AY0GWrZswJlg7xUn+WJNwQ9uIHI1fxYHx
 2Nr+AmDDs6ZOEI5zhwxioePw/Cg=
 =9lKb
 -----END PGP PUBLIC KEY BLOCK-----
+pub   rsa2048 2018-05-02 [SC] [expires: 2020-05-01]
+      6BA4DA8B1C88A49428A29C3D0C69C1EF41181E13
+uid           [ultimate] PJ Fanning (http://www.apache.org/) <fanningpj@apache.org>
+uid           [ultimate] PJ Fanning <fanningpj@yahoo.com>
+sub   rsa2048 2018-05-02 [E] [expires: 2020-05-01]
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFrpc9YBCADQjZMJ8ThwsFwZJ9B5rjAFZY48ri1LiZrTgydYY9X3bzjDkng+
+ARFmtFPnwYwLTdz3ECqWWsC3RkI62079DweNasXV8nBz9sUt6mQqSMx3W/s6389/
+k9iywPLvhHH7rpp05js8zwJoA8Fr1YwPtBjyhrxl58LQ5ihd/1f2ud2tnwQw1dI2
+8fuTS3QaKP4Zdx2diD5rYhkAecWaFRwxn1L7Tye5dfD1uPElPCHGKqfaeQXtl01u
+TOwYB1p9tKPHvfni1qgD3QLWUJ2oyBGSA9IgEF5rm8LtR6vADKQwORjg99a7HE2h
+lDBZi/tmu23fgWSioiy084fB5GqmApK/681DABEBAAG0IFBKIEZhbm5pbmcgPGZh
+bm5pbmdwakB5YWhvby5jb20+iQFUBBMBCAA+FiEEa6TaixyIpJQoopw9DGnB70EY
+HhMFAlrpc9YCGwMFCQPCZwAFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQDGnB
+70EYHhOWoAf/V4SZNhYfHWeI58n1mnq+4ufG1+s4HdtvXRCYjDdypmdFLl4e27jO
+YNvZ8Fvk1wqiA8ui1XcCI5hSsbFUj/vNIUUItOr6TXILttOOR3qLEkmBLmHCY35w
+a+QpNxjvufHjewb8Nk7sNcX+4WIUiQ3vmWWtgtmy9Efk+X653g7LlyH3ZfJADYKt
+QC2Q5ui6Ewm7ZxE4Ob8J2BZBCP3CXZgJ65xnCtE7jUQVW5B5YR9/1GyvfdTyh/pY
+4PdEeif2S8hhS0xx3l62+o4QOkmiI1dJJYifXtO5qnxfKMvSka29wy9tbs9XAsAU
+27Zc++iSYBMTGLGROhDMgCRPZbYaI4YYTrQ6UEogRmFubmluZyAoaHR0cDovL3d3
+dy5hcGFjaGUub3JnLykgPGZhbm5pbmdwakBhcGFjaGUub3JnPokBVAQTAQgAPhYh
+BGuk2osciKSUKKKcPQxpwe9BGB4TBQJbQKUuAhsDBQkDwmcABQsJCAcCBhUKCQgL
+AgQWAgMBAh4BAheAAAoJEAxpwe9BGB4TW10IAI7ONAHmqsjR1JkxjSQzq4imQl+J
+ZAmHxglMPQs39AKuVEp4BdFH5SeBWNPjue1V6iw22ahTEvgJZwv9O3JBrjsYUUD/
+PQcwp63q0JKYk5qF/XmwmHox8kqXcoPxhsCJQhdg7ZH3YAYPp4yOJ+ATZx/0E9Ew
+JbUu/yefxtvPeRzBLZVrxc8Qp+hMszRO3mQzO4xTuDMh3lX3rILXEfEoZoqFHvr9
+oCNgXxUYXY/KTfH9dLPGnmaqJyEEydRqQmClxn0MiJo5hLsmxeG7pZNPfE3Zhzod
+i5oRy2JDUY3x+PHvKc+cM93BbxpSsK+Jtu88aOHwXp+Fj8WciO8Ku+2uN8q5AQ0E
+Wulz1gEIAORuS4e+Ek+d+0gBMlnigNJ2HoQalKFaERf5K/iQZY4E6Z2ahJ4UFIj7
+ri3isWgOleP+REJJPfeSrWQ5XgdklDlHHyv4O5iMkEFWQHttiaTuvdomDncQrNRP
+TaIOe9iQgfQzDw6mqsb7ZWd5ICA8Krd97BwNHjq/CZ9+WrU6GDc6ImissLVVGGdk
+EGO7qZTqNUCeH4Znm/00mNMI4OH8xkwA2vzV5o3J5116zIuv29XQDtcSM+9NQ/Hd
+sjKIA0OpDyWE7Ek/SO+/CvkylwaOcmkuf33ADNjpF4BsBxn7L9XI1WJDtRaMkpbq
+MsymIxi35VUOGD+ms+72CcUStfYj4NEAEQEAAYkBPAQYAQgAJhYhBGuk2osciKSU
+KKKcPQxpwe9BGB4TBQJa6XPWAhsMBQkDwmcAAAoJEAxpwe9BGB4TWlEH/1ygNg5R
+W5XD5JAats8CJzmaJSpQY4Yr41K5sRqPYA6s+kSJx0t7dP8OG/RoDjs2Dmzsy6J4
+RQCIxo74g8d7yCE+aijb0zDX/3e5qecY7kDYqBDE0KkHpXfQprOntxgne7BsBZqM
+pNpL7MDQGAmGLh41XWy7CmT+haoS2zhxAXWwXgUZOE0umsMfil+XVE9oZWjeg1Dm
+3BH/QtUS9kuRmYa38JAg6Cr3D6/j/LBqWjaEVXr6RNdd6zlQHBwmLTEhQVYyepK9
+egfcIxtZ0AuggFN6ijBJqATbj0DlomeKrnHLVloD6lEDgB/j0SoYsGbv9kpYPqvU
+lSeSg2C31/20JYI=
+=/nGR
+-----END PGP PUBLIC KEY BLOCK-----

README.rst

@@ -58,12 +58,12 @@ Source code:
 * Official `Apache git mirror`_ at apache.org
 * Unofficial `GitHub git mirror`_ at github.com
 
-Requires Java 1.6 or later.
+Requires Java 1.8 or later.
 
 Contributing
 ------------------
 
-* Download and install svn or git, Java JDK 1.6+, and Apache Ant 1.8+ or Gradle
+* Download and install svn or git, Java JDK 1.8+, and Apache Ant 1.8+ or Gradle
 
 * Check out the code from svn or git
 

build.gradle

@@ -15,25 +15,43 @@
    limitations under the License.
 ==================================================================== */
 buildscript {
-	repositories {
-		maven { url "https://plugins.gradle.org/m2/" }
-	}
+    repositories {
+        maven { url "https://plugins.gradle.org/m2/" }
+    }
 
-	dependencies {
-		classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.1.2'
-		classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.2.1"
-	}
+    dependencies {
+        classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.1.2'	// 2.x requires Gradle >=4
+        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.5"
+    }
 }
 
-// Only add the plugin for Sonar if enabled as it requires Java 8
+repositories {
+    mavenCentral()
+}
+
+// Only add the plugin for Sonar if enabled
 if (project.hasProperty('enableSonar')) {
-	println 'Enabling Sonar support'
-	apply plugin: "org.sonarqube"
+    println 'Enabling Sonar support'
+    apply plugin: "org.sonarqube"
 }
 
 // For help converting an Ant build to a Gradle build, see
 // https://docs.gradle.org/current/userguide/ant.html
 
+configurations {
+    antLibs
+}
+
+dependencies {
+    antLibs("junit:junit:4.12")
+    antLibs("org.apache.ant:ant-junit:1.10.4")
+    antLibs("org.apache.ant:ant-junit4:1.10.4")
+}
+
+ant.taskdef(name: "junit",
+        classname: "org.apache.tools.ant.taskdefs.optional.junit.JUnitTask",
+        classpath: configurations.antLibs.asPath)
+
 ant.importBuild 'build.xml'
 
 /**
@@ -42,22 +60,22 @@ Define properties for all projects, including this one
 
 */
 allprojects {
-	apply plugin: 'eclipse'
+    apply plugin: 'eclipse'
 
-	task wrapper(type: Wrapper) {
-	    gradleVersion = '3.4.1'
-	}
-	
-	task adjustWrapperPropertiesFile {
-		doLast {
-			ant.replaceregexp(match:'^#.*', replace:'', flags:'g', byline:true) {
-				fileset(dir: project.projectDir, includes: 'gradle/wrapper/gradle-wrapper.properties')
-			}
-			new File(project.projectDir, 'gradle/wrapper/gradle-wrapper.properties').with { it.text = it.readLines().findAll { it }.sort().join('\n') }
-			ant.fixcrlf(file: 'gradle/wrapper/gradle-wrapper.properties', eol: 'lf')
-		}
-	}
-	wrapper.finalizedBy adjustWrapperPropertiesFile
+    task wrapper(type: Wrapper) {
+        gradleVersion = '4.6'
+    }
+
+    task adjustWrapperPropertiesFile {
+        doLast {
+            ant.replaceregexp(match:'^#.*', replace:'', flags:'g', byline:true) {
+                fileset(dir: project.projectDir, includes: 'gradle/wrapper/gradle-wrapper.properties')
+            }
+            new File(project.projectDir, 'gradle/wrapper/gradle-wrapper.properties').with { it.text = it.readLines().findAll { it }.sort().join('\n') }
+            ant.fixcrlf(file: 'gradle/wrapper/gradle-wrapper.properties', eol: 'lf')
+        }
+    }
+    wrapper.finalizedBy adjustWrapperPropertiesFile
 }
 
 /**
@@ -71,41 +89,46 @@ subprojects {
     apply plugin: 'jacoco'
 
     // See https://github.com/melix/japicmp-gradle-plugin 
-	apply plugin: 'me.champeau.gradle.japicmp'
+    apply plugin: 'me.champeau.gradle.japicmp'
         
-	version = '3.16-beta3'
-	ext {
-		japicmpversion = '3.15'
-	}
+    version = '4.0.1-SNAPSHOT'
+    ext {
+        japicmpversion = '4.0.0'
+    }
 
-	tasks.withType(JavaCompile) {
-	    options.encoding = 'UTF-8'
-	}
+    tasks.withType(JavaCompile) {
+        options.encoding = 'UTF-8'
+    }
 
-    sourceCompatibility = 1.6
+    sourceCompatibility = 1.8
 
     repositories {
         mavenCentral()
     }
 
-	jar {
-		manifest {
-			attributes 'Implementation-Title': 'Apache POI', 'Implementation-Version': version
-		}
-	}
+    jar {
+        manifest {
+            attributes 'Implementation-Title': 'Apache POI', 'Implementation-Version': version
+        }
+    }
 
     test {
-		// Exclude some tests that are not actually tests or do not run cleanly on purpose
-		exclude '**/BaseTestBorderStyle.class'
-		exclude '**/BaseTestCellUtil.class'
-		exclude '**/TestUnfixedBugs.class'
-		exclude '**/TestOneFile.class'
+        // Exclude some tests that are not actually tests or do not run cleanly on purpose
+        exclude '**/BaseTestBorderStyle.class'
+        exclude '**/BaseTestCellUtil.class'
+        exclude '**/TestUnfixedBugs.class'
+        exclude '**/TestOneFile.class'
+
+        // Exclude Test Suites
+        exclude '**/All*Tests.class'
+        exclude '**/HSSFTests.class'
 
-        systemProperties = System.properties
-    
         // set heap size for the test JVM(s)
         minHeapSize = "128m"
         maxHeapSize = "768m"
+
+        // Specifying the local via system properties did not work, so we set them this way
+        jvmArgs '-Duser.language=en -Duser.country=US'
   
         // show standard out and standard error of the test JVM(s) on the console
         //testLogging.showStandardStreams = true
@@ -114,201 +137,217 @@ subprojects {
         systemProperties['user.dir'] = workingDir
         
         systemProperties['POI.testdata.path'] = '../../test-data'
-        //systemProperties['user.language'] = 'en'
-        //systemProperties['user.country'] = 'US'
+        
+        // this is necessary for JDK 9+ to keep formatting dates the same way as in previous JDK-versions
+        systemProperties['java.locale.providers'] = 'JRE,CLDR'
     }
 
-	test.beforeSuite { TestDescriptor suite ->
-	   System.setProperty('user.language', 'en')
-	   System.setProperty('user.country', 'US')
-	}
-
     jacoco {
-        toolVersion = '0.7.8'
+        toolVersion = '0.8.2'
     }
     
     // ensure the build-dir exists
     projectDir.mkdirs()
 
-	if (project.hasProperty('enableSonar')) {
-		sonarqube {
-			properties {
-				// as we currently use build/<module>/ as project-basedir, we need to tell Sonar to use
-				// the root-folder as "basedir" for the projects
-				property "sonar.projectBaseDir", "$projectDir/../.."
-			}
-		}
-	}
+    if (project.hasProperty('enableSonar')) {
+        sonarqube {
+            properties {
+                // as we currently use build/<module>/ as project-basedir, we need to tell Sonar to use
+                // the root-folder as "basedir" for the projects
+                property "sonar.projectBaseDir", "$projectDir/../.."
+            }
+        }
+    }
+
+    task(japicmp, type: me.champeau.gradle.ArtifactJapicmpTask, dependsOn: jar) {
+        to = jar.archivePath
+        onlyModified = true
+        onlyBinaryIncompatibleModified = true
+        failOnModification = false
+        txtOutputFile = file("$buildDir/reports/japi.txt")
+        htmlOutputFile = file("$buildDir/reports/japi.html")
+    }
 }
 
 project('main') {
-	sourceSets.main.java.srcDirs = ['../../src/java']
-	sourceSets.main.resources.srcDirs = ['../../src/resources/main']
-	sourceSets.test.java.srcDirs = ['../../src/testcases']
-	
-	dependencies {
-		compile 'commons-codec:commons-codec:1.10'
-		compile 'commons-logging:commons-logging:1.2'
-		compile 'org.apache.commons:commons-collections4:4.1'
-		
-		testCompile 'junit:junit:4.12'
-	}
-	
-	// Create a separate jar for test-code to depend on it in other projects
-	// See http://stackoverflow.com/questions/5144325/gradle-test-dependency
-	task testJar(type: Jar, dependsOn: testClasses) {
-		baseName = "test-${project.archivesBaseName}"
-		from sourceSets.test.output
-	}
+    sourceSets.main.java.srcDirs = ['../../src/java']
+    sourceSets.main.resources.srcDirs = ['../../src/resources/main']
+    sourceSets.test.java.srcDirs = ['../../src/testcases']
 
-	configurations {
-		tests
-	}
+    dependencies {
+        compile 'commons-codec:commons-codec:1.11'
+        compile 'commons-logging:commons-logging:1.2'
+        compile 'org.apache.commons:commons-collections4:4.2'
+        compile 'org.apache.commons:commons-math3:3.6.1'
+        compile 'javax.xml.bind:jaxb-api:2.3.0'
+        compile 'com.sun.xml.bind:jaxb-impl:2.3.0.1'
+        compile 'com.sun.xml.bind:jaxb-core:2.3.0.1'
+        compile 'javax.activation:activation:1.1.1'
 
-	artifacts {
-		tests testJar
-	}
+        testCompile 'junit:junit:4.12'
+        testCompile 'org.reflections:reflections:0.9.11'
+    }
 
-	// TOOD: we should not duplicate this task in each project, but I did not figure out how to inject the artifactId for each project
-    task japicmp(type: me.champeau.gradle.ArtifactJapicmpTask, dependsOn: jar) {
-		baseline = 'org.apache.poi:poi:' + japicmpversion + '@jar'
-		to = jar.archivePath
-		onlyModified = true
-		onlyBinaryIncompatibleModified = true
-		failOnModification = false
-		txtOutputFile = file("$buildDir/reports/japi.txt")
-		htmlOutputFile = file("$buildDir/reports/japi.html")
-	}
+    jar {
+        manifest {
+            attributes 'Automatic-Module-Name': 'org.apache.poi.main'
+        }
+    }
+
+    // Create a separate jar for test-code to depend on it in other projects
+    // See http://stackoverflow.com/questions/5144325/gradle-test-dependency
+    task testJar(type: Jar, dependsOn: testClasses) {
+        baseName = "test-${project.archivesBaseName}"
+        from sourceSets.test.output
+    }
+
+    configurations {
+        tests
+    }
+
+    artifacts {
+        tests testJar
+    }
+
+    japicmp.baseline = 'org.apache.poi:poi:' + japicmpversion + '@jar'
 }
 
 project('ooxml') {
-	sourceSets.main.java.srcDirs = ['../../src/ooxml/java']
-	sourceSets.main.resources.srcDirs = ['../../src/ooxml/resources', '../../src/resources/ooxml']
-	sourceSets.test.java.srcDirs = ['../../src/ooxml/testcases']
+    sourceSets.main.java.srcDirs = ['../../src/ooxml/java']
+    sourceSets.main.resources.srcDirs = ['../../src/ooxml/resources', '../../src/resources/ooxml']
+    sourceSets.test.java.srcDirs = ['../../src/ooxml/testcases']
 
     // for now import the ant-task for building the jars from build.xml
     // we need to rename the tasks as e.g. task "jar" conflicts with :ooxml:jar
-	ant.importBuild('../../build.xml') { antTargetName ->
-		'ant-' + antTargetName
-	}
-	compileJava.dependsOn 'ant-compile-ooxml-xsds'
-	
-	dependencies {
-		compile 'org.apache.xmlbeans:xmlbeans:2.6.0'
-		compile 'org.apache.commons:commons-collections4:4.1'
-		compile 'org.apache.santuario:xmlsec:2.0.6'
-		compile 'org.bouncycastle:bcpkix-jdk15on:1.54'
-		compile 'com.github.virtuald:curvesapi:1.04'
-		
-		// for ooxml-lite, should we move this somewhere else?
-		compile 'junit:junit:4.12'
+    ant.importBuild('../../build.xml') { antTargetName ->
+        'ant-' + antTargetName
+    }
+    compileJava.dependsOn 'ant-compile-ooxml-xsds'
 
-		compile project(':main')
-		compile project(':scratchpad')		// TODO: get rid of this dependency!
-		compile files('../../ooxml-lib/ooxml-schemas-1.3.jar')
-		compile files('../../ooxml-lib/ooxml-security-1.1.jar')
-		
-		testCompile 'junit:junit:4.12'
-		testCompile project(path: ':main', configuration: 'tests')
-	}
+    dependencies {
+        compile 'org.apache.xmlbeans:xmlbeans:3.0.2'
+        compile 'org.apache.commons:commons-collections4:4.2'
+        compile 'org.apache.commons:commons-math3:3.6.1'
+        compile 'org.apache.commons:commons-compress:1.18'
+        compile 'org.apache.santuario:xmlsec:2.1.0'
+        compile 'org.bouncycastle:bcpkix-jdk15on:1.60'
+        compile 'com.github.virtuald:curvesapi:1.05'
 
-	// TOOD: we should not duplicate this task in each project, but I did not figure out how to inject the artifactId for each project
-    task japicmp(type: me.champeau.gradle.ArtifactJapicmpTask, dependsOn: jar) {
-		baseline = 'org.apache.poi:poi-ooxml:' + japicmpversion + '@jar'
-		to = jar.archivePath
-		onlyModified = true
-		onlyBinaryIncompatibleModified = true
-		failOnModification = false
-		txtOutputFile = file("$buildDir/reports/japi.txt")
-		htmlOutputFile = file("$buildDir/reports/japi.html")
-	}
+        // for ooxml-lite, should we move this somewhere else?
+        compile 'junit:junit:4.12'
+
+        compile project(':main')
+        compile project(':scratchpad')		// TODO: get rid of this dependency!
+        compile files('../../ooxml-lib/ooxml-schemas-1.4.jar')
+        compile files('../../ooxml-lib/ooxml-security-1.1.jar')
+
+        testCompile 'junit:junit:4.12'
+        testCompile 'org.mockito:mockito-core:2.21.0'
+        testCompile 'org.xmlunit:xmlunit-core:2.5.1'
+        testCompile 'org.reflections:reflections:0.9.11'
+        testCompile project(path: ':main', configuration: 'tests')
+        testCompile 'org.openjdk.jmh:jmh-core:1.19'
+        testCompile 'org.openjdk.jmh:jmh-generator-annprocess:1.19'
+    }
+
+    jar {
+        manifest {
+            attributes 'Automatic-Module-Name': 'org.apache.poi.ooxml'
+        }
+    }
+
+    japicmp.baseline = 'org.apache.poi:poi-ooxml:' + japicmpversion + '@jar'
 }
 
 project('examples') {
-	sourceSets.main.java.srcDirs = ['../../src/examples/src']
-	
-	dependencies {
-		compile project(':main')
-		compile project(':ooxml')
-	}
+    sourceSets.main.java.srcDirs = ['../../src/examples/src']
+
+    dependencies {
+        compile project(':main')
+        compile project(':ooxml')
+    }
+
+    japicmp.enabled = false
 }
 
 
 project('excelant') {
-	sourceSets.main.java.srcDirs = ['../../src/excelant/java']
-	sourceSets.main.resources.srcDirs = ['../../src/excelant/resources']
-	sourceSets.test.java.srcDirs = ['../../src/excelant/testcases']
-	
-	dependencies {
-		compile 'org.apache.ant:ant:1.9.4'
+    sourceSets.main.java.srcDirs = ['../../src/excelant/java']
+    sourceSets.main.resources.srcDirs = ['../../src/excelant/resources']
+    sourceSets.test.java.srcDirs = ['../../src/excelant/testcases']
 
-		compile project(':main')
-		compile project(':ooxml')
+    dependencies {
+        compile 'org.apache.ant:ant:1.10.4'
 
-		testCompile project(path: ':main', configuration: 'tests')
+        compile project(':main')
+        compile project(':ooxml')
+
+        testCompile project(path: ':main', configuration: 'tests')
+    }
+
+	jar {
+		manifest {
+			attributes 'Automatic-Module-Name': 'org.apache.poi.excelant'
+		}
 	}
 
-	// TOOD: we should not duplicate this task in each project, but I did not figure out how to inject the artifactId for each project
-    task japicmp(type: me.champeau.gradle.ArtifactJapicmpTask, dependsOn: jar) {
-		baseline = 'org.apache.poi:poi-excelant:' + japicmpversion + '@jar'
-		to = jar.archivePath
-		onlyModified = true
-		onlyBinaryIncompatibleModified = true
-		failOnModification = false
-		txtOutputFile = file("$buildDir/reports/japi.txt")
-		htmlOutputFile = file("$buildDir/reports/japi.html")
-	}
+    japicmp.baseline = 'org.apache.poi:poi-excelant:' + japicmpversion + '@jar'
 }
 
 project('integrationtest') {
-	sourceSets.test.java.srcDirs = ['../../src/integrationtest']
-	
-	dependencies {
-		compile 'org.apache.ant:ant:1.9.4'
+    sourceSets.test.java.srcDirs = ['../../src/integrationtest']
 
-		compile project(':main')
-		compile project(':ooxml')
-		compile project(':scratchpad')
-		compile project(':examples')
-		
-		testCompile 'junit:junit:4.12'
+    dependencies {
+        compile 'org.apache.ant:ant:1.10.4'
+
+        compile project(':main')
+        compile project(':ooxml')
+        compile project(':scratchpad')
+        compile project(':examples')
+
+        testCompile 'junit:junit:4.12'
+    }
+
+	jar {
+		manifest {
+			attributes 'Automatic-Module-Name': 'org.apache.poi.integrationtest'
+		}
 	}
 
-    test {
-		// exclude these from the normal test-run
-		exclude '**/TestAllFiles.class'
-		exclude '**/*FileHandler.class'
-		exclude '**/RecordsStresser.class'
-	}
-	
-	task integrationTest(type: Test) {
-		// these are just tests used during development of more test-code
-		exclude '**/*FileHandler.class'
-		exclude '**/RecordStresser.class'
-	}
+	test {
+        // exclude these from the normal test-run
+        exclude '**/TestAllFiles.class'
+        exclude '**/*FileHandler.class'
+        exclude '**/RecordsStresser.class'
+    }
+
+    task integrationTest(type: Test) {
+        // these are just tests used during development of more test-code
+        exclude '**/*FileHandler.class'
+        exclude '**/RecordStresser.class'
+    }
+
+    japicmp.enabled = false
 }
 
 project('scratchpad') {
-	sourceSets.main.java.srcDirs = ['../../src/scratchpad/src']
-	sourceSets.main.resources.srcDirs = ['../../src/resources/scratchpad']
-	sourceSets.test.java.srcDirs = ['../../src/scratchpad/testcases']
-	
-	dependencies {
-		compile project(':main')
-		// cyclic-dependency here: compile project(':ooxml')
-		
-		testCompile 'junit:junit:4.12'
-		testCompile project(path: ':main', configuration: 'tests')
+    sourceSets.main.java.srcDirs = ['../../src/scratchpad/src']
+    sourceSets.main.resources.srcDirs = ['../../src/resources/scratchpad']
+    sourceSets.test.java.srcDirs = ['../../src/scratchpad/testcases']
+
+    dependencies {
+        compile project(':main')
+        // cyclic-dependency here: compile project(':ooxml')
+
+        testCompile 'junit:junit:4.12'
+        testCompile project(path: ':main', configuration: 'tests')
+    }
+
+	jar {
+		manifest {
+			attributes 'Automatic-Module-Name': 'org.apache.poi.scratchpad'
+		}
 	}
 
-	// TOOD: we should not duplicate this task in each project, but I did not figure out how to inject the artifactId for each project
-    task japicmp(type: me.champeau.gradle.ArtifactJapicmpTask, dependsOn: jar) {
-		baseline = 'org.apache.poi:poi-scratchpad:' + japicmpversion + '@jar'
-		to = jar.archivePath
-		onlyModified = true
-		onlyBinaryIncompatibleModified = true
-		failOnModification = false
-		txtOutputFile = file("$buildDir/reports/japi.txt")
-		htmlOutputFile = file("$buildDir/reports/japi.html")
-	}
+    japicmp.baseline = 'org.apache.poi:poi-scratchpad:' + japicmpversion + '@jar'
 }

doap_POI.rdf

@@ -35,6 +35,27 @@
     <programming-language>Java</programming-language>
     <category rdf:resource="https://projects.apache.org/category/content" />
     <category rdf:resource="https://projects.apache.org/category/library" />
+    <release>
+      <Version>
+        <name>Apache POI 4.0.0</name>
+        <created>2018-09-07</created>
+        <revision>4.0.0</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>Apache POI 3.17</name>
+        <created>2017-09-15</created>
+        <revision>3.17</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>Apache POI 3.16</name>
+        <created>2017-04-19</created>
+        <revision>3.16</revision>
+      </Version>
+    </release>
     <release>
       <Version>
         <name>Apache POI 3.15</name>

file-leak-detector.exclude

@@ -0,0 +1,55 @@
+# JaCoCo Agent
+sun.instrument.InstrumentationImpl.loadClassAndStartAgent
+org.jacoco.agent.rt.internal_14f7ee5.output.FileOutput.openFile
+
+# Ant Junit
+org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter.getDocumentBuilder
+
+# JVM
+sun.security.jca.ProviderConfig.doLoadProvider
+javax.xml.parsers.FactoryFinder.findJarServiceProvider
+com.sun.org.apache.xerces.internal.utils.SecuritySupport.getResourceBundle
+
+# Codepage support loads classes
+java.nio.charset.Charset.lookupViaProviders
+
+# Ant
+org.apache.tools.ant.Main.getAntVersion
+javax.xml.parsers.FactoryFinder.findJarServiceProvider
+org.apache.tools.ant.taskdefs.Antlib.createAntlib
+
+# XML Parser
+com.sun.org.apache.xerces.internal.utils.SecuritySupport.getResourceBundle
+com.sun.org.apache.xml.internal.serializer.OutputPropertiesFactory.loadPropertiesFile
+com.sun.xml.internal.bind.v2.runtime.property.ArrayElementNodeProperty.<init>
+com.sun.xml.internal.bind.v2.runtime.property.AttributeProperty.<init>
+com.sun.xml.internal.bind.v2.runtime.property.SingleElementNodeProperty.<init>
+javax.xml.stream.FactoryFinder.findJarServiceProvider
+
+# XMLBeans
+org.apache.xmlbeans.impl.regex.RegexParser.setLocale
+org.apache.xmlbeans.impl.schema.SchemaTypeSystemImpl$XsbReader.getLoaderStream
+
+# JCA
+sun.security.jca.ProviderConfig.getProvider
+javax.crypto.JceSecurity.setupJurisdictionPolicies
+javax.crypto.Cipher.getMaxAllowedKeyLength
+
+# IntelliJ
+com.intellij.junit4.JUnit4TestRunnerUtil.<clinit>
+
+# Java
+sun.util.resources.LocaleData.getBundle
+sun.util.LocaleServiceProviderPool.<init>
+sun.util.calendar.LocalGregorianCalendar.getLocalGregorianCalendar
+sun.net.www.protocol.jar.JarURLConnection.getInputStream
+sun.text.normalizer.ICUData.getStream
+sun.font.T2KFontScaler.initNativeScaler
+sun.font.SunFontManager.loadFonts
+sun.font.FontManagerFactory.getInstance
+sun.font.TrueTypeFont.open
+sun.reflect.misc.MethodUtil.<clinit>
+java.util.logging.Logger.findSystemResourceBundle
+java.text.BreakIterator.getBundle
+sun.java2d.SunGraphicsEnvironment.<init>
+org.kohsuke.file_leak_detector.AgentMain.runHttpServer

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

jenkins/create_jobs.groovy

@@ -1,5 +1,5 @@
 // This script is used as input to the Jenkins Job DSL plugin to create all the build-jobs that
-// Apache POI uses on the public Jenkins instance at https://builds.apache.org/view/POI/
+// Apache POI uses on the public Jenkins instance at https://builds.apache.org/view/P/view/POI/
 //
 // See https://github.com/jenkinsci/job-dsl-plugin/wiki for information about the DSL, you can
 // use http://job-dsl.herokuapp.com/ to validate the code before checkin
@@ -10,93 +10,133 @@ def triggerSundays = '''
 H H * * 0
 '''
 
+def xercesUrl = 'http://repo1.maven.org/maven2/xerces/xercesImpl/2.6.1/xercesImpl-2.6.1.jar'
+def xercesLib = './xercesImpl-2.6.1.jar'
+
 def poijobs = [
-    [ name: 'POI-DSL-1.6',
-            // workaround as Sourceforge does not accept any of the SSL ciphers in JDK 6 any more and thus we cannot download this jar
-            // as part of the Ant build
-            addShell: 'wget -O lib/findbugs-noUpdateChecks-2.0.3.zip http://downloads.sourceforge.net/project/findbugs/findbugs/2.0.3/findbugs-noUpdateChecks-2.0.3.zip?download='
-    ],
-    [ name: 'POI-DSL-1.8', jdk: '1.8', trigger: 'H */12 * * *'
-    ],
-    [ name: 'POI-DSL-OpenJDK', jdk: 'OpenJDK', trigger: 'H */12 * * *',
-        // H13-H20 (Ubuntu 16.04) do not have OpenJDK 6 installed, see https://issues.apache.org/jira/browse/INFRA-12880
-        slaveAdd: '&&!beam1&&!beam2&&!beam3&&!beam4&&!beam5&&!beam6&&!beam7&&!beam8&&!H12&&!H13&&!H14&&!H15&&!H16&&!H17&&!H18&&!H19&&!H20&&!H21&&!H22&&!H23&&!H24&&!qnode1&&!qnode2&&!qnode3&&!ubuntu-eu2&&!ubuntu-eu3&&!ubuntu-us1',
-        // the JDK is missing on some slaves so builds are unstable
-        skipcigame: true
-    ],
-    [ name: 'POI-DSL-1.9', jdk: '1.9', trigger: triggerSundays,
-        properties: ['-Dmaxpermsize=-Dthis.is.a.dummy=true',
-                     '-Djava9addmods=--add-modules=java.xml.bind',
-                     '-Djavadoc9addmods=--add-modules=java.xml.bind',
-                     '-Djava9addmodsvalue=-Dsun.reflect.debugModuleAccessChecks=true',
-                     '-Djava9addopens1=--add-opens=java.xml/com.sun.org.apache.xerces.internal.util=ALL-UNNAMED',
-                     '-Djava9addopens2=--add-opens=java.base/java.io=ALL-UNNAMED',
-                     '-Djava9addopens3=--add-opens=java.base/java.nio=ALL-UNNAMED',
-                     '-Djava9addopens4=--add-opens=java.base/java.lang=ALL-UNNAMED',
-                     '-Djava9addopens5=--add-opens=java.base/jdk.internal.ref=ALL-UNNAMED',
-                     '-Djava.locale.providers=JRE,CLDR'],
-        skipcigame: true
-    ],
-    [ name: 'POI-DSL-IBM-JDK', jdk: 'IBMJDK', trigger: triggerSundays,
-        // some OOXML tests fail with strange XML parsing errors and missing JCE unlimited strength requirements
-        disabled: true, skipcigame: true
-    ],
-    [ name: 'POI-DSL-old-Xerces', trigger: triggerSundays,
-        shell: 'mkdir -p compile-lib && test -f compile-lib/xercesImpl-2.6.1.jar || wget -O compile-lib/xercesImpl-2.6.1.jar http://repo1.maven.org/maven2/xerces/xercesImpl/2.6.1/xercesImpl-2.6.1.jar\n',
-        // the property triggers using Xerces as XML Parser and previously showed some exception that can occur
-        properties: ['-Dadditionaljar=compile-lib/xercesImpl-2.6.1.jar'],
-        // workaround as Sourceforge does not accept any of the SSL ciphers in JDK 6 any more and thus we cannot download this jar
-        // as part of the Ant build
-        addShell: 'wget -O lib/findbugs-noUpdateChecks-2.0.3.zip http://downloads.sourceforge.net/project/findbugs/findbugs/2.0.3/findbugs-noUpdateChecks-2.0.3.zip?download='
-    ],
-    [ name: 'POI-DSL-Maven', trigger: 'H */4 * * *', maven: true
-    ],
-    [ name: 'POI-DSL-regenerate-javadoc', trigger: triggerSundays, javadoc: true
-    ],
-    [ name: 'POI-DSL-API-Check', jdk: '1.7', trigger: '@daily', apicheck: true
-    ],
-    [ name: 'POI-DSL-Gradle', jdk: '1.7', trigger: triggerSundays, email: 'centic@apache.org', gradle: true,
-        // Gradle will not run any tests if the code is up-to-date, therefore manually mark the files as updated
-        addShell: 'touch --no-create build/*/build/test-results/TEST-*.xml build/*/build/test-results/test/TEST-*.xml'
-    ],
-    [ name: 'POI-DSL-no-scratchpad', trigger: triggerSundays, noScratchpad: true
-    ],
-    [ name: 'POI-DSL-SonarQube', jdk: '1.8', trigger: 'H 9 * * *', maven: true, sonar: true
-    ],
-    [ name: 'POI-DSL-SonarQube-Gradle', jdk: '1.8', trigger: 'H 9 * * *', gradle: true, sonar: true, skipcigame: true
-    ],
+        [ name: 'POI-DSL-1.8', trigger: 'H */12 * * *'
+        ],
+        [ name: 'POI-DSL-OpenJDK', jdk: 'OpenJDK', trigger: 'H */12 * * *',
+          // H13-H20 (Ubuntu 16.04) do not have OpenJDK 6 installed, see https://issues.apache.org/jira/browse/INFRA-12880
+          slaveAdd: '&&!beam1&&!beam2&&!beam3&&!beam4&&!beam5&&!beam6&&!beam7&&!beam8' +
+                  '&&!H0&&!H1&&!H2&&!H3&&!H4&&!H5&&!H6&&!H7&&!H8&&!H9&&!H10&&!H11' +
+                  '&&!qnode3' +
+                  '&&!ubuntu-1&&!ubuntu-2&&!ubuntu-4&&!ubuntu-5&&!ubuntu-6&&!ubuntu-eu2&&!ubuntu-us1',
+          // the JDK is missing on some slaves so builds are unstable
+          skipcigame: true
+        ],
+        [ name: 'POI-DSL-1.10', jdk: '1.10', trigger: triggerSundays,
+          properties: ['-Djava9addmods=--add-modules=java.xml.bind',
+                       '-Djavadoc9addmods=--add-modules=java.xml.bind',
+                       '-Djava9addmodsvalue=-Dsun.reflect.debugModuleAccessChecks=true',
+                       '-Djava9addopens1=--add-opens=java.xml/com.sun.org.apache.xerces.internal.util=ALL-UNNAMED',
+                       '-Djava9addopens2=--add-opens=java.base/java.io=ALL-UNNAMED',
+                       '-Djava9addopens3=--add-opens=java.base/java.nio=ALL-UNNAMED',
+                       '-Djava9addopens4=--add-opens=java.base/java.lang=ALL-UNNAMED',
+                       '-Djava9addopens5=--add-opens=java.base/jdk.internal.ref=ALL-UNNAMED',
+                       '-Djava9addopens6=--add-opens=java.base/java.lang=java.xml.bind',
+                       '-Djava.locale.providers=JRE,CLDR'],
+          skipcigame: true
+        ],
+        [ name: 'POI-DSL-1.11', jdk: '1.11', trigger: triggerSundays,
+          // Nodes beam* do not yet have JDK 11 installed
+          slaveAdd: '&&!beam1&&!beam2&&!beam3&&!beam4&&!beam6&&!beam7&&!beam8&&!beam9&&!beam10&&!beam11&&!beam12&&!beam13&&!beam14&&!beam15&&!beam16',
+          properties: ['-Djava9addmods=-Dthis.is.a.dummy=true',
+                       '-Djavadoc9addmods=-Dthis.is.a.dummy=true',
+                       '-Djava9addmodsvalue=-Dsun.reflect.debugModuleAccessChecks=true',
+                       '-Djava9addopens1=--add-opens=java.xml/com.sun.org.apache.xerces.internal.util=ALL-UNNAMED',
+                       '-Djava9addopens2=--add-opens=java.base/java.io=ALL-UNNAMED',
+                       '-Djava9addopens3=--add-opens=java.base/java.nio=ALL-UNNAMED',
+                       '-Djava9addopens4=--add-opens=java.base/java.lang=ALL-UNNAMED',
+                       '-Djava9addopens5=--add-opens=java.base/jdk.internal.ref=ALL-UNNAMED',
+                       '-Djava9addopens6=-Dthis.is.a.dummy=true',
+                       '-Djava.locale.providers=JRE,CLDR'],
+          skipcigame: true
+        ],
+        [ name: 'POI-DSL-1.12', jdk: '1.12', trigger: '''
+# do not run this via a schedule for now
+''',
+          // Nodes beam* do not yet have JDK 12 installed
+          slaveAdd: '&&!beam1&&!beam2&&!beam3&&!beam4&&!beam6&&!beam7&&!beam8&&!beam9&&!beam10&&!beam11&&!beam12&&!beam13&&!beam14&&!beam15&&!beam16',
+          properties: ['-Djava9addmods=-Dthis.is.a.dummy=true',
+                       '-Djavadoc9addmods=-Dthis.is.a.dummy=true',
+                       '-Djava9addmodsvalue=-Dsun.reflect.debugModuleAccessChecks=true',
+                       '-Djava9addopens1=--add-opens=java.xml/com.sun.org.apache.xerces.internal.util=ALL-UNNAMED',
+                       '-Djava9addopens2=--add-opens=java.base/java.io=ALL-UNNAMED',
+                       '-Djava9addopens3=--add-opens=java.base/java.nio=ALL-UNNAMED',
+                       '-Djava9addopens4=--add-opens=java.base/java.lang=ALL-UNNAMED',
+                       '-Djava9addopens5=--add-opens=java.base/jdk.internal.ref=ALL-UNNAMED',
+                       '-Djava9addopens6=-Dthis.is.a.dummy=true',
+                       '-Djava.locale.providers=JRE,CLDR'],
+          skipcigame: true
+        ],
+        [ name: 'POI-DSL-IBM-JDK', jdk: 'IBMJDK', trigger: triggerSundays,
+          // some OOXML tests fail with strange XML parsing errors and missing JCE unlimited strength requirements
+          disabled: true, skipcigame: true
+        ],
+        [ name: 'POI-DSL-old-Xerces', trigger: triggerSundays,
+          shell: "test -f ${xercesLib} || wget -O ${xercesLib} ${xercesUrl}\n",
+          // the property triggers using Xerces as XML Parser and previously showed some exception that can occur
+          properties: ["-Dadditionaljar=${xercesLib}"]
+        ],
+        [ name: 'POI-DSL-Maven', trigger: 'H */4 * * *', maven: true
+        ],
+        [ name: 'POI-DSL-regenerate-javadoc', trigger: triggerSundays, javadoc: true
+        ],
+        // disabled for 4.0.0 because we break compatibility on-purpose in a few places, e.g. for Java 9 compatibility
+        [ name: 'POI-DSL-API-Check', trigger: '@daily', apicheck: true, disabled: true
+        ],
+        [ name: 'POI-DSL-Gradle', trigger: triggerSundays, email: 'centic@apache.org', gradle: true,
+          // Gradle will not run any tests if the code is up-to-date, therefore manually mark the files as updated
+          addShell: 'touch --no-create build/*/build/test-results/TEST-*.xml build/*/build/test-results/test/TEST-*.xml'
+        ],
+        [ name: 'POI-DSL-no-scratchpad', trigger: triggerSundays, noScratchpad: true
+        ],
+        [ name: 'POI-DSL-SonarQube', trigger: 'H 9 * * *', maven: true, sonar: true, skipcigame: true
+        ],
+        [ name: 'POI-DSL-SonarQube-Gradle', trigger: 'H 9 * * *', gradle: true, sonar: true, skipcigame: true,
+                disabled: true // this one does run, but does not actually send data to Sonarqube for some reason, we need to investigate some more
+        ],
+        [ name: 'POI-DSL-Windows-1.8', trigger: 'H */12 * * *', windows: true, slaves: 'Windows'
+        ],
+]
+
+def xmlbeansjobs = [
+        [ name: 'POI-XMLBeans-DSL-1.6', jdk: '1.6', trigger: 'H */12 * * *', skipcigame: true
+        ]
 ]
 
 def svnBase = 'https://svn.apache.org/repos/asf/poi/trunk'
-def defaultJdk = '1.6'
+def xmlbeansSvnBase = 'https://svn.apache.org/repos/asf/xmlbeans/trunk'
+
+def defaultJdk = '1.8'
 def defaultTrigger = 'H/15 * * * *'     // check SCM every 60/15 = 4 minutes
 def defaultEmail = 'dev@poi.apache.org'
 def defaultAnt = 'Ant 1.9.9'
-// currently a lot of H?? slaves don't have Ant installed ...
-def defaultSlaves = 'ubuntu&&!cloud-slave&&!H15&&!H17&&!H18&&!H24&&!ubuntu-4'
+// currently a lot of H?? slaves don't have Ant installed ... H21 seems to have a SVN problem
+// H35 fails with ImageIO create cache file errors, although the java.io.tmpdir is writable
+def defaultSlaves = '(ubuntu||beam)&&!cloud-slave&&!H15&&!H17&&!H18&&!H24&&!ubuntu-4&&!H21&&!H35'
 
 def jdkMapping = [
-    '1.6': 'JDK 1.6 (latest)',
-    '1.7': 'JDK 1.7 (latest)',
-    '1.8': 'JDK 1.8 (latest)',
-    '1.9': 'JDK 9 b156 (early access build) with project Jigsaw',
-    'OpenJDK': 'OpenJDK 6 (on Ubuntu only) ',   // blank is required here until the name in the Jenkins instance is fixed!
-    'IBMJDK': 'IBM 1.8 64-bit (on Ubuntu only)',
+        '1.6': 'JDK 1.6 (latest)',
+        '1.8': 'JDK 1.8 (latest)',
+        '1.10': 'JDK 10 (latest)',
+        '1.11': 'JDK 11 (latest)',
+        '1.12': 'JDK 12 (latest)',
+        'OpenJDK': 'OpenJDK 8 (on Ubuntu only) ',   // blank is required here until the name in the Jenkins instance is fixed!
+        'IBMJDK': 'IBM 1.8 64-bit (on Ubuntu only)',
 ]
 
-poijobs.each { poijob ->
-    def jdkKey = poijob.jdk ?: defaultJdk
-    def trigger = poijob.trigger ?: defaultTrigger
-    def email = poijob.email ?: defaultEmail
-    def slaves = defaultSlaves + (poijob.slaveAdd ?: '')
+static def shellEx(def context, String cmd, def poijob) {
+    if (poijob.windows) {
+        context.batchFile(cmd)
+    } else {
+        context.shell(cmd)
+    }
+}
 
-    job(poijob.name) {
-        if (poijob.disabled) {
-            disabled()
-        }
-
-        def defaultDesc = '''
-<img src="https://poi.apache.org/resources/images/project-logo.jpg" />
+def defaultDesc = '''
+<img src="https://poi.apache.org/images/project-header.png" />
 <p>
 Apache POI - the Java API for Microsoft Documents
 </p>
@@ -107,9 +147,7 @@ see <a href="https://github.com/jenkinsci/job-dsl-plugin/wiki">https://github.co
 for more details about the DSL.</b>
 </p>'''
 
-        description( defaultDesc +
-(poijob.apicheck ? 
-'''
+def apicheckDesc = '''
 <p>
 <b><a href="https://builds.apache.org/analysis/dashboard?id=org.apache.poi%3Apoi-parent&did=1" target="_blank">Sonar reports</a></b> -
 <p>
@@ -119,14 +157,70 @@ for more details about the DSL.</b>
 <b><a href="lastSuccessfulBuild/artifact/build/scratchpad/build/reports/japi.html">API Check POI-Scratchpad</a></b>
 
 </p>
-''' :
 '''
+
+def sonarDesc = '''
 <p>
 <b><a href="lastSuccessfulBuild/findbugsResult/" target="_blank">Findbugs report of latest build</a></b> -
 <b><a href="https://builds.apache.org/analysis/dashboard?id=org.apache.poi%3Apoi-parent&did=1" target="_blank">Sonar reports</a></b> -
 <b><a href="lastSuccessfulBuild/artifact/build/coverage/index.html" target="_blank">Coverage of latest build</a></b>
 </p>
-'''))
+'''
+
+def shellCmdsUnix =
+        '''# show which files are currently modified in the working copy
+svn status
+
+# print out information about which exact version of java we are using
+echo Java-Home: $JAVA_HOME
+ls -al $JAVA_HOME/
+ls -al $JAVA_HOME/bin
+$JAVA_HOME/bin/java -version
+
+echo which java
+which java
+java -version
+
+echo which javac
+which javac
+javac -version
+
+echo '<project default="test"><target name="test"><echo>Java ${ant.java.version}/${java.version}</echo><exec executable="javac"><arg value="-version"/></exec></target></project>' > build.javacheck.xml
+ant -f build.javacheck.xml -v
+
+POIJOBSHELL
+
+# ignore any error message
+exit 0'''
+
+def shellCmdsWin =
+        '''@echo off
+:: show which files are currently modified in the working copy
+svn status
+
+:: print out information about which exact version of java we are using
+echo Java-Home: %JAVA_HOME%
+dir "%JAVA_HOME:\\\\=\\%"
+"%JAVA_HOME%/bin/java" -version
+
+POIJOBSHELL
+
+:: ignore any error message
+exit /b 0'''
+
+poijobs.each { poijob ->
+    def jdkKey = poijob.jdk ?: defaultJdk
+    def trigger = poijob.trigger ?: defaultTrigger
+    def email = poijob.email ?: defaultEmail
+    def slaves = poijob.slaves ?: defaultSlaves + (poijob.slaveAdd ?: '')
+    def antRT = defaultAnt + (poijob.windows ? ' (Windows)' : '')
+
+    job(poijob.name) {
+        if (poijob.disabled) {
+            disabled()
+        }
+
+        description( defaultDesc + (poijob.apicheck ? apicheckDesc : sonarDesc) )
         logRotator {
             numToKeep(5)
             artifactNumToKeep(1)
@@ -134,10 +228,12 @@ for more details about the DSL.</b>
         label(slaves)
         environmentVariables {
             env('LANG', 'en_US.UTF-8')
-            if(jdkKey == '1.9') {
-                // when using JDK 9 for running Ant, we need to provide more packages for the forbidden-api-checks task
-                env('ANT_OPTS', '--add-modules=java.xml.bind')
+            if(jdkKey == '1.10') {
+                // when using JDK 9/10 for running Ant, we need to provide more modules for the forbidden-api-checks task
+                // on JDK 11 and newer there is no such module any more, so do not add it here
+                env('ANT_OPTS', '--add-modules=java.xml.bind --add-opens=java.xml/com.sun.org.apache.xerces.internal.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED')
             }
+            env('FORREST_HOME', poijob.windows ? 'f:\\jenkins\\tools\\forrest\\latest' : '/home/jenkins/tools/forrest/latest')
         }
         wrappers {
             timeout {
@@ -145,6 +241,9 @@ for more details about the DSL.</b>
                 abortBuild()
                 writeDescription('Build was aborted due to timeout')
             }
+            preBuildCleanup {
+                includePattern('**/ooxml-lib/ooxml*.jar')
+            }
             if(poijob.sonar) {
                 configure { project ->
                     project / buildWrappers << 'hudson.plugins.sonar.SonarBuildWrapper' {}
@@ -154,28 +253,22 @@ for more details about the DSL.</b>
         jdk(jdkMapping.get(jdkKey))
         scm {
             svn(svnBase) { svnNode ->
-                        svnNode / browser(class: 'hudson.scm.browsers.ViewSVN') /
-                            url << 'http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN'
-                    }
+                svnNode / browser(class: 'hudson.scm.browsers.ViewSVN') /
+                        url << 'http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN'
+            }
         }
+        checkoutRetryCount(3)
+
         triggers {
             scm(trigger)
         }
 
-        def shellcmds = '# show which files are currently modified in the working copy\n' +
-            'svn status\n' +
-            '\n' +
-            'echo Java-Home: $JAVA_HOME\n' +
-            'ls -al $JAVA_HOME/\n' +
-            '\n' +
-            (poijob.shell ?: '') + '\n' +
-            '# ignore any error message\n' +
-            'exit 0\n'
+        def shellcmds = (poijob.windows ? shellCmdsWin : shellCmdsUnix).replace('POIJOBSHELL', poijob.shell ?: '')
 
         // Create steps and publishers depending on the type of Job that is selected
         if(poijob.maven) {
             steps {
-                shell(shellcmds)
+                shellEx(delegate, shellcmds, poijob)
                 maven {
                     goals('clean')
                     rootPOM('sonar/pom.xml')
@@ -195,7 +288,6 @@ for more details about the DSL.</b>
                     rootPOM('sonar/pom.xml')
                     mavenOpts('-Xmx2g')
                     mavenOpts('-Xms256m')
-                    mavenOpts('-XX:MaxPermSize=512m')
                     mavenOpts('-XX:-OmitStackTraceInFastThrow')
                     localRepository(LocalRepositoryLocation.LOCAL_TO_WORKSPACE)
                     mavenInstallation('maven-3.2.1')
@@ -207,19 +299,26 @@ for more details about the DSL.</b>
                         project / publishers << 'hudson.plugins.cigame.GamePublisher' {}
                     }
                 }
+                if (!poijob.sonar) {
+                    archiveJunit('sonar/*/target/surefire-reports/TEST-*.xml') {
+                        testDataPublishers {
+                            publishTestStabilityData()
+                        }
+                    }
+                }
                 mailer(email, false, false)
             }
         } else if (poijob.javadoc) {
             steps {
-                shell(shellcmds)
+                shellEx(delegate, shellcmds, poijob)
                 ant {
                     targets(['clean', 'javadocs'] + (poijob.properties ?: []))
                     prop('coverage.enabled', true)
                     // Properties did not work, so I had to use targets instead
                     //properties(poijob.properties ?: '')
-                    antInstallation(defaultAnt)
+                    antInstallation(antRT)
                 }
-                shell('zip -r build/javadocs.zip build/tmp/site/build/site/apidocs')
+                shellEx(delegate, 'zip -r build/javadocs.zip build/site/apidocs', poijob)
             }
             publishers {
                 if (!poijob.skipcigame) {
@@ -231,7 +330,7 @@ for more details about the DSL.</b>
             }
         } else if (poijob.apicheck) {
             steps {
-                shell(shellcmds)
+                shellEx(delegate, shellcmds, poijob)
                 gradle {
                     tasks('japicmp')
                     useWrapper(false)
@@ -248,7 +347,7 @@ for more details about the DSL.</b>
             }
         } else if(poijob.sonar) {
             steps {
-                shell(shellcmds)
+                shellEx(delegate, shellcmds, poijob)
                 gradle {
                     switches('-PenableSonar')
                     switches('-Dsonar.host.url=$SONAR_HOST_URL')
@@ -266,9 +365,9 @@ for more details about the DSL.</b>
             }
         } else {
             steps {
-                shell(shellcmds)
+                shellEx(delegate, shellcmds, poijob)
                 if(poijob.addShell) {
-                    shell(poijob.addShell)
+                    shellEx(delegate, poijob.addShell, poijob)
                 }
                 // For Jobs that should still have the default set of publishers we can configure different steps here
                 if(poijob.gradle) {
@@ -278,14 +377,14 @@ for more details about the DSL.</b>
                     }
                 } else if (poijob.noScratchpad) {
                     ant {
-                        targets(['clean', 'compile-all'] + (poijob.properties ?: []))
+                        targets(['clean', 'compile'] + (poijob.properties ?: []))
                         prop('coverage.enabled', true)
-                        antInstallation(defaultAnt)
+                        antInstallation(antRT)
                     }
                     ant {
                         targets(['-Dscratchpad.ignore=true', 'jacocotask', 'test-all', 'testcoveragereport'] + (poijob.properties ?: []))
                         prop('coverage.enabled', true)
-                        antInstallation(defaultAnt)
+                        antInstallation(antRT)
                     }
                 } else {
                     ant {
@@ -293,14 +392,14 @@ for more details about the DSL.</b>
                         prop('coverage.enabled', true)
                         // Properties did not work, so I had to use targets instead
                         //properties(poijob.properties ?: '')
-                        antInstallation(defaultAnt)
+                        antInstallation(antRT)
                     }
                     ant {
                         targets(['run'] + (poijob.properties ?: []))
                         buildFile('src/integrationtest/build.xml')
                         // Properties did not work, so I had to use targets instead
                         //properties(poijob.properties ?: '')
-                        antInstallation(defaultAnt)
+                        antInstallation(antRT)
                     }
                 }
             }
@@ -337,3 +436,236 @@ for more details about the DSL.</b>
         }
     }
 }
+
+xmlbeansjobs.each { xjob ->
+    def jdkKey = xjob.jdk ?: defaultJdk
+    def trigger = xjob.trigger ?: defaultTrigger
+    def email = xjob.email ?: defaultEmail
+    def slaves = xjob.slaves ?: defaultSlaves + (xjob.slaveAdd ?: '')
+    def antRT = defaultAnt + (xjob.windows ? ' (Windows)' : '')
+
+    job(xjob.name) {
+        if (xjob.disabled) {
+            disabled()
+        }
+
+        description( defaultDesc + (xjob.apicheck ? apicheckDesc : sonarDesc) )
+        logRotator {
+            numToKeep(5)
+            artifactNumToKeep(1)
+        }
+        label(slaves)
+        environmentVariables {
+            env('LANG', 'en_US.UTF-8')
+            if(jdkKey == '1.10') {
+                // when using JDK 9/10 for running Ant, we need to provide more modules for the forbidden-api-checks task
+                // on JDK 11 and newer there is no such module any more, so do not add it here
+                env('ANT_OPTS', '--add-modules=java.xml.bind --add-opens=java.xml/com.sun.org.apache.xerces.internal.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED')
+            }
+            env('FORREST_HOME', xjob.windows ? 'f:\\jenkins\\tools\\forrest\\latest' : '/home/jenkins/tools/forrest/latest')
+        }
+        wrappers {
+            timeout {
+                absolute(180)
+                abortBuild()
+                writeDescription('Build was aborted due to timeout')
+            }
+        }
+        jdk(jdkMapping.get(jdkKey))
+        scm {
+            svn(xmlbeansSvnBase) { svnNode ->
+                svnNode / browser(class: 'hudson.scm.browsers.ViewSVN') /
+                        url << 'http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN'
+            }
+        }
+        checkoutRetryCount(3)
+
+        triggers {
+            scm(trigger)
+        }
+
+        def shellcmds = (xjob.windows ? shellCmdsWin : shellCmdsUnix).replace('POIJOBSHELL', xjob.shell ?: '')
+
+        // Create steps and publishers depending on the type of Job that is selected
+        steps {
+            shellEx(delegate, shellcmds, xjob)
+            if(xjob.addShell) {
+                shellEx(delegate, xjob.addShell, xjob)
+            }
+            ant {
+                targets(['clean'])
+                antInstallation(antRT)
+            }
+            ant {
+                targets(['checkintest'])
+                antInstallation(antRT)
+            }
+            ant {
+                targets(['dist'])
+                antInstallation(antRT)
+            }
+        }
+        publishers {
+            archiveArtifacts('build/private/**')
+            //archiveJunit('build/test/reports/*.xml') {
+            //    testDataPublishers {
+            //        publishTestStabilityData()
+            //    }
+            //}
+
+            if (!xjob.skipcigame) {
+                configure { project ->
+                    project / publishers << 'hudson.plugins.cigame.GamePublisher' {}
+                }
+            }
+            mailer(email, false, false)
+        }
+    }
+}
+
+/*
+Add a special job which spans a two-dimensional matrix of all JDKs that we want to use and
+all slaves that we would like to use and test if the java and ant binaries are available
+on that machine correctly.
+ */
+matrixJob('POI-DSL-Test-Environment') {
+    description(
+'''Check installed version of Java/Ant on all build-nodes
+
+This job is used to verify which machines actually have the required programs installed.
+
+Unfortunately we often see builds break because of changes/new machines...''')
+
+    /*throttleConcurrentBuilds {
+        maxPerNode(1)
+        maxTotal(1)
+    }*/
+    logRotator {
+        numToKeep(1)
+        artifactNumToKeep(1)
+    }
+    axes {
+        jdk(
+                'JDK 1.8 (latest)',
+                'OpenJDK 8 (on Ubuntu only) ',   // blank is required here until the name in the Jenkins instance is fixed!
+                'IBM 1.8 64-bit (on Ubuntu only)',
+
+                'JDK 10 (latest)',
+                'JDK 10 b46 (Windows Only)',
+                'OpenJDK 10.0.2 (on Ubuntu only)',
+
+                'JDK 11 (latest)',
+                'JDK 11 b23 (early access build) (Windows Only)',
+
+                'JDK 12 (latest)',
+                'OpenJDK 12 b18 (early access build)'
+        )
+        elasticAxis {
+            name('Nodes')
+            labelString('!cloud-slave&&!H15&&!H17&&!H18&&!H24&&!ubuntu-4&&!H21&&!H35&&!websites1&&!couchdb&&!plc4x&&!ppc64le')
+            ignoreOffline(true)
+        }
+    }
+    steps {
+        conditionalSteps {
+            condition {
+                fileExists('/usr', BaseDir.WORKSPACE)
+                runner('DontRun')
+                steps {
+                    shell(
+'''which javac
+javac -version
+echo '<?xml version="1.0"?><project name="POI Build" default="test"><target name="test"><echo>Using Ant: ${ant.version} from ${ant.home}</echo></target></project>' > build.xml
+''')
+                    ant {
+                        antInstallation(defaultAnt)
+                    }
+
+                }
+            }
+        }
+        conditionalSteps {
+            condition {
+                fileExists('c:\\windows', BaseDir.WORKSPACE)
+                runner('DontRun')
+                steps {
+                    batchFile {
+                        command(
+'''@echo off
+echo .
+where javac.exe
+echo .
+javac -version
+echo .
+echo ^<?xml version=^"1.0^"?^>^<project name=^"POI Build^" default=^"test^"^>^<target name=^"test^"^>^<echo^>Using Ant: ${ant.version} from ${ant.home}^</echo^>^</target^>^</project^> > build.xml
+''')
+                    }
+                    ant {
+                        antInstallation(defaultAnt + ' (Windows)')
+                    }
+                }
+            }
+        }
+    }
+}
+
+/* I tried to put the view into a sub-folder/sub-view, but failed, there are multiple related
+ plugins so this is all a bit confusing :(, see also https://issues.apache.org/jira/browse/INFRA-14002
+dashboardView("P/POI-new") {
+    columns {
+        status()
+        weather()
+        configureProject()
+        buildButton()
+        cronTrigger()
+        lastBuildConsole()
+        name()
+        lastSuccess()
+        lastFailure()
+        lastDuration()
+        //lastSuccessDescription()
+        jacoco()
+    }
+    description("<table>\n" +
+            "  <tr>\n" +
+            "    <td><img src=\"https://poi.apache.org/images/project-header.png\" /></td>\n" +
+            "    <td>  \n" +
+            "      <p>Apache POI - the Java API for Microsoft Documents</p>\n" +
+            "      <p><b>Most of the POI Jobs are automatically generated by Jenkins Job DSL\n" +
+            "        at <a href=\"https://svn.apache.org/repos/asf/poi/trunk/jenkins\">https://svn.apache.org/repos/asf/poi/trunk/jenkins</a>,<br/>\n" +
+            "        see <a href=\"https://github.com/jenkinsci/job-dsl-plugin/wiki\">https://github.com/jenkinsci/job-dsl-plugin/wiki</a>\n" +
+            "        for more details about the DSL.</b>\n" +
+            "      </p>\n" +
+            "      <p>\n" +
+            "      <b><a href=\"job/POI-DSL-1.8/lastSuccessfulBuild/findbugsResult/\" target=\"_blank\">Findbugs report of latest build</a></b> -\n" +
+            "      <b><a href=\"https://builds.apache.org/analysis/dashboard?id=org.apache.poi%3Apoi-parent&did=1\" target=\"_blank\">Sonar reports</a></b> -\n" +
+            "      <b><a href=\"job/POI-DSL-1.8/lastSuccessfulBuild/artifact/build/coverage/index.html\" target=\"_blank\">Coverage of latest build</a></b>\n" +
+            "      </p>\n" +
+            "    </td>\n" +
+            "  </tr>\n" +
+            "</table>")
+    filterBuildQueue(false)
+    filterExecutors(false)
+
+    // Job selection
+    jobs {*/
+//regex(/.*POI.*/)
+/*}
+
+// Layout
+topPortlets {
+    jenkinsJobsList {
+        displayName('POI jobs')
+    }
+}
+leftPortlets {
+    testStatisticsChart()
+}
+rightPortlets {
+    testTrendChart()
+}
+bottomPortlets {
+    testStatisticsGrid()
+    buildStatistics()
+}
+}*/

legal/NOTICE

@@ -1,7 +1,7 @@
 Apache POI
-Copyright 2003-2017 The Apache Software Foundation
+Copyright 2003-2018 The Apache Software Foundation
 
-This product includes software developed by
+This product includes software developed at
 The Apache Software Foundation (https://www.apache.org/).
 
 This product contains parts that were originally based on software from BEA.
@@ -14,9 +14,6 @@ This product contains W3C XML Schema documents. Copyright 2001-2003 (c)
 World Wide Web Consortium (Massachusetts Institute of Technology, European
 Research Consortium for Informatics and Mathematics, Keio University)
 
-This product contains the Piccolo XML Parser for Java
-(http://piccolo.sourceforge.net/). Copyright 2002 Yuval Oren.
-
 This product contains the chunks_parse_cmds.tbl file from the vsdump program.
 Copyright (C) 2006-2007 Valek Filippov (frob@df.ru)
 

maven/ooxml-schemas.pom

@@ -64,7 +64,7 @@
     <dependency>
       <groupId>org.apache.xmlbeans</groupId>
       <artifactId>xmlbeans</artifactId>
-      <version>2.3.0</version>
+      <version>2.6.0</version>
     </dependency>
   </dependencies>
 </project>

maven/ooxml-security.pom

@@ -73,7 +73,7 @@
     <dependency>
       <groupId>org.apache.xmlbeans</groupId>
       <artifactId>xmlbeans</artifactId>
-      <version>2.3.0</version>
+      <version>2.6.0</version>
     </dependency>
   </dependencies>
 </project>

maven/poi-ooxml-schemas.pom

@@ -62,7 +62,7 @@
     <dependency>
       <groupId>org.apache.xmlbeans</groupId>
       <artifactId>xmlbeans</artifactId>
-      <version>2.6.0</version>
+      <version>3.0.2</version>
     </dependency>
   </dependencies>
 </project>

maven/poi-ooxml.pom

@@ -70,9 +70,14 @@
       <version>@VERSION@</version>
     </dependency>
     <dependency>
-    	<groupId>com.github.virtuald</groupId>
-    	<artifactId>curvesapi</artifactId>
-    	<version>1.04</version>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-compress</artifactId>
+      <version>1.18</version>
+    </dependency>
+    <dependency>
+      <groupId>com.github.virtuald</groupId>
+      <artifactId>curvesapi</artifactId>
+      <version>1.05</version>
     </dependency>
   </dependencies>
 </project>

maven/poi.pom

@@ -76,7 +76,17 @@
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
-      <version>1.10</version>
+      <version>1.11</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-collections4</artifactId>
+      <version>4.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-math3</artifactId>
+      <version>3.6.1</version>
     </dependency>
 
     <dependency>
@@ -91,11 +101,6 @@
       <scope>test</scope>
       <version>4.12</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-collections4</artifactId>
-      <version>4.1</version>
-    </dependency>
   </dependencies>
 
 </project>

osgi/build.xml

@@ -26,7 +26,7 @@ under the License.
 
     <!-- TODO Import these from the parent build file -->
     <property name="repository.m2" value="http://repo1.maven.org"/>
-    <property name="version.id" value="3.11-beta1"/>
+    <property name="version.id" value="4.0.1-SNAPSHOT"/>
     <property name="dist.dir" value="build/dist"/>
 
     <!-- jars in the /lib directory, see the fetch-bundle-jars target-->

sonar/examples/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.apache.poi</groupId>
         <artifactId>poi-parent</artifactId>
-        <version>3.16-beta3-SNAPSHOT</version>
+        <version>4.0.2-SNAPSHOT</version>
     </parent>
     <artifactId>poi-examples</artifactId>
     <packaging>jar</packaging>

sonar/excelant/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.apache.poi</groupId>
         <artifactId>poi-parent</artifactId>
-        <version>3.16-beta3-SNAPSHOT</version>
+        <version>4.0.2-SNAPSHOT</version>
     </parent>
     <artifactId>poi-excelant</artifactId>
     <packaging>jar</packaging>
@@ -108,7 +108,7 @@
 		<dependency>
 			<groupId>org.apache.ant</groupId>
 			<artifactId>ant</artifactId>
-			<version>1.8.2</version>
+			<version>1.10.1</version>
         </dependency>
     </dependencies>
 </project>

sonar/main/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.apache.poi</groupId>
         <artifactId>poi-parent</artifactId>
-        <version>3.16-beta3-SNAPSHOT</version>
+        <version>4.0.2-SNAPSHOT</version>
     </parent>
     <artifactId>poi-main</artifactId>
     <packaging>jar</packaging>
@@ -103,7 +103,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${maven.plugin.surefire.version}</version>
                 <configuration>
-                    <argLine>@{argLine} -Duser.language=en -Duser.country=US -Xmx1024m -XX:MaxPermSize=256m -XX:-OmitStackTraceInFastThrow</argLine>
+                    <argLine>@{argLine} -Duser.language=en -Duser.country=US -Xmx1024m -Djava.io.tmpdir=${basedir}/target/tmp -XX:-OmitStackTraceInFastThrow</argLine>
                 </configuration>
             </plugin>
 		</plugins>
@@ -113,17 +113,42 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-collections4</artifactId>
-            <version>4.1</version>
+            <version>4.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-math3</artifactId>
+            <version>3.6.1</version>
         </dependency>
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.10</version>
+            <version>1.11</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
             <version>1.2</version>
         </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>2.3.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-core</artifactId>
+            <version>2.3.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+            <version>1.1.1</version>
+        </dependency>
     </dependencies>
 </project>

sonar/ooxml-schema-encryption/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.apache.poi</groupId>
         <artifactId>poi-parent</artifactId>
-        <version>3.16-beta3-SNAPSHOT</version>
+        <version>4.0.2-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>poi-ooxml-schema-encryption</artifactId>

sonar/ooxml-schema-security/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.apache.poi</groupId>
         <artifactId>poi-parent</artifactId>
-        <version>3.16-beta3-SNAPSHOT</version>
+        <version>4.0.2-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>poi-ooxml-schema-security</artifactId>

sonar/ooxml-schema/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.apache.poi</groupId>
         <artifactId>poi-parent</artifactId>
-        <version>3.16-beta3-SNAPSHOT</version>
+        <version>4.0.2-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>poi-ooxml-schema</artifactId>

sonar/ooxml/pom.xml

@@ -6,70 +6,70 @@
     <parent>
         <groupId>org.apache.poi</groupId>
         <artifactId>poi-parent</artifactId>
-        <version>3.16-beta3-SNAPSHOT</version>
+        <version>4.0.2-SNAPSHOT</version>
     </parent>
     <artifactId>poi-ooxml</artifactId>
     <packaging>jar</packaging>
 
     <name>Apache POI OOXML package</name>
-	
-    <build>
-		<plugins>
-			<!-- copy sources, resources and tests in place as otherwise Sonar does not pick them up correctly! -->
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>${maven.plugin.resources.version}</version>
-				<executions>
-					<execution>
-						<id>copy-sources</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${basedir}/src/main/java</outputDirectory>
-							<resources>          
-								<resource>
-									<directory>../../src/ooxml/java</directory>
-								</resource>
-							</resources>              
-						</configuration>            
-					</execution>
-					<execution>
-						<id>copy-resources</id>
-						<phase>generate-resources</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${basedir}/src/main/resources</outputDirectory>
-							<resources>          
-								<resource>
-									<directory>../../src/resources/ooxml</directory>
-								</resource>
-							</resources>              
-						</configuration>            
-					</execution>
-					<execution>
-						<id>copy-tests</id>
-						<phase>generate-test-sources</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${basedir}/src/test/java</outputDirectory>
-							<resources>          
-								<resource>
-									<directory>../../src/ooxml/testcases</directory>
-								</resource>
-							</resources>              
-						</configuration>            
-					</execution>
-				</executions>
-			</plugin>
 
-			<!-- clean copied sources afterwards -->
-			<plugin>
+    <build>
+        <plugins>
+            <!-- copy sources, resources and tests in place as otherwise Sonar does not pick them up correctly! -->
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>${maven.plugin.resources.version}</version>
+                <executions>
+                    <execution>
+                        <id>copy-sources</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}/src/main/java</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>../../src/ooxml/java</directory>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}/src/main/resources</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>../../src/resources/ooxml</directory>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy-tests</id>
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}/src/test/java</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>../../src/ooxml/testcases</directory>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- clean copied sources afterwards -->
+            <plugin>
                 <artifactId>maven-clean-plugin</artifactId>
                 <version>${maven.plugin.clean.version}</version>
                 <configuration>
@@ -93,73 +93,97 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${maven.plugin.surefire.version}</version>
                 <configuration>
-                    <argLine>@{argLine} -Duser.language=en -Duser.country=US -Xmx1024m -XX:MaxPermSize=256m -XX:-OmitStackTraceInFastThrow</argLine>
+                    <argLine>@{argLine} -Duser.language=en -Duser.country=US -Xmx1024m -Djava.io.tmpdir=${basedir}/target/tmp -XX:-OmitStackTraceInFastThrow</argLine>
                 </configuration>
             </plugin>
-		</plugins>
+        </plugins>
     </build>
 
     <dependencies>
         <dependency>
-			<groupId>${project.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>poi-ooxml-schema</artifactId>
-			<version>${project.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>poi-ooxml-schema-encryption</artifactId>
-			<version>${project.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
-			<groupId>${project.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>poi-ooxml-schema-security</artifactId>
-			<version>${project.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>poi-main</artifactId>
-			<version>${project.version}</version>
+            <version>${project.version}</version>
         </dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>poi-main</artifactId>
-			<version>${project.version}</version>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>poi-main</artifactId>
+            <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
-		</dependency>
+        </dependency>
 
-		<dependency>
-		  <groupId>org.apache.xmlbeans</groupId>
-		  <artifactId>xmlbeans</artifactId>
-		  <version>${xmlbeans.version}</version>
-		</dependency>
-		
-		<dependency>
-			<groupId>org.bouncycastle</groupId>
-			<artifactId>bcpkix-jdk15on</artifactId>
-			<version>1.54</version>
-		</dependency>
-		<dependency>
-			<groupId>org.bouncycastle</groupId>
-			<artifactId>bcprov-jdk15on</artifactId>
-			<version>1.54</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.santuario</groupId>
-			<artifactId>xmlsec</artifactId>
-			<version>2.0.5</version>
-		</dependency>
-		<dependency>
-			<groupId>com.github.virtuald</groupId>
-			<artifactId>curvesapi</artifactId>
-			<version>1.04</version>
-		</dependency>
+        <dependency>
+          <groupId>org.apache.xmlbeans</groupId>
+          <artifactId>xmlbeans</artifactId>
+          <version>${xmlbeans.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcpkix-jdk15on</artifactId>
+            <version>1.60</version>
+        </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk15on</artifactId>
+            <version>1.60</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.santuario</groupId>
+            <artifactId>xmlsec</artifactId>
+            <version>2.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+            <version>1.18</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.virtuald</groupId>
+            <artifactId>curvesapi</artifactId>
+            <version>1.05</version>
+        </dependency>
   
-		<!-- non-test dependency for OOXMLLite -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.reflections</groupId>
+            <artifactId>reflections</artifactId>
+            <version>0.9.11</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-core</artifactId>
+            <version>1.19</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-generator-annprocess</artifactId>
+            <version>1.19</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 </project>

sonar/pom.xml

@@ -1,277 +1,338 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.apache.poi</groupId>
-	<artifactId>poi-parent</artifactId>
-	<packaging>pom</packaging>
-	<version>3.16-beta3-SNAPSHOT</version>
-	<name>Apache POI - the Java API for Microsoft Documents</name>
-	<description>Maven build of Apache POI for Sonar checks</description>
-	<url>http://poi.apache.org/</url>
-	
-	<mailingLists>
-		<mailingList>
-			<name>POI Users List</name>
-			<subscribe>user-subscribe@poi.apache.org</subscribe>
-			<unsubscribe>user-unsubscribe@poi.apache.org</unsubscribe>
-			<archive>http://mail-archives.apache.org/mod_mbox/poi-user/</archive>
-		</mailingList>
-		<mailingList>
-			<name>POI Developer List</name>
-			<subscribe>dev-subscribe@poi.apache.org</subscribe>
-			<unsubscribe>dev-unsubscribe@poi.apache.org</unsubscribe>
-			<archive>http://mail-archives.apache.org/mod_mbox/poi-dev/</archive>
-		</mailingList>
-	</mailingLists>
-	
-	<licenses>
-		<license>
-			<name>The Apache Software License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-		</license>
-	</licenses>
-	
-	<organization>
-		<name>Apache Software Foundation</name>
-		<url>http://www.apache.org/</url>
-	</organization>
-	
-	<issueManagement>
-		<system>Bugzilla</system>
-		<url>https://bz.apache.org/bugzilla/</url>
-	</issueManagement>
-	
-	<scm>
-		<connection>scm:svn:http://svn.apache.org/repos/asf/poi/trunk</connection>
-		<developerConnection>scm:svn:https://svn.apache.org/repos/asf/poi/trunk</developerConnection>
-		<url>http://svn.apache.org/viewvc/poi</url>
-	</scm>
-	
-	<modules>
-		<module>main</module>
-		<module>ooxml-schema</module>
-		<module>ooxml-schema-encryption</module>
-		<module>ooxml-schema-security</module>
-		<module>ooxml</module>
-		<module>scratchpad</module>
-		<module>excelant</module>
-		<module>examples</module>
-	</modules>
-	
-	<properties>
-		<project.build.sourceEncoding>ASCII</project.build.sourceEncoding>
-		<!-- Try to disable running SVN blame as it causes errors here because the source is copied from the actual SVN location here! -->
-		<sonar.scm.disabled>true</sonar.scm.disabled>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.poi</groupId>
+    <artifactId>poi-parent</artifactId>
+    <packaging>pom</packaging>
+    <version>4.0.2-SNAPSHOT</version>
+    <name>Apache POI - the Java API for Microsoft Documents</name>
+    <description>Maven build of Apache POI for Sonar checks</description>
+    <url>http://poi.apache.org/</url>
 
-		<!-- define some of the third-party or plugin-versions globally to use the same in all modules -->
-		<xmlbeans.version>2.6.0</xmlbeans.version>
-		<junit.version>4.12</junit.version>
-		<maven.plugin.resources.version>3.0.1</maven.plugin.resources.version>
-		<maven.plugin.jar.version>3.0.1</maven.plugin.jar.version>
-		<maven.plugin.clean.version>3.0.0</maven.plugin.clean.version>
-		<maven.plugin.download.version>1.1.0</maven.plugin.download.version>
-		<maven.plugin.antrun.version>1.8</maven.plugin.antrun.version>
-		<maven.plugin.surefire.version>2.19.1</maven.plugin.surefire.version>
-	</properties>
-	
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.5.1</version>
-					<configuration>
-						<source>1.6</source>
-						<target>1.6</target>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>${maven.plugin.surefire.version}</version>
-				<dependencies>
-					<dependency>
-						<groupId>org.apache.maven.surefire</groupId>
-						<artifactId>surefire-junit47</artifactId>
-						<version>${maven.plugin.surefire.version}</version>
-					</dependency>
-				</dependencies>
-				<configuration>
-					<systemPropertyVariables>
-						<POI.testdata.path>../../test-data</POI.testdata.path>
-						<java.awt.headless>true</java.awt.headless>
-						<org.apache.poi.util.POILogger>org.apache.poi.util.NullLogger</org.apache.poi.util.POILogger>
-					</systemPropertyVariables>
-					<!-- use to following to analyze OOM issues:	-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp -->
-					<argLine>@{argLine} -Duser.language=en -Duser.country=US -Xmx1024m</argLine>
-					<excludes>
-						<exclude>**/All*Tests.java</exclude>
-						<exclude>**/TestUnfixedBugs.java</exclude>
-						<exclude>**/TestcaseRecordInputStream.java</exclude>
-						<exclude>**/POITestCase.java</exclude>
-						<!-- TODO: error about no public construct, seems to run with JUnit 3.8... -->
-						<exclude>**/TestWordToConverterSuite*.java</exclude>
-						<exclude>**/TestExcelConverterSuite*.java</exclude>
-					</excludes>
-					<!--test>TestPPTX2PNG</test-->
-					<!--parallel>both</parallel>
-				<threadCount>10</threadCount-->
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.7.8</version>
-			</plugin>
-		</plugins>
-	</build>
-	
-	<dependencies>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>${junit.version}</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
+    <mailingLists>
+        <mailingList>
+            <name>POI Users List</name>
+            <subscribe>user-subscribe@poi.apache.org</subscribe>
+            <unsubscribe>user-unsubscribe@poi.apache.org</unsubscribe>
+            <archive>http://mail-archives.apache.org/mod_mbox/poi-user/</archive>
+        </mailingList>
+        <mailingList>
+            <name>POI Developer List</name>
+            <subscribe>dev-subscribe@poi.apache.org</subscribe>
+            <unsubscribe>dev-unsubscribe@poi.apache.org</unsubscribe>
+            <archive>http://mail-archives.apache.org/mod_mbox/poi-dev/</archive>
+        </mailingList>
+    </mailingLists>
 
-	<profiles>
-		<!-- We need a fair amount of memory to compile the xml schema, -->
-		<!-- but limit it in case it goes wrong!                        -->
-		<!-- Pick the right amount based on 32 vs 64 bit jvm            -->
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+    </licenses>
+
+    <organization>
+        <name>Apache Software Foundation</name>
+        <url>http://www.apache.org/</url>
+    </organization>
+
+    <issueManagement>
+        <system>Bugzilla</system>
+        <url>https://bz.apache.org/bugzilla/</url>
+    </issueManagement>
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/poi/trunk</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/poi/trunk</developerConnection>
+        <url>http://svn.apache.org/viewvc/poi</url>
+    </scm>
+
+    <repositories>
+        <repository>
+            <id>apache-releases-repo</id>
+            <name>apache releases repo</name>
+            <url>https://repository.apache.org/content/repositories/releases</url>
+        </repository>
+    </repositories>
+
+    <modules>
+        <module>main</module>
+        <module>ooxml-schema</module>
+        <module>ooxml-schema-encryption</module>
+        <module>ooxml-schema-security</module>
+        <module>ooxml</module>
+        <module>scratchpad</module>
+        <module>excelant</module>
+        <module>examples</module>
+    </modules>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <!-- Try to disable running SVN blame as it causes errors here because the source is copied from the actual SVN location here! -->
+        <sonar.scm.disabled>true</sonar.scm.disabled>
+
+        <!-- define some of the third-party or plugin-versions globally to use the same in all modules -->
+        <xmlbeans.version>3.0.2</xmlbeans.version>
+        <junit.version>4.12</junit.version>
+        <xmlunit.version>2.5.1</xmlunit.version>
+        <mockito.version>2.13.0</mockito.version>
+        <maven.plugin.resources.version>3.0.1</maven.plugin.resources.version>
+        <maven.plugin.jar.version>3.0.1</maven.plugin.jar.version>
+        <maven.plugin.clean.version>3.0.0</maven.plugin.clean.version>
+        <maven.plugin.download.version>1.1.0</maven.plugin.download.version>
+        <maven.plugin.antrun.version>1.8</maven.plugin.antrun.version>
+        <maven.plugin.surefire.version>2.19.1</maven.plugin.surefire.version>
+    </properties>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.5.1</version>
+                    <configuration>
+                        <source>1.8</source>
+                        <target>1.8</target>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven.plugin.surefire.version}</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit47</artifactId>
+                        <version>${maven.plugin.surefire.version}</version>
+                    </dependency>
+                </dependencies>
+                <configuration>
+                    <systemPropertyVariables>
+                        <POI.testdata.path>../../test-data</POI.testdata.path>
+                        <java.awt.headless>true</java.awt.headless>
+                        <org.apache.poi.util.POILogger>org.apache.poi.util.NullLogger</org.apache.poi.util.POILogger>
+                    </systemPropertyVariables>
+                    <!-- use to following to analyze OOM issues:	-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp -->
+                    <argLine>@{argLine} -Duser.language=en -Duser.country=US -Xmx1024m -Djava.io.tmpdir=${basedir}/target/tmp
+                    </argLine>
+                    <excludes>
+                        <exclude>**/All*Tests.java</exclude>
+                        <exclude>**/TestUnfixedBugs.java</exclude>
+                        <exclude>**/TestcaseRecordInputStream.java</exclude>
+                        <exclude>**/POITestCase.java</exclude>
+                        <!-- TODO: error about no public construct, seems to run with JUnit 3.8... -->
+                        <exclude>**/TestWordToConverterSuite*.java</exclude>
+                        <exclude>**/TestExcelConverterSuite*.java</exclude>
+                    </excludes>
+                    <!--test>TestPPTX2PNG</test-->
+                    <!--parallel>both</parallel>
+                <threadCount>10</threadCount-->
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.8.2</version>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.xmlunit</groupId>
+            <artifactId>xmlunit-core</artifactId>
+            <version>${xmlunit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>${mockito.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+        <!-- We need a fair amount of memory to compile the xml schema, -->
+        <!-- but limit it in case it goes wrong!                        -->
+        <!-- Pick the right amount based on 32 vs 64 bit jvm            -->
         <!-- ********************************************************** -->
         <!-- If you are using IntelliJ, you might want to check         -->
         <!-- http://stackoverflow.com/questions/24115142                -->
         <!-- ********************************************************** -->
-		<profile>
-			<id>32bitstuff</id>
-			<activation>
-				<property>
-					<name>sun.arch.data.model</name>
-					<value>32</value>
-				</property>
-			</activation>
-			<properties>
-				<maven.compiler.maxmem>512m</maven.compiler.maxmem>
-                <argLine>-Xmx768m -XX:MaxPermSize=128m</argLine>
-			</properties>
-		</profile>
-		
-		<profile>
-			<id>64bitstuff</id>
-			<activation>
-				<property>
-					<name>sun.arch.data.model</name>
-					<value>64</value>
-				</property>
-			</activation>
-			<properties>
-				<maven.compiler.maxmem>768m</maven.compiler.maxmem>
-                <argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
-			</properties>
-		</profile>
+        <profile>
+            <id>32bitstuff</id>
+            <activation>
+                <property>
+                    <name>sun.arch.data.model</name>
+                    <value>32</value>
+                </property>
+            </activation>
+            <properties>
+                <maven.compiler.maxmem>512m</maven.compiler.maxmem>
+                <argLine>-Xmx768m</argLine>
+            </properties>
+        </profile>
 
-		<profile>
-			<id>xmlbean</id>
-      <activation>
-        <file><exists>xmlbeans.marker</exists></file>
-      </activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>xmlbeans-maven-plugin</artifactId>
-						<version>2.3.3</version>
-						<executions>
-							<execution>
-								<phase>process-sources</phase>
-								<goals>
-									<goal>xmlbeans</goal>
-								</goals>
-                <configuration>
-                  <schemaDirectory>${basedir}/target/schemas</schemaDirectory>
-                  <javaSource>1.5</javaSource>
-                  <noJavac>true</noJavac>
-                  <noUpa>${xmlbeans.noUpa}</noUpa>
-                  <noPvr>${xmlbeans.noPvr}</noPvr>
-                  <xmlConfigs>
-                    <xmlConfig implementation="java.io.File">${basedir}/../../src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionCertificate.xsdconfig</xmlConfig>
-                    <xmlConfig implementation="java.io.File">${basedir}/../../src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionInfo.xsdconfig</xmlConfig>
-                    <xmlConfig implementation="java.io.File">${basedir}/../../src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionPassword.xsdconfig</xmlConfig>
-                    <xmlConfig implementation="java.io.File">${basedir}/../../src/ooxml/resources/org/apache/poi/schemas/ooxmlSchemas.xsdconfig</xmlConfig>
-                  </xmlConfigs>
-                </configuration>
-							</execution>
-						</executions>
-					</plugin>
+        <profile>
+            <id>64bitstuff</id>
+            <activation>
+                <property>
+                    <name>sun.arch.data.model</name>
+                    <value>64</value>
+                </property>
+            </activation>
+            <properties>
+                <maven.compiler.maxmem>768m</maven.compiler.maxmem>
+                <argLine>-Xmx1024m</argLine>
+            </properties>
+        </profile>
 
-          <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <version>${maven.plugin.antrun.version}</version>
-            <executions>
-              <execution>
-                <id>copy-xmltype-and-xsdconfig</id>
-                <phase>generate-sources</phase>
-                <goals><goal>run</goal></goals>                   
-                <configuration>
-                  <target>
-                    <copy todir="${basedir}/target/generated-sources/xmlbeans">
-                      <fileset dir="${basedir}/../../src/ooxml/java">
-                        <include name="org/apache/poi/POIXMLTypeLoader.java"/>
-                        <include name="org/apache/poi/util/DocumentHelper.java"/>
-                        <include name="org/apache/poi/util/SAXHelper.java"/>
-                      </fileset>
-                      <fileset dir="${basedir}/../../src/java">
-                        <include name="org/apache/poi/util/POILogFactory.java"/>
-                        <include name="org/apache/poi/util/POILogger.java"/>
-                        <include name="org/apache/poi/util/NullLogger.java"/>
-                        <include name="org/apache/poi/util/Internal.java"/>
-                      </fileset>
-                    </copy>
-                    <copy todir="${basedir}/target/schemas">
-                      <fileset dir="${basedir}/../../src/ooxml/resources/org/apache/poi/schemas"/>
-                    </copy>
-                  </target>
-                </configuration>
-              </execution>
-              <execution>
-                <id>replace-xmltypeloader</id>
-                <phase>process-sources</phase>
-                <goals><goal>run</goal></goals>                   
-                <configuration>
-                  <target>
-                    <replace dir="${basedir}/target/generated-sources/xmlbeans" includes="**/*.java" excludes="**/impl/**">
-                        <replacetoken>org.apache.xmlbeans.XmlBeans.getContextTypeLoader()</replacetoken>
-                        <replacevalue>org.apache.poi.POIXMLTypeLoader</replacevalue>
-                    </replace>                    
-                  </target>
-                </configuration>
-              </execution>
-              <execution>
-                <id>remove-xmltypeloader-from-schema-jar</id>
-                <phase>prepare-package</phase>
-                <goals><goal>run</goal></goals>                   
-                <configuration>
-                  <target>
-                    <touch file="${basedir}/target/generated-sources/xmlbeans/.staleFlag"/>
-                    <delete dir="${basedir}/target/classes/org/apache"/>
-                  </target>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-				</plugins>
-			</build>
-      <dependencies>
-        <dependency>
-          <groupId>org.apache.xmlbeans</groupId>
-          <artifactId>xmlbeans</artifactId>
-          <version>${xmlbeans.version}</version>
-        </dependency>
-      </dependencies>
-		</profile>
-	</profiles>
+        <profile>
+            <id>xmlbean</id>
+            <activation>
+                <file>
+                    <exists>xmlbeans.marker</exists>
+                </file>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>xmlbeans-maven-plugin</artifactId>
+                        <version>2.3.3</version>
+                        <executions>
+                            <execution>
+                                <phase>process-sources</phase>
+                                <goals>
+                                    <goal>xmlbeans</goal>
+                                </goals>
+                                <configuration>
+                                    <schemaDirectory>${basedir}/target/schemas</schemaDirectory>
+                                    <javaSource>1.5</javaSource>
+                                    <noJavac>true</noJavac>
+                                    <noUpa>${xmlbeans.noUpa}</noUpa>
+                                    <noPvr>${xmlbeans.noPvr}</noPvr>
+                                    <xmlConfigs>
+                                        <xmlConfig implementation="java.io.File">
+                                            ${basedir}/../../src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionCertificate.xsdconfig
+                                        </xmlConfig>
+                                        <xmlConfig implementation="java.io.File">
+                                            ${basedir}/../../src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionInfo.xsdconfig
+                                        </xmlConfig>
+                                        <xmlConfig implementation="java.io.File">
+                                            ${basedir}/../../src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionPassword.xsdconfig
+                                        </xmlConfig>
+                                        <xmlConfig implementation="java.io.File">
+                                            ${basedir}/../../src/ooxml/resources/org/apache/poi/schemas/ooxmlSchemas.xsdconfig
+                                        </xmlConfig>
+                                    </xmlConfigs>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <version>${maven.plugin.antrun.version}</version>
+                        <executions>
+                            <execution>
+                                <id>copy-xmltype-and-xsdconfig</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <configuration>
+                                    <target>
+                                        <copy todir="${basedir}/target/schemas">
+                                            <fileset dir="${basedir}/../../src/ooxml/resources/org/apache/poi/schemas"/>
+                                        </copy>
+                                    </target>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>replace-xmltypeloader</id>
+                                <phase>process-sources</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <configuration>
+                                    <target>
+                                        <property name="xmlbean.sources.dir"
+                                                  location="${basedir}/target/generated-sources/xmlbeans"/>
+
+                                        <property name="loaderMethod"><![CDATA[
+        private static java.lang.ref.SoftReference<org.apache.xmlbeans.SchemaTypeLoader> typeLoader;
+
+        private static synchronized org.apache.xmlbeans.SchemaTypeLoader getTypeLoader() {
+            org.apache.xmlbeans.SchemaTypeLoader stl = (typeLoader == null) ? null : typeLoader.get();
+            if (stl == null) {
+                stl = org.apache.xmlbeans.XmlBeans.typeLoaderForClassLoader(\2.class.getClassLoader());
+                typeLoader = new java.lang.ref.SoftReference(stl);
+            }
+            return stl;
+        }
+
+        public static \2 newInstance\(\) \{]]></property>
+
+                                        <replaceregexp byline="true"
+                                                       match="(\s*)public static ([^ ]+) newInstance\(\) \{"
+                                                       replace="${loaderMethod}">
+                                            <fileset dir="${xmlbean.sources.dir}" includes="**/*.java"
+                                                     excludes="**/impl/**"/>
+                                        </replaceregexp>
+
+                                        <replace dir="${xmlbean.sources.dir}" includes="**/*.java"
+                                                 excludes="**/impl/**">
+                                            <replacetoken>org.apache.xmlbeans.XmlBeans.getContextTypeLoader
+                                            </replacetoken>
+                                            <replacevalue>getTypeLoader</replacevalue>
+                                        </replace>
+
+                                        <!-- remove deprecated warnings, as we prefer the array methods - see #56854 -->
+                                        <replace dir="${xmlbean.sources.dir}" includes="**/*.java"
+                                                 excludes="**/impl/**">
+                                            <replacetoken><![CDATA[     * @deprecated
+]]></replacetoken>
+                                        </replace>
+                                    </target>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>remove-xmltypeloader-from-schema-jar</id>
+                                <phase>prepare-package</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <configuration>
+                                    <target>
+                                        <touch file="${basedir}/target/generated-sources/xmlbeans/.staleFlag"/>
+                                        <delete dir="${basedir}/target/classes/org/apache"/>
+                                    </target>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.xmlbeans</groupId>
+                    <artifactId>xmlbeans</artifactId>
+                    <version>${xmlbeans.version}</version>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
 </project>

sonar/scratchpad/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.apache.poi</groupId>
         <artifactId>poi-parent</artifactId>
-        <version>3.16-beta3-SNAPSHOT</version>
+        <version>4.0.2-SNAPSHOT</version>
     </parent>
     <artifactId>poi-scratchpad</artifactId>
     <packaging>jar</packaging>

src/examples/clojure/SpreadSheetDemo.clj

@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,31 +14,23 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
 
-package org.apache.poi.poifs.storage;
+(ns poi.core
+    (:gen-class)
+    (:use [clojure.java.io :only [input-stream]])
+    (:import [org.apache.poi.ss.usermodel WorkbookFactory DataFormatter]))
 
-import java.io.IOException;
 
-/**
- * An interface for blocks managed by a list that works with a
- * BlockAllocationTable to keep block sequences straight
- *
- * @author Marc Johnson (mjohnson at apache dot org
- */
+(defn sheets [wb] (map #(.getSheetAt wb %1) (range 0 (.getNumberOfSheets wb))))
 
-public interface ListManagedBlock
-{
-
-    /**
-     * Get the data from the block
-     *
-     * @return the block's data as a byte array
-     *
-     * @exception IOException if there is no data
-     */
-
-    public byte [] getData()
-        throws IOException;
-}   // end public interface ListManagedBlock
+(defn print-all [wb]
+  (let [df (DataFormatter.)]
+    (doseq [sheet (sheets wb)]
+      (doseq [row (seq sheet)]
+        (doseq [cell (seq row)]
+          (println (.formatAsString (.getAddress cell)) ": " (.formatCellValue df cell)))))))
 
+(defn -main [& args]
+  (when-let [name (first args)]
+    (let [wb (WorkbookFactory/create (input-stream name))]
+      (print-all wb))))

src/examples/groovy/SpreadSheetDemo.groovy

@@ -0,0 +1,108 @@
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+
+import org.apache.poi.ss.usermodel.*
+import org.apache.poi.ss.util.*
+import java.io.File
+
+if (args.length == 0) {
+   println "Use:"
+   println "   SpreadSheetDemo <excel-file> [output-file]"
+   return 1
+}
+
+File f = new File(args[0])
+DataFormatter formatter = new DataFormatter()
+WorkbookFactory.create(f,null,true).withCloseable { workbook ->
+   println "Has ${workbook.getNumberOfSheets()} sheets"
+
+   // Dump the contents of the spreadsheet
+   (0..<workbook.getNumberOfSheets()).each { sheetNum ->
+      println "Sheet ${sheetNum} is called ${workbook.getSheetName(sheetNum)}"
+
+      def sheet = workbook.getSheetAt(sheetNum)
+      sheet.each { row ->
+         def nonEmptyCells = row.grep { c -> c.getCellType() != Cell.CELL_TYPE_BLANK }
+         println " Row ${row.getRowNum()} has ${nonEmptyCells.size()} non-empty cells:"
+         nonEmptyCells.each { c ->
+            def cRef = [c] as CellReference
+            println "  * ${cRef.formatAsString()} = ${formatter.formatCellValue(c)}"
+         }
+      }
+   }
+
+   // Add two new sheets and populate
+   CellStyle headerStyle = makeHeaderStyle(workbook)
+   Sheet ns1 = workbook.createSheet("Generated 1")
+   exportHeader(ns1, headerStyle, null, ["ID","Title","Num"] as String[])
+   ns1.createRow(1).createCell(0).setCellValue("TODO - Populate with data")
+
+   Sheet ns2 = workbook.createSheet("Generated 2")
+   exportHeader(ns2, headerStyle, "This is a demo sheet", 
+                ["ID","Title","Date","Author","Num"] as String[])
+   ns2.createRow(2).createCell(0).setCellValue(1)
+   ns2.createRow(3).createCell(0).setCellValue(4)
+   ns2.createRow(4).createCell(0).setCellValue(1)
+
+   // Save
+   File output = File.createTempFile("output-", (f.getName() =~ /(\.\w+$)/)[0][0])
+   output.withOutputStream { os -> workbook.write(os) }
+   println "Saved as ${output}"
+}
+
+CellStyle makeHeaderStyle(Workbook wb) {
+   int HEADER_HEIGHT = 18
+   CellStyle style = wb.createCellStyle()
+
+   style.setFillForegroundColor(IndexedColors.AQUA.getIndex())
+   style.setFillPattern(FillPatternType.SOLID_FOREGROUND)
+
+   Font font = wb.createFont()
+   font.setFontHeightInPoints((short)HEADER_HEIGHT)
+   font.setBold(true)
+   style.setFont(font)
+
+   return style
+}
+void exportHeader(Sheet s, CellStyle headerStyle, String info, String[] headers) {
+   Row r
+   int rn = 0
+   int HEADER_HEIGHT = 18
+   // Do they want an info row at the top?
+   if (info != null && !info.isEmpty()) {
+      r = s.createRow(rn)
+      r.setHeightInPoints(HEADER_HEIGHT+1)
+      rn++
+
+      Cell c = r.createCell(0)
+      c.setCellValue(info)
+      c.setCellStyle(headerStyle)
+      s.addMergedRegion(new CellRangeAddress(0,0,0,headers.length-1))
+   }
+   // Create the header row, of the right size
+   r = s.createRow(rn)
+   r.setHeightInPoints(HEADER_HEIGHT+1)
+   // Add the column headings
+   headers.eachWithIndex { col, idx ->
+      Cell c = r.createCell(idx)
+      c.setCellValue(col)
+      c.setCellStyle(headerStyle)
+      s.autoSizeColumn(idx)
+   }
+   // Make all the columns filterable
+   s.setAutoFilter(new CellRangeAddress(rn, rn, 0, headers.length-1))
+}

src/examples/groovy/build.gradle

@@ -15,26 +15,29 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hpsf;
-
-import org.apache.poi.util.Removal;
-
-/**
- * Interface for the convenience classes {@link SummaryInformation}
- * and {@link DocumentSummaryInformation}.<p>
- *
- * This used to be an abstract class to support late loading
- * of the SummaryInformation classes, as their concrete instance can
- * only be determined after the PropertySet has been loaded.
- *
- * @deprecated POI 3.16 - use PropertySet as base class instead
- */
-@Removal(version="3.18")
-public class SpecialPropertySet extends MutablePropertySet {
-    public SpecialPropertySet() {
-    }
-
-    public SpecialPropertySet(final PropertySet ps) throws UnexpectedPropertySetTypeException {
-        super(ps);
-    }
+// Add the POI core and OOXML support dependencies into your gradle build,
+//  along with all of Groovy so it can run as a standalone script
+apply plugin: 'groovy'
+repositories {
+    mavenCentral()
 }
+dependencies {
+    compile 'org.codehaus.groovy:groovy-all:2.4.13'
+    compile 'org.apache.poi:poi:4.0.0'
+    compile 'org.apache.poi:poi-ooxml:4.0.0'
+}
+
+// Our files are in the current directory
+sourceSets {
+   main { groovy { srcDirs = ['.'] } }
+}
+
+// Run out read demo by default
+tasks.withType(JavaExec) {
+   classpath = sourceSets.main.runtimeClasspath
+}
+task runScript(type: JavaExec) {
+    main = "SpreadSheetDemo"
+    args = ["../../../test-data/spreadsheet/Simple.xls"]
+}
+defaultTasks 'runScript'

src/examples/jsp/HSSFExample.jsp

@@ -32,7 +32,7 @@ Select an Excel file to read.
 
 <%
 	String filename = request.getParameter("xls_filename"); 
-	if (filename != null && !filename.equals("")) {
+	if (filename != null && !filename.isEmpty()) {
 %>	
 	<br>You chose the file <%= filename %>. 
 	<br><br>It's contents are: 	

src/examples/scala/XSSFMain.scala

@@ -0,0 +1,56 @@
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+
+// Import the required classes
+import org.apache.poi.ss.usermodel.{WorkbookFactory, DataFormatter}
+import java.io.{File, FileOutputStream}
+
+object XSSFMain extends App {
+
+    // Automatically convert Java collections to Scala equivalents
+    import scala.collection.JavaConversions._
+
+    // Read the contents of the workbook
+    val workbook = WorkbookFactory.create(new File("SampleSS.xlsx"))
+    val formatter = new DataFormatter()
+    for {
+        // Iterate and print the sheets
+        (sheet, i) <- workbook.zipWithIndex
+        _ = println(s"Sheet $i of ${workbook.getNumberOfSheets}: ${sheet.getSheetName}")
+
+        // Iterate and print the rows
+        row <- sheet
+        _ = println(s"\tRow ${row.getRowNum}")
+
+        // Iterate and print the cells
+        cell <- row
+    } {
+        println(s"\t\t${cell.getCellAddress}: ${formatter.formatCellValue(cell)}")
+    }
+
+    // Add a sheet to the workbook
+    val sheet = workbook.createSheet("new sheet")
+    val row = sheet.createRow(7)
+    val cell = row.createCell(42)
+    cell.setAsActiveCell()
+    cell.setCellValue("The answer to life, the universe, and everything")
+
+    // Save the updated workbook as a new file
+    val fos = new FileOutputStream("SampleSS-updated.xlsx")
+    workbook.write(fos)
+    workbook.close()
+}

src/examples/scala/build.sbt

@@ -0,0 +1,23 @@
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+      
+// Add the POI core and OOXML support dependencies into your build.sbt
+libraryDependencies ++= Seq(
+   "org.apache.poi" % "poi" % "4.0.0",
+   "org.apache.poi" % "poi-ooxml" % "4.0.0",
+   "org.apache.poi" % "poi-ooxml-schemas" "4.0.0",
+)

src/examples/src/org/apache/poi/crypt/examples/OOXMLPasswordsTry.java

@@ -0,0 +1,119 @@
+/*
+ *  ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one or more
+ *    contributor license agreements.  See the NOTICE file distributed with
+ *    this work for additional information regarding copyright ownership.
+ *    The ASF licenses this file to You under the Apache License, Version 2.0
+ *    (the "License"); you may not use this file except in compliance with
+ *    the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ * ====================================================================
+ */
+
+package org.apache.poi.crypt.examples;
+
+import java.io.BufferedReader;
+import java.io.Closeable;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.GeneralSecurityException;
+
+import org.apache.poi.poifs.crypt.Decryptor;
+import org.apache.poi.poifs.crypt.EncryptionInfo;
+import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+
+/**
+ * Tries a list of possible passwords for an OOXML protected file
+ * 
+ * Note that this isn't very fast, and is aimed at when you have
+ *  just a few passwords to check.
+ * For serious processing, you'd be best off grabbing the hash
+ *  out with POI or office2john.py, then running that against
+ *  "John The Ripper" or GPU enabled version of "hashcat"
+ */
+public class OOXMLPasswordsTry implements Closeable {
+    private POIFSFileSystem fs;
+    private EncryptionInfo info;
+    private Decryptor d;
+    
+    private OOXMLPasswordsTry(POIFSFileSystem fs) throws IOException {
+        info = new EncryptionInfo(fs);
+        d = Decryptor.getInstance(info);
+        this.fs = fs;
+    }
+    private OOXMLPasswordsTry(File file) throws IOException {
+        this(new POIFSFileSystem(file, true));
+    }
+    private OOXMLPasswordsTry(InputStream is) throws IOException {
+        this(new POIFSFileSystem(is));
+    }
+    
+    public void close() throws IOException {
+        fs.close();
+    }
+    
+    public String tryAll(File wordfile) throws IOException, GeneralSecurityException {
+        // Load
+        BufferedReader r = new BufferedReader(new FileReader(wordfile));
+        long start = System.currentTimeMillis();
+        int count = 0;
+        
+        // Try each password in turn, reporting progress
+        String valid = null;
+        String password;
+        while ((password = r.readLine()) != null) {
+            if (isValid(password)) {
+                valid = password;
+                break;
+            }
+            count++;
+            
+            if (count % 1000 == 0) {
+                int secs = (int)((System.currentTimeMillis() - start) / 1000);
+                System.out.println("Done " + count + " passwords, " +
+                                   secs + " seconds, last password " + password);
+            }
+        }
+        
+        // Tidy and return (null if no match)
+        r.close();
+        return valid;
+    }
+    public boolean isValid(String password) throws GeneralSecurityException {
+        return d.verifyPassword(password);
+    }
+    
+    public static void main(String[] args) throws Exception {
+        if (args.length < 2) {
+            System.err.println("Use:");
+            System.err.println("  OOXMLPasswordsTry <file.ooxml> <wordlist>");
+            System.exit(1);
+        }
+        File ooxml = new File(args[0]);
+        File words = new File(args[1]);
+        
+        System.out.println("Trying passwords from " + words + " against " + ooxml);
+        System.out.println();
+        
+        OOXMLPasswordsTry pt = new OOXMLPasswordsTry(ooxml);
+        String password = pt.tryAll(words);
+        pt.close();
+        
+        System.out.println();
+        if (password == null) {
+            System.out.println("Error - No password matched");
+        } else {
+            System.out.println("Password found!");
+            System.out.println(password);
+        }
+    }
+}

src/examples/src/org/apache/poi/hpsf/examples/CopyCompare.java

@@ -20,8 +20,6 @@ package org.apache.poi.hpsf.examples;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -30,21 +28,21 @@ import java.io.UnsupportedEncodingException;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.poi.hpsf.DocumentSummaryInformation;
 import org.apache.poi.hpsf.HPSFRuntimeException;
 import org.apache.poi.hpsf.MarkUnsupportedException;
-import org.apache.poi.hpsf.MutablePropertySet;
 import org.apache.poi.hpsf.NoPropertySetStreamException;
 import org.apache.poi.hpsf.PropertySet;
 import org.apache.poi.hpsf.PropertySetFactory;
-import org.apache.poi.hpsf.Util;
+import org.apache.poi.hpsf.SummaryInformation;
+import org.apache.poi.hpsf.UnexpectedPropertySetTypeException;
 import org.apache.poi.hpsf.WritingNotSupportedException;
 import org.apache.poi.poifs.eventfilesystem.POIFSReader;
 import org.apache.poi.poifs.eventfilesystem.POIFSReaderEvent;
 import org.apache.poi.poifs.eventfilesystem.POIFSReaderListener;
 import org.apache.poi.poifs.filesystem.DirectoryEntry;
-import org.apache.poi.poifs.filesystem.DocumentEntry;
 import org.apache.poi.poifs.filesystem.DocumentInputStream;
-import org.apache.poi.poifs.filesystem.Entry;
+import org.apache.poi.poifs.filesystem.EntryUtils;
 import org.apache.poi.poifs.filesystem.POIFSDocumentPath;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import org.apache.poi.util.TempFile;
@@ -52,55 +50,43 @@ import org.apache.poi.util.TempFile;
 /**
  * <p>This class copies a POI file system to a new file and compares the copy
  * with the original.</p>
- * 
+ * <p>
  * <p>Property set streams are copied logically, i.e. the application
  * establishes a {@link org.apache.poi.hpsf.PropertySet} of an original property
- * set, creates a {@link org.apache.poi.hpsf.MutablePropertySet} from the
- * {@link org.apache.poi.hpsf.PropertySet} and writes the
- * {@link org.apache.poi.hpsf.MutablePropertySet} to the destination POI file
+ * set, creates a {@link org.apache.poi.hpsf.PropertySet} and writes the
+ * {@link org.apache.poi.hpsf.PropertySet} to the destination POI file
  * system. - Streams which are no property set streams are copied bit by
  * bit.</p>
- * 
+ * <p>
  * <p>The comparison of the POI file systems is done logically. That means that
  * the two disk files containing the POI file systems do not need to be
  * exactly identical. However, both POI file systems must contain the same
  * files, and most of these files must be bitwise identical. Property set
  * streams, however, are compared logically: they must have the same sections
- * with the same attributs, and the sections must contain the same properties.
+ * with the same attributes, and the sections must contain the same properties.
  * Details like the ordering of the properties do not matter.</p>
  */
-public class CopyCompare
-{
+public final class CopyCompare {
+    private CopyCompare() {}
+
     /**
-     * <p>Runs the example program. The application expects one or two
-     * arguments:</p>
-     * 
+     * Runs the example program. The application expects one or two arguments:
+     *
      * <ol>
-     * 
-     * <li><p>The first argument is the disk file name of the POI filesystem to
-     * copy.</p></li>
-     * 
-     * <li><p>The second argument is optional. If it is given, it is the name of
+     * <li>The first argument is the disk file name of the POI filesystem to copy.</li>
+     * <li>The second argument is optional. If it is given, it is the name of
      * a disk file the copy of the POI filesystem will be written to. If it is
      * not given, the copy will be written to a temporary file which will be
-     * deleted at the end of the program.</p></li>
-     * 
+     * deleted at the end of the program.</li>
      * </ol>
      *
      * @param args Command-line arguments.
-     * @exception MarkUnsupportedException if a POI document stream does not
-     * support the mark() operation.
-     * @exception NoPropertySetStreamException if the application tries to
-     * create a property set from a POI document stream that is not a property
-     * set stream.
-     * @exception IOException if any I/O exception occurs.
-     * @exception UnsupportedEncodingException if a character encoding is not
-     * supported.
+     * @throws IOException                  if any I/O exception occurs.
+     * @throws UnsupportedEncodingException if a character encoding is not
+     *                                      supported.
      */
     public static void main(final String[] args)
-    throws NoPropertySetStreamException, MarkUnsupportedException,
-           UnsupportedEncodingException, IOException
-    {
+            throws UnsupportedEncodingException, IOException {
         String originalFileName = null;
         String copyFileName = null;
 
@@ -115,7 +101,7 @@ public class CopyCompare
             copyFileName = args[1];
         } else {
             System.err.println("Usage: " + CopyCompare.class.getName() +
-                               "originPOIFS [copyPOIFS]");
+                    "originPOIFS [copyPOIFS]");
             System.exit(1);
         }
 
@@ -124,156 +110,23 @@ public class CopyCompare
         final POIFSReader r = new POIFSReader();
         final CopyFile cf = new CopyFile(copyFileName);
         r.registerListener(cf);
-        FileInputStream fis = new FileInputStream(originalFileName);
-        r.read(fis);
-        fis.close();
-        
+        r.setNotifyEmptyDirectories(true);
+
+        r.read(new File(originalFileName));
+
         /* Write the new POIFS to disk. */
         cf.close();
 
         /* Read all documents from the original POI file system and compare them
          * with the equivalent document from the copy. */
-        final POIFSFileSystem opfs = new POIFSFileSystem(new File(originalFileName));
-        final POIFSFileSystem cpfs = new POIFSFileSystem(new File(copyFileName));
-
-        final DirectoryEntry oRoot = opfs.getRoot();
-        final DirectoryEntry cRoot = cpfs.getRoot();
-        final StringBuffer messages = new StringBuffer();
-        if (equal(oRoot, cRoot, messages)) {
-            System.out.println("Equal");
-        } else {
-            System.out.println("Not equal: " + messages.toString());
+        try (POIFSFileSystem opfs = new POIFSFileSystem(new File(originalFileName));
+             POIFSFileSystem cpfs = new POIFSFileSystem(new File(copyFileName))) {
+            final DirectoryEntry oRoot = opfs.getRoot();
+            final DirectoryEntry cRoot = cpfs.getRoot();
+            System.out.println(EntryUtils.areDirectoriesIdentical(oRoot, cRoot) ? "Equal" : "Not equal");
         }
-        cpfs.close();
-        opfs.close();
     }
 
-
-
-    /**
-     * <p>Compares two {@link DirectoryEntry} instances of a POI file system.
-     * The directories must contain the same streams with the same names and
-     * contents.</p>
-     *
-     * @param d1 The first directory.
-     * @param d2 The second directory.
-     * @param msg The method may append human-readable comparison messages to
-     * this string buffer. 
-     * @return <code>true</code> if the directories are equal, else
-     * <code>false</code>.
-     * @exception MarkUnsupportedException if a POI document stream does not
-     * support the mark() operation.
-     * @exception NoPropertySetStreamException if the application tries to
-     * create a property set from a POI document stream that is not a property
-     * set stream.
-     * @throws UnsupportedEncodingException 
-     * @exception IOException if any I/O exception occurs.
-     */
-    private static boolean equal(final DirectoryEntry d1,
-                                 final DirectoryEntry d2,
-                                 final StringBuffer msg)
-    throws NoPropertySetStreamException, MarkUnsupportedException,
-           UnsupportedEncodingException, IOException
-    {
-        boolean equal = true;
-        /* Iterate over d1 and compare each entry with its counterpart in d2. */
-        for (final Entry e1 : d1) {
-            final String n1 = e1.getName();
-            Entry e2 = null;
-            try {
-                e2 = d2.getEntry(n1);
-            } catch (FileNotFoundException ex) {
-                msg.append("Document \"" + e1 + "\" exists, document \"" +
-                           e2 + "\" does not.\n");
-                equal = false;
-                break;
-            }
-
-            if (e1.isDirectoryEntry() && e2.isDirectoryEntry()) {
-                equal = equal((DirectoryEntry) e1, (DirectoryEntry) e2, msg);
-            } else if (e1.isDocumentEntry() && e2.isDocumentEntry()) {
-                equal = equal((DocumentEntry) e1, (DocumentEntry) e2, msg);
-            } else {
-                msg.append("One of \"" + e1 + "\" and \"" + e2 + "\" is a " +
-                           "document while the other one is a directory.\n");
-                equal = false;
-            }
-        }
-
-        /* Iterate over d2 just to make sure that there are no entries in d2
-         * that are not in d1. */
-        for (final Entry e2 : d2) {
-            final String n2 = e2.getName();
-            Entry e1 = null;
-            try {
-                e1 = d1.getEntry(n2);
-            } catch (FileNotFoundException ex) {
-                msg.append("Document \"" + e2 + "\" exitsts, document \"" +
-                           e1 + "\" does not.\n");
-                equal = false;
-                break;
-            }
-        }
-        return equal;
-    }
-
-
-
-    /**
-     * <p>Compares two {@link DocumentEntry} instances of a POI file system.
-     * Documents that are not property set streams must be bitwise identical.
-     * Property set streams must be logically equal.</p>
-     *
-     * @param d1 The first document.
-     * @param d2 The second document.
-     * @param msg The method may append human-readable comparison messages to
-     * this string buffer. 
-     * @return <code>true</code> if the documents are equal, else
-     * <code>false</code>.
-     * @exception MarkUnsupportedException if a POI document stream does not
-     * support the mark() operation.
-     * @exception NoPropertySetStreamException if the application tries to
-     * create a property set from a POI document stream that is not a property
-     * set stream.
-     * @throws UnsupportedEncodingException 
-     * @exception IOException if any I/O exception occurs.
-     */
-    private static boolean equal(final DocumentEntry d1, final DocumentEntry d2,
-                                 final StringBuffer msg)
-    throws NoPropertySetStreamException, MarkUnsupportedException,
-           UnsupportedEncodingException, IOException
-    {
-        final DocumentInputStream dis1 = new DocumentInputStream(d1);
-        final DocumentInputStream dis2 = new DocumentInputStream(d2);
-        try {
-            if (PropertySet.isPropertySetStream(dis1) &&
-                PropertySet.isPropertySetStream(dis2)) {
-                final PropertySet ps1 = PropertySetFactory.create(dis1);
-                final PropertySet ps2 = PropertySetFactory.create(dis2);
-                if (!ps1.equals(ps2)) {
-                    msg.append("Property sets are not equal.\n");
-                    return false;
-                }
-            } else {
-                int i1, i2;
-                do {
-                    i1 = dis1.read();
-                    i2 = dis2.read();
-                    if (i1 != i2) {
-                        msg.append("Documents are not equal.\n");
-                        return false;
-                    }
-                } while (i1 > -1);
-            }
-        } finally {
-            dis2.close();
-            dis1.close();
-        }
-        return true;
-    }
-
-
-
     /**
      * <p>This class does all the work. Its method {@link
      * #processPOIFSReaderEvent(POIFSReaderEvent)} is called for each file in
@@ -281,7 +134,7 @@ public class CopyCompare
      * everything unmodified to the destination POI filesystem. Property set
      * streams are copied by creating a new {@link PropertySet} from the
      * original property set by using the {@link
-     * MutablePropertySet#MutablePropertySet(PropertySet)} constructor.</p>
+     * PropertySet#PropertySet(PropertySet)} constructor.</p>
      */
     static class CopyFile implements POIFSReaderListener {
         private String dstName;
@@ -293,11 +146,11 @@ public class CopyCompare
          * <p>The constructor of a {@link CopyFile} instance creates the target
          * POIFS. It also stores the name of the file the POIFS will be written
          * to once it is complete.</p>
-         * 
+         *
          * @param dstName The name of the disk file the destination POIFS is to
-         * be written to.
+         *                be written to.
          */
-        public CopyFile(final String dstName) {
+        CopyFile(final String dstName) {
             this.dstName = dstName;
             poiFs = new POIFSFileSystem();
         }
@@ -320,7 +173,7 @@ public class CopyCompare
             try {
                 /* Find out whether the current document is a property set
                  * stream or not. */
-                if (PropertySet.isPropertySetStream(stream)) {
+                if (stream != null && PropertySet.isPropertySetStream(stream)) {
                     /* Yes, the current document is a property set stream.
                      * Let's create a PropertySet instance from it. */
                     PropertySet ps = null;
@@ -337,68 +190,74 @@ public class CopyCompare
                 } else {
                     /* No, the current document is not a property set stream. We
                      * copy it unmodified to the destination POIFS. */
-                    copy(poiFs, event.getPath(), event.getName(), stream);
+                    copy(poiFs, path, name, stream);
                 }
-            } catch (MarkUnsupportedException ex) {
-                t = ex;
-            } catch (IOException ex) {
-                t = ex;
-            } catch (WritingNotSupportedException ex) {
+            } catch (MarkUnsupportedException | WritingNotSupportedException | IOException ex) {
                 t = ex;
             }
 
             /* According to the definition of the processPOIFSReaderEvent method
              * we cannot pass checked exceptions to the caller. The following
-             * lines check whether a checked exception occured and throws an
+             * lines check whether a checked exception occurred and throws an
              * unchecked exception. The message of that exception is that of
              * the underlying checked exception. */
             if (t != null) {
-                throw new HPSFRuntimeException
-                    ("Could not read file \"" + path + "/" + name +
-                     "\". Reason: " + Util.toString(t));
+                throw new HPSFRuntimeException("Could not read file \"" + path + "/" + name, t);
             }
         }
 
 
-
         /**
-         * <p>Writes a {@link PropertySet} to a POI filesystem.</p>
+         * Writes a {@link PropertySet} to a POI filesystem.
          *
          * @param poiFs The POI filesystem to write to.
-         * @param path The file's path in the POI filesystem.
-         * @param name The file's name in the POI filesystem.
-         * @param ps The property set to write.
-         * @throws WritingNotSupportedException 
-         * @throws IOException 
+         * @param path  The file's path in the POI filesystem.
+         * @param name  The file's name in the POI filesystem.
+         * @param ps    The property set to write.
          */
         public void copy(final POIFSFileSystem poiFs,
                          final POIFSDocumentPath path,
                          final String name,
                          final PropertySet ps)
-        throws WritingNotSupportedException, IOException {
+                throws WritingNotSupportedException, IOException {
             final DirectoryEntry de = getPath(poiFs, path);
-            final MutablePropertySet mps = new MutablePropertySet(ps);
+            final PropertySet mps;
+            try {
+                if (ps instanceof DocumentSummaryInformation) {
+                    mps = new DocumentSummaryInformation(ps);
+                } else if (ps instanceof SummaryInformation) {
+                    mps = new SummaryInformation(ps);
+                } else {
+                    mps = new PropertySet(ps);
+                }
+            } catch (UnexpectedPropertySetTypeException e) {
+                throw new IOException(e);
+            }
             de.createDocument(name, mps.toInputStream());
         }
 
 
-
         /**
-         * <p>Copies the bytes from a {@link DocumentInputStream} to a new
-         * stream in a POI filesystem.</p>
+         * Copies the bytes from a {@link DocumentInputStream} to a new
+         * stream in a POI filesystem.
          *
-         * @param poiFs The POI filesystem to write to.
-         * @param path The source document's path.
-         * @param name The source document's name.
+         * @param poiFs  The POI filesystem to write to.
+         * @param path   The source document's path.
+         * @param name   The source document's name.
          * @param stream The stream containing the source document.
-         * @throws IOException 
          */
         public void copy(final POIFSFileSystem poiFs,
                          final POIFSDocumentPath path,
                          final String name,
                          final DocumentInputStream stream)
-        throws IOException {
+                throws IOException {
+            // create the directories to the document
             final DirectoryEntry de = getPath(poiFs, path);
+            // check the parameters after the directories have been created
+            if (stream == null || name == null) {
+                // Empty directory
+                return;
+            }
             final ByteArrayOutputStream out = new ByteArrayOutputStream();
             int c;
             while ((c = stream.read()) != -1) {
@@ -407,30 +266,27 @@ public class CopyCompare
             stream.close();
             out.close();
             final InputStream in =
-                new ByteArrayInputStream(out.toByteArray());
+                    new ByteArrayInputStream(out.toByteArray());
             de.createDocument(name, in);
         }
 
 
         /**
-         * <p>Writes the POI file system to a disk file.</p>
-         *
-         * @throws FileNotFoundException
-         * @throws IOException
+         * Writes the POI file system to a disk file.
          */
-        public void close() throws FileNotFoundException, IOException {
+        public void close() throws IOException {
             out = new FileOutputStream(dstName);
             poiFs.writeFilesystem(out);
             out.close();
         }
 
 
-
-        /** Contains the directory paths that have already been created in the
+        /**
+         * Contains the directory paths that have already been created in the
          * output POI filesystem and maps them to their corresponding
-         * {@link org.apache.poi.poifs.filesystem.DirectoryNode}s. */
-        private final Map<String,DirectoryEntry> paths = new HashMap<String,DirectoryEntry>();
-
+         * {@link org.apache.poi.poifs.filesystem.DirectoryNode}s.
+         */
+        private final Map<String, DirectoryEntry> paths = new HashMap<>();
 
 
         /**
@@ -439,7 +295,7 @@ public class CopyCompare
          * a POI filesystem its directory must be created first. This method
          * creates all directories between the POI filesystem root and the
          * directory the document should belong to which do not yet exist.</p>
-         * 
+         * <p>
          * <p>Unfortunately POI does not offer a simple method to interrogate
          * the POIFS whether a certain child node (file or directory) exists in
          * a directory. However, since we always start with an empty POIFS which
@@ -450,9 +306,9 @@ public class CopyCompare
          * to the corresponding {@link DirectoryEntry} instances.</p>
          *
          * @param poiFs The POI filesystem the directory hierarchy is created
-         * in, if needed.
-         * @param path The document's path. This method creates those directory
-         * components of this hierarchy which do not yet exist.
+         *              in, if needed.
+         * @param path  The document's path. This method creates those directory
+         *              components of this hierarchy which do not yet exist.
          * @return The directory entry of the document path's parent. The caller
          * should use this {@link DirectoryEntry} to create documents in it.
          */
@@ -479,7 +335,7 @@ public class CopyCompare
                     de = getPath(poiFs, path.getParent());
                     /* Now create the target directory: */
                     de = de.createDirectory(path.getComponent
-                                            (path.length() - 1));
+                            (path.length() - 1));
                 }
                 paths.put(s, de);
                 return de;
@@ -487,11 +343,7 @@ public class CopyCompare
                 /* This exception will be thrown if the directory already
                  * exists. However, since we have full control about directory
                  * creation we can ensure that this will never happen. */
-                ex.printStackTrace(System.err);
-                throw new RuntimeException(ex.toString());
-                /* FIXME (2): Replace the previous line by the following once we
-                 * no longer need JDK 1.3 compatibility. */
-                // throw new RuntimeException(ex);
+                throw new RuntimeException(ex);
             }
         }
     }

src/examples/src/org/apache/poi/hpsf/examples/ModifyDocumentSummaryInformation.java

@@ -19,19 +19,14 @@ package org.apache.poi.hpsf.examples;
 
 import java.io.File;
 import java.io.FileNotFoundException;
-import java.io.IOException;
 import java.util.Date;
 
 import org.apache.poi.hpsf.CustomProperties;
 import org.apache.poi.hpsf.DocumentSummaryInformation;
-import org.apache.poi.hpsf.MarkUnsupportedException;
-import org.apache.poi.hpsf.NoPropertySetStreamException;
 import org.apache.poi.hpsf.PropertySetFactory;
 import org.apache.poi.hpsf.SummaryInformation;
-import org.apache.poi.hpsf.UnexpectedPropertySetTypeException;
-import org.apache.poi.hpsf.WritingNotSupportedException;
 import org.apache.poi.poifs.filesystem.DirectoryEntry;
-import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
+import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 
 /**
  * <p>This is a sample application showing how to easily modify properties in
@@ -76,98 +71,84 @@ public class ModifyDocumentSummaryInformation {
      * <p>Main method - see class description.</p>
      *
      * @param args The command-line parameters.
-     * @throws IOException
-     * @throws MarkUnsupportedException
-     * @throws NoPropertySetStreamException
-     * @throws UnexpectedPropertySetTypeException
-     * @throws WritingNotSupportedException
      */
-    public static void main(final String[] args) throws IOException,
-            NoPropertySetStreamException, MarkUnsupportedException,
-            UnexpectedPropertySetTypeException, WritingNotSupportedException
-    {
+    public static void main(final String[] args) throws Exception {
         /* Read the name of the POI filesystem to modify from the command line.
          * For brevity to boundary check is performed on the command-line
          * arguments. */
         File summaryFile = new File(args[0]);
 
         /* Open the POI filesystem. */
-        NPOIFSFileSystem poifs = new NPOIFSFileSystem(summaryFile, false);
+        try (POIFSFileSystem poifs = new POIFSFileSystem(summaryFile, false)) {
 
-        /* Read the summary information. */
-        DirectoryEntry dir = poifs.getRoot();
-        SummaryInformation si;
-        try
-        {
-            si = (SummaryInformation)PropertySetFactory.create(
-                    dir, SummaryInformation.DEFAULT_STREAM_NAME);
+            /* Read the summary information. */
+            DirectoryEntry dir = poifs.getRoot();
+            SummaryInformation si;
+            try {
+                si = (SummaryInformation) PropertySetFactory.create(
+                        dir, SummaryInformation.DEFAULT_STREAM_NAME);
+            } catch (FileNotFoundException ex) {
+                // There is no summary information yet. We have to create a new one
+                si = PropertySetFactory.newSummaryInformation();
+            }
+
+            /* Change the author to "Rainer Klute". Any former author value will
+             * be lost. If there has been no author yet, it will be created. */
+            si.setAuthor("Rainer Klute");
+            System.out.println("Author changed to " + si.getAuthor() + ".");
+
+
+            /* Handling the document summary information is analogous to handling
+             * the summary information. An additional feature, however, are the
+             * custom properties. */
+
+            /* Read the document summary information. */
+            DocumentSummaryInformation dsi;
+            try {
+                dsi = (DocumentSummaryInformation) PropertySetFactory.create(
+                        dir, DocumentSummaryInformation.DEFAULT_STREAM_NAME);
+            } catch (FileNotFoundException ex) {
+                /* There is no document summary information yet. We have to create a
+                 * new one. */
+                dsi = PropertySetFactory.newDocumentSummaryInformation();
+            }
+
+            /* Change the category to "POI example". Any former category value will
+             * be lost. If there has been no category yet, it will be created. */
+            dsi.setCategory("POI example");
+            System.out.println("Category changed to " + dsi.getCategory() + ".");
+
+            /* Read the custom properties. If there are no custom properties yet,
+             * the application has to create a new CustomProperties object. It will
+             * serve as a container for custom properties. */
+            CustomProperties customProperties = dsi.getCustomProperties();
+            if (customProperties == null)
+                customProperties = new CustomProperties();
+
+            /* Insert some custom properties into the container. */
+            customProperties.put("Key 1", "Value 1");
+            customProperties.put("Schl\u00fcssel 2", "Wert 2");
+            customProperties.put("Sample Number", 12345);
+            customProperties.put("Sample Boolean", Boolean.TRUE);
+            customProperties.put("Sample Date", new Date());
+
+            /* Read a custom property. */
+            Object value = customProperties.get("Sample Number");
+            System.out.println("Custom Sample Number is now " + value);
+
+            /* Write the custom properties back to the document summary
+             * information. */
+            dsi.setCustomProperties(customProperties);
+
+            /* Write the summary information and the document summary information
+             * to the POI filesystem. */
+            si.write(dir, SummaryInformation.DEFAULT_STREAM_NAME);
+            dsi.write(dir, DocumentSummaryInformation.DEFAULT_STREAM_NAME);
+
+            /* Write the POI filesystem back to the original file. Please note that
+             * in production code you should take care when write directly to the
+             * origin, to make sure you don't loose things on error */
+            poifs.writeFilesystem();
         }
-        catch (FileNotFoundException ex)
-        {
-            // There is no summary information yet. We have to create a new one
-            si = PropertySetFactory.newSummaryInformation();
-        }
-
-        /* Change the author to "Rainer Klute". Any former author value will
-         * be lost. If there has been no author yet, it will be created. */
-        si.setAuthor("Rainer Klute");
-        System.out.println("Author changed to " + si.getAuthor() + ".");
-
-
-        /* Handling the document summary information is analogous to handling
-         * the summary information. An additional feature, however, are the
-         * custom properties. */
-
-        /* Read the document summary information. */
-        DocumentSummaryInformation dsi;
-        try
-        {
-            dsi = (DocumentSummaryInformation)PropertySetFactory.create(
-                    dir, DocumentSummaryInformation.DEFAULT_STREAM_NAME);
-        }
-        catch (FileNotFoundException ex)
-        {
-            /* There is no document summary information yet. We have to create a
-             * new one. */
-            dsi = PropertySetFactory.newDocumentSummaryInformation();
-        }
-
-        /* Change the category to "POI example". Any former category value will
-         * be lost. If there has been no category yet, it will be created. */
-        dsi.setCategory("POI example");
-        System.out.println("Category changed to " + dsi.getCategory() + ".");
-
-        /* Read the custom properties. If there are no custom properties yet,
-         * the application has to create a new CustomProperties object. It will
-         * serve as a container for custom properties. */
-        CustomProperties customProperties = dsi.getCustomProperties();
-        if (customProperties == null)
-            customProperties = new CustomProperties();
-
-        /* Insert some custom properties into the container. */
-        customProperties.put("Key 1", "Value 1");
-        customProperties.put("Schl\u00fcssel 2", "Wert 2");
-        customProperties.put("Sample Number", new Integer(12345));
-        customProperties.put("Sample Boolean", Boolean.TRUE);
-        customProperties.put("Sample Date", new Date());
-
-        /* Read a custom property. */
-        Object value = customProperties.get("Sample Number");
-        System.out.println("Custom Sample Number is now " + value);
-
-        /* Write the custom properties back to the document summary
-         * information. */
-        dsi.setCustomProperties(customProperties);
-
-        /* Write the summary information and the document summary information
-         * to the POI filesystem. */
-        si.write(dir, SummaryInformation.DEFAULT_STREAM_NAME);
-        dsi.write(dir, DocumentSummaryInformation.DEFAULT_STREAM_NAME);
-
-        /* Write the POI filesystem back to the original file. Please note that
-         * in production code you should take care when write directly to the 
-         * origin, to make sure you don't loose things on error */
-        poifs.writeFilesystem();
-        poifs.close();
     }
 }

src/examples/src/org/apache/poi/hpsf/examples/ReadCustomPropertySets.java

@@ -17,9 +17,8 @@
 
 package org.apache.poi.hpsf.examples;
 
-import java.io.FileInputStream;
+import java.io.File;
 import java.io.IOException;
-import java.util.Iterator;
 import java.util.List;
 
 import org.apache.poi.hpsf.NoPropertySetStreamException;
@@ -38,8 +37,9 @@ import org.apache.poi.util.HexDump;
  *
  * <p>Explanations can be found in the HPSF HOW-TO.</p>
  */
-public class ReadCustomPropertySets
-{
+public final class ReadCustomPropertySets {
+
+    private ReadCustomPropertySets() {}
 
     /**
      * <p>Runs the example program.</p>
@@ -55,7 +55,7 @@ public class ReadCustomPropertySets
 
         /* Register a listener for *all* documents. */
         r.registerListener(new MyPOIFSReaderListener());
-        r.read(new FileInputStream(filename));
+        r.read(new File(filename));
     }
 
 
@@ -64,7 +64,7 @@ public class ReadCustomPropertySets
         @Override
         public void processPOIFSReaderEvent(final POIFSReaderEvent event)
         {
-            PropertySet ps = null;
+            PropertySet ps;
             try
             {
                 ps = PropertySetFactory.create(event.getStream());
@@ -93,10 +93,8 @@ public class ReadCustomPropertySets
             /* Print the list of sections: */
             List<Section> sections = ps.getSections();
             int nr = 0;
-            for (Iterator<Section> i = sections.iterator(); i.hasNext();)
-            {
+            for (Section sec : sections) {
                 /* Print a single section: */
-                Section sec = i.next();
                 out("   Section " + nr++ + ":");
                 String s = hex(sec.getFormatID().getBytes());
                 s = s.substring(0, s.length() - 1);
@@ -108,26 +106,24 @@ public class ReadCustomPropertySets
 
                 /* Print the properties: */
                 Property[] properties = sec.getProperties();
-                for (int i2 = 0; i2 < properties.length; i2++)
-                {
+                for (Property p : properties) {
                     /* Print a single property: */
-                    Property p = properties[i2];
                     long id = p.getID();
                     long type = p.getType();
                     Object value = p.getValue();
                     out("      Property ID: " + id + ", type: " + type +
-                        ", value: " + value);
+                            ", value: " + value);
                 }
             }
         }
     }
 
-    static void out(final String msg)
+    private static void out(final String msg)
     {
         System.out.println(msg);
     }
 
-    static String hex(final byte[] bytes)
+    private static String hex(final byte[] bytes)
     {
         return HexDump.dump(bytes, 0L, 0);
     }

src/examples/src/org/apache/poi/hpsf/examples/ReadTitle.java

@@ -17,7 +17,7 @@
 
 package org.apache.poi.hpsf.examples;
 
-import java.io.FileInputStream;
+import java.io.File;
 import java.io.IOException;
 
 import org.apache.poi.hpsf.PropertySetFactory;
@@ -33,8 +33,10 @@ import org.apache.poi.poifs.eventfilesystem.POIFSReaderListener;
  *
  * <p>Explanations can be found in the HPSF HOW-TO.</p>
  */
-public class ReadTitle
+public final class ReadTitle
 {
+    private ReadTitle() {}
+
     /**
      * <p>Runs the example program.</p>
      *
@@ -46,9 +48,8 @@ public class ReadTitle
     {
         final String filename = args[0];
         POIFSReader r = new POIFSReader();
-        r.registerListener(new MyPOIFSReaderListener(),
-                           "\005SummaryInformation");
-        r.read(new FileInputStream(filename));
+        r.registerListener(new MyPOIFSReaderListener(), SummaryInformation.DEFAULT_STREAM_NAME);
+        r.read(new File(filename));
     }
 
 
@@ -57,7 +58,7 @@ public class ReadTitle
         @Override
         public void processPOIFSReaderEvent(final POIFSReaderEvent event)
         {
-            SummaryInformation si = null;
+            SummaryInformation si;
             try
             {
                 si = (SummaryInformation)

src/examples/src/org/apache/poi/hpsf/examples/WriteAuthorAndTitle.java

@@ -19,8 +19,7 @@ package org.apache.poi.hpsf.examples;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
+import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -30,13 +29,11 @@ import java.util.Map;
 
 import org.apache.poi.hpsf.HPSFRuntimeException;
 import org.apache.poi.hpsf.MarkUnsupportedException;
-import org.apache.poi.hpsf.MutablePropertySet;
-import org.apache.poi.hpsf.MutableSection;
 import org.apache.poi.hpsf.NoPropertySetStreamException;
 import org.apache.poi.hpsf.PropertySet;
 import org.apache.poi.hpsf.PropertySetFactory;
+import org.apache.poi.hpsf.Section;
 import org.apache.poi.hpsf.SummaryInformation;
-import org.apache.poi.hpsf.Util;
 import org.apache.poi.hpsf.Variant;
 import org.apache.poi.hpsf.WritingNotSupportedException;
 import org.apache.poi.hpsf.wellknown.PropertyIDMap;
@@ -82,8 +79,9 @@ import org.apache.poi.poifs.filesystem.POIFSFileSystem;
  * 
  * <p>Further explanations can be found in the HPSF HOW-TO.</p>
  */
-public class WriteAuthorAndTitle
-{
+public final class WriteAuthorAndTitle {
+    private WriteAuthorAndTitle() {}
+
     /**
      * <p>Runs the example program.</p>
      *
@@ -111,10 +109,8 @@ public class WriteAuthorAndTitle
         final POIFSReader r = new POIFSReader();
         final ModifySICopyTheRest msrl = new ModifySICopyTheRest(dstName);
         r.registerListener(msrl);
-        FileInputStream fis = new FileInputStream(srcName);
-        r.read(fis);
-        fis.close();
-        
+        r.read(new File(srcName));
+
         /* Write the new POIFS to disk. */
         msrl.close();
     }
@@ -137,14 +133,14 @@ public class WriteAuthorAndTitle
 
 
         /**
-         * <p>The constructor of a {@link ModifySICopyTheRest} instance creates
+         * The constructor of a {@link ModifySICopyTheRest} instance creates
          * the target POIFS. It also stores the name of the file the POIFS will
-         * be written to once it is complete.</p>
+         * be written to once it is complete.
          * 
          * @param dstName The name of the disk file the destination POIFS is to
          * be written to.
          */
-        public ModifySICopyTheRest(final String dstName)
+        ModifySICopyTheRest(final String dstName)
         {
             this.dstName = dstName;
             poiFs = new POIFSFileSystem();
@@ -152,8 +148,8 @@ public class WriteAuthorAndTitle
 
 
         /**
-         * <p>The method is called by POI's eventing API for each file in the
-         * origin POIFS.</p>
+         * The method is called by POI's eventing API for each file in the
+         * origin POIFS.
          */
         @Override
         public void processPOIFSReaderEvent(final POIFSReaderEvent event)
@@ -197,23 +193,17 @@ public class WriteAuthorAndTitle
                      * copy it unmodified to the destination POIFS. */
                     copy(poiFs, event.getPath(), event.getName(), stream);
                 }
-            } catch (MarkUnsupportedException ex) {
-                t = ex;
-            } catch (IOException ex) {
-                t = ex;
-            } catch (WritingNotSupportedException ex) {
+            } catch (MarkUnsupportedException | WritingNotSupportedException | IOException ex) {
                 t = ex;
             }
 
             /* According to the definition of the processPOIFSReaderEvent method
              * we cannot pass checked exceptions to the caller. The following
-             * lines check whether a checked exception occured and throws an
+             * lines check whether a checked exception occurred and throws an
              * unchecked exception. The message of that exception is that of
              * the underlying checked exception. */
             if (t != null) {
-                throw new HPSFRuntimeException
-                    ("Could not read file \"" + path + "/" + name +
-                     "\". Reason: " + Util.toString(t));
+                throw new HPSFRuntimeException("Could not read file \"" + path + "/" + name, t);
             }
         }
 
@@ -228,10 +218,8 @@ public class WriteAuthorAndTitle
          * @param name The original (and destination) stream's name.
          * @param si The property set. It should be a summary information
          * property set.
-         * @throws IOException 
-         * @throws WritingNotSupportedException 
          */
-        public void editSI(final POIFSFileSystem poiFs,
+        void editSI(final POIFSFileSystem poiFs,
                            final POIFSDocumentPath path,
                            final String name,
                            final PropertySet si)
@@ -243,12 +231,11 @@ public class WriteAuthorAndTitle
 
             /* Create a mutable property set as a copy of the original read-only
              * property set. */
-            final MutablePropertySet mps = new MutablePropertySet(si);
+            final PropertySet mps = new PropertySet(si);
             
             /* Retrieve the section containing the properties to modify. A
              * summary information property set contains exactly one section. */
-            final MutableSection s =
-                (MutableSection) mps.getSections().get(0);
+            final Section s = mps.getSections().get(0);
 
             /* Set the properties. */
             s.setProperty(PropertyIDMap.PID_AUTHOR, Variant.VT_LPSTR,
@@ -274,8 +261,6 @@ public class WriteAuthorAndTitle
          * @param path The file's path in the POI filesystem.
          * @param name The file's name in the POI filesystem.
          * @param ps The property set to write.
-         * @throws WritingNotSupportedException 
-         * @throws IOException 
          */
         public void copy(final POIFSFileSystem poiFs,
                          final POIFSDocumentPath path,
@@ -284,7 +269,7 @@ public class WriteAuthorAndTitle
             throws WritingNotSupportedException, IOException
         {
             final DirectoryEntry de = getPath(poiFs, path);
-            final MutablePropertySet mps = new MutablePropertySet(ps);
+            final PropertySet mps = new PropertySet(ps);
             de.createDocument(name, mps.toInputStream());
         }
 
@@ -298,7 +283,6 @@ public class WriteAuthorAndTitle
          * @param path The source document's path.
          * @param name The source document's name.
          * @param stream The stream containing the source document.
-         * @throws IOException 
          */
         public void copy(final POIFSFileSystem poiFs,
                          final POIFSDocumentPath path,
@@ -319,12 +303,9 @@ public class WriteAuthorAndTitle
 
 
         /**
-         * <p>Writes the POI file system to a disk file.</p>
-         *
-         * @throws FileNotFoundException
-         * @throws IOException
+         * Writes the POI file system to a disk file.
          */
-        public void close() throws FileNotFoundException, IOException
+        public void close() throws IOException
         {
             out = new FileOutputStream(dstName);
             poiFs.writeFilesystem(out);
@@ -336,7 +317,7 @@ public class WriteAuthorAndTitle
         /** Contains the directory paths that have already been created in the
          * output POI filesystem and maps them to their corresponding
          * {@link org.apache.poi.poifs.filesystem.DirectoryNode}s. */
-        private final Map<String, DirectoryEntry> paths = new HashMap<String, DirectoryEntry>();
+        private final Map<String, DirectoryEntry> paths = new HashMap<>();
 
 
 

src/examples/src/org/apache/poi/hpsf/examples/WriteTitle.java

@@ -21,14 +21,13 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.poi.hpsf.MutableProperty;
-import org.apache.poi.hpsf.MutablePropertySet;
-import org.apache.poi.hpsf.MutableSection;
+import org.apache.poi.hpsf.Property;
+import org.apache.poi.hpsf.PropertySet;
+import org.apache.poi.hpsf.Section;
 import org.apache.poi.hpsf.SummaryInformation;
 import org.apache.poi.hpsf.Variant;
 import org.apache.poi.hpsf.WritingNotSupportedException;
 import org.apache.poi.hpsf.wellknown.PropertyIDMap;
-import org.apache.poi.hpsf.wellknown.SectionIDMap;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 
 /**
@@ -61,18 +60,18 @@ public class WriteTitle
 
         /* Create a mutable property set. Initially it contains a single section
          * with no properties. */
-        final MutablePropertySet mps = new MutablePropertySet();
+        final PropertySet mps = new PropertySet();
 
         /* Retrieve the section the property set already contains. */
-        final MutableSection ms = (MutableSection) mps.getSections().get(0);
+        final Section ms = mps.getSections().get(0);
 
         /* Turn the property set into a summary information property. This is
          * done by setting the format ID of its first section to
          * SectionIDMap.SUMMARY_INFORMATION_ID. */
-        ms.setFormatID(SectionIDMap.SUMMARY_INFORMATION_ID);
+        ms.setFormatID(SummaryInformation.FORMAT_ID);
 
         /* Create an empty property. */    
-        final MutableProperty p = new MutableProperty();
+        final Property p = new Property();
 
         /* Fill the property with appropriate settings so that it specifies the
          * document's title. */
@@ -84,23 +83,21 @@ public class WriteTitle
         ms.setProperty(p);
 
         /* Create the POI file system the property set is to be written to. */
-        final POIFSFileSystem poiFs = new POIFSFileSystem();
+        try (final POIFSFileSystem poiFs = new POIFSFileSystem()) {
+            /* For writing the property set into a POI file system it has to be
+             * handed over to the POIFS.createDocument() method as an input stream
+             * which produces the bytes making out the property set stream. */
+            final InputStream is = mps.toInputStream();
 
-        /* For writing the property set into a POI file system it has to be
-         * handed over to the POIFS.createDocument() method as an input stream
-         * which produces the bytes making out the property set stream. */
-        final InputStream is = mps.toInputStream();
+            /* Create the summary information property set in the POI file
+             * system. It is given the default name most (if not all) summary
+             * information property sets have. */
+            poiFs.createDocument(is, SummaryInformation.DEFAULT_STREAM_NAME);
 
-        /* Create the summary information property set in the POI file
-         * system. It is given the default name most (if not all) summary
-         * information property sets have. */
-        poiFs.createDocument(is, SummaryInformation.DEFAULT_STREAM_NAME);
-
-        /* Write the whole POI file system to a disk file. */
-        FileOutputStream fos = new FileOutputStream(fileName);
-        poiFs.writeFilesystem(fos);
-        fos.close();
-        poiFs.close();
+            /* Write the whole POI file system to a disk file. */
+            try (FileOutputStream fos = new FileOutputStream(fileName)) {
+                poiFs.writeFilesystem(fos);
+            }
+        }
     }
-
 }

src/examples/src/org/apache/poi/hslf/examples/ApacheconEU08.java

@@ -51,28 +51,28 @@ import org.apache.poi.sl.usermodel.VerticalAlignment;
 public final class ApacheconEU08 {
 
     public static void main(String[] args) throws IOException {
-        SlideShow<?,?> ppt = new HSLFSlideShow();
-        // SlideShow<?,?> ppt = new XMLSlideShow();
-        ppt.setPageSize(new Dimension(720, 540));
+        try (SlideShow<?,?> ppt = new HSLFSlideShow()) {
+            // SlideShow<?,?> ppt = new XMLSlideShow();
+            ppt.setPageSize(new Dimension(720, 540));
 
-        slide1(ppt);
-        slide2(ppt);
-        slide3(ppt);
-        slide4(ppt);
-        slide5(ppt);
-        slide6(ppt);
-        slide7(ppt);
-        slide8(ppt);
-        slide9(ppt);
-        slide10(ppt);
-        slide11(ppt);
-        slide12(ppt);
+            slide1(ppt);
+            slide2(ppt);
+            slide3(ppt);
+            slide4(ppt);
+            slide5(ppt);
+            slide6(ppt);
+            slide7(ppt);
+            slide8(ppt);
+            slide9(ppt);
+            slide10(ppt);
+            slide11(ppt);
+            slide12(ppt);
 
-        String ext = ppt.getClass().getName().contains("HSLF") ? "ppt" : "pptx";
-        FileOutputStream out = new FileOutputStream("apachecon_eu_08."+ext);
-        ppt.write(out);
-        out.close();
-        ppt.close();
+            String ext = ppt.getClass().getName().contains("HSLF") ? "ppt" : "pptx";
+            try (FileOutputStream out = new FileOutputStream("apachecon_eu_08." + ext)) {
+                ppt.write(out);
+            }
+        }
     }
 
     public static void slide1(SlideShow<?,?> ppt) throws IOException {

src/examples/src/org/apache/poi/hslf/examples/BulletsDemo.java

@@ -32,32 +32,29 @@ import org.apache.poi.hslf.usermodel.HSLFTextParagraph;
 public final class BulletsDemo {
 
     public static void main(String[] args) throws IOException {
+        try (HSLFSlideShow ppt = new HSLFSlideShow()) {
+            HSLFSlide slide = ppt.createSlide();
 
-        HSLFSlideShow ppt = new HSLFSlideShow();
+            HSLFTextBox shape = new HSLFTextBox();
+            HSLFTextParagraph rt = shape.getTextParagraphs().get(0);
+            rt.getTextRuns().get(0).setFontSize(42d);
+            rt.setBullet(true);
+            rt.setIndent(0d);  //bullet offset
+            rt.setLeftMargin(50d);   //text offset (should be greater than bullet offset)
+            rt.setBulletChar('\u263A'); //bullet character
+            shape.setText(
+                    "January\r" +
+                            "February\r" +
+                            "March\r" +
+                            "April");
+            slide.addShape(shape);
 
-        HSLFSlide slide = ppt.createSlide();
+            shape.setAnchor(new java.awt.Rectangle(50, 50, 500, 300));  //position of the text box in the slide
+            slide.addShape(shape);
 
-        HSLFTextBox shape = new HSLFTextBox();
-        HSLFTextParagraph rt = shape.getTextParagraphs().get(0);
-        rt.getTextRuns().get(0).setFontSize(42d);
-        rt.setBullet(true);
-        rt.setIndent(0d);  //bullet offset
-        rt.setLeftMargin(50d);   //text offset (should be greater than bullet offset)
-        rt.setBulletChar('\u263A'); //bullet character
-        shape.setText(
-                "January\r" +
-                "February\r" +
-                "March\r" +
-                "April");
-        slide.addShape(shape);
-
-        shape.setAnchor(new java.awt.Rectangle(50, 50, 500, 300));  //position of the text box in the slide
-        slide.addShape(shape);
-
-        FileOutputStream out = new FileOutputStream("bullets.ppt");
-        ppt.write(out);
-        out.close();
-        
-        ppt.close();
+            try (FileOutputStream out = new FileOutputStream("bullets.ppt")) {
+                ppt.write(out);
+            }
+        }
    }
 }

src/examples/src/org/apache/poi/hslf/examples/CreateHyperlink.java

@@ -32,33 +32,31 @@ import org.apache.poi.hslf.usermodel.HSLFTextBox;
 public abstract class CreateHyperlink {
     
     public static void main(String[] args) throws IOException {
-        HSLFSlideShow ppt = new HSLFSlideShow();
+        try (HSLFSlideShow ppt = new HSLFSlideShow()) {
+            HSLFSlide slideA = ppt.createSlide();
+            ppt.createSlide();
+            HSLFSlide slideC = ppt.createSlide();
 
-        HSLFSlide slideA = ppt.createSlide();
-        ppt.createSlide();
-        HSLFSlide slideC = ppt.createSlide();
+            // link to a URL
+            HSLFTextBox textBox1 = slideA.createTextBox();
+            textBox1.setText("Apache POI");
+            textBox1.setAnchor(new Rectangle(100, 100, 200, 50));
 
-        // link to a URL
-        HSLFTextBox textBox1 = slideA.createTextBox();
-        textBox1.setText("Apache POI");
-        textBox1.setAnchor(new Rectangle(100, 100, 200, 50));
+            HSLFHyperlink link1 = textBox1.getTextParagraphs().get(0).getTextRuns().get(0).createHyperlink();
+            link1.linkToUrl("http://www.apache.org");
+            link1.setLabel(textBox1.getText());
 
-        HSLFHyperlink link1 = textBox1.getTextParagraphs().get(0).getTextRuns().get(0).createHyperlink();
-        link1.linkToUrl("http://www.apache.org");
-        link1.setLabel(textBox1.getText());
+            // link to another slide
+            HSLFTextBox textBox2 = slideA.createTextBox();
+            textBox2.setText("Go to slide #3");
+            textBox2.setAnchor(new Rectangle(100, 300, 200, 50));
 
-        // link to another slide
-        HSLFTextBox textBox2 = slideA.createTextBox();
-        textBox2.setText("Go to slide #3");
-        textBox2.setAnchor(new Rectangle(100, 300, 200, 50));
+            HSLFHyperlink link2 = textBox2.getTextParagraphs().get(0).getTextRuns().get(0).createHyperlink();
+            link2.linkToSlide(slideC);
 
-        HSLFHyperlink link2 = textBox2.getTextParagraphs().get(0).getTextRuns().get(0).createHyperlink();
-        link2.linkToSlide(slideC);
-
-        FileOutputStream out = new FileOutputStream("hyperlink.ppt");
-        ppt.write(out);
-        out.close();
-
-        ppt.close();
+            try (FileOutputStream out = new FileOutputStream("hyperlink.ppt")) {
+                ppt.write(out);
+            }
+        }
    }
 }

src/examples/src/org/apache/poi/hslf/examples/DataExtraction.java

@@ -21,8 +21,8 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.InputStream;
 
-import org.apache.poi.hslf.model.OLEShape;
 import org.apache.poi.hslf.usermodel.HSLFObjectData;
+import org.apache.poi.hslf.usermodel.HSLFObjectShape;
 import org.apache.poi.hslf.usermodel.HSLFPictureData;
 import org.apache.poi.hslf.usermodel.HSLFPictureShape;
 import org.apache.poi.hslf.usermodel.HSLFShape;
@@ -52,10 +52,10 @@ public final class DataExtraction {
 
         //extract all sound files embedded in this presentation
         HSLFSoundData[] sound = ppt.getSoundData();
-        for (int i = 0; i < sound.length; i++) {
-            String type = sound[i].getSoundType();  //*.wav
-            String name = sound[i].getSoundName();  //typically file name
-            byte[] data = sound[i].getData();       //raw bytes
+        for (HSLFSoundData aSound : sound) {
+            String type = aSound.getSoundType();  //*.wav
+            String name = aSound.getSoundName();  //typically file name
+            byte[] data = aSound.getData();       //raw bytes
 
             //save the sound  on disk
             FileOutputStream out = new FileOutputStream(name + type);
@@ -67,19 +67,19 @@ public final class DataExtraction {
         for (HSLFSlide slide : ppt.getSlides()) {
             //extract embedded OLE documents
             for (HSLFShape shape : slide.getShapes()) {
-                if (shape instanceof OLEShape) {
+                if (shape instanceof HSLFObjectShape) {
                     oleIdx++;
-                    OLEShape ole = (OLEShape) shape;
+                    HSLFObjectShape ole = (HSLFObjectShape) shape;
                     HSLFObjectData data = ole.getObjectData();
                     String name = ole.getInstanceName();
                     if ("Worksheet".equals(name)) {
 
                         //read xls
                         @SuppressWarnings({ "unused", "resource" })
-                        HSSFWorkbook wb = new HSSFWorkbook(data.getData());
+                        HSSFWorkbook wb = new HSSFWorkbook(data.getInputStream());
 
                     } else if ("Document".equals(name)) {
-                        HWPFDocument doc = new HWPFDocument(data.getData());
+                        HWPFDocument doc = new HWPFDocument(data.getInputStream());
                         //read the word document
                         Range r = doc.getRange();
                         for(int k = 0; k < r.numParagraphs(); k++) {
@@ -93,8 +93,8 @@ public final class DataExtraction {
                         out.close();
                         doc.close();
                      }  else {
-                        FileOutputStream out = new FileOutputStream(ole.getProgID() + "-"+(oleIdx+1)+".dat");
-                        InputStream dis = data.getData();
+                        FileOutputStream out = new FileOutputStream(ole.getProgId() + "-"+(oleIdx+1)+".dat");
+                        InputStream dis = data.getInputStream();
                         byte[] chunk = new byte[2048];
                         int count;
                         while ((count = dis.read(chunk)) >= 0) {

src/examples/src/org/apache/poi/hslf/examples/Graphics2DDemo.java

@@ -39,47 +39,45 @@ public final class Graphics2DDemo {
      * A simple bar chart demo
      */
     public static void main(String[] args) throws Exception {
-        HSLFSlideShow ppt = new HSLFSlideShow();
+        try (HSLFSlideShow ppt = new HSLFSlideShow()) {
+            //bar chart data. The first value is the bar color, the second is the width
+            Object[] def = new Object[]{
+                    Color.yellow, 40,
+                    Color.green, 60,
+                    Color.gray, 30,
+                    Color.red, 80,
+            };
 
-        //bar chart data. The first value is the bar color, the second is the width
-        Object[] def = new Object[]{
-            Color.yellow, 40,
-            Color.green, 60,
-            Color.gray, 30,
-            Color.red, 80,
-        };
+            HSLFSlide slide = ppt.createSlide();
 
-        HSLFSlide slide = ppt.createSlide();
+            HSLFGroupShape group = new HSLFGroupShape();
+            //define position of the drawing in the slide
+            Rectangle bounds = new Rectangle(200, 100, 350, 300);
+            group.setAnchor(bounds);
+            group.setInteriorAnchor(new Rectangle(0, 0, 100, 100));
+            slide.addShape(group);
+            Graphics2D graphics = new PPGraphics2D(group);
 
-        HSLFGroupShape group = new HSLFGroupShape();
-        //define position of the drawing in the slide
-        Rectangle bounds = new java.awt.Rectangle(200, 100, 350, 300);
-        group.setAnchor(bounds);
-        group.setInteriorAnchor(new java.awt.Rectangle(0, 0, 100, 100));
-        slide.addShape(group);
-        Graphics2D graphics = new PPGraphics2D(group);
-
-        //draw a simple bar graph
-        int x = 10, y = 10;
-        graphics.setFont(new Font("Arial", Font.BOLD, 10));
-        for (int i = 0, idx = 1; i < def.length; i+=2, idx++) {
+            //draw a simple bar graph
+            int x = 10, y = 10;
+            graphics.setFont(new Font("Arial", Font.BOLD, 10));
+            for (int i = 0, idx = 1; i < def.length; i += 2, idx++) {
+                graphics.setColor(Color.black);
+                int width = ((Integer) def[i + 1]).intValue();
+                graphics.drawString("Q" + idx, x - 5, y + 10);
+                graphics.drawString(width + "%", x + width + 3, y + 10);
+                graphics.setColor((Color) def[i]);
+                graphics.fill(new Rectangle(x, y, width, 10));
+                y += 15;
+            }
             graphics.setColor(Color.black);
-            int width = ((Integer)def[i+1]).intValue();
-            graphics.drawString("Q" + idx, x-5, y+10);
-            graphics.drawString(width + "%", x + width+3, y + 10);
-            graphics.setColor((Color)def[i]);
-            graphics.fill(new Rectangle(x, y, width, 10));
-            y += 15;
+            graphics.setFont(new Font("Arial", Font.BOLD, 14));
+            graphics.draw(group.getInteriorAnchor());
+            graphics.drawString("Performance", x + 30, y + 10);
+
+            try (FileOutputStream out = new FileOutputStream("hslf-graphics.ppt")) {
+                ppt.write(out);
+            }
         }
-        graphics.setColor(Color.black);
-        graphics.setFont(new Font("Arial", Font.BOLD, 14));
-        graphics.draw(group.getInteriorAnchor());
-        graphics.drawString("Performance", x + 30, y + 10);
-
-        FileOutputStream out = new FileOutputStream("hslf-graphics.ppt");
-        ppt.write(out);
-        out.close();
-
-        ppt.close();
     }
 }

src/examples/src/org/apache/poi/hslf/examples/HeadersFootersDemo.java

@@ -27,24 +27,22 @@ import org.apache.poi.hslf.usermodel.HSLFSlideShow;
  */
 public abstract class HeadersFootersDemo {
     public static void main(String[] args) throws IOException {
-        HSLFSlideShow ppt = new HSLFSlideShow();
-        
-        HeadersFooters slideHeaders = ppt.getSlideHeadersFooters();
-        slideHeaders.setFootersText("Created by POI-HSLF");
-        slideHeaders.setSlideNumberVisible(true);
-        slideHeaders.setDateTimeText("custom date time");
+        try (HSLFSlideShow ppt = new HSLFSlideShow()) {
+            HeadersFooters slideHeaders = ppt.getSlideHeadersFooters();
+            slideHeaders.setFootersText("Created by POI-HSLF");
+            slideHeaders.setSlideNumberVisible(true);
+            slideHeaders.setDateTimeText("custom date time");
 
-        HeadersFooters notesHeaders = ppt.getNotesHeadersFooters();
-        notesHeaders.setFootersText("My notes footers");
-        notesHeaders.setHeaderText("My notes header");
+            HeadersFooters notesHeaders = ppt.getNotesHeadersFooters();
+            notesHeaders.setFootersText("My notes footers");
+            notesHeaders.setHeaderText("My notes header");
 
-        ppt.createSlide();
+            ppt.createSlide();
 
-        FileOutputStream out = new FileOutputStream("headers_footers.ppt");
-        ppt.write(out);
-        out.close();
-
-        ppt.close();
+            try (FileOutputStream out = new FileOutputStream("headers_footers.ppt")) {
+                ppt.write(out);
+            }
+        }
     }
 
 }

src/examples/src/org/apache/poi/hslf/examples/Hyperlinks.java

@@ -37,8 +37,8 @@ import org.apache.poi.hslf.usermodel.HSLFTextRun;
 public final class Hyperlinks {
 
     public static void main(String[] args) throws Exception {
-        for (int i = 0; i < args.length; i++) {
-            FileInputStream is = new FileInputStream(args[i]);
+        for (String arg : args) {
+            FileInputStream is = new FileInputStream(arg);
             HSLFSlideShow ppt = new HSLFSlideShow(is);
             is.close();
 
@@ -64,7 +64,7 @@ public final class Hyperlinks {
                 System.out.println("- reading hyperlinks from the slide's shapes");
                 for (HSLFShape sh : slide.getShapes()) {
                     if (sh instanceof HSLFSimpleShape) {
-                        HSLFHyperlink link = ((HSLFSimpleShape)sh).getHyperlink();
+                        HSLFHyperlink link = ((HSLFSimpleShape) sh).getHyperlink();
                         if (link != null) {
                             System.out.println(toStr(link, null));
                         }

src/examples/src/org/apache/poi/hslf/examples/SoundFinder.java

@@ -30,23 +30,23 @@ import org.apache.poi.hslf.usermodel.HSLFSoundData;
  */
 public class SoundFinder {
     public static void main(String[] args) throws IOException {
-        FileInputStream fis = new FileInputStream(args[0]);
-        HSLFSlideShow ppt = new HSLFSlideShow(fis);
-        HSLFSoundData[] sounds = ppt.getSoundData();
+        try (FileInputStream fis = new FileInputStream(args[0])) {
+            try (HSLFSlideShow ppt = new HSLFSlideShow(fis)) {
+                HSLFSoundData[] sounds = ppt.getSoundData();
 
-        for (HSLFSlide slide : ppt.getSlides()) {
-            for (HSLFShape shape : slide.getShapes()) {
-                int soundRef = getSoundReference(shape);
-                if(soundRef == -1) continue;
+                for (HSLFSlide slide : ppt.getSlides()) {
+                    for (HSLFShape shape : slide.getShapes()) {
+                        int soundRef = getSoundReference(shape);
+                        if (soundRef == -1) continue;
 
-                
-                System.out.println("Slide["+slide.getSlideNumber()+"], shape["+shape.getShapeId()+"], soundRef: "+soundRef);
-                System.out.println("  " + sounds[soundRef].getSoundName());
-                System.out.println("  " + sounds[soundRef].getSoundType());
+
+                        System.out.println("Slide[" + slide.getSlideNumber() + "], shape[" + shape.getShapeId() + "], soundRef: " + soundRef);
+                        System.out.println("  " + sounds[soundRef].getSoundName());
+                        System.out.println("  " + sounds[soundRef].getSoundType());
+                    }
+                }
             }
         }
-        ppt.close();
-        fis.close();
     }
 
     /**

src/examples/src/org/apache/poi/hslf/examples/TableDemo.java

@@ -31,27 +31,41 @@ import org.apache.poi.sl.usermodel.VerticalAlignment;
 
 /**
  * Demonstrates how to create tables
- *
- * @author Yegor Kozlov
  */
 public final class TableDemo {
 
+    //test data for the first table
+    static final String[][] txt1 = {
+        {"INPUT FILE", "NUMBER OF RECORDS"},
+        {"Item File", "11,559"},
+        {"Vendor File", "502"},
+        {"Purchase History File - # of PO\u2019s\r(12/01/04 - 05/31/06)", "12,852"},
+        {"Purchase History File - # of PO Lines\r(12/01/04 - 05/31/06)", "53,523" },
+        {"Total PO History Spend", "$10,172,038"}
+    };
+
+    //test data for the second taable
+    static final String[][] txt2 = {
+        {"Data Source"},
+        {"CAS Internal Metrics - Item Master Summary\r" +
+         "CAS Internal Metrics - Vendor Summary\r" +
+         "CAS Internal Metrics - PO History Summary"}
+    };
+
+
     public static void main(String[] args) throws Exception {
+        try (HSLFSlideShow ppt = new HSLFSlideShow()) {
+            HSLFSlide slide = ppt.createSlide();
+            create1stTable(slide);
+            create2ndTable(slide);
 
-        //test data for the first taable
-        String[][] txt1 = {
-            {"INPUT FILE", "NUMBER OF RECORDS"},
-            {"Item File", "11,559"},
-            {"Vendor File", "502"},
-            {"Purchase History File - # of PO\u2019s\r(12/01/04 - 05/31/06)", "12,852"},
-            {"Purchase History File - # of PO Lines\r(12/01/04 - 05/31/06)", "53,523" },
-            {"Total PO History Spend", "$10,172,038"}
-        };
-
-        HSLFSlideShow ppt = new HSLFSlideShow();
-
-        HSLFSlide slide = ppt.createSlide();
-
+            try (FileOutputStream out = new FileOutputStream("hslf-table.ppt")) {
+                ppt.write(out);
+            }
+        }
+    }
+    
+    static void create1stTable(HSLFSlide slide) {
         //six rows, two columns
         HSLFTable table1 = slide.createTable(6, 2);
         for (int i = 0; i < txt1.length; i++) {
@@ -77,17 +91,11 @@ public final class TableDemo {
         table1.setColumnWidth(0, 300);
         table1.setColumnWidth(1, 150);
 
-        int pgWidth = ppt.getPageSize().width;
+        int pgWidth = slide.getSlideShow().getPageSize().width;
         table1.moveTo((pgWidth - table1.getAnchor().getWidth())/2., 100.);
+    }
 
-        //test data for the second taable
-        String[][] txt2 = {
-            {"Data Source"},
-            {"CAS Internal Metrics - Item Master Summary\r" +
-             "CAS Internal Metrics - Vendor Summary\r" +
-             "CAS Internal Metrics - PO History Summary"}
-        };
-
+    static void create2ndTable(HSLFSlide slide) {
         //two rows, one column
         HSLFTable table2 = slide.createTable(2, 1);
         for (int i = 0; i < txt2.length; i++) {
@@ -120,11 +128,5 @@ public final class TableDemo {
         dts2.setOutsideBorders(Color.black, 1.0);
 
         table2.moveTo(200, 400);
-
-        FileOutputStream out = new FileOutputStream("hslf-table.ppt");
-        ppt.write(out);
-        out.close();
-
-        ppt.close();
     }
 }

src/examples/src/org/apache/poi/hsmf/examples/Msg2txt.java

@@ -157,12 +157,12 @@ public class Msg2txt {
 		if(args.length <= 0) {
 			System.err.println("No files names provided");
 		} else {
-			for(int i = 0; i < args.length; i++) {
+			for (String arg : args) {
 				try {
-					Msg2txt processor = new Msg2txt(args[i]);
+					Msg2txt processor = new Msg2txt(arg);
 					processor.processMessage();
 				} catch (IOException e) {
-					System.err.println("Could not process "+args[i]+": "+e);
+					System.err.println("Could not process " + arg + ": " + e);
 				}
 			}
 		}

src/examples/src/org/apache/poi/hssf/eventusermodel/examples/XLS2CSVmra.java

@@ -76,7 +76,7 @@ public class XLS2CSVmra implements HSSFListener {
 	/** So we known which sheet we're on */
 	private int sheetIndex = -1;
 	private BoundSheetRecord[] orderedBSRs;
-	private List<BoundSheetRecord> boundSheetRecords = new ArrayList<BoundSheetRecord>();
+	private List<BoundSheetRecord> boundSheetRecords = new ArrayList<>();
 
 	// For handling formulas with string results
 	private int nextRow;
@@ -99,8 +99,6 @@ public class XLS2CSVmra implements HSSFListener {
 	 * Creates a new XLS -> CSV converter
 	 * @param filename The file to process
 	 * @param minColumns The minimum number of columns to output, or -1 for no minimum
-	 * @throws IOException
-	 * @throws FileNotFoundException
 	 */
 	public XLS2CSVmra(String filename, int minColumns) throws IOException, FileNotFoundException {
 		this(

src/examples/src/org/apache/poi/hssf/usermodel/examples/AddDimensionedImage.java

@@ -142,13 +142,13 @@ import org.apache.poi.ss.usermodel.ClientAnchor.AnchorType;
 public class AddDimensionedImage {
 
     // Four constants that determine how - and indeed whether - the rows
-    // and columns an image may overlie should be expanded to accomodate that
+    // and columns an image may overlie should be expanded to accommodate that
     // image.
     // Passing EXPAND_ROW will result in the height of a row being increased
-    // to accomodate the image if it is not already larger. The image will
+    // to accommodate the image if it is not already larger. The image will
     // be layed across one or more columns.
     // Passing EXPAND_COLUMN will result in the width of the column being
-    // increased to accomodate the image if it is not already larger. The image
+    // increased to accommodate the image if it is not already larger. The image
     // will be layed across one or many rows.
     // Passing EXPAND_ROW_AND_COLUMN will result in the height of the row
     // bing increased along with the width of the column to accomdate the
@@ -251,10 +251,10 @@ public class AddDimensionedImage {
             String imageFile, double reqImageWidthMM, double reqImageHeightMM,
             int resizeBehaviour) throws FileNotFoundException, IOException,
                                                      IllegalArgumentException  {
-        HSSFClientAnchor anchor = null;
-        HSSFPatriarch patriarch = null;
-        ClientAnchorDetail rowClientAnchorDetail = null;
-        ClientAnchorDetail colClientAnchorDetail = null;
+        HSSFClientAnchor anchor;
+        HSSFPatriarch patriarch;
+        ClientAnchorDetail rowClientAnchorDetail;
+        ClientAnchorDetail colClientAnchorDetail;
 
         // Validate the resizeBehaviour parameter.
         if((resizeBehaviour != AddDimensionedImage.EXPAND_COLUMN) &&
@@ -266,7 +266,7 @@ public class AddDimensionedImage {
         }
 
         // Call methods to calculate how the image and sheet should be
-        // manipulated to accomodate the image; columns and then rows.
+        // manipulated to accommodate the image; columns and then rows.
         colClientAnchorDetail = this.fitImageToColumns(sheet, colNumber,
                 reqImageWidthMM, resizeBehaviour);
         rowClientAnchorDetail = this.fitImageToRows(sheet, rowNumber,
@@ -279,14 +279,19 @@ public class AddDimensionedImage {
         // The first two parameters are not used currently but could be if the
         // need arose to extend the functionality of this code by adding the
         // ability to specify that a clear 'border' be placed around the image.
-        anchor = new HSSFClientAnchor(0,
-                                      0,
-                                      colClientAnchorDetail.getInset(),
-                                      rowClientAnchorDetail.getInset(),
-                                      (short)colClientAnchorDetail.getFromIndex(),
-                                      rowClientAnchorDetail.getFromIndex(),
-                                      (short)colClientAnchorDetail.getToIndex(),
-                                      rowClientAnchorDetail.getToIndex());
+        int dx1 = 0, dy1 = 0, dx2 = 0, dy2 = 0;
+        short col1 = 0, col2 = 0, row1 = 0, row2 = 0;
+        if (colClientAnchorDetail != null) {
+            dx2 = colClientAnchorDetail.getInset();
+            col1 = (short)colClientAnchorDetail.getFromIndex();
+            col2 = (short)colClientAnchorDetail.getToIndex();
+        }
+        if (rowClientAnchorDetail != null) {
+            dy2 = rowClientAnchorDetail.getInset();
+            row1 = (short)rowClientAnchorDetail.getFromIndex();
+            row2 = (short)rowClientAnchorDetail.getToIndex();
+        }
+        anchor = new HSSFClientAnchor(dx1, dy1, dx2, dy2, col1, row1, col2, row2);
 
         // For now, set the anchor type to do not move or resize the
         // image as the size of the row/column is adjusted. This could easilly
@@ -307,7 +312,7 @@ public class AddDimensionedImage {
     }
 
     /**
-     * Determines whether the sheets columns should be re-sized to accomodate
+     * Determines whether the sheets columns should be re-sized to accommodate
      * the image, adjusts the columns width if necessary and creates then
      * returns a ClientAnchorDetail object that facilitates construction of
      * an HSSFClientAnchor that will fix the image on the sheet and establish
@@ -334,16 +339,16 @@ public class AddDimensionedImage {
     private ClientAnchorDetail fitImageToColumns(HSSFSheet sheet, int colNumber,
             double reqImageWidthMM, int resizeBehaviour) {
 
-        double colWidthMM = 0.0D;
-        double colCoordinatesPerMM = 0.0D;
-        int pictureWidthCoordinates = 0;
+        double colWidthMM;
+        double colCoordinatesPerMM;
+        int pictureWidthCoordinates;
         ClientAnchorDetail colClientAnchorDetail = null;
 
         // Get the colum's width in millimetres
         colWidthMM = ConvertImageUnits.widthUnits2Millimetres(
                 (short)sheet.getColumnWidth(colNumber));
 
-        // Check that the column's width will accomodate the image at the
+        // Check that the column's width will accommodate the image at the
         // required dimension. If the width of the column is LESS than the
         // required width of the image, decide how the application should
         // respond - resize the column or overlay the image across one or more
@@ -391,7 +396,7 @@ public class AddDimensionedImage {
     }
 
     /**
-     * Determines whether the sheet's row should be re-sized to accomodate
+     * Determines whether the sheet's row should be re-sized to accommodate
      * the image, adjusts the rows height if necessary and creates then
      * returns a ClientAnchorDetail object that facilitates construction of
      * an HSSFClientAnchor that will fix the image on the sheet and establish
@@ -417,23 +422,21 @@ public class AddDimensionedImage {
      */
     private ClientAnchorDetail fitImageToRows(HSSFSheet sheet, int rowNumber,
             double reqImageHeightMM, int resizeBehaviour) {
-        HSSFRow row = null;
-        double rowHeightMM = 0.0D;
-        double rowCoordinatesPerMM = 0.0D;
-        int pictureHeightCoordinates = 0;
+        double rowCoordinatesPerMM;
+        int pictureHeightCoordinates;
         ClientAnchorDetail rowClientAnchorDetail = null;
 
         // Get the row and it's height
-        row = sheet.getRow(rowNumber);
+        HSSFRow row = sheet.getRow(rowNumber);
         if(row == null) {
             // Create row if it does not exist.
             row = sheet.createRow(rowNumber);
         }
 
         // Get the row's height in millimetres
-        rowHeightMM = row.getHeightInPoints() / ConvertImageUnits.POINTS_PER_MILLIMETRE;
+        double rowHeightMM = row.getHeightInPoints() / ConvertImageUnits.POINTS_PER_MILLIMETRE;
 
-        // Check that the row's height will accomodate the image at the required
+        // Check that the row's height will accommodate the image at the required
         // dimensions. If the height of the row is LESS than the required height
         // of the image, decide how the application should respond - resize the
         // row or overlay the image across a series of rows.
@@ -494,13 +497,13 @@ public class AddDimensionedImage {
     private ClientAnchorDetail calculateColumnLocation(HSSFSheet sheet,
                                                        int startingColumn,
                                                        double reqImageWidthMM) {
-        ClientAnchorDetail anchorDetail = null;
+        ClientAnchorDetail anchorDetail;
         double totalWidthMM = 0.0D;
         double colWidthMM = 0.0D;
-        double overlapMM = 0.0D;
-        double coordinatePositionsPerMM = 0.0D;
+        double overlapMM;
+        double coordinatePositionsPerMM;
         int toColumn = startingColumn;
-        int inset = 0;
+        int inset;
 
         // Calculate how many columns the image will have to
         // span in order to be presented at the required size.
@@ -593,14 +596,14 @@ public class AddDimensionedImage {
      */
     private ClientAnchorDetail calculateRowLocation(HSSFSheet sheet,
             int startingRow, double reqImageHeightMM) {
-        ClientAnchorDetail clientAnchorDetail = null;
-        HSSFRow row = null;
+        ClientAnchorDetail clientAnchorDetail;
+        HSSFRow row;
         double rowHeightMM = 0.0D;
         double totalRowHeightMM = 0.0D;
-        double overlapMM = 0.0D;
-        double rowCoordinatesPerMM = 0.0D;
+        double overlapMM;
+        double rowCoordinatesPerMM;
         int toRow = startingRow;
-        int inset = 0;
+        int inset;
 
         // Step through the rows in the sheet and accumulate a total of their
         // heights.
@@ -672,10 +675,10 @@ public class AddDimensionedImage {
      *                             interrupted.
      */
     private byte[] imageToBytes(String imageFilename) throws IOException {
-        File imageFile = null;
+        File imageFile;
         FileInputStream fis = null;
-        ByteArrayOutputStream bos = null;
-        int read = 0;
+        ByteArrayOutputStream bos;
+        int read;
         try {
             imageFile = new File(imageFilename);
             fis = new FileInputStream(imageFile);
@@ -718,10 +721,10 @@ public class AddDimensionedImage {
      * @param args the command line arguments
      */
     public static void main(String[] args) {
-        String imageFile = null;
-        String outputFile = null;
+        String imageFile;
+        String outputFile;
         FileOutputStream fos = null;
-        HSSFSheet sheet = null;
+        HSSFSheet sheet;
         try {
             if(args.length < 2){
                 System.err.println("Usage: AddDimensionedImage imageFile outputFile");
@@ -730,22 +733,15 @@ public class AddDimensionedImage {
             imageFile = args[0];
             outputFile = args[1];
 
-            HSSFWorkbook workbook = new HSSFWorkbook();
-            sheet = workbook.createSheet("Picture Test");
-            new AddDimensionedImage().addImageToSheet("A1", sheet,
-                    imageFile, 125, 125,
-                    AddDimensionedImage.EXPAND_ROW_AND_COLUMN);
-            fos = new FileOutputStream(outputFile);
-            workbook.write(fos);
-            workbook.close();
-        }
-        catch(FileNotFoundException fnfEx) {
-            System.out.println("Caught an: " + fnfEx.getClass().getName());
-            System.out.println("Message: " + fnfEx.getMessage());
-            System.out.println("Stacktrace follows...........");
-            fnfEx.printStackTrace(System.out);
-        }
-        catch(IOException ioEx) {
+            try (HSSFWorkbook workbook = new HSSFWorkbook()) {
+                sheet = workbook.createSheet("Picture Test");
+                new AddDimensionedImage().addImageToSheet("A1", sheet,
+                        imageFile, 125, 125,
+                        AddDimensionedImage.EXPAND_ROW_AND_COLUMN);
+                fos = new FileOutputStream(outputFile);
+                workbook.write(fos);
+            }
+        } catch(IOException ioEx) {
             System.out.println("Caught an: " + ioEx.getClass().getName());
             System.out.println("Message: " + ioEx.getMessage());
             System.out.println("Stacktrace follows...........");
@@ -791,9 +787,9 @@ public class AddDimensionedImage {
      */
     public class ClientAnchorDetail {
 
-        public int fromIndex = 0;
-        public int toIndex = 0;
-        public int inset = 0;
+        public int fromIndex;
+        public int toIndex;
+        public int inset;
 
         /**
          * Create a new instance of the ClientAnchorDetail class using the

src/examples/src/org/apache/poi/hssf/usermodel/examples/Alignment.java

@@ -36,23 +36,22 @@ import org.apache.poi.ss.usermodel.HorizontalAlignment;
  */
 public class Alignment {
     public static void main(String[] args) throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet("new sheet");
-        HSSFRow row = sheet.createRow(2);
-        createCell(wb, row, 0, HorizontalAlignment.CENTER);
-        createCell(wb, row, 1, HorizontalAlignment.CENTER_SELECTION);
-        createCell(wb, row, 2, HorizontalAlignment.FILL);
-        createCell(wb, row, 3, HorizontalAlignment.GENERAL);
-        createCell(wb, row, 4, HorizontalAlignment.JUSTIFY);
-        createCell(wb, row, 5, HorizontalAlignment.LEFT);
-        createCell(wb, row, 6, HorizontalAlignment.RIGHT);
+        try (HSSFWorkbook wb = new HSSFWorkbook()) {
+            HSSFSheet sheet = wb.createSheet("new sheet");
+            HSSFRow row = sheet.createRow(2);
+            createCell(wb, row, 0, HorizontalAlignment.CENTER);
+            createCell(wb, row, 1, HorizontalAlignment.CENTER_SELECTION);
+            createCell(wb, row, 2, HorizontalAlignment.FILL);
+            createCell(wb, row, 3, HorizontalAlignment.GENERAL);
+            createCell(wb, row, 4, HorizontalAlignment.JUSTIFY);
+            createCell(wb, row, 5, HorizontalAlignment.LEFT);
+            createCell(wb, row, 6, HorizontalAlignment.RIGHT);
 
-        // Write the output to a file
-        FileOutputStream fileOut = new FileOutputStream("workbook.xls");
-        wb.write(fileOut);
-        fileOut.close();
-        
-        wb.close();
+            // Write the output to a file
+            try (FileOutputStream fileOut = new FileOutputStream("workbook.xls")) {
+                wb.write(fileOut);
+            }
+        }
     }
 
     /**

src/examples/src/org/apache/poi/hssf/usermodel/examples/BigExample.java

@@ -38,138 +38,133 @@ public class BigExample {
     public static void main(String[] args) throws IOException {
         int rownum;
 
-        // create a new file
-        FileOutputStream out = new FileOutputStream("workbook.xls");
         // create a new workbook
-        HSSFWorkbook wb = new HSSFWorkbook();
-        // create a new sheet
-        HSSFSheet s = wb.createSheet();
-        // declare a row object reference
-        HSSFRow r = null;
-        // declare a cell object reference
-        HSSFCell c = null;
-        // create 3 cell styles
-        HSSFCellStyle cs = wb.createCellStyle();
-        HSSFCellStyle cs2 = wb.createCellStyle();
-        HSSFCellStyle cs3 = wb.createCellStyle();
-        // create 2 fonts objects
-        HSSFFont f = wb.createFont();
-        HSSFFont f2 = wb.createFont();
+        try (HSSFWorkbook wb = new HSSFWorkbook()) {
+            // create a new sheet
+            HSSFSheet s = wb.createSheet();
+            // declare a row object reference
+            HSSFRow r;
+            // declare a cell object reference
+            HSSFCell c;
+            // create 3 cell styles
+            HSSFCellStyle cs = wb.createCellStyle();
+            HSSFCellStyle cs2 = wb.createCellStyle();
+            HSSFCellStyle cs3 = wb.createCellStyle();
+            // create 2 fonts objects
+            HSSFFont f = wb.createFont();
+            HSSFFont f2 = wb.createFont();
 
-        //set font 1 to 12 point type
-        f.setFontHeightInPoints((short) 12);
-        //make it red
-        f.setColor(HSSFColorPredefined.RED.getIndex());
-        // make it bold
-        //arial is the default font
-        f.setBold(true);
+            //set font 1 to 12 point type
+            f.setFontHeightInPoints((short) 12);
+            //make it red
+            f.setColor(HSSFColorPredefined.RED.getIndex());
+            // make it bold
+            //arial is the default font
+            f.setBold(true);
 
-        //set font 2 to 10 point type
-        f2.setFontHeightInPoints((short) 10);
-        //make it the color at palette index 0xf (white)
-        f2.setColor(HSSFColorPredefined.WHITE.getIndex());
-        //make it bold
-        f2.setBold(true);
+            //set font 2 to 10 point type
+            f2.setFontHeightInPoints((short) 10);
+            //make it the color at palette index 0xf (white)
+            f2.setColor(HSSFColorPredefined.WHITE.getIndex());
+            //make it bold
+            f2.setBold(true);
 
-        //set cell stlye
-        cs.setFont(f);
-        //set the cell format see HSSFDataFromat for a full list
-        cs.setDataFormat(HSSFDataFormat.getBuiltinFormat("($#,##0_);[Red]($#,##0)"));
+            //set cell style
+            cs.setFont(f);
+            //set the cell format see HSSFDataFormat for a full list
+            cs.setDataFormat(HSSFDataFormat.getBuiltinFormat("($#,##0_);[Red]($#,##0)"));
 
-        //set a thin border
-        cs2.setBorderBottom(BorderStyle.THIN);
-        //fill w fg fill color
-        cs2.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-        // set foreground fill to red
-        cs2.setFillForegroundColor(HSSFColorPredefined.RED.getIndex());
+            //set a thin border
+            cs2.setBorderBottom(BorderStyle.THIN);
+            //fill w fg fill color
+            cs2.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+            // set foreground fill to red
+            cs2.setFillForegroundColor(HSSFColorPredefined.RED.getIndex());
 
-        // set the font
-        cs2.setFont(f2);
+            // set the font
+            cs2.setFont(f2);
+
+            // set the sheet name to HSSF Test
+            wb.setSheetName(0, "HSSF Test");
+            // create a sheet with 300 rows (0-299)
+            for (rownum = 0; rownum < 300; rownum++) {
+                // create a row
+                r = s.createRow(rownum);
+                // on every other row
+                if ((rownum % 2) == 0) {
+                    // make the row height bigger  (in twips - 1/20 of a point)
+                    r.setHeight((short) 0x249);
+                }
+
+                //r.setRowNum(( short ) rownum);
+                // create 50 cells (0-49) (the += 2 becomes apparent later
+                for (int cellnum = 0; cellnum < 50; cellnum += 2) {
+                    // create a numeric cell
+                    c = r.createCell(cellnum);
+                    // do some goofy math to demonstrate decimals
+                    c.setCellValue(rownum * 10000 + cellnum
+                            + (((double) rownum / 1000)
+                            + ((double) cellnum / 10000)));
+
+                    // on every other row
+                    if ((rownum % 2) == 0) {
+                        // set this cell to the first cell style we defined
+                        c.setCellStyle(cs);
+                    }
+
+                    // create a string cell (see why += 2 in the
+                    c = r.createCell(cellnum + 1);
+
+                    // set the cell's string value to "TEST"
+                    c.setCellValue("TEST");
+                    // make this column a bit wider
+                    s.setColumnWidth(cellnum + 1, (int) ((50 * 8) / ((double) 1 / 20)));
+
+                    // on every other row
+                    if ((rownum % 2) == 0) {
+                        // set this to the white on red cell style
+                        // we defined above
+                        c.setCellStyle(cs2);
+                    }
+
+                }
+            }
+
+            //draw a thick black border on the row at the bottom using BLANKS
+            // advance 2 rows
+            rownum++;
+            rownum++;
 
-        // set the sheet name to HSSF Test
-        wb.setSheetName(0, "HSSF Test");
-        // create a sheet with 300 rows (0-299)
-        for (rownum = 0; rownum < 300; rownum++)
-        {
-            // create a row
             r = s.createRow(rownum);
-            // on every other row
-            if ((rownum % 2) == 0)
-            {
-                // make the row height bigger  (in twips - 1/20 of a point)
-                r.setHeight((short) 0x249);
-            }
 
-            //r.setRowNum(( short ) rownum);
-            // create 50 cells (0-49) (the += 2 becomes apparent later
-            for (int cellnum = 0; cellnum < 50; cellnum += 2)
-            {
-                // create a numeric cell
+            // define the third style to be the default
+            // except with a thick black border at the bottom
+            cs3.setBorderBottom(BorderStyle.THICK);
+
+            //create 50 cells
+            for (int cellnum = 0; cellnum < 50; cellnum++) {
+                //create a blank type cell (no value)
                 c = r.createCell(cellnum);
-                // do some goofy math to demonstrate decimals
-                c.setCellValue(rownum * 10000 + cellnum
-                        + (((double) rownum / 1000)
-                        + ((double) cellnum / 10000)));
+                // set it to the thick black border style
+                c.setCellStyle(cs3);
+            }
 
-                // on every other row
-                if ((rownum % 2) == 0)
-                {
-                    // set this cell to the first cell style we defined
-                    c.setCellStyle(cs);
-                }
+            //end draw thick black border
 
-                // create a string cell (see why += 2 in the
-                c = r.createCell(cellnum + 1);
 
-                // set the cell's string value to "TEST"
-                c.setCellValue("TEST");
-                // make this column a bit wider
-                s.setColumnWidth(cellnum + 1, (int)((50 * 8) / ((double) 1 / 20)));
-
-                // on every other row
-                if ((rownum % 2) == 0)
-                {
-                    // set this to the white on red cell style
-                    // we defined above
-                    c.setCellStyle(cs2);
-                }
+            // demonstrate adding/naming and deleting a sheet
+            // create a sheet, set its title then delete it
+            wb.createSheet();
+            wb.setSheetName(1, "DeletedSheet");
+            wb.removeSheetAt(1);
+            //end deleted sheet
 
+            // create a new file
+            try (FileOutputStream out = new FileOutputStream("workbook.xls")) {
+                // write the workbook to the output stream
+                // close our file (don't blow out our file handles
+                wb.write(out);
             }
         }
-
-        //draw a thick black border on the row at the bottom using BLANKS
-        // advance 2 rows
-        rownum++;
-        rownum++;
-
-        r = s.createRow(rownum);
-
-        // define the third style to be the default
-        // except with a thick black border at the bottom
-        cs3.setBorderBottom(BorderStyle.THICK);
-
-        //create 50 cells
-        for (int cellnum =0; cellnum < 50; cellnum++) {
-            //create a blank type cell (no value)
-            c = r.createCell(cellnum);
-            // set it to the thick black border style
-            c.setCellStyle(cs3);
-        }
-
-        //end draw thick black border
-
-
-        // demonstrate adding/naming and deleting a sheet
-        // create a sheet, set its title then delete it
-        wb.createSheet();
-        wb.setSheetName(1, "DeletedSheet");
-        wb.removeSheetAt(1);
-        //end deleted sheet
-
-        // write the workbook to the output stream
-        // close our file (don't blow out our file handles
-        wb.write(out);
-        out.close();
-        wb.close();
     }
 }

src/examples/src/org/apache/poi/hssf/usermodel/examples/Borders.java

@@ -33,33 +33,32 @@ import org.apache.poi.ss.usermodel.BorderStyle;
  */
 public class Borders {
     public static void main(String[] args) throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet("new sheet");
+        try (HSSFWorkbook wb = new HSSFWorkbook()) {
+            HSSFSheet sheet = wb.createSheet("new sheet");
 
-        // Create a row and put some cells in it. Rows are 0 based.
-        HSSFRow row = sheet.createRow(1);
+            // Create a row and put some cells in it. Rows are 0 based.
+            HSSFRow row = sheet.createRow(1);
 
-        // Create a cell and put a value in it.
-        HSSFCell cell = row.createCell(1);
-        cell.setCellValue(4);
+            // Create a cell and put a value in it.
+            HSSFCell cell = row.createCell(1);
+            cell.setCellValue(4);
 
-        // Style the cell with borders all around.
-        HSSFCellStyle style = wb.createCellStyle();
-        style.setBorderBottom(BorderStyle.THIN);
-        style.setBottomBorderColor(HSSFColorPredefined.BLACK.getIndex());
-        style.setBorderLeft(BorderStyle.THIN);
-        style.setLeftBorderColor(HSSFColorPredefined.GREEN.getIndex());
-        style.setBorderRight(BorderStyle.THIN);
-        style.setRightBorderColor(HSSFColorPredefined.BLUE.getIndex());
-        style.setBorderTop(BorderStyle.MEDIUM_DASHED);
-        style.setTopBorderColor(HSSFColorPredefined.ORANGE.getIndex());
-        cell.setCellStyle(style);
+            // Style the cell with borders all around.
+            HSSFCellStyle style = wb.createCellStyle();
+            style.setBorderBottom(BorderStyle.THIN);
+            style.setBottomBorderColor(HSSFColorPredefined.BLACK.getIndex());
+            style.setBorderLeft(BorderStyle.THIN);
+            style.setLeftBorderColor(HSSFColorPredefined.GREEN.getIndex());
+            style.setBorderRight(BorderStyle.THIN);
+            style.setRightBorderColor(HSSFColorPredefined.BLUE.getIndex());
+            style.setBorderTop(BorderStyle.MEDIUM_DASHED);
+            style.setTopBorderColor(HSSFColorPredefined.ORANGE.getIndex());
+            cell.setCellStyle(style);
 
-        // Write the output to a file
-        FileOutputStream fileOut = new FileOutputStream("workbook.xls");
-        wb.write(fileOut);
-        fileOut.close();
-        
-        wb.close();
+            // Write the output to a file
+            try (FileOutputStream fileOut = new FileOutputStream("workbook.xls")) {
+                wb.write(fileOut);
+            }
+        }
     }
 }

src/examples/src/org/apache/poi/hssf/usermodel/examples/CellComments.java

@@ -17,90 +17,108 @@
 
 package org.apache.poi.hssf.usermodel.examples;
 
+import org.apache.poi.hssf.usermodel.HSSFComment;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.ClientAnchor;
+import org.apache.poi.ss.usermodel.Comment;
+import org.apache.poi.ss.usermodel.CreationHelper;
+import org.apache.poi.ss.usermodel.Drawing;
+import org.apache.poi.ss.usermodel.Font;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.apache.poi.ss.usermodel.RichTextString;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.WorkbookFactory;
+
 import java.io.FileOutputStream;
 import java.io.IOException;
 
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFClientAnchor;
-import org.apache.poi.hssf.usermodel.HSSFComment;
-import org.apache.poi.hssf.usermodel.HSSFFont;
-import org.apache.poi.hssf.usermodel.HSSFPatriarch;
-import org.apache.poi.hssf.usermodel.HSSFRichTextString;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.util.HSSFColor.HSSFColorPredefined;
-
 /**
- * Demonstrates how to work with excel cell comments.
+ * Demonstrates how to work with excel cell comments.<p>
  *
- * <p>
  * Excel comment is a kind of a text shape,
  * so inserting a comment is very similar to placing a text box in a worksheet
- * </p>
  */
 public class CellComments {
 
     public static void main(String[] args) throws IOException  {
+        createWorkbook(false, ".xls");
+        createWorkbook(true, ".xlsx");
+    }
 
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet("Cell comments in POI HSSF");
+    private static void createWorkbook(boolean xssf, String extension) throws IOException {
+        try (Workbook wb = WorkbookFactory.create(xssf)) {
+            Sheet sheet = wb.createSheet("Cell comments in POI " + extension);
+            CreationHelper creationHelper = wb.getCreationHelper();
 
-        // Create the drawing patriarch. This is the top level container for all shapes including cell comments.
-        HSSFPatriarch patr = sheet.createDrawingPatriarch();
+            // Create the drawing patriarch. This is the top level container for all shapes including cell comments.
+            Drawing<?> patr = sheet.createDrawingPatriarch();
 
-        //create a cell in row 3
-        HSSFCell cell1 = sheet.createRow(3).createCell(1);
-        cell1.setCellValue(new HSSFRichTextString("Hello, World"));
+            //create a cell in row 3
+            Cell cell1 = sheet.createRow(3).createCell(1);
+            cell1.setCellValue(creationHelper.createRichTextString("Hello, World"));
 
-        //anchor defines size and position of the comment in worksheet
-        HSSFComment comment1 = patr.createComment(new HSSFClientAnchor(0, 0, 0, 0, (short)4, 2, (short) 6, 5));
+            //anchor defines size and position of the comment in worksheet
+            ClientAnchor clientAnchor = creationHelper.createClientAnchor();
+            clientAnchor.setCol1(4);
+            clientAnchor.setRow1(2);
+            clientAnchor.setCol2(6);
+            clientAnchor.setRow2(5);
+            Comment comment1 = patr.createCellComment(clientAnchor);
 
-         // set text in the comment
-        comment1.setString(new HSSFRichTextString("We can set comments in POI"));
+            // set text in the comment
+            comment1.setString(creationHelper.createRichTextString("We can set comments in POI"));
 
-        //set comment author.
-        //you can see it in the status bar when moving mouse over the commented cell
-        comment1.setAuthor("Apache Software Foundation");
+            //set comment author.
+            //you can see it in the status bar when moving mouse over the commented cell
+            comment1.setAuthor("Apache Software Foundation");
 
-        // The first way to assign comment to a cell is via HSSFCell.setCellComment method
-        cell1.setCellComment(comment1);
+            // The first way to assign comment to a cell is via Cell.setCellComment method
+            cell1.setCellComment(comment1);
 
-        //create another cell in row 6
-        HSSFCell cell2 = sheet.createRow(6).createCell(1);
-        cell2.setCellValue(36.6);
+            //create another cell in row 6
+            Cell cell2 = sheet.createRow(6).createCell(1);
+            cell2.setCellValue(36.6);
 
 
-        HSSFComment comment2 = patr.createComment(new HSSFClientAnchor(0, 0, 0, 0, (short)4, 8, (short) 6, 11));
-        //modify background color of the comment
-        comment2.setFillColor(204, 236, 255);
+            clientAnchor = creationHelper.createClientAnchor();
+            clientAnchor.setCol1(4);
+            clientAnchor.setRow1(8);
+            clientAnchor.setCol2(6);
+            clientAnchor.setRow2(11);
+            Comment comment2 = patr.createCellComment(clientAnchor);
+            //modify background color of the comment, only available in HSSF currently
+            if (wb instanceof HSSFWorkbook) {
+                ((HSSFComment) comment2).setFillColor(204, 236, 255);
+            }
 
-        HSSFRichTextString string = new HSSFRichTextString("Normal body temperature");
+            RichTextString string = creationHelper.createRichTextString("Normal body temperature");
 
-        //apply custom font to the text in the comment
-        HSSFFont font = wb.createFont();
-        font.setFontName("Arial");
-        font.setFontHeightInPoints((short)10);
-        font.setBold(true);
-        font.setColor(HSSFColorPredefined.RED.getIndex());
-        string.applyFont(font);
+            //apply custom font to the text in the comment
+            Font font = wb.createFont();
+            font.setFontName("Arial");
+            font.setFontHeightInPoints((short) 10);
+            font.setBold(true);
+            font.setColor(IndexedColors.RED.getIndex());
+            string.applyFont(font);
 
-        comment2.setString(string);
-        comment2.setVisible(true); //by default comments are hidden. This one is always visible.
+            comment2.setString(string);
+            comment2.setVisible(true); //by default comments are hidden. This one is always visible.
 
-        comment2.setAuthor("Bill Gates");
+            comment2.setAuthor("Bill Gates");
 
-        /**
-         * The second way to assign comment to a cell is to implicitly specify its row and column.
-         * Note, it is possible to set row and column of a non-existing cell.
-         * It works, the comment is visible.
-         */
-        comment2.setRow(6);
-        comment2.setColumn(1);
+            /*
+             * The second way to assign comment to a cell is to implicitly specify its row and column.
+             * Note, it is possible to set row and column of a non-existing cell.
+             * It works, the comment is visible.
+             */
+            comment2.setRow(6);
+            comment2.setColumn(1);
 
-        FileOutputStream out = new FileOutputStream("poi_comment.xls");
-        wb.write(out);
-        out.close();
-        
-        wb.close();
+            try (FileOutputStream out = new FileOutputStream("poi_comment" + extension)) {
+                wb.write(out);
+            }
+        }
     }
 }

src/examples/src/org/apache/poi/hssf/usermodel/examples/CellTypes.java

@@ -28,20 +28,19 @@ import org.apache.poi.ss.usermodel.CellType;
 
 public class CellTypes {
     public static void main(String[] args) throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet("new sheet");
-        HSSFRow row = sheet.createRow(2);
-        row.createCell(0).setCellValue(1.1);
-        row.createCell(1).setCellValue(new Date());
-        row.createCell(2).setCellValue("a string");
-        row.createCell(3).setCellValue(true);
-        row.createCell(4).setCellType(CellType.ERROR);
+        try (HSSFWorkbook wb = new HSSFWorkbook()) {
+            HSSFSheet sheet = wb.createSheet("new sheet");
+            HSSFRow row = sheet.createRow(2);
+            row.createCell(0).setCellValue(1.1);
+            row.createCell(1).setCellValue(new Date());
+            row.createCell(2).setCellValue("a string");
+            row.createCell(3).setCellValue(true);
+            row.createCell(4).setCellType(CellType.ERROR);
 
-        // Write the output to a file
-        FileOutputStream fileOut = new FileOutputStream("workbook.xls");
-        wb.write(fileOut);
-        fileOut.close();
-        
-        wb.close();
+            // Write the output to a file
+            try (FileOutputStream fileOut = new FileOutputStream("workbook.xls")) {
+                wb.write(fileOut);
+            }
+        }
     }
 }

src/examples/src/org/apache/poi/hssf/usermodel/examples/CreateCells.java

@@ -32,25 +32,24 @@ import java.io.IOException;
  */
 public class CreateCells {
     public static void main(String[] args) throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet("new sheet");
+        try (HSSFWorkbook wb = new HSSFWorkbook()) {
+            HSSFSheet sheet = wb.createSheet("new sheet");
 
-        // Create a row and put some cells in it. Rows are 0 based.
-        HSSFRow row = sheet.createRow(0);
-        // Create a cell and put a value in it.
-        HSSFCell cell = row.createCell(0);
-        cell.setCellValue(1);
+            // Create a row and put some cells in it. Rows are 0 based.
+            HSSFRow row = sheet.createRow(0);
+            // Create a cell and put a value in it.
+            HSSFCell cell = row.createCell(0);
+            cell.setCellValue(1);
 
-        // Or do it on one line.
-        row.createCell(1).setCellValue(1.2);
-        row.createCell(2).setCellValue("This is a string");
-        row.createCell(3).setCellValue(true);
+            // Or do it on one line.
+            row.createCell(1).setCellValue(1.2);
+            row.createCell(2).setCellValue("This is a string");
+            row.createCell(3).setCellValue(true);
 
-        // Write the output to a file
-        FileOutputStream fileOut = new FileOutputStream("workbook.xls");
-        wb.write(fileOut);
-        fileOut.close();
-
-        wb.close();
+            // Write the output to a file
+            try (FileOutputStream fileOut = new FileOutputStream("workbook.xls")) {
+                wb.write(fileOut);
+            }
+        }
     }
 }

src/examples/src/org/apache/poi/hssf/usermodel/examples/CreateDateCells.java

@@ -35,29 +35,28 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook;
  */
 public class CreateDateCells {
     public static void main(String[] args) throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet("new sheet");
+        try (HSSFWorkbook wb = new HSSFWorkbook()) {
+            HSSFSheet sheet = wb.createSheet("new sheet");
 
-        // Create a row and put some cells in it. Rows are 0 based.
-        HSSFRow row = sheet.createRow(0);
+            // Create a row and put some cells in it. Rows are 0 based.
+            HSSFRow row = sheet.createRow(0);
 
-        // Create a cell and put a date value in it.  The first cell is not styled as a date.
-        HSSFCell cell = row.createCell(0);
-        cell.setCellValue(new Date());
+            // Create a cell and put a date value in it.  The first cell is not styled as a date.
+            HSSFCell cell = row.createCell(0);
+            cell.setCellValue(new Date());
 
-        // we style the second cell as a date (and time).  It is important to create a new cell style from the workbook
-        // otherwise you can end up modifying the built in style and effecting not only this cell but other cells.
-        HSSFCellStyle cellStyle = wb.createCellStyle();
-        cellStyle.setDataFormat(HSSFDataFormat.getBuiltinFormat("m/d/yy h:mm"));
-        cell = row.createCell(1);
-        cell.setCellValue(new Date());
-        cell.setCellStyle(cellStyle);
+            // we style the second cell as a date (and time).  It is important to create a new cell style from the workbook
+            // otherwise you can end up modifying the built in style and effecting not only this cell but other cells.
+            HSSFCellStyle cellStyle = wb.createCellStyle();
+            cellStyle.setDataFormat(HSSFDataFormat.getBuiltinFormat("m/d/yy h:mm"));
+            cell = row.createCell(1);
+            cell.setCellValue(new Date());
+            cell.setCellStyle(cellStyle);
 
-        // Write the output to a file
-        FileOutputStream fileOut = new FileOutputStream("workbook.xls");
-        wb.write(fileOut);
-        fileOut.close();
-        
-        wb.close();
+            // Write the output to a file
+            try (FileOutputStream fileOut = new FileOutputStream("workbook.xls")) {
+                wb.write(fileOut);
+            }
+        }
     }
 }

src/examples/src/org/apache/poi/hssf/usermodel/examples/EmbeddedObjects.java

@@ -34,34 +34,34 @@ public class EmbeddedObjects {
     @SuppressWarnings("unused")
     public static void main(String[] args) throws Exception {
         POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(args[0]));
-        HSSFWorkbook workbook = new HSSFWorkbook(fs);
-        for (HSSFObjectData obj : workbook.getAllEmbeddedObjects()) {
-            //the OLE2 Class Name of the object
-            String oleName = obj.getOLE2ClassName();
-            DirectoryNode dn = (obj.hasDirectoryEntry()) ? (DirectoryNode) obj.getDirectory() : null;
-            Closeable document = null;
-            if (oleName.equals("Worksheet")) {
-                document = new HSSFWorkbook(dn, fs, false);
-            } else if (oleName.equals("Document")) {
-                document = new HWPFDocument(dn);
-            }  else if (oleName.equals("Presentation")) {
-                document = new HSLFSlideShow(dn);
-            } else {
-                if(dn != null){
-                    // The DirectoryEntry is a DocumentNode. Examine its entries to find out what it is
-                    for (Entry entry : dn) {
-                         String name = entry.getName();
-                    }
+        try (HSSFWorkbook workbook = new HSSFWorkbook(fs)) {
+            for (HSSFObjectData obj : workbook.getAllEmbeddedObjects()) {
+                //the OLE2 Class Name of the object
+                String oleName = obj.getOLE2ClassName();
+                DirectoryNode dn = (obj.hasDirectoryEntry()) ? (DirectoryNode) obj.getDirectory() : null;
+                Closeable document = null;
+                if (oleName.equals("Worksheet")) {
+                    document = new HSSFWorkbook(dn, fs, false);
+                } else if (oleName.equals("Document")) {
+                    document = new HWPFDocument(dn);
+                } else if (oleName.equals("Presentation")) {
+                    document = new HSLFSlideShow(dn);
                 } else {
-                    // There is no DirectoryEntry
-                    // Recover the object's data from the HSSFObjectData instance.
-                    byte[] objectData = obj.getObjectData();
+                    if (dn != null) {
+                        // The DirectoryEntry is a DocumentNode. Examine its entries to find out what it is
+                        for (Entry entry : dn) {
+                            String name = entry.getName();
+                        }
+                    } else {
+                        // There is no DirectoryEntry
+                        // Recover the object's data from the HSSFObjectData instance.
+                        byte[] objectData = obj.getObjectData();
+                    }
+                }
+                if (document != null) {
+                    document.close();
                 }
             }
-            if (document != null) {
-                document.close();
-            }
         }
-        workbook.close();
     }
 }

src/examples/src/org/apache/poi/hssf/usermodel/examples/EventExample.java

@@ -31,9 +31,7 @@ import java.io.InputStream;
 /**
  * This example shows how to use the event API for reading a file.
  */
-public class EventExample
-        implements HSSFListener
-{
+public class EventExample implements HSSFListener {
     private SSTRecord sstrec;
 
     /**
@@ -97,23 +95,22 @@ public class EventExample
     {
         // create a new file input stream with the input file specified
         // at the command line
-        FileInputStream fin = new FileInputStream(args[0]);
-        // create a new org.apache.poi.poifs.filesystem.Filesystem
-        POIFSFileSystem poifs = new POIFSFileSystem(fin);
-        // get the Workbook (excel part) stream in a InputStream
-        InputStream din = poifs.createDocumentInputStream("Workbook");
-        // construct out HSSFRequest object
-        HSSFRequest req = new HSSFRequest();
-        // lazy listen for ALL records with the listener shown above
-        req.addListenerForAllRecords(new EventExample());
-        // create our event factory
-        HSSFEventFactory factory = new HSSFEventFactory();
-        // process our events based on the document input stream
-        factory.processEvents(req, din);
-        // once all the events are processed close our file input stream
-        fin.close();
-        // and our document input stream (don't want to leak these!)
-        din.close();
+        try (FileInputStream fin = new FileInputStream(args[0])) {
+            // create a new org.apache.poi.poifs.filesystem.Filesystem
+            try (POIFSFileSystem poifs = new POIFSFileSystem(fin)) {
+                // get the Workbook (excel part) stream in a InputStream
+                try (InputStream din = poifs.createDocumentInputStream("Workbook")) {
+                    // construct out HSSFRequest object
+                    HSSFRequest req = new HSSFRequest();
+                    // lazy listen for ALL records with the listener shown above
+                    req.addListenerForAllRecords(new EventExample());
+                    // create our event factory
+                    HSSFEventFactory factory = new HSSFEventFactory();
+                    // process our events based on the document input stream
+                    factory.processEvents(req, din);
+                }
+            }
+        }
         System.out.println("done.");
     }
 }

src/examples/src/org/apache/poi/hssf/usermodel/examples/FrillsAndFills.java

@@ -33,33 +33,32 @@ import org.apache.poi.ss.usermodel.FillPatternType;
  */
 public class FrillsAndFills {
     public static void main(String[] args) throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet("new sheet");
+        try (HSSFWorkbook wb = new HSSFWorkbook()) {
+            HSSFSheet sheet = wb.createSheet("new sheet");
 
-        // Create a row and put some cells in it. Rows are 0 based.
-        HSSFRow row = sheet.createRow(1);
+            // Create a row and put some cells in it. Rows are 0 based.
+            HSSFRow row = sheet.createRow(1);
 
-        // Aqua background
-        HSSFCellStyle style = wb.createCellStyle();
-        style.setFillBackgroundColor(HSSFColorPredefined.AQUA.getIndex());
-        style.setFillPattern(FillPatternType.BIG_SPOTS);
-        HSSFCell cell = row.createCell(1);
-        cell.setCellValue("X");
-        cell.setCellStyle(style);
+            // Aqua background
+            HSSFCellStyle style = wb.createCellStyle();
+            style.setFillBackgroundColor(HSSFColorPredefined.AQUA.getIndex());
+            style.setFillPattern(FillPatternType.BIG_SPOTS);
+            HSSFCell cell = row.createCell(1);
+            cell.setCellValue("X");
+            cell.setCellStyle(style);
 
-        // Orange "foreground", foreground being the fill foreground not the font color.
-        style = wb.createCellStyle();
-        style.setFillForegroundColor(HSSFColorPredefined.ORANGE.getIndex());
-        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-        cell = row.createCell(2);
-        cell.setCellValue("X");
-        cell.setCellStyle(style);
+            // Orange "foreground", foreground being the fill foreground not the font color.
+            style = wb.createCellStyle();
+            style.setFillForegroundColor(HSSFColorPredefined.ORANGE.getIndex());
+            style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+            cell = row.createCell(2);
+            cell.setCellValue("X");
+            cell.setCellStyle(style);
 
-        // Write the output to a file
-        FileOutputStream fileOut = new FileOutputStream("workbook.xls");
-        wb.write(fileOut);
-        fileOut.close();
-        
-        wb.close();
+            // Write the output to a file
+            try (FileOutputStream fileOut = new FileOutputStream("workbook.xls")) {
+                wb.write(fileOut);
+            }
+        }
     }
 }

src/examples/src/org/apache/poi/hssf/usermodel/examples/HSSFReadWrite.java

@@ -47,12 +47,9 @@ public final class HSSFReadWrite {
 	 * creates an {@link HSSFWorkbook} with the specified OS filename.
 	 */
 	private static HSSFWorkbook readFile(String filename) throws IOException {
-	    FileInputStream fis = new FileInputStream(filename);
-	    try {
-	        return new HSSFWorkbook(fis);		// NOSONAR - should not be closed here
-	    } finally {
-	        fis.close();
-	    }
+		try (FileInputStream fis = new FileInputStream(filename)) {
+			return new HSSFWorkbook(fis);        // NOSONAR - should not be closed here
+		}
 	}
 
 	/**
@@ -60,8 +57,7 @@ public final class HSSFReadWrite {
 	 * rows/cells.
 	 */
 	private static void testCreateSampleSheet(String outputFilename) throws IOException {
-		HSSFWorkbook wb = new HSSFWorkbook();
-		try {
+		try (HSSFWorkbook wb = new HSSFWorkbook()) {
 			HSSFSheet s = wb.createSheet();
 			HSSFCellStyle cs = wb.createCellStyle();
 			HSSFCellStyle cs2 = wb.createCellStyle();
@@ -125,14 +121,9 @@ public final class HSSFReadWrite {
 			wb.removeSheetAt(1);
 
 			// end deleted sheet
-			FileOutputStream out = new FileOutputStream(outputFilename);
-			try {
+			try (FileOutputStream out = new FileOutputStream(outputFilename)) {
 				wb.write(out);
-			} finally {
-				out.close();
 			}
-		} finally {
-			wb.close();
 		}
 	}
 
@@ -140,15 +131,15 @@ public final class HSSFReadWrite {
      * Method main
      *
      * Given 1 argument takes that as the filename, inputs it and dumps the
-     * cell values/types out to sys.out.<br/>
+     * cell values/types out to sys.out.<br>
      *
      * given 2 arguments where the second argument is the word "write" and the
      * first is the filename - writes out a sample (test) spreadsheet
-     * see {@link HSSFReadWrite#testCreateSampleSheet(String)}.<br/>
+     * see {@link HSSFReadWrite#testCreateSampleSheet(String)}.<br>
      *
      * given 2 arguments where the first is an input filename and the second
      * an output filename (not write), attempts to fully read in the
-     * spreadsheet and fully write it out.<br/>
+     * spreadsheet and fully write it out.<br>
      *
      * given 3 arguments where the first is an input filename and the second an
      * output filename (not write) and the third is "modify1", attempts to read in the
@@ -166,9 +157,7 @@ public final class HSSFReadWrite {
 		try {
 			if (args.length < 2) {
 
-				HSSFWorkbook wb = HSSFReadWrite.readFile(fileName);
-
-				try {
+				try (HSSFWorkbook wb = HSSFReadWrite.readFile(fileName)) {
 					System.out.println("Data dump:\n");
 
 					for (int k = 0; k < wb.getNumberOfSheets(); k++) {
@@ -187,8 +176,8 @@ public final class HSSFReadWrite {
 								HSSFCell cell = row.getCell(c);
 								String value;
 
-								if(cell != null) {
-									switch (cell.getCellTypeEnum()) {
+								if (cell != null) {
+									switch (cell.getCellType()) {
 
 										case FORMULA:
 											value = "FORMULA value=" + cell.getCellFormula();
@@ -215,7 +204,7 @@ public final class HSSFReadWrite {
 											break;
 
 										default:
-											value = "UNKNOWN value of type " + cell.getCellTypeEnum();
+											value = "UNKNOWN value of type " + cell.getCellType();
 									}
 									System.out.println("CELL col=" + cell.getColumnIndex() + " VALUE="
 											+ value);
@@ -223,8 +212,6 @@ public final class HSSFReadWrite {
 							}
 						}
 					}
-				} finally {
-					wb.close();
 				}
 			} else if (args.length == 2) {
 				if (args[1].toLowerCase(Locale.ROOT).equals("write")) {
@@ -236,23 +223,16 @@ public final class HSSFReadWrite {
 							+ " ms generation time");
 				} else {
 					System.out.println("readwrite test");
-					HSSFWorkbook wb = HSSFReadWrite.readFile(fileName);
-					try {
-						FileOutputStream stream = new FileOutputStream(args[1]);
-						try {
+					try (HSSFWorkbook wb = HSSFReadWrite.readFile(fileName)) {
+						try (FileOutputStream stream = new FileOutputStream(args[1])) {
 							wb.write(stream);
-						} finally {
-							stream.close();
 						}
-					} finally {
-						wb.close();
 					}
 				}
 			} else if (args.length == 3 && args[2].equalsIgnoreCase("modify1")) {
 				// delete row 0-24, row 74 - 99 && change cell 3 on row 39 to string "MODIFIED CELL!!"
 
-				HSSFWorkbook wb = HSSFReadWrite.readFile(fileName);
-				try {
+				try (HSSFWorkbook wb = HSSFReadWrite.readFile(fileName)) {
 					HSSFSheet sheet = wb.getSheetAt(0);
 
 					for (int k = 0; k < 25; k++) {
@@ -269,14 +249,9 @@ public final class HSSFReadWrite {
 					HSSFCell cell = row.getCell(3);
 					cell.setCellValue("MODIFIED CELL!!!!!");
 
-					FileOutputStream stream = new FileOutputStream(args[1]);
-					try {
+					try (FileOutputStream stream = new FileOutputStream(args[1])) {
 						wb.write(stream);
-					} finally {
-						stream.close();
 					}
-				} finally {
-					wb.close();
 				}
 			}
 		} catch (Exception e) {

src/examples/src/org/apache/poi/hssf/usermodel/examples/HyperlinkFormula.java

@@ -31,17 +31,17 @@ import org.apache.poi.ss.usermodel.CellType;
  */
 public class HyperlinkFormula {
     public static void main(String[] args) throws IOException {
-    	HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet("new sheet");
-        HSSFRow row = sheet.createRow(0);
+    	try (HSSFWorkbook wb = new HSSFWorkbook()) {
+            HSSFSheet sheet = wb.createSheet("new sheet");
+            HSSFRow row = sheet.createRow(0);
 
-        HSSFCell cell = row.createCell(0);
-        cell.setCellType(CellType.FORMULA);
-        cell.setCellFormula("HYPERLINK(\"http://127.0.0.1:8080/toto/truc/index.html?test=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"test\")");
+            HSSFCell cell = row.createCell(0);
+            cell.setCellType(CellType.FORMULA);
+            cell.setCellFormula("HYPERLINK(\"http://127.0.0.1:8080/toto/truc/index.html?test=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"test\")");
 
-        FileOutputStream fileOut = new FileOutputStream("workbook.xls");
-        wb.write(fileOut);
-        fileOut.close();
-        wb.close();
+            try (FileOutputStream fileOut = new FileOutputStream("workbook.xls")) {
+                wb.write(fileOut);
+            }
+        }
     }
 }

src/examples/src/org/apache/poi/hssf/usermodel/examples/Hyperlinks.java

@@ -37,61 +37,61 @@ import org.apache.poi.ss.usermodel.Font;
 public class Hyperlinks {
 
     public static void main(String[] args) throws IOException  {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFCreationHelper helper = wb.getCreationHelper();
+        try (HSSFWorkbook wb = new HSSFWorkbook()) {
+            HSSFCreationHelper helper = wb.getCreationHelper();
 
-        //cell style for hyperlinks
-        //by default hyperlinks are blue and underlined
-        HSSFCellStyle hlink_style = wb.createCellStyle();
-        HSSFFont hlink_font = wb.createFont();
-        hlink_font.setUnderline(Font.U_SINGLE);
-        hlink_font.setColor(HSSFColorPredefined.BLUE.getIndex());
-        hlink_style.setFont(hlink_font);
+            //cell style for hyperlinks
+            //by default hyperlinks are blue and underlined
+            HSSFCellStyle hlink_style = wb.createCellStyle();
+            HSSFFont hlink_font = wb.createFont();
+            hlink_font.setUnderline(Font.U_SINGLE);
+            hlink_font.setColor(HSSFColorPredefined.BLUE.getIndex());
+            hlink_style.setFont(hlink_font);
 
-        HSSFCell cell;
-        HSSFSheet sheet = wb.createSheet("Hyperlinks");
+            HSSFCell cell;
+            HSSFSheet sheet = wb.createSheet("Hyperlinks");
 
-        //URL
-        cell = sheet.createRow(0).createCell(0);
-        cell.setCellValue("URL Link");
-        HSSFHyperlink link = helper.createHyperlink(HyperlinkType.URL);
-        link.setAddress("http://poi.apache.org/");
-        cell.setHyperlink(link);
-        cell.setCellStyle(hlink_style);
+            //URL
+            cell = sheet.createRow(0).createCell(0);
+            cell.setCellValue("URL Link");
+            HSSFHyperlink link = helper.createHyperlink(HyperlinkType.URL);
+            link.setAddress("http://poi.apache.org/");
+            cell.setHyperlink(link);
+            cell.setCellStyle(hlink_style);
 
-        //link to a file in the current directory
-        cell = sheet.createRow(1).createCell(0);
-        cell.setCellValue("File Link");
-        link = helper.createHyperlink(HyperlinkType.FILE);
-        link.setAddress("link1.xls");
-        cell.setHyperlink(link);
-        cell.setCellStyle(hlink_style);
+            //link to a file in the current directory
+            cell = sheet.createRow(1).createCell(0);
+            cell.setCellValue("File Link");
+            link = helper.createHyperlink(HyperlinkType.FILE);
+            link.setAddress("link1.xls");
+            cell.setHyperlink(link);
+            cell.setCellStyle(hlink_style);
 
-        //e-mail link
-        cell = sheet.createRow(2).createCell(0);
-        cell.setCellValue("Email Link");
-        link = helper.createHyperlink(HyperlinkType.EMAIL);
-        //note, if subject contains white spaces, make sure they are url-encoded
-        link.setAddress("mailto:poi@apache.org?subject=Hyperlinks");
-        cell.setHyperlink(link);
-        cell.setCellStyle(hlink_style);
+            //e-mail link
+            cell = sheet.createRow(2).createCell(0);
+            cell.setCellValue("Email Link");
+            link = helper.createHyperlink(HyperlinkType.EMAIL);
+            //note, if subject contains white spaces, make sure they are url-encoded
+            link.setAddress("mailto:poi@apache.org?subject=Hyperlinks");
+            cell.setHyperlink(link);
+            cell.setCellStyle(hlink_style);
 
-        //link to a place in this workbook
+            //link to a place in this workbook
 
-        //create a target sheet and cell
-        HSSFSheet sheet2 = wb.createSheet("Target Sheet");
-        sheet2.createRow(0).createCell(0).setCellValue("Target Cell");
+            //create a target sheet and cell
+            HSSFSheet sheet2 = wb.createSheet("Target Sheet");
+            sheet2.createRow(0).createCell(0).setCellValue("Target Cell");
 
-        cell = sheet.createRow(3).createCell(0);
-        cell.setCellValue("Worksheet Link");
-        link = helper.createHyperlink(HyperlinkType.DOCUMENT);
-        link.setAddress("'Target Sheet'!A1");
-        cell.setHyperlink(link);
-        cell.setCellStyle(hlink_style);
+            cell = sheet.createRow(3).createCell(0);
+            cell.setCellValue("Worksheet Link");
+            link = helper.createHyperlink(HyperlinkType.DOCUMENT);
+            link.setAddress("'Target Sheet'!A1");
+            cell.setHyperlink(link);
+            cell.setCellStyle(hlink_style);
 
-        FileOutputStream out = new FileOutputStream("hssf-links.xls");
-        wb.write(out);
-        out.close();
-        wb.close();
+            try (FileOutputStream out = new FileOutputStream("hssf-links.xls")) {
+                wb.write(out);
+            }
+        }
     }
 }

src/examples/src/org/apache/poi/hssf/usermodel/examples/InCellLists.java

@@ -20,7 +20,6 @@ package org.apache.poi.hssf.usermodel.examples;
 
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.ArrayList;
 
@@ -67,8 +66,7 @@ public class InCellLists {
      *                       the Excel spreadsheet file this code will create.
      */
     public void demonstrateMethodCalls(String outputFilename) throws IOException {
-        HSSFWorkbook workbook = new HSSFWorkbook();
-        try {
+        try (HSSFWorkbook workbook = new HSSFWorkbook()) {
             HSSFSheet sheet = workbook.createSheet("In Cell Lists");
             HSSFRow row = sheet.createRow(0);
 
@@ -81,7 +79,7 @@ public class InCellLists {
             // whose items are neither bulleted or numbered - into that cell.
             row = sheet.createRow(1);
             cell = row.createCell(0);
-            ArrayList<String> listItems = new ArrayList<String>();
+            ArrayList<String> listItems = new ArrayList<>();
             listItems.add("List Item One.");
             listItems.add("List Item Two.");
             listItems.add("List Item Three.");
@@ -89,7 +87,7 @@ public class InCellLists {
             this.listInCell(workbook, listItems, cell);
             // The row height and cell width are set here to ensure that the
             // list may be seen.
-            row.setHeight((short)1100);
+            row.setHeight((short) 1100);
             sheet.setColumnWidth(0, 9500);
 
             // Create a cell at A3 and insert a numbered list into that cell.
@@ -100,7 +98,7 @@ public class InCellLists {
             listItems.add("List Item Five.");
             listItems.add("List Item Six.");
             this.numberedListInCell(workbook, listItems, cell, 1, 2);
-            row.setHeight((short)1550);
+            row.setHeight((short) 1550);
 
             // Create a cell at A4 and insert a numbered list into that cell.
             // Note that a couple of items have been added to the listItems
@@ -112,7 +110,7 @@ public class InCellLists {
             listItems.add("List Item Nine.");
             listItems.add("List Item Ten.");
             this.bulletedListInCell(workbook, listItems, cell);
-            row.setHeight((short)2550);
+            row.setHeight((short) 2550);
 
             // Insert a plain, multi-level list into cell A5. Note that
             // the major difference here is that the list items are passed as
@@ -125,8 +123,8 @@ public class InCellLists {
             // to preserve order.
             row = sheet.createRow(4);
             cell = row.createCell(0);
-            ArrayList<MultiLevelListItem> multiLevelListItems = new ArrayList<MultiLevelListItem>();
-            listItems = new ArrayList<String>();
+            ArrayList<MultiLevelListItem> multiLevelListItems = new ArrayList<>();
+            listItems = new ArrayList<>();
             listItems.add("ML List Item One - Sub Item One.");
             listItems.add("ML List Item One - Sub Item Two.");
             listItems.add("ML List Item One - Sub Item Three.");
@@ -137,13 +135,13 @@ public class InCellLists {
             // item
             multiLevelListItems.add(new MultiLevelListItem("List Item Two.", null));
             multiLevelListItems.add(new MultiLevelListItem("List Item Three.", null));
-            listItems = new ArrayList<String>();
+            listItems = new ArrayList<>();
             listItems.add("ML List Item Four - Sub Item One.");
             listItems.add("ML List Item Four - Sub Item Two.");
             listItems.add("ML List Item Four - Sub Item Three.");
             multiLevelListItems.add(new MultiLevelListItem("List Item Four.", listItems));
             this.multiLevelListInCell(workbook, multiLevelListItems, cell);
-            row.setHeight((short)2800);
+            row.setHeight((short) 2800);
 
             // Insert a numbered multi-level list into cell A6. Note that the
             // same ArrayList as constructed for the above plain multi-level
@@ -151,8 +149,8 @@ public class InCellLists {
             row = sheet.createRow(5);
             cell = row.createCell(0);
             this.multiLevelNumberedListInCell(workbook, multiLevelListItems,
-                                              cell, 1, 1, 1, 2);
-            row.setHeight((short)2800);
+                    cell, 1, 1, 1, 2);
+            row.setHeight((short) 2800);
 
             // Insert a numbered multi-level list into cell A7. Note that the
             // same ArrayList as constructed for the plain multi-level list
@@ -160,31 +158,18 @@ public class InCellLists {
             row = sheet.createRow(6);
             cell = row.createCell(0);
             this.multiLevelBulletedListInCell(workbook, multiLevelListItems, cell);
-            row.setHeight((short)2800);
+            row.setHeight((short) 2800);
 
             // Save the completed workbook
-            FileOutputStream fos = new FileOutputStream(new File(outputFilename));
-            try {
+            try (FileOutputStream fos = new FileOutputStream(new File(outputFilename))) {
                 workbook.write(fos);
-            } finally {
-                fos.close();
             }
-        }
-        catch(FileNotFoundException fnfEx) {
-            System.out.println("Caught a: " + fnfEx.getClass().getName());
-            System.out.println("Message: " + fnfEx.getMessage());
-            System.out.println("Stacktrace follows...........");
-            fnfEx.printStackTrace(System.out);
-        }
-        catch(IOException ioEx) {
+        } catch (IOException ioEx) {
             System.out.println("Caught a: " + ioEx.getClass().getName());
             System.out.println("Message: " + ioEx.getMessage());
             System.out.println("Stacktrace follows...........");
             ioEx.printStackTrace(System.out);
         }
-        finally {
-            workbook.close();
-        }
     }
 
     /**
@@ -512,8 +497,8 @@ public class InCellLists {
      */
     public final class MultiLevelListItem {
 
-        private String itemText = null;
-        private ArrayList<String> lowerLevelItems = null;
+        private String itemText;
+        private ArrayList<String> lowerLevelItems;
 
         /**
          * Create a new instance of the MultiLevelListItem class using the

src/examples/src/org/apache/poi/hssf/usermodel/examples/MergedCells.java

@@ -31,19 +31,19 @@ import org.apache.poi.ss.util.CellRangeAddress;
  */
 public class MergedCells {
    public static void main(String[] args) throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet("new sheet");
+        try (HSSFWorkbook wb = new HSSFWorkbook()) {
+             HSSFSheet sheet = wb.createSheet("new sheet");
 
-        HSSFRow row = sheet.createRow(1);
-        HSSFCell cell = row.createCell(1);
-        cell.setCellValue("This is a test of merging");
+             HSSFRow row = sheet.createRow(1);
+             HSSFCell cell = row.createCell(1);
+             cell.setCellValue("This is a test of merging");
 
-        sheet.addMergedRegion(new CellRangeAddress(1, 1, 1, 2));
+             sheet.addMergedRegion(new CellRangeAddress(1, 1, 1, 2));
 
-        // Write the output to a file
-        FileOutputStream fileOut = new FileOutputStream("workbook.xls");
-        wb.write(fileOut);
-        fileOut.close();
-        wb.close();
+             // Write the output to a file
+             try (FileOutputStream fileOut = new FileOutputStream("workbook.xls")) {
+                  wb.write(fileOut);
+             }
+        }
     }
 }

src/examples/src/org/apache/poi/hssf/usermodel/examples/NewLinesInCells.java

@@ -33,31 +33,27 @@ import org.apache.poi.ss.usermodel.CellType;
  */
 public class NewLinesInCells {
     public static void main( String[] args ) throws IOException {
+        try (HSSFWorkbook wb = new HSSFWorkbook()) {
+			HSSFSheet s = wb.createSheet();
+			HSSFFont f2 = wb.createFont();
 
-        HSSFWorkbook wb = new HSSFWorkbook();
-		HSSFSheet s = wb.createSheet();
-		HSSFRow r = null;
-		HSSFCell c = null;
-		HSSFCellStyle cs = wb.createCellStyle();
-		HSSFFont f2 = wb.createFont();
+			HSSFCellStyle cs = wb.createCellStyle();
 
-		cs = wb.createCellStyle();
+			cs.setFont(f2);
+			// Word Wrap MUST be turned on
+			cs.setWrapText(true);
 
-		cs.setFont(f2);
-		// Word Wrap MUST be turned on
-		cs.setWrapText(true);
+			HSSFRow r = s.createRow(2);
+			r.setHeight((short) 0x349);
+			HSSFCell c = r.createCell(2);
+			c.setCellType(CellType.STRING);
+			c.setCellValue("Use \n with word wrap on to create a new line");
+			c.setCellStyle(cs);
+			s.setColumnWidth(2, (int) ((50 * 8) / ((double) 1 / 20)));
 
-		r = s.createRow(2);
-		r.setHeight((short) 0x349);
-		c = r.createCell(2);
-		c.setCellType(CellType.STRING);
-		c.setCellValue("Use \n with word wrap on to create a new line");
-		c.setCellStyle(cs);
-		s.setColumnWidth(2, (int) ((50 * 8) / ((double) 1 / 20)));
-
-		FileOutputStream fileOut = new FileOutputStream("workbook.xls");
-		wb.write(fileOut);
-		fileOut.close();
-		wb.close();
+			try (FileOutputStream fileOut = new FileOutputStream("workbook.xls")) {
+				wb.write(fileOut);
+			}
+		}
     }
 }

src/examples/src/org/apache/poi/hssf/usermodel/examples/NewSheet.java

@@ -28,16 +28,17 @@ import org.apache.poi.ss.util.WorkbookUtil;
  */
 public abstract class NewSheet {
     public static void main(String[] args) throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        wb.createSheet("new sheet");
-        // create with default name
-        wb.createSheet();
-        final String name = "second sheet";
-        // setting sheet name later
-        wb.setSheetName(1, WorkbookUtil.createSafeSheetName(name));
-        FileOutputStream fileOut = new FileOutputStream("workbook.xls");
-        wb.write(fileOut);
-        fileOut.close();
-        wb.close();
+        try (HSSFWorkbook wb = new HSSFWorkbook()) {
+            wb.createSheet("new sheet");
+            // create with default name
+            wb.createSheet();
+            final String name = "second sheet";
+            // setting sheet name later
+            wb.setSheetName(1, WorkbookUtil.createSafeSheetName(name));
+
+            try (FileOutputStream fileOut = new FileOutputStream("workbook.xls")) {
+                wb.write(fileOut);
+            }
+        }
     }
 }

src/examples/src/org/apache/poi/hssf/usermodel/examples/NewWorkbook.java

@@ -29,10 +29,10 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook;
  */
 public class NewWorkbook {
     public static void main(String[] args) throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        FileOutputStream fileOut = new FileOutputStream("workbook.xls");
-        wb.write(fileOut);
-        fileOut.close();
-        wb.close();
+        try (HSSFWorkbook wb = new HSSFWorkbook()) {
+            try (FileOutputStream fileOut = new FileOutputStream("workbook.xls")) {
+                wb.write(fileOut);
+            }
+        }
     }
 }

src/examples/src/org/apache/poi/hssf/usermodel/examples/OfficeDrawing.java

@@ -30,24 +30,25 @@ import java.io.*;
 public class OfficeDrawing {
     public static void main(String[] args) throws IOException {
         // Create the workbook and sheets.
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet1 = wb.createSheet("new sheet");
-        HSSFSheet sheet2 = wb.createSheet("second sheet");
-        HSSFSheet sheet3 = wb.createSheet("third sheet");
-        HSSFSheet sheet4 = wb.createSheet("fourth sheet");
-        HSSFSheet sheet5 = wb.createSheet("fifth sheet");
+        try (HSSFWorkbook wb = new HSSFWorkbook()) {
+            HSSFSheet sheet1 = wb.createSheet("new sheet");
+            HSSFSheet sheet2 = wb.createSheet("second sheet");
+            HSSFSheet sheet3 = wb.createSheet("third sheet");
+            HSSFSheet sheet4 = wb.createSheet("fourth sheet");
+            HSSFSheet sheet5 = wb.createSheet("fifth sheet");
 
-        // Draw stuff in them
-        drawSheet1( sheet1 );
-        drawSheet2( sheet2 );
-        drawSheet3( sheet3 );
-        drawSheet4( sheet4, wb );
-        drawSheet5( sheet5, wb );
+            // Draw stuff in them
+            drawSheet1(sheet1);
+            drawSheet2(sheet2);
+            drawSheet3(sheet3);
+            drawSheet4(sheet4, wb);
+            drawSheet5(sheet5, wb);
 
-        // Write the file out.
-        FileOutputStream fileOut = new FileOutputStream("workbook.xls");
-        wb.write(fileOut);
-        fileOut.close();
+            // Write the file out.
+            try (FileOutputStream fileOut = new FileOutputStream("workbook.xls")) {
+                wb.write(fileOut);
+            }
+        }
     }
 
     private static void drawSheet1( HSSFSheet sheet1 )

src/examples/src/org/apache/poi/hssf/usermodel/examples/OfficeDrawingWithGraphics.java

@@ -32,51 +32,51 @@ public class OfficeDrawingWithGraphics {
     public static void main( String[] args ) throws IOException {
         // Create a workbook with one sheet and size the first three somewhat
         // larger so we can fit the chemical structure diagram in.
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet( "my drawing" );
-        sheet.setColumnWidth(1, 256 * 27);
-        HSSFRow row1 = sheet.createRow(0);
-        row1.setHeightInPoints(10 * 15f);
-        HSSFRow row2 = sheet.createRow(1);
-        row2.setHeightInPoints(5 * 15f);
-        HSSFRow row3 = sheet.createRow(2);
-        row3.setHeightInPoints(10 * 15f);
+        try (HSSFWorkbook wb = new HSSFWorkbook()) {
+            HSSFSheet sheet = wb.createSheet("my drawing");
+            sheet.setColumnWidth(1, 256 * 27);
+            HSSFRow row1 = sheet.createRow(0);
+            row1.setHeightInPoints(10 * 15f);
+            HSSFRow row2 = sheet.createRow(1);
+            row2.setHeightInPoints(5 * 15f);
+            HSSFRow row3 = sheet.createRow(2);
+            row3.setHeightInPoints(10 * 15f);
 
-        // Add some cells so we can test that the anchoring works when we
-        // sort them.
-        row1.createCell(0).setCellValue("C");
-        row2.createCell(0).setCellValue("A");
-        row3.createCell(0).setCellValue("B");
+            // Add some cells so we can test that the anchoring works when we
+            // sort them.
+            row1.createCell(0).setCellValue("C");
+            row2.createCell(0).setCellValue("A");
+            row3.createCell(0).setCellValue("B");
 
-        // Create the top level drawing patriarch.
-        HSSFPatriarch patriarch = sheet.createDrawingPatriarch();
+            // Create the top level drawing patriarch.
+            HSSFPatriarch patriarch = sheet.createDrawingPatriarch();
 
-        HSSFClientAnchor a;
-        HSSFShapeGroup group;
-        EscherGraphics g;
-        EscherGraphics2d g2d;
-        // Anchor entirely within one cell.
-        a = new HSSFClientAnchor( 0, 0, 1023, 255, (short) 1, 0, (short) 1, 0 );
-        group = patriarch.createGroup( a );
-        group.setCoordinates( 0, 0, 320, 276 );
-        float verticalPointsPerPixel = a.getAnchorHeightInPoints(sheet) / Math.abs(group.getY2() - group.getY1());
-        g = new EscherGraphics( group, wb, Color.black, verticalPointsPerPixel );
-        g2d = new EscherGraphics2d( g );
-        drawStar( g2d );
+            HSSFClientAnchor a;
+            HSSFShapeGroup group;
+            EscherGraphics g;
+            EscherGraphics2d g2d;
+            // Anchor entirely within one cell.
+            a = new HSSFClientAnchor(0, 0, 1023, 255, (short) 1, 0, (short) 1, 0);
+            group = patriarch.createGroup(a);
+            group.setCoordinates(0, 0, 320, 276);
+            float verticalPointsPerPixel = a.getAnchorHeightInPoints(sheet) / Math.abs(group.getY2() - group.getY1());
+            g = new EscherGraphics(group, wb, Color.black, verticalPointsPerPixel);
+            g2d = new EscherGraphics2d(g);
+            drawStar(g2d);
 
-        a = new HSSFClientAnchor( 0, 0, 1023, 255, (short) 1, 1, (short) 1, 1 );
-        group = patriarch.createGroup( a );
-        group.setCoordinates( 0, 0, 640, 276 );
-        verticalPointsPerPixel = a.getAnchorHeightInPoints(sheet) / Math.abs(group.getY2() - group.getY1());
+            a = new HSSFClientAnchor(0, 0, 1023, 255, (short) 1, 1, (short) 1, 1);
+            group = patriarch.createGroup(a);
+            group.setCoordinates(0, 0, 640, 276);
+            verticalPointsPerPixel = a.getAnchorHeightInPoints(sheet) / Math.abs(group.getY2() - group.getY1());
 //        verticalPixelsPerPoint = (float)Math.abs(group.getY2() - group.getY1()) / a.getAnchorHeightInPoints(sheet);
-        g = new EscherGraphics( group, wb, Color.black, verticalPointsPerPixel );
-        g2d = new EscherGraphics2d( g );
-        drawStar( g2d );
-
-        FileOutputStream out = new FileOutputStream("workbook.xls");
-        wb.write(out);
-        out.close();
+            g = new EscherGraphics(group, wb, Color.black, verticalPointsPerPixel);
+            g2d = new EscherGraphics2d(g);
+            drawStar(g2d);
 
+            try (FileOutputStream out = new FileOutputStream("workbook.xls")) {
+                wb.write(out);
+            }
+        }
     }
 
     private static void drawStar( EscherGraphics2d g2d )

src/examples/src/org/apache/poi/hssf/usermodel/examples/Outlines.java

@@ -37,14 +37,11 @@ public class Outlines implements Closeable {
     throws IOException, IllegalAccessException, InvocationTargetException, NoSuchMethodException {
         POILogger LOGGER = POILogFactory.getLogger(Outlines.class);
         for (int i=1; i<=13; i++) {
-            Outlines o = new Outlines();
-            try {
-                String log = (String)Outlines.class.getDeclaredMethod("test"+i).invoke(o);
-                String filename = "outline"+i+".xls";
+            try (Outlines o = new Outlines()) {
+                String log = (String) Outlines.class.getDeclaredMethod("test" + i).invoke(o);
+                String filename = "outline" + i + ".xls";
                 o.writeOut(filename);
-                LOGGER.log(POILogger.INFO, filename+" written. "+log);
-            } finally {
-                o.close();
+                LOGGER.log(POILogger.INFO, filename + " written. " + log);
             }
         }
     }
@@ -53,11 +50,8 @@ public class Outlines implements Closeable {
     private final HSSFSheet sheet1 = wb.createSheet("new sheet");
 
     public void writeOut(String filename) throws IOException {
-        FileOutputStream fileOut = new FileOutputStream(filename);
-        try {
+        try (FileOutputStream fileOut = new FileOutputStream(filename)) {
             wb.write(fileOut);
-        } finally {
-            fileOut.close();
         }
     }
     

src/examples/src/org/apache/poi/hssf/usermodel/examples/ReadWriteWorkbook.java

@@ -36,12 +36,7 @@ import org.apache.poi.ss.usermodel.CellType;
  */
 public class ReadWriteWorkbook {
     public static void main(String[] args) throws IOException {
-        FileInputStream fileIn = null;
-        FileOutputStream fileOut = null;
-
-        try
-        {
-            fileIn = new FileInputStream("workbook.xls");
+        try (FileInputStream fileIn = new FileInputStream("workbook.xls")) {
             POIFSFileSystem fs = new POIFSFileSystem(fileIn);
             HSSFWorkbook wb = new HSSFWorkbook(fs);
             HSSFSheet sheet = wb.getSheetAt(0);
@@ -55,13 +50,9 @@ public class ReadWriteWorkbook {
             cell.setCellValue("a test");
 
             // Write the output to a file
-            fileOut = new FileOutputStream("workbookout.xls");
-            wb.write(fileOut);
-        } finally {
-            if (fileOut != null)
-                fileOut.close();
-            if (fileIn != null)
-                fileIn.close();
+            try (FileOutputStream fileOut = new FileOutputStream("workbookout.xls")) {
+                wb.write(fileOut);
+            }
         }
     }
 }

src/examples/src/org/apache/poi/hssf/usermodel/examples/RepeatingRowsAndColumns.java

@@ -30,35 +30,35 @@ import org.apache.poi.ss.util.CellRangeAddress;
 
 public class RepeatingRowsAndColumns {
     public static void main(String[] args) throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet1 = wb.createSheet("first sheet");
-        HSSFSheet sheet2 = wb.createSheet("second sheet");
-        HSSFSheet sheet3 = wb.createSheet("third sheet");
+        try (HSSFWorkbook wb = new HSSFWorkbook()) {
+            HSSFSheet sheet1 = wb.createSheet("first sheet");
+            HSSFSheet sheet2 = wb.createSheet("second sheet");
+            HSSFSheet sheet3 = wb.createSheet("third sheet");
 
-        HSSFFont boldFont = wb.createFont();
-        boldFont.setFontHeightInPoints((short)22);
-        boldFont.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
+            HSSFFont boldFont = wb.createFont();
+            boldFont.setFontHeightInPoints((short) 22);
+            boldFont.setBold(true);
 
-        HSSFCellStyle boldStyle = wb.createCellStyle();
-        boldStyle.setFont(boldFont);
+            HSSFCellStyle boldStyle = wb.createCellStyle();
+            boldStyle.setFont(boldFont);
 
-        HSSFRow row = sheet1.createRow(1);
-        HSSFCell cell = row.createCell(0);
-        cell.setCellValue("This quick brown fox");
-        cell.setCellStyle(boldStyle);
+            HSSFRow row = sheet1.createRow(1);
+            HSSFCell cell = row.createCell(0);
+            cell.setCellValue("This quick brown fox");
+            cell.setCellStyle(boldStyle);
 
-        // Set the columns to repeat from column 0 to 2 on the first sheet
-        sheet1.setRepeatingColumns(CellRangeAddress.valueOf("A:C"));
-        // Set the rows to repeat from row 0 to 2 on the second sheet.
-        sheet2.setRepeatingRows(CellRangeAddress.valueOf("1:3"));
-        // Set the the repeating rows and columns on the third sheet.
-        CellRangeAddress cra = CellRangeAddress.valueOf("D1:E2"); 
-        sheet3.setRepeatingColumns(cra);
-        sheet3.setRepeatingRows(cra);
+            // Set the columns to repeat from column 0 to 2 on the first sheet
+            sheet1.setRepeatingColumns(CellRangeAddress.valueOf("A:C"));
+            // Set the rows to repeat from row 0 to 2 on the second sheet.
+            sheet2.setRepeatingRows(CellRangeAddress.valueOf("1:3"));
+            // Set the the repeating rows and columns on the third sheet.
+            CellRangeAddress cra = CellRangeAddress.valueOf("D1:E2");
+            sheet3.setRepeatingColumns(cra);
+            sheet3.setRepeatingRows(cra);
 
-        FileOutputStream fileOut = new FileOutputStream("workbook.xls");
-        wb.write(fileOut);
-        fileOut.close();
-        wb.close();
+            try (FileOutputStream fileOut = new FileOutputStream("workbook.xls")) {
+                wb.write(fileOut);
+            }
+        }
     }
 }

src/examples/src/org/apache/poi/hssf/usermodel/examples/SplitAndFreezePanes.java

@@ -28,24 +28,24 @@ import org.apache.poi.ss.usermodel.Sheet;
 
 public class SplitAndFreezePanes {
     public static void main(String[] args) throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet1 = wb.createSheet("new sheet");
-        HSSFSheet sheet2 = wb.createSheet("second sheet");
-        HSSFSheet sheet3 = wb.createSheet("third sheet");
-        HSSFSheet sheet4 = wb.createSheet("fourth sheet");
+        try (HSSFWorkbook wb = new HSSFWorkbook()) {
+            HSSFSheet sheet1 = wb.createSheet("new sheet");
+            HSSFSheet sheet2 = wb.createSheet("second sheet");
+            HSSFSheet sheet3 = wb.createSheet("third sheet");
+            HSSFSheet sheet4 = wb.createSheet("fourth sheet");
 
-        // Freeze just one row
-        sheet1.createFreezePane( 0, 1, 0, 1 );
-        // Freeze just one column
-        sheet2.createFreezePane( 1, 0, 1, 0 );
-        // Freeze the columns and rows (forget about scrolling position of the lower right quadrant).
-        sheet3.createFreezePane( 2, 2 );
-        // Create a split with the lower left side being the active quadrant
-        sheet4.createSplitPane( 2000, 2000, 0, 0, Sheet.PANE_LOWER_LEFT );
+            // Freeze just one row
+            sheet1.createFreezePane(0, 1, 0, 1);
+            // Freeze just one column
+            sheet2.createFreezePane(1, 0, 1, 0);
+            // Freeze the columns and rows (forget about scrolling position of the lower right quadrant).
+            sheet3.createFreezePane(2, 2);
+            // Create a split with the lower left side being the active quadrant
+            sheet4.createSplitPane(2000, 2000, 0, 0, Sheet.PANE_LOWER_LEFT);
 
-        FileOutputStream fileOut = new FileOutputStream("workbook.xls");
-        wb.write(fileOut);
-        fileOut.close();
-        wb.close();
+            try (FileOutputStream fileOut = new FileOutputStream("workbook.xls")) {
+                wb.write(fileOut);
+            }
+        }
     }
 }

src/examples/src/org/apache/poi/hssf/usermodel/examples/WorkingWithFonts.java

@@ -32,32 +32,32 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook;
  */
 public class WorkingWithFonts {
     public static void main(String[] args) throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet = wb.createSheet("new sheet");
+        try (HSSFWorkbook wb = new HSSFWorkbook()) {
+            HSSFSheet sheet = wb.createSheet("new sheet");
 
-        // Create a row and put some cells in it. Rows are 0 based.
-        HSSFRow row = sheet.createRow(1);
+            // Create a row and put some cells in it. Rows are 0 based.
+            HSSFRow row = sheet.createRow(1);
 
-        // Create a new font and alter it.
-        HSSFFont font = wb.createFont();
-        font.setFontHeightInPoints((short)24);
-        font.setFontName("Courier New");
-        font.setItalic(true);
-        font.setStrikeout(true);
+            // Create a new font and alter it.
+            HSSFFont font = wb.createFont();
+            font.setFontHeightInPoints((short) 24);
+            font.setFontName("Courier New");
+            font.setItalic(true);
+            font.setStrikeout(true);
 
-        // Fonts are set into a style so create a new one to use.
-        HSSFCellStyle style = wb.createCellStyle();
-        style.setFont(font);
+            // Fonts are set into a style so create a new one to use.
+            HSSFCellStyle style = wb.createCellStyle();
+            style.setFont(font);
 
-        // Create a cell and put a value in it.
-        HSSFCell cell = row.createCell(1);
-        cell.setCellValue("This is a test of fonts");
-        cell.setCellStyle(style);
+            // Create a cell and put a value in it.
+            HSSFCell cell = row.createCell(1);
+            cell.setCellValue("This is a test of fonts");
+            cell.setCellStyle(style);
 
-        // Write the output to a file
-        FileOutputStream fileOut = new FileOutputStream("workbook.xls");
-        wb.write(fileOut);
-        fileOut.close();
-        wb.close();
+            // Write the output to a file
+            try (FileOutputStream fileOut = new FileOutputStream("workbook.xls")) {
+                wb.write(fileOut);
+            }
+        }
     }
 }

src/examples/src/org/apache/poi/hssf/usermodel/examples/ZoomSheet.java

@@ -32,15 +32,14 @@ import java.io.FileOutputStream;
  */
 public class ZoomSheet
 {
-    public static void main(String[] args)
-        throws IOException
-    {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        HSSFSheet sheet1 = wb.createSheet("new sheet");
-        sheet1.setZoom(75);   // 75 percent magnification
-        FileOutputStream fileOut = new FileOutputStream("workbook.xls");
-        wb.write(fileOut);
-        fileOut.close();
-        wb.close();
+    public static void main(String[] args) throws IOException {
+        try (HSSFWorkbook wb = new HSSFWorkbook()) {
+            HSSFSheet sheet1 = wb.createSheet("new sheet");
+            sheet1.setZoom(75);   // 75 percent magnification
+
+            try (FileOutputStream fileOut = new FileOutputStream("workbook.xls")) {
+                wb.write(fileOut);
+            }
+        }
     }
 }

src/examples/src/org/apache/poi/hssf/view/SVBorder.java

@@ -33,19 +33,19 @@ import org.apache.poi.ss.usermodel.BorderStyle;
  * @author Jason Height
  */
 public class SVBorder extends AbstractBorder {
-  private Color northColor = null;
-  private Color eastColor = null;
-  private Color southColor = null;
-  private Color westColor = null;
+  private Color northColor;
+  private Color eastColor;
+  private Color southColor;
+  private Color westColor;
   private BorderStyle northBorderType = BorderStyle.NONE;
   private BorderStyle eastBorderType = BorderStyle.NONE;
   private BorderStyle southBorderType = BorderStyle.NONE;
   private BorderStyle westBorderType = BorderStyle.NONE;
-  private boolean northBorder=false;
-  private boolean eastBorder=false;
-  private boolean southBorder=false;
-  private boolean westBorder=false;
-  private boolean selected = false;
+  private boolean northBorder;
+  private boolean eastBorder;
+  private boolean southBorder;
+  private boolean westBorder;
+  private boolean selected;
 
    public void setBorder(Color northColor, Color eastColor,
                          Color southColor, Color westColor,
@@ -348,14 +348,16 @@ public void paintBorder(Component c, Graphics g, int x, int y, int width,
 
                 // if there are borders on the west or east then
                 // the second line shouldn't cross them
-        if (westBorder)
-           leftx = x+3;
+        if (westBorder) {
+            leftx = x + 3;
+        }
 
-        if (eastBorder)
-           rightx = width-3;
+        if (eastBorder) {
+            rightx = width - 3;
+        }
 
-           g.drawLine(x,y,width,y);
-           g.drawLine(leftx,y+2,rightx,y+2);
+        g.drawLine(x,y,width,y);
+        g.drawLine(leftx,y+2,rightx,y+2);
       }
 
       if (eastBorder &&
@@ -370,11 +372,13 @@ public void paintBorder(Component c, Graphics g, int x, int y, int width,
         int topy=y;
         int bottomy=height;
 
-        if (northBorder)
-          topy=y+3;
+        if (northBorder) {
+            topy = y + 3;
+        }
 
-        if (southBorder)
-            bottomy=height-3;
+        if (southBorder) {
+            bottomy = height - 3;
+        }
 
         g.drawLine(width-1,y,width-1,height);
         g.drawLine(width-3,topy,width-3,bottomy);
@@ -498,13 +502,13 @@ public void paintBorder(Component c, Graphics g, int x, int y, int width,
     *  @param y the y origin of the line
     *  @param thickness the thickness of the line
     *  @param horizontal or vertical (true for horizontal)
-    *  @param right/bottom or left/top thickness (true for right or top),
+    *  @param rightBottom or left/top thickness (true for right or top),
     *         if true then the x or y origin will be incremented to provide
     *         thickness, if false, they'll be decremented.  For vertical
     *         borders, x is incremented or decremented, for horizontal its y.
     *         Just set to true for north and west, and false for east and
     *         south.
-    *  @returns length - returns the length of the line.
+    *  @return length - returns the length of the line.
     */
    private int drawDashDotDot(Graphics g,int x, int y, int thickness,
                               boolean horizontal,
@@ -529,7 +533,7 @@ public void paintBorder(Component c, Graphics g, int x, int y, int width,
    }
 
    /**
-    * @returns the line thickness for a border based on border type
+    * @return the line thickness for a border based on border type
     */
    private int getThickness(BorderStyle thickness) {
        switch (thickness) {

src/examples/src/org/apache/poi/hssf/view/SVRowHeader.java

@@ -32,12 +32,12 @@ import org.apache.poi.hssf.usermodel.*;
  *
  * @author Jason Height
  */
-public class SVRowHeader extends JList {
+public class SVRowHeader extends JList<Object> {
   /** This model simply returns an integer number up to the number of rows
    *  that are present in the sheet.
    *
    */
-  private class SVRowHeaderModel extends AbstractListModel {
+  private class SVRowHeaderModel extends AbstractListModel<Object> {
     private HSSFSheet sheet;
 
     public SVRowHeaderModel(HSSFSheet sheet) {
@@ -55,7 +55,7 @@ public class SVRowHeader extends JList {
   }
 
   /** Renderes the row number*/
-  private class RowHeaderRenderer extends JLabel implements ListCellRenderer {
+  private class RowHeaderRenderer extends JLabel implements ListCellRenderer<Object> {
     private HSSFSheet sheet;
     private int extraHeight;
 
@@ -90,7 +90,7 @@ public class SVRowHeader extends JList {
   }
 
   public SVRowHeader(HSSFSheet sheet, JTable table, int extraHeight) {
-    ListModel lm = new SVRowHeaderModel(sheet);
+    ListModel<Object> lm = new SVRowHeaderModel(sheet);
     this.setModel(lm);
 
     setFixedCellWidth(50);

src/examples/src/org/apache/poi/hssf/view/SVSheetTable.java

@@ -64,11 +64,11 @@ public class SVSheetTable extends JTable {
   /**
    * This field is the magic number to convert from a Character width to a java
    * pixel width.
-   * <p/>
+   * <p>
    * When the "normal" font size in a workbook changes, this effects all of the
    * heights and widths. Unfortunately there is no way to retrieve this
    * information, hence the MAGIC number.
-   * <p/>
+   * <p>
    * This number may only work for the normal style font size of Arial size 10.
    */
   private static final int magicCharFactor = 7;
@@ -144,7 +144,7 @@ public class SVSheetTable extends JTable {
       HSSFCell cell = (HSSFCell) getValueAt(row, col);
       String formula = "";
       if (cell != null) {
-        if (cell.getCellTypeEnum() == CellType.FORMULA) {
+        if (cell.getCellType() == CellType.FORMULA) {
           formula = cell.getCellFormula();
         } else {
           formula = cell.toString();

src/examples/src/org/apache/poi/hssf/view/SVTableCellEditor.java

@@ -40,173 +40,176 @@ import org.apache.poi.hssf.usermodel.HSSFFont;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.hssf.util.HSSFColor.HSSFColorPredefined;
 import org.apache.poi.ss.usermodel.FillPatternType;
+import org.apache.poi.util.POILogFactory;
+import org.apache.poi.util.POILogger;
 
 /**
  * Sheet Viewer Table Cell Editor -- not commented via javadoc as it
  * nearly completely consists of overridden methods.
  *
- * @author     Jason Height
+ * @author Jason Height
  */
 public class SVTableCellEditor extends AbstractCellEditor implements TableCellEditor, ActionListener {
-  private static final Color black = getAWTColor(HSSFColorPredefined.BLACK);
-  private static final Color white = getAWTColor(HSSFColorPredefined.WHITE);
+    private static final Color black = getAWTColor(HSSFColorPredefined.BLACK);
+    private static final Color white = getAWTColor(HSSFColorPredefined.WHITE);
+    private static final POILogger logger = POILogFactory.getLogger(SVTableCellEditor.class);
 
-  private HSSFWorkbook wb;
-  private JTextField editor;
+    private HSSFWorkbook wb;
+    private JTextField editor;
 
-  public SVTableCellEditor(HSSFWorkbook wb) {
-    this.wb = wb;
-    this.editor = new JTextField();
-  }
-
-
-  /**
-   *  Gets the cellEditable attribute of the SVTableCellEditor object
-   *
-   * @return    The cellEditable value
-   */
-  @Override
-  public boolean isCellEditable(java.util.EventObject e) {
-    if (e instanceof MouseEvent) {
-      return ((MouseEvent) e).getClickCount() >= 2;
+    public SVTableCellEditor(HSSFWorkbook wb) {
+        this.wb = wb;
+        this.editor = new JTextField();
     }
-    return false;
-  }
 
 
-  @Override
-  public boolean shouldSelectCell(EventObject anEvent) {
-    return true;
-  }
-
-
-  public boolean startCellEditing(EventObject anEvent) {
-    System.out.println("Start Cell Editing");
-    return true;
-  }
-
-
-  @Override
-  public boolean stopCellEditing() {
-    System.out.println("Stop Cell Editing");
-    fireEditingStopped();
-    return true;
-  }
-
-
-  @Override
-  public void cancelCellEditing() {
-    System.out.println("Cancel Cell Editing");
-    fireEditingCanceled();
-  }
-
-
-  @Override
-  public void actionPerformed(ActionEvent e) {
-    System.out.println("Action performed");
-    stopCellEditing();
-  }
-
-
-  /**
-   *  Gets the cellEditorValue attribute of the SVTableCellEditor object
-   *
-   * @return    The cellEditorValue value
-   */
-  @Override
-  public Object getCellEditorValue() {
-    System.out.println("GetCellEditorValue");
-    //JMH Look at when this method is called. Should it return a HSSFCell?
-    return editor.getText();
-  }
-
-
-  /**
-   *  Gets the tableCellEditorComponent attribute of the SVTableCellEditor object
-   *
-   * @return             The tableCellEditorComponent value
-   */
-  @Override
-  public Component getTableCellEditorComponent(JTable table, Object value,
-      boolean isSelected,
-      int row,
-      int column) {
-    System.out.println("GetTableCellEditorComponent");
-    HSSFCell cell = (HSSFCell) value;
-    if (cell != null) {
-          HSSFCellStyle style = cell.getCellStyle();
-          HSSFFont f = wb.getFontAt(style.getFontIndex());
-          boolean isbold = f.getBold();
-          boolean isitalics = f.getItalic();
-
-          int fontstyle = Font.PLAIN;
-
-          if (isbold) {
-            fontstyle = Font.BOLD;
-          }
-          if (isitalics) {
-            fontstyle = fontstyle | Font.ITALIC;
-          }
-
-          int fontheight = f.getFontHeightInPoints();
-          if (fontheight == 9) {
-            fontheight = 10; //fix for stupid ol Windows
-          }
-
-          Font font = new Font(f.getFontName(),fontstyle,fontheight);
-          editor.setFont(font);
-
-          if (style.getFillPatternEnum() == FillPatternType.SOLID_FOREGROUND) {
-            editor.setBackground(getAWTColor(style.getFillForegroundColor(), white));
-          } else {
-            editor.setBackground(white);
-          }
-
-          editor.setForeground(getAWTColor(f.getColor(), black));
-
-
-      //Set the value that is rendered for the cell
-      switch (cell.getCellTypeEnum()) {
-        case BLANK:
-          editor.setText("");
-          break;
-        case BOOLEAN:
-          if (cell.getBooleanCellValue()) {
-            editor.setText("true");
-          } else {
-            editor.setText("false");
-          }
-          break;
-        case NUMERIC:
-          editor.setText(Double.toString(cell.getNumericCellValue()));
-          break;
-        case STRING:
-          editor.setText(cell.getRichStringCellValue().getString());
-          break;
-        case FORMULA:
-        default:
-          editor.setText("?");
-      }
-      switch (style.getAlignmentEnum()) {
-        case LEFT:
-        case JUSTIFY:
-        case FILL:
-          editor.setHorizontalAlignment(SwingConstants.LEFT);
-          break;
-        case CENTER:
-        case CENTER_SELECTION:
-          editor.setHorizontalAlignment(SwingConstants.CENTER);
-          break;
-        case GENERAL:
-        case RIGHT:
-          editor.setHorizontalAlignment(SwingConstants.RIGHT);
-          break;
-        default:
-          editor.setHorizontalAlignment(SwingConstants.LEFT);
-          break;
-      }
-
+    /**
+     * Gets the cellEditable attribute of the SVTableCellEditor object
+     *
+     * @return The cellEditable value
+     */
+    @Override
+    public boolean isCellEditable(java.util.EventObject e) {
+        if (e instanceof MouseEvent) {
+            return ((MouseEvent) e).getClickCount() >= 2;
+        }
+        return false;
+    }
+
+
+    @Override
+    public boolean shouldSelectCell(EventObject anEvent) {
+        return true;
+    }
+
+
+    public boolean startCellEditing(EventObject anEvent) {
+        logger.log(POILogger.INFO, "Start Cell Editing");
+        return true;
+    }
+
+
+    @Override
+    public boolean stopCellEditing() {
+        logger.log(POILogger.INFO, "Stop Cell Editing");
+        fireEditingStopped();
+        return true;
+    }
+
+
+    @Override
+    public void cancelCellEditing() {
+        logger.log(POILogger.INFO, "Cancel Cell Editing");
+        fireEditingCanceled();
+    }
+
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
+        logger.log(POILogger.INFO, "Action performed");
+        stopCellEditing();
+    }
+
+
+    /**
+     * Gets the cellEditorValue attribute of the SVTableCellEditor object
+     *
+     * @return The cellEditorValue value
+     */
+    @Override
+    public Object getCellEditorValue() {
+        logger.log(POILogger.INFO, "GetCellEditorValue");
+        //JMH Look at when this method is called. Should it return a HSSFCell?
+        return editor.getText();
+    }
+
+
+    /**
+     * Gets the tableCellEditorComponent attribute of the SVTableCellEditor object
+     *
+     * @return The tableCellEditorComponent value
+     */
+    @Override
+    public Component getTableCellEditorComponent(JTable table, Object value,
+                                                 boolean isSelected,
+                                                 int row,
+                                                 int column) {
+        logger.log(POILogger.INFO, "GetTableCellEditorComponent");
+        HSSFCell cell = (HSSFCell) value;
+        if (cell != null) {
+            HSSFCellStyle style = cell.getCellStyle();
+            HSSFFont f = wb.getFontAt(style.getFontIndexAsInt());
+            boolean isbold = f.getBold();
+            boolean isitalics = f.getItalic();
+
+            int fontstyle = Font.PLAIN;
+
+            if (isbold) {
+                fontstyle = Font.BOLD;
+            }
+            if (isitalics) {
+                fontstyle = fontstyle | Font.ITALIC;
+            }
+
+            int fontheight = f.getFontHeightInPoints();
+            if (fontheight == 9) {
+                fontheight = 10; //fix for stupid ol Windows
+            }
+
+            Font font = new Font(f.getFontName(), fontstyle, fontheight);
+            editor.setFont(font);
+
+            if (style.getFillPattern() == FillPatternType.SOLID_FOREGROUND) {
+                editor.setBackground(getAWTColor(style.getFillForegroundColor(), white));
+            } else {
+                editor.setBackground(white);
+            }
+
+            editor.setForeground(getAWTColor(f.getColor(), black));
+
+
+            //Set the value that is rendered for the cell
+            switch (cell.getCellType()) {
+                case BLANK:
+                    editor.setText("");
+                    break;
+                case BOOLEAN:
+                    if (cell.getBooleanCellValue()) {
+                        editor.setText("true");
+                    } else {
+                        editor.setText("false");
+                    }
+                    break;
+                case NUMERIC:
+                    editor.setText(Double.toString(cell.getNumericCellValue()));
+                    break;
+                case STRING:
+                    editor.setText(cell.getRichStringCellValue().getString());
+                    break;
+                case FORMULA:
+                default:
+                    editor.setText("?");
+            }
+            switch (style.getAlignment()) {
+                case LEFT:
+                case JUSTIFY:
+                case FILL:
+                    editor.setHorizontalAlignment(SwingConstants.LEFT);
+                    break;
+                case CENTER:
+                case CENTER_SELECTION:
+                    editor.setHorizontalAlignment(SwingConstants.CENTER);
+                    break;
+                case GENERAL:
+                case RIGHT:
+                    editor.setHorizontalAlignment(SwingConstants.RIGHT);
+                    break;
+                default:
+                    editor.setHorizontalAlignment(SwingConstants.LEFT);
+                    break;
+            }
+
+        }
+        return editor;
     }
-    return editor;
-  }
 }

src/examples/src/org/apache/poi/hssf/view/SVTableCellRenderer.java

@@ -52,11 +52,11 @@ import org.apache.poi.ss.usermodel.FillPatternType;
 public class SVTableCellRenderer extends JLabel
     implements TableCellRenderer, Serializable
 {
-    protected static Border noFocusBorder = new EmptyBorder(1, 1, 1, 1);
+    protected static final Border noFocusBorder = new EmptyBorder(1, 1, 1, 1);
     protected SVBorder cellBorder = new SVBorder();
 
 
-    private HSSFWorkbook wb = null;
+    private HSSFWorkbook wb;
 
     /** This class holds the references to the predefined cell formats.
      */
@@ -140,7 +140,7 @@ public class SVTableCellRenderer extends JLabel
     @Override
     public Component getTableCellRendererComponent(JTable table, Object value,
                           boolean isSelected, boolean hasFocus, int row, int column) {
-	boolean isBorderSet = false;
+	    boolean isBorderSet = false;
 
         //If the JTables default cell renderer has been setup correctly the
         //value will be the HSSFCell that we are trying to render
@@ -148,10 +148,10 @@ public class SVTableCellRenderer extends JLabel
 
         if (c != null) {
           HSSFCellStyle s = c.getCellStyle();
-          HSSFFont f = wb.getFontAt(s.getFontIndex());
+          HSSFFont f = wb.getFontAt(s.getFontIndexAsInt());
           setFont(SVTableUtils.makeFont(f));
 
-          if (s.getFillPatternEnum() == FillPatternType.SOLID_FOREGROUND) {
+          if (s.getFillPattern() == FillPatternType.SOLID_FOREGROUND) {
             setBackground(SVTableUtils.getAWTColor(s.getFillForegroundColor(), SVTableUtils.white));
           } else setBackground(SVTableUtils.white);
 
@@ -161,14 +161,14 @@ public class SVTableCellRenderer extends JLabel
                                SVTableUtils.getAWTColor(s.getRightBorderColor(), SVTableUtils.black),
                                SVTableUtils.getAWTColor(s.getBottomBorderColor(), SVTableUtils.black),
                                SVTableUtils.getAWTColor(s.getLeftBorderColor(), SVTableUtils.black),
-                               s.getBorderTopEnum(), s.getBorderRightEnum(),
-                               s.getBorderBottomEnum(), s.getBorderLeftEnum(),
+                               s.getBorderTop(), s.getBorderRight(),
+                               s.getBorderBottom(), s.getBorderLeft(),
                                hasFocus);
             setBorder(cellBorder);
             isBorderSet=true;
 
             //Set the value that is rendered for the cell
-            switch (c.getCellTypeEnum()) {
+            switch (c.getCellType()) {
               case BLANK:
                 setValue("");
               break;
@@ -195,7 +195,7 @@ public class SVTableCellRenderer extends JLabel
                 setValue("?");
             }
             //Set the text alignment of the cell
-            switch (s.getAlignmentEnum()) {
+            switch (s.getAlignment()) {
               case LEFT:
               case JUSTIFY:
               case FILL:

src/examples/src/org/apache/poi/hssf/view/SVTableModel.java

@@ -34,8 +34,8 @@ import org.apache.poi.hssf.usermodel.HSSFCell;
  */
 
 public class SVTableModel extends AbstractTableModel {
-  private HSSFSheet st = null;
-  int maxcol = 0;
+  private HSSFSheet st;
+  int maxcol;
 
   public SVTableModel(HSSFSheet st, int maxcol) {
     this.st = st;

src/examples/src/org/apache/poi/hssf/view/SVTableUtils.java

@@ -41,7 +41,7 @@ public class SVTableUtils {
   /**  Description of the Field */
   public final static Color white = getAWTColor(HSSFColorPredefined.WHITE);
   /**  Description of the Field */
-  public static Border noFocusBorder = new EmptyBorder(1, 1, 1, 1);
+  public static final Border noFocusBorder = new EmptyBorder(1, 1, 1, 1);
 
 
   /**
@@ -70,7 +70,7 @@ public class SVTableUtils {
   /** This method retrieves the AWT Color representation from the colour hash table
    *
    */
-  /* package */ static final Color getAWTColor(int index, Color deflt) {
+  /* package */ static Color getAWTColor(int index, Color deflt) {
     HSSFColor clr = colors.get(index);
     if (clr == null) {
       return deflt;
@@ -79,7 +79,7 @@ public class SVTableUtils {
     return new Color(rgb[0],rgb[1],rgb[2]);
   }
 
-  /* package */ static final Color getAWTColor(HSSFColorPredefined clr) {
+  /* package */ static Color getAWTColor(HSSFColorPredefined clr) {
     short[] rgb = clr.getTriplet();
     return new Color(rgb[0],rgb[1],rgb[2]);
   }

src/examples/src/org/apache/poi/hssf/view/SViewer.java

@@ -40,8 +40,8 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook;
  */
 public class SViewer extends JApplet {
   private SViewerPanel panel;
-  boolean isStandalone = false;
-  String filename = null;
+  boolean isStandalone;
+  String filename;
 
   /**Get a parameter value*/
   public String getParameter(String key, String def) {
@@ -139,8 +139,7 @@ public String[][] getParameterInfo() {
       System.out.println(field);
       field = uc.getHeaderField(i);
   }
-    BufferedInputStream is = new BufferedInputStream(uc.getInputStream());
-    return is;
+      return new BufferedInputStream(uc.getInputStream());
   }
 
 

src/examples/src/org/apache/poi/hssf/view/SViewerPanel.java

@@ -27,10 +27,6 @@ import org.apache.poi.hssf.usermodel.*;
 
 /**
  * This class presents the sheets to the user.
- *
- *
- * @author Andrew C. Oliver
- * @author Jason Height
  */
 public class SViewerPanel extends JPanel {
   /** This field is the magic number to convert from a Character width to a
@@ -264,15 +260,13 @@ public void paint(Graphics g) {
   }
 
   /**Main method*/
-  public static void main(String[] args) {
-    if(args.length < 1) {
+  public static void main(String[] args) throws IOException {
+    if (args.length < 1) {
       throw new IllegalArgumentException("A filename to view must be supplied as the first argument, but none was given");
     }
-    try {
-      FileInputStream in = new FileInputStream(args[0]);
-      HSSFWorkbook wb = new HSSFWorkbook(in);
-      in.close();
 
+    try (FileInputStream in = new FileInputStream(args[0]);
+         HSSFWorkbook wb = new HSSFWorkbook(in)) {
       SViewerPanel p = new SViewerPanel(wb, true);
       JFrame frame;
       frame = new JFrame() {
@@ -283,6 +277,7 @@ public void paint(Graphics g) {
             System.exit(0);
           }
         }
+
         @Override
         public synchronized void setTitle(String title) {
           super.setTitle(title);
@@ -291,13 +286,10 @@ public void paint(Graphics g) {
       };
       frame.setTitle("Viewer Frame");
       frame.getContentPane().add(p, BorderLayout.CENTER);
-      frame.setSize(800,640);
+      frame.setSize(800, 640);
       Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
       frame.setLocation((d.width - frame.getSize().width) / 2, (d.height - frame.getSize().height) / 2);
       frame.setVisible(true);
-    } catch (IOException ex) {
-      ex.printStackTrace();
-      System.exit(1);
     }
   }
 }

src/examples/src/org/apache/poi/hssf/view/brush/PendingPaintings.java

@@ -29,7 +29,7 @@ import java.util.List;
  * initial paint of the component, and then executed at the appropriate time,
  * such as at the end of the containing object's {@link
  * JComponent#paintChildren(Graphics)} method.
- * <p/>
+ * <p>
  * It is up to the parent component to invoke the {@link #paint(Graphics2D)}
  * method of this objet at that appropriate time.
  *
@@ -89,7 +89,7 @@ public class PendingPaintings {
      * @param parent
      */
     public PendingPaintings(JComponent parent) {
-        paintings = new ArrayList<Painting>();
+        paintings = new ArrayList<>();
         parent.putClientProperty(PENDING_PAINTINGS, this);
     }
 
@@ -153,7 +153,7 @@ public class PendingPaintings {
      * is retrieved from the first object found that has a {@link
      * #PENDING_PAINTINGS} client property, starting with this component and
      * looking up its ancestors (parent, parent's parent, etc.)
-     * <p/>
+     * <p>
      * This allows any descendant of a component that has a {@link
      * PendingPaintings} property to add its own pending paintings.
      *

src/examples/src/org/apache/poi/hwpf/Word2Forrest.java

@@ -24,7 +24,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
 import org.apache.poi.hwpf.model.StyleDescription;
 import org.apache.poi.hwpf.model.StyleSheet;
@@ -40,8 +40,7 @@ public final class Word2Forrest
   @SuppressWarnings("unused")
   public Word2Forrest(HWPFDocument doc, OutputStream stream) throws IOException
   {
-    OutputStreamWriter out = new OutputStreamWriter (stream, Charset.forName("UTF-8"));
-    _out = out;
+      _out = new OutputStreamWriter (stream, StandardCharsets.UTF_8);
     _doc = doc;
 
     init ();
@@ -217,13 +216,9 @@ public final class Word2Forrest
 
 
     public static void main(String[] args) throws IOException {
-        InputStream is = new FileInputStream(args[0]);
-        OutputStream out = new FileOutputStream("test.xml");
-        try {
-            new Word2Forrest(new HWPFDocument(is), out);
-        } finally {
-            out.close();
-            is.close();
-        }
+      try (InputStream is = new FileInputStream(args[0]);
+           OutputStream out = new FileOutputStream("test.xml")) {
+        new Word2Forrest(new HWPFDocument(is), out);
+      }
     }
 }

src/examples/src/org/apache/poi/poifs/poibrowser/DocumentDescriptor.java

@@ -17,15 +17,22 @@
 
 package org.apache.poi.poifs.poibrowser;
 
-import java.io.*;
-import org.apache.poi.poifs.filesystem.*;
+import java.io.IOException;
+
+import org.apache.poi.poifs.filesystem.DocumentInputStream;
+import org.apache.poi.poifs.filesystem.POIFSDocumentPath;
+import org.apache.poi.util.IOUtils;
 
 /**
  * <p>Describes the most important (whatever that is) features of a
- * {@link POIFSDocument}.</p>
+ * {@link POIFSDocumentPath}.</p>
  */
-public class DocumentDescriptor
+class DocumentDescriptor
 {
+
+    //arbitrarily selected; may need to increase
+    private static final int MAX_RECORD_LENGTH = 100_000;
+
     String name;
     POIFSDocumentPath path;
     DocumentInputStream stream;
@@ -49,26 +56,20 @@ public class DocumentDescriptor
     public DocumentDescriptor(final String name,
                               final POIFSDocumentPath path,
                               final DocumentInputStream stream,
-                              final int nrOfBytes)
-    {
+                              final int nrOfBytes) {
         this.name = name;
         this.path = path;
         this.stream = stream;
-        try
-        {
-            size = stream.available();
-            if (stream.markSupported())
-            {
+        try {
+            if (stream.markSupported()) {
                 stream.mark(nrOfBytes);
-                final byte[] b = new byte[nrOfBytes];
-                final int read = stream.read(b, 0, Math.min(size, b.length));
-                bytes = new byte[read];
-                System.arraycopy(b, 0, bytes, 0, read);
+                bytes = IOUtils.toByteArray(stream, nrOfBytes, MAX_RECORD_LENGTH);
                 stream.reset();
+            } else {
+                bytes = new byte[0];
             }
-        }
-        catch (IOException ex)
-        {
+            size = bytes.length + stream.available();
+        } catch (IOException ex) {
             System.out.println(ex);
         }
     }

src/examples/src/org/apache/poi/poifs/poibrowser/DocumentDescriptorRenderer.java

@@ -57,23 +57,16 @@ public class DocumentDescriptorRenderer extends DefaultTreeCellRenderer
     /**
      * <p>Renders {@link DocumentDescriptor} as a string.</p>
      */
-    protected String renderAsString(final DocumentDescriptor d)
-    {
-        final StringBuilder b = new StringBuilder();
-        b.append("Name: ");
-        b.append(d.name);
-        b.append(" ");
-        b.append(HexDump.toHex(d.name));
-        b.append("\n");
-
-        b.append("Size: ");
-        b.append(d.size);
-        b.append(" bytes\n");
-
-        b.append("First bytes: ");
-        b.append(HexDump.toHex(d.bytes));
-
-        return b.toString();
+    protected String renderAsString(final DocumentDescriptor d) {
+        return "Name: " +
+                d.name +
+                " " +
+                HexDump.toHex(d.name) +
+                "\n" +
+                "Size: " +
+                d.size +
+                " bytes\n" +
+                "First bytes: " +
+                HexDump.toHex(d.bytes);
     }
-
 }

src/examples/src/org/apache/poi/poifs/poibrowser/ExtendableTreeCellRenderer.java

@@ -46,7 +46,7 @@ public class ExtendableTreeCellRenderer implements TreeCellRenderer
 
     public ExtendableTreeCellRenderer()
     {
-        renderers = new HashMap<Class<?>,TreeCellRenderer>();
+        renderers = new HashMap<>();
         register(Object.class, new DefaultTreeCellRenderer()
             {
                 @Override

src/examples/src/org/apache/poi/poifs/poibrowser/POIBrowser.java

@@ -19,7 +19,7 @@ package org.apache.poi.poifs.poibrowser;
 
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import java.io.FileInputStream;
+import java.io.File;
 import java.io.IOException;
 
 import javax.swing.JFrame;
@@ -42,12 +42,6 @@ import org.apache.poi.poifs.eventfilesystem.POIFSReader;
 public class POIBrowser extends JFrame
 {
 
-    /**
-     * <p>The tree's root node must be visible to all methods.</p>
-     */
-    protected MutableTreeNode rootNode;
-
-
 
     /**
      * <p>Takes a bunch of file names as command line parameters,
@@ -59,8 +53,6 @@ public class POIBrowser extends JFrame
         new POIBrowser().run(args);
     }
 
-
-
     protected void run(String[] args)
     {
         addWindowListener(new WindowAdapter()
@@ -74,8 +66,11 @@ public class POIBrowser extends JFrame
 
         /* Create the tree model with a root node. The latter is
          * invisible but it must be present because a tree model
-         * always needs a root. */
-        rootNode = new DefaultMutableTreeNode("POI Filesystems");
+         * always needs a root.
+         *
+         * The tree's root node must be visible to all methods.
+         */
+        MutableTreeNode rootNode = new DefaultMutableTreeNode("POI Filesystems");
         DefaultTreeModel treeModel = new DefaultTreeModel(rootNode);
 
         /* Create the tree UI element. */
@@ -84,21 +79,17 @@ public class POIBrowser extends JFrame
 
         /* Add the POI filesystems to the tree. */
         int displayedFiles = 0;
-        for (int i = 0; i < args.length; i++)
-        {
-            final String filename = args[i];
+        for (final String filename : args) {
             try {
-                FileInputStream fis = new FileInputStream(filename);
                 POIFSReader r = new POIFSReader();
                 r.registerListener(new TreeReaderListener(filename, rootNode));
-                r.read(fis);
-                fis.close();
+                r.read(new File(filename));
                 displayedFiles++;
             } catch (IOException ex) {
                 System.err.println(filename + ": " + ex);
             } catch (Exception t) {
                 System.err.println("Unexpected exception while reading \"" +
-                                   filename + "\":");
+                        filename + "\":");
                 t.printStackTrace(System.err);
             }
         }

src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptorRenderer.java

@@ -159,7 +159,7 @@ public class PropertySetDescriptorRenderer extends DocumentDescriptorRenderer
                 b.append(' ');
                 System.arraycopy(value, ((byte[])value).length - 4, buf, 0, 4);
             } else if (value != null) {
-                b.append(value.toString());
+                b.append(value);
             } else {
                 b.append("null");
             }

src/examples/src/org/apache/poi/poifs/poibrowser/TreeReaderListener.java

@@ -49,7 +49,7 @@ import org.apache.poi.poifs.filesystem.POIFSDocumentPath;
  * but it could be any other string.</p>
  *
  * <p>The value of a tree node is a {@link DocumentDescriptor}. Unlike
- * a {@link org.apache.poi.poifs.filesystem.POIFSDocument} which may be as heavy
+ * a {@link org.apache.poi.poifs.filesystem.OPOIFSDocument} which may be as heavy
  * as many megabytes, an instance of {@link DocumentDescriptor} is a
  * light-weight object and contains only some meta-information about a
  * document.</p>
@@ -96,7 +96,7 @@ public class TreeReaderListener implements POIFSReaderListener
     {
         this.filename = filename;
         this.rootNode = rootNode;
-        pathToNode = new HashMap<Object,MutableTreeNode>(15); // Should be a reasonable guess.
+        pathToNode = new HashMap<>(15); // Should be a reasonable guess.
     }
 
 

src/examples/src/org/apache/poi/ss/examples/AddDimensionedImage.java

@@ -202,13 +202,13 @@ import org.apache.poi.util.IOUtils;
 public class AddDimensionedImage {
 
     // Four constants that determine how - and indeed whether - the rows
-    // and columns an image may overlie should be expanded to accomodate that
+    // and columns an image may overlie should be expanded to accommodate that
     // image.
     // Passing EXPAND_ROW will result in the height of a row being increased
-    // to accomodate the image if it is not already larger. The image will
+    // to accommodate the image if it is not already larger. The image will
     // be layed across one or more columns.
     // Passing EXPAND_COLUMN will result in the width of the column being
-    // increased to accomodate the image if it is not already larger. The image
+    // increased to accommodate the image if it is not already larger. The image
     // will be layed across one or many rows.
     // Passing EXPAND_ROW_AND_COLUMN will result in the height of the row
     // bing increased along with the width of the column to accomdate the
@@ -333,10 +333,10 @@ public class AddDimensionedImage {
             URL imageFile, double reqImageWidthMM, double reqImageHeightMM,
             int resizeBehaviour) throws IOException,
                                                      IllegalArgumentException {
-        ClientAnchor anchor = null;
-        ClientAnchorDetail rowClientAnchorDetail = null;
-        ClientAnchorDetail colClientAnchorDetail = null;
-        int imageType = 0;
+        ClientAnchor anchor;
+        ClientAnchorDetail rowClientAnchorDetail;
+        ClientAnchorDetail colClientAnchorDetail;
+        int imageType;
 
         // Validate the resizeBehaviour parameter.
         if((resizeBehaviour != AddDimensionedImage.EXPAND_COLUMN) &&
@@ -348,7 +348,7 @@ public class AddDimensionedImage {
         }
 
         // Call methods to calculate how the image and sheet should be
-        // manipulated to accomodate the image; columns and then rows.
+        // manipulated to accommodate the image; columns and then rows.
         colClientAnchorDetail = this.fitImageToColumns(sheet, colNumber,
                 reqImageWidthMM, resizeBehaviour);
         rowClientAnchorDetail = this.fitImageToRows(sheet, rowNumber,
@@ -365,12 +365,16 @@ public class AddDimensionedImage {
 
         anchor.setDx1(0);
         anchor.setDy1(0);
-        anchor.setDx2(colClientAnchorDetail.getInset());
-        anchor.setDy2(rowClientAnchorDetail.getInset());
-        anchor.setCol1(colClientAnchorDetail.getFromIndex());
-        anchor.setRow1(rowClientAnchorDetail.getFromIndex());
-        anchor.setCol2(colClientAnchorDetail.getToIndex());
-        anchor.setRow2(rowClientAnchorDetail.getToIndex());
+        if (colClientAnchorDetail != null) {
+            anchor.setDx2(colClientAnchorDetail.getInset());
+            anchor.setCol1(colClientAnchorDetail.getFromIndex());
+            anchor.setCol2(colClientAnchorDetail.getToIndex());
+        }
+        if (rowClientAnchorDetail != null) {
+            anchor.setDy2(rowClientAnchorDetail.getInset());
+            anchor.setRow1(rowClientAnchorDetail.getFromIndex());
+            anchor.setRow2(rowClientAnchorDetail.getToIndex());
+        }
 
         // For now, set the anchor type to do not move or resize the
         // image as the size of the row/column is adjusted. This could easily
@@ -427,16 +431,16 @@ public class AddDimensionedImage {
     private ClientAnchorDetail fitImageToColumns(Sheet sheet, int colNumber,
             double reqImageWidthMM, int resizeBehaviour) {
 
-        double colWidthMM = 0.0D;
-        double colCoordinatesPerMM = 0.0D;
-        int pictureWidthCoordinates = 0;
+        double colWidthMM;
+        double colCoordinatesPerMM;
+        int pictureWidthCoordinates;
         ClientAnchorDetail colClientAnchorDetail = null;
 
         // Get the colum's width in millimetres
         colWidthMM = ConvertImageUnits.widthUnits2Millimetres(
                 (short)sheet.getColumnWidth(colNumber));
 
-        // Check that the column's width will accomodate the image at the
+        // Check that the column's width will accommodate the image at the
         // required dimension. If the width of the column is LESS than the
         // required width of the image, decide how the application should
         // respond - resize the column or overlay the image across one or more
@@ -496,7 +500,7 @@ public class AddDimensionedImage {
     }
 
     /**
-     * Determines whether the sheets row should be re-sized to accomodate
+     * Determines whether the sheets row should be re-sized to accommodate
      * the image, adjusts the rows height if necessary and creates then
      * returns a ClientAnchorDetail object that facilitates construction of
      * a ClientAnchor that will fix the image on the sheet and establish
@@ -522,10 +526,10 @@ public class AddDimensionedImage {
      */
     private ClientAnchorDetail fitImageToRows(Sheet sheet, int rowNumber,
             double reqImageHeightMM, int resizeBehaviour) {
-        Row row = null;
-        double rowHeightMM = 0.0D;
-        double rowCoordinatesPerMM = 0.0D;
-        int pictureHeightCoordinates = 0;
+        Row row;
+        double rowHeightMM;
+        double rowCoordinatesPerMM;
+        int pictureHeightCoordinates;
         ClientAnchorDetail rowClientAnchorDetail = null;
 
         // Get the row and it's height
@@ -538,7 +542,7 @@ public class AddDimensionedImage {
         // Get the row's height in millimetres
         rowHeightMM = row.getHeightInPoints() / ConvertImageUnits.POINTS_PER_MILLIMETRE;
 
-        // Check that the row's height will accomodate the image at the required
+        // Check that the row's height will accommodate the image at the required
         // dimensions. If the height of the row is LESS than the required height
         // of the image, decide how the application should respond - resize the
         // row or overlay the image across a series of rows.
@@ -612,13 +616,13 @@ public class AddDimensionedImage {
     private ClientAnchorDetail calculateColumnLocation(Sheet sheet,
                                                        int startingColumn,
                                                        double reqImageWidthMM) {
-        ClientAnchorDetail anchorDetail = null;
+        ClientAnchorDetail anchorDetail;
         double totalWidthMM = 0.0D;
         double colWidthMM = 0.0D;
-        double overlapMM = 0.0D;
-        double coordinatePositionsPerMM = 0.0D;
+        double overlapMM;
+        double coordinatePositionsPerMM;
         int toColumn = startingColumn;
-        int inset = 0;
+        int inset;
 
         // Calculate how many columns the image will have to
         // span in order to be presented at the required size.
@@ -722,14 +726,14 @@ public class AddDimensionedImage {
      */
     private ClientAnchorDetail calculateRowLocation(Sheet sheet,
             int startingRow, double reqImageHeightMM) {
-        ClientAnchorDetail clientAnchorDetail = null;
-        Row row = null;
+        ClientAnchorDetail clientAnchorDetail;
+        Row row;
         double rowHeightMM = 0.0D;
         double totalRowHeightMM = 0.0D;
-        double overlapMM = 0.0D;
-        double rowCoordinatesPerMM = 0.0D;
+        double overlapMM;
+        double rowCoordinatesPerMM;
         int toRow = startingRow;
-        int inset = 0;
+        int inset;
 
         // Step through the rows in the sheet and accumulate a total of their
         // heights.
@@ -813,27 +817,22 @@ public class AddDimensionedImage {
      * @param args the command line arguments
      */
     public static void main(String[] args) throws IOException {
-    	String imageFile = null;
-    	String outputFile = null;
-        FileOutputStream fos = null;
-        Workbook workbook = null;
-        Sheet sheet = null;
-
         if(args.length < 2){
     		System.err.println("Usage: AddDimensionedImage imageFile outputFile");
     		return;
     	}
-    	workbook = new HSSFWorkbook();   // OR XSSFWorkbook
-    	sheet = workbook.createSheet("Picture Test");
-       	imageFile = args[0];
-    	outputFile = args[1];
-    	new AddDimensionedImage().addImageToSheet("B5", sheet, sheet.createDrawingPatriarch(),
-    		new File(imageFile).toURI().toURL(), 100, 40,
-    		AddDimensionedImage.EXPAND_ROW_AND_COLUMN);
-  		fos = new FileOutputStream(outputFile);
-        workbook.write(fos);
-        fos.close();
-        workbook.close();
+
+        final String imageFile = args[0];
+        final String outputFile = args[1];
+
+        try (final Workbook workbook = new HSSFWorkbook();
+             final FileOutputStream fos = new FileOutputStream(outputFile)) {   // OR XSSFWorkbook
+            Sheet sheet = workbook.createSheet("Picture Test");
+            new AddDimensionedImage().addImageToSheet("B5", sheet, sheet.createDrawingPatriarch(),
+                    new File(imageFile).toURI().toURL(), 100, 40,
+                    AddDimensionedImage.EXPAND_ROW_AND_COLUMN);
+            workbook.write(fos);
+        }
     }
 
     /**
@@ -864,9 +863,9 @@ public class AddDimensionedImage {
      */
     public class ClientAnchorDetail {
 
-        public int fromIndex = 0;
-        public int toIndex = 0;
-        public int inset = 0;
+        public int fromIndex;
+        public int toIndex;
+        public int inset;
 
         /**
          * Create a new instance of the ClientAnchorDetail class using the
@@ -962,8 +961,6 @@ public class AddDimensionedImage {
 
         /**
         * pixel units to excel width units(units of 1/256th of a character width)
-        * @param pxs
-        * @return
         */
         public static short pixel2WidthUnits(int pxs) {
             short widthUnits = (short) (EXCEL_COLUMN_WIDTH_FACTOR *
@@ -975,9 +972,6 @@ public class AddDimensionedImage {
         /**
          * excel width units(units of 1/256th of a character width) to pixel
          * units.
-         *
-         * @param widthUnits
-         * @return
          */
         public static int widthUnits2Pixel(short widthUnits) {
             int pixels = (widthUnits / EXCEL_COLUMN_WIDTH_FACTOR)