diff --git a/README.in b/README.in new file mode 100644 index 0000000..6f50cef --- /dev/null +++ b/README.in @@ -0,0 +1,52 @@ + +## jproperties + +Java functions to access values from `java.util.Properties` collections +with + +## Features + +* Functions to access `java.util.Properties` values as typed values. +* High coverage test suite. +* [OSGi-ready](https://www.osgi.org/) +* [JPMS-ready](https://en.wikipedia.org/wiki/Java_Platform_Module_System) +* ISC license. + +## Usage + +The `JProperties` class contains numerous functions to extract typed values +from a `Properties` collection: + +``` +final var p = new Properties(); +p.setProperty("int0", "23"); +p.setProperty("b0", "true"); + +JProperties.getBoolean(p, "b0"); // ⇒ true +JProperties.getBigInteger(p, "int0"); // ⇒ new BigInteger(23) +``` + +If a property is not present, or has a value that cannot be parsed as a value +of the requested type, a `JPropertyException` is raised. + +``` +JProperties.getBigInteger(p, "nonexistent") // ⇒ JPropertyNonexistent +JProperties.getBigInteger(p, "b0"); // ⇒ JPropertyIncorrectType +``` + +Functions typically have an optional variant that returns an `Optional.empty()` +value on missing keys (but an exception will still be raised on type errors). + +``` +JProperties.getStringOptional(p, "nonexistent") // ⇒ Optional.empty() +JProperties.getStringOptional(p, "b0"); // ⇒ "true" +``` + +Functions typically also have a `default` variant that can return a given +default value if a property is not present (but an exception will still be +raised on type errors). + +``` +JProperties.getStringWithDefault(p, "nonexistent", "z") // ⇒ "z" +JProperties.getStringWithDefault(p, "b0", "z"); // ⇒ "true" +``` diff --git a/README.md b/README.md index c435b2b..4bdd50e 100644 --- a/README.md +++ b/README.md @@ -13,3 +13,56 @@ jproperties | OpenJDK (Temurin) LTS | Linux | [![Build (OpenJDK (Temurin) LTS, Linux)](https://img.shields.io/github/actions/workflow/status/io7m-com/jproperties/main.linux.temurin.lts.yml)](https://www.github.com/io7m-com/jproperties/actions?query=workflow%3Amain.linux.temurin.lts)| | OpenJDK (Temurin) Current | Windows | [![Build (OpenJDK (Temurin) Current, Windows)](https://img.shields.io/github/actions/workflow/status/io7m-com/jproperties/main.windows.temurin.current.yml)](https://www.github.com/io7m-com/jproperties/actions?query=workflow%3Amain.windows.temurin.current)| | OpenJDK (Temurin) LTS | Windows | [![Build (OpenJDK (Temurin) LTS, Windows)](https://img.shields.io/github/actions/workflow/status/io7m-com/jproperties/main.windows.temurin.lts.yml)](https://www.github.com/io7m-com/jproperties/actions?query=workflow%3Amain.windows.temurin.lts)| + +## jproperties + +Java functions to access values from `java.util.Properties` collections +with + +## Features + +* Functions to access `java.util.Properties` values as typed values. +* High coverage test suite. +* [OSGi-ready](https://www.osgi.org/) +* [JPMS-ready](https://en.wikipedia.org/wiki/Java_Platform_Module_System) +* ISC license. + +## Usage + +The `JProperties` class contains numerous functions to extract typed values +from a `Properties` collection: + +``` +final var p = new Properties(); +p.setProperty("int0", "23"); +p.setProperty("b0", "true"); + +JProperties.getBoolean(p, "b0"); // ⇒ true +JProperties.getBigInteger(p, "int0"); // ⇒ new BigInteger(23) +``` + +If a property is not present, or has a value that cannot be parsed as a value +of the requested type, a `JPropertyException` is raised. + +``` +JProperties.getBigInteger(p, "nonexistent") // ⇒ JPropertyNonexistent +JProperties.getBigInteger(p, "b0"); // ⇒ JPropertyIncorrectType +``` + +Functions typically have an optional variant that returns an `Optional.empty()` +value on missing keys (but an exception will still be raised on type errors). + +``` +JProperties.getStringOptional(p, "nonexistent") // ⇒ Optional.empty() +JProperties.getStringOptional(p, "b0"); // ⇒ "true" +``` + +Functions typically also have a `default` variant that can return a given +default value if a property is not present (but an exception will still be +raised on type errors). + +``` +JProperties.getStringWithDefault(p, "nonexistent", "z") // ⇒ "z" +JProperties.getStringWithDefault(p, "b0", "z"); // ⇒ "true" +``` + diff --git a/com.io7m.jproperties.documentation/pom.xml b/com.io7m.jproperties.documentation/pom.xml deleted file mode 100644 index 6411dd5..0000000 --- a/com.io7m.jproperties.documentation/pom.xml +++ /dev/null @@ -1,228 +0,0 @@ - - - - 4.0.0 - - com.io7m.jproperties - com.io7m.jproperties - 3.3.0-SNAPSHOT - - com.io7m.jproperties.documentation - - jar - com.io7m.jproperties.documentation - Typed property handling (Documentation) - https://www.io7m.com/software/jproperties - - - true - - - - - ${project.groupId} - com.io7m.jproperties.core - ${project.version} - - - ${project.groupId} - com.io7m.jproperties.monad - ${project.version} - - - - org.osgi - org.osgi.annotation.bundle - provided - - - org.osgi - org.osgi.annotation.versioning - provided - - - com.io7m.primogenitor - com.io7m.primogenitor.support - - - com.io7m.immutables.style - com.io7m.immutables.style - provided - - - org.immutables - value - provided - - - - - - - - org.apache.maven.plugins - maven-resources-plugin - - - copy-documentation-resources - - copy-resources - - generate-resources - - ${project.build.directory}/documentation/ - - - src/main/resources/com/io7m/jproperties/documentation/ - true - - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-sources - package - - unpack-dependencies - - - module-info.java - ${project.groupId} - sources - false - ${project.build.directory}/javadoc-sources - - - - make-classpath - package - - build-classpath - - - ${project.build.directory}/javadoc-classpath - - - - - - - - com.io7m.jstructural - io7m-jstructural-maven-plugin - - - make-documentation-single - prepare-package - - transform - - - ${project.build.directory}/documentation/documentation.xml - ${project.build.directory}/documentation/ - ${project.build.directory}/documentation/brand.xml - XHTML_SINGLE - - - - make-documentation-multi - prepare-package - - transform - - - ${project.build.directory}/documentation/documentation.xml - ${project.build.directory}/documentation/ - ${project.build.directory}/documentation/brand.xml - XHTML_MULTI - - - - - - - - org.codehaus.mojo - exec-maven-plugin - - - javadoc - - java - - package - - com.io7m.primogenitor.support.TrivialJavadoc - - ${project.build.directory}/javadoc-sources - ${project.build.directory}/javadoc-classpath - ${project.build.directory}/documentation/apidocs - ${project.build.directory}/javadoc-log.txt - ${project.build.directory}/javadoc-options - - - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - - - src/main/assembly/documentation.xml - - - - - make-assembly - package - - single - - - false - - - - - - - - - org.codehaus.mojo - truezip-maven-plugin - false - - - copy-site-documentation - - copy - - site - - true - - ${project.build.directory}/${project.name}-${project.version}.zip/${project.name}-${project.version}/ - ${project.parent.build.directory}/minisite/documentation/ - - - - - - - - - diff --git a/com.io7m.jproperties.documentation/src/main/assembly/documentation.xml b/com.io7m.jproperties.documentation/src/main/assembly/documentation.xml deleted file mode 100644 index 0b5d459..0000000 --- a/com.io7m.jproperties.documentation/src/main/assembly/documentation.xml +++ /dev/null @@ -1,21 +0,0 @@ - - documentation - ${project.name}-${project.version} - - zip - - - - ${project.build.directory}/documentation - / - - - ${project.build.directory}/site/apidocs - /apidocs - - - - diff --git a/com.io7m.jproperties.documentation/src/main/java/com/io7m/jproperties/documentation/Documentation.java b/com.io7m.jproperties.documentation/src/main/java/com/io7m/jproperties/documentation/Documentation.java deleted file mode 100644 index 6e3475c..0000000 --- a/com.io7m.jproperties.documentation/src/main/java/com/io7m/jproperties/documentation/Documentation.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright © 2014 Mark Raynsford https://www.io7m.com - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY - * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR - * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -package com.io7m.jproperties.documentation; - -/** - * Documentation marker class. - */ - -public final class Documentation -{ - private Documentation() - { - - } -} diff --git a/com.io7m.jproperties.documentation/src/main/java/com/io7m/jproperties/documentation/package-info.java b/com.io7m.jproperties.documentation/src/main/java/com/io7m/jproperties/documentation/package-info.java deleted file mode 100644 index 8099804..0000000 --- a/com.io7m.jproperties.documentation/src/main/java/com/io7m/jproperties/documentation/package-info.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright © 2014 Mark Raynsford https://www.io7m.com - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY - * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR - * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -/** - * Documentation. - */ - -package com.io7m.jproperties.documentation; - diff --git a/com.io7m.jproperties.documentation/src/main/java/module-info.java b/com.io7m.jproperties.documentation/src/main/java/module-info.java deleted file mode 100644 index c934270..0000000 --- a/com.io7m.jproperties.documentation/src/main/java/module-info.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright © 2014 Mark Raynsford https://www.io7m.com - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY - * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR - * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -/** - * Typed property handling (Documentation) - */ - -module com.io7m.jproperties.documentation -{ - requires com.io7m.jproperties.core; - - exports com.io7m.jproperties.documentation; -} \ No newline at end of file diff --git a/com.io7m.jproperties.documentation/src/main/resources/com/io7m/jproperties/documentation/brand.xml b/com.io7m.jproperties.documentation/src/main/resources/com/io7m/jproperties/documentation/brand.xml deleted file mode 100644 index 61f9658..0000000 --- a/com.io7m.jproperties.documentation/src/main/resources/com/io7m/jproperties/documentation/brand.xml +++ /dev/null @@ -1,9 +0,0 @@ - -
-
- io7m -
-
- ${project.parent.name} ${project.version} -
-
\ No newline at end of file diff --git a/com.io7m.jproperties.documentation/src/main/resources/com/io7m/jproperties/documentation/documentation.css b/com.io7m.jproperties.documentation/src/main/resources/com/io7m/jproperties/documentation/documentation.css deleted file mode 100644 index 2b9cd43..0000000 --- a/com.io7m.jproperties.documentation/src/main/resources/com/io7m/jproperties/documentation/documentation.css +++ /dev/null @@ -1,63 +0,0 @@ -.brand -{ - font-size: 75%; - font-family: monospace; -} - -.brand_left -{ - float: left; -} - -.brand_right -{ - text-align: right; -} - -.package -{ - font-family: monospace; - font-weight: bold; -} - -.attribute, -.class, -.command, -.constant, -.element, -.file, -.function, -.keyword, -.type -{ - font-family: monospace; -} - -.example, .license, .terminal -{ - font-family: monospace; - border: 1px solid #ccc; - padding-top: 1.0em; - padding-left: 1.0em; - padding-bottom: 1.0em; - margin-top: 1.2em; - overflow: auto; -} - -.dependencies table td -{ - padding-right: 3.0em; - font-family: monospace; - font-size: 9pt; -} - -.platforms table td -{ - padding-right: 2.0em; -} -.platforms table tbody, -.platforms table thead -{ - font-size: 8pt; - font-family: monospace; -} diff --git a/com.io7m.jproperties.documentation/src/main/resources/com/io7m/jproperties/documentation/documentation.xml b/com.io7m.jproperties.documentation/src/main/resources/com/io7m/jproperties/documentation/documentation.xml deleted file mode 100644 index f8f7067..0000000 --- a/com.io7m.jproperties.documentation/src/main/resources/com/io7m/jproperties/documentation/documentation.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - ${project.parent.name} ${project.version} Documentation - documentation.css - - - - Package Information - - - Orientation - - Overview - - The ${project.parent.name} package - implements a set of functions and types for handling properties - in Java. - - - - - - Installation - - Source compilation - - The project can be compiled and installed with - Maven: - - - - - - - - Maven - - Regular releases are made to the - Central Repository, - so it's possible to use the ${project.parent.name} - package in your projects with the following Maven dependency: - - - - ${project.groupId} - ${project.parent.artifactId}-core - ${project.version} -]]> - - - All io7m.com - packages use Semantic Versioning - - http://semver.org - , which implies that it is always safe to use version ranges - with an exclusive upper bound equal to the next major version - the API of - the package will not change in a backwards-incompatible manner before the - next major version. - - - - - - Platform Specific Issues - - There are currently no known platform-specific issues. - - - - - License - - All files distributed with the ${project.parent.name} - package are placed under the following license: - https://www.io7m.com - -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.]]> - - - - - - - API Reference - - - Javadoc - - API documentation for the package is provided via the - included Javadoc. - - - - - diff --git a/pom.xml b/pom.xml index e82bc8c..0a4cda9 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,6 @@ com.io7m.jproperties.core - com.io7m.jproperties.documentation com.io7m.jproperties.monad com.io7m.jproperties.tests @@ -72,6 +71,10 @@ sonatype-nexus-staging https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + + sonatype-nexus-snapshots + https://s01.oss.sonatype.org/content/repositories/snapshots/ + @@ -148,13 +151,6 @@ - - - com.io7m.jstructural - io7m-jstructural-maven-plugin - 5.0.0 - - com.github.spotbugs diff --git a/src/site/resources/documentation.xml b/src/site/resources/documentation.xml index 5c0c663..d3cd820 100644 --- a/src/site/resources/documentation.xml +++ b/src/site/resources/documentation.xml @@ -2,8 +2,7 @@

User documentation

- +

+ See the README. +