update to content 2.3.1, better named module exports
This commit is contained in:
parent
c7d2aa3c87
commit
aef7c53a04
8 changed files with 20 additions and 16 deletions
|
@ -1,12 +1,12 @@
|
||||||
group = org.xbib
|
group = org.xbib
|
||||||
name = marc
|
name = marc
|
||||||
version = 2.3.0
|
version = 2.3.1
|
||||||
|
|
||||||
gradle.wrapper.version = 6.4.1
|
gradle.wrapper.version = 6.4.1
|
||||||
xbib-content.version = 2.2.0
|
xbib-content.version = 2.3.1
|
||||||
xbib-bibliographic-character-sets.version = 1.0.0
|
xbib-bibliographic-character-sets.version = 2.0.0
|
||||||
xalan.version = 2.7.2
|
xalan.version = 2.7.2
|
||||||
xmlunit-matchers.version = 2.6.3
|
xmlunit-matchers.version = 2.6.3
|
||||||
system-rules.version = 1.19.0
|
system-rules.version = 1.19.0
|
||||||
mockito.version = 3.1.0
|
mockito.version = 3.3.3
|
||||||
marc4j.version = 2.9.1
|
marc4j.version = 2.9.1
|
||||||
|
|
|
@ -33,3 +33,11 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
|
||||||
artifacts {
|
artifacts {
|
||||||
archives sourcesJar, javadocJar
|
archives sourcesJar, javadocJar
|
||||||
}
|
}
|
||||||
|
|
||||||
|
tasks.withType(JavaCompile) {
|
||||||
|
options.compilerArgs << '-Xlint:all'
|
||||||
|
}
|
||||||
|
|
||||||
|
javadoc {
|
||||||
|
options.addStringOption('Xdoclint:none', '-quiet')
|
||||||
|
}
|
||||||
|
|
|
@ -15,6 +15,6 @@ module org.xbib.marc {
|
||||||
exports org.xbib.marc.transformer.field;
|
exports org.xbib.marc.transformer.field;
|
||||||
exports org.xbib.marc.transformer.value;
|
exports org.xbib.marc.transformer.value;
|
||||||
exports org.xbib.marc.xml;
|
exports org.xbib.marc.xml;
|
||||||
|
requires transitive java.xml;
|
||||||
requires java.logging;
|
requires java.logging;
|
||||||
requires java.xml;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,7 +23,7 @@ import java.io.InputStream;
|
||||||
* Interface for stream token handlers.
|
* Interface for stream token handlers.
|
||||||
*/
|
*/
|
||||||
@FunctionalInterface
|
@FunctionalInterface
|
||||||
interface StreamTokenHandler {
|
public interface StreamTokenHandler {
|
||||||
/**
|
/**
|
||||||
* Process token.
|
* Process token.
|
||||||
* @param token the token
|
* @param token the token
|
||||||
|
|
|
@ -57,7 +57,7 @@ import java.util.Objects;
|
||||||
* may lead to an inconsistent state.
|
* may lead to an inconsistent state.
|
||||||
* </p>
|
* </p>
|
||||||
*/
|
*/
|
||||||
class JsonObject extends JsonValue implements Iterable<JsonObject.Member> {
|
public class JsonObject extends JsonValue implements Iterable<JsonObject.Member> {
|
||||||
|
|
||||||
private final List<String> names;
|
private final List<String> names;
|
||||||
|
|
||||||
|
@ -68,7 +68,7 @@ class JsonObject extends JsonValue implements Iterable<JsonObject.Member> {
|
||||||
/**
|
/**
|
||||||
* Creates a new empty JsonObject.
|
* Creates a new empty JsonObject.
|
||||||
*/
|
*/
|
||||||
JsonObject() {
|
public JsonObject() {
|
||||||
names = new ArrayList<>();
|
names = new ArrayList<>();
|
||||||
values = new ArrayList<>();
|
values = new ArrayList<>();
|
||||||
table = new HashIndexTable();
|
table = new HashIndexTable();
|
||||||
|
@ -674,12 +674,12 @@ class JsonObject extends JsonValue implements Iterable<JsonObject.Member> {
|
||||||
/**
|
/**
|
||||||
* Represents a member of a JSON object, a pair of a name and a value.
|
* Represents a member of a JSON object, a pair of a name and a value.
|
||||||
*/
|
*/
|
||||||
static class Member {
|
public static class Member {
|
||||||
|
|
||||||
private final String name;
|
private final String name;
|
||||||
private final JsonValue value;
|
private final JsonValue value;
|
||||||
|
|
||||||
Member(String name, JsonValue value) {
|
public Member(String name, JsonValue value) {
|
||||||
this.name = name;
|
this.name = name;
|
||||||
this.value = value;
|
this.value = value;
|
||||||
}
|
}
|
||||||
|
|
|
@ -49,11 +49,7 @@ import java.io.StringWriter;
|
||||||
* appropriate target type.
|
* appropriate target type.
|
||||||
* </p>
|
* </p>
|
||||||
*/
|
*/
|
||||||
abstract class JsonValue {
|
public abstract class JsonValue {
|
||||||
|
|
||||||
JsonValue() {
|
|
||||||
// prevent subclasses outside of this package
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Detects whether this value represents a JSON object. If this is the case, this value is an
|
* Detects whether this value represents a JSON object. If this is the case, this value is an
|
||||||
|
|
|
@ -24,7 +24,7 @@ import java.util.Arrays;
|
||||||
* Controls the formatting of the JSON output. Use one of the available constants.
|
* Controls the formatting of the JSON output. Use one of the available constants.
|
||||||
*/
|
*/
|
||||||
@FunctionalInterface
|
@FunctionalInterface
|
||||||
interface JsonWriterConfig {
|
public interface JsonWriterConfig {
|
||||||
|
|
||||||
JsonWriter createWriter(Writer writer);
|
JsonWriter createWriter(Writer writer);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue