refactoring into the settings subprojects, each content/datastructure
parent
9411e901be
commit
bd2eb07591
@ -1,8 +1,3 @@
|
||||
import org.xbib.content.SettingsBuilder;
|
||||
|
||||
module org.xbib.content.api {
|
||||
exports org.xbib.content;
|
||||
requires transitive org.xbib.datastructures.api;
|
||||
requires java.sql;
|
||||
uses SettingsBuilder;
|
||||
}
|
||||
|
@ -1,5 +1,5 @@
|
||||
dependencies {
|
||||
api project(':content-settings-datastructures')
|
||||
testImplementation project(':content-settings-datastructures-json')
|
||||
testImplementation project(':content-settings-datastructures-yaml')
|
||||
api project(':settings-datastructures')
|
||||
testImplementation project(':settings-datastructures-json')
|
||||
testImplementation project(':settings-datastructures-yaml')
|
||||
}
|
||||
|
@ -1,11 +1,11 @@
|
||||
import org.xbib.content.config.ConfigLogger;
|
||||
import org.xbib.content.SettingsLoader;
|
||||
import org.xbib.settings.SettingsLoader;
|
||||
|
||||
module org.xbib.content.config {
|
||||
exports org.xbib.content.config;
|
||||
uses ConfigLogger;
|
||||
uses SettingsLoader;
|
||||
provides ConfigLogger with org.xbib.content.config.SystemConfigLogger;
|
||||
requires org.xbib.content.api;
|
||||
requires transitive org.xbib.content.settings.datastructures;
|
||||
requires org.xbib.settings.api;
|
||||
requires transitive org.xbib.settings.datastructures;
|
||||
}
|
||||
|
@ -1,3 +0,0 @@
|
||||
org.xbib.content.settings.datastructures.PropertiesSettingsLoader
|
||||
org.xbib.content.settings.datastructures.json.JsonSettingsLoader
|
||||
org.xbib.content.settings.datastructures.yaml.YamlSettingsLoader
|
@ -0,0 +1,3 @@
|
||||
org.xbib.settings.datastructures.PropertiesSettingsLoader
|
||||
org.xbib.settings.datastructures.json.JsonSettingsLoader
|
||||
org.xbib.settings.datastructures.yaml.YamlSettingsLoader
|
@ -1 +0,0 @@
|
||||
org.xbib.content.json.JsonSettingsLoader
|
@ -1,10 +0,0 @@
|
||||
import org.xbib.content.SettingsLoader;
|
||||
import org.xbib.content.settings.datastructures.json.JsonSettingsLoader;
|
||||
|
||||
module org.xbib.content.settings.datastructures.json {
|
||||
exports org.xbib.content.settings.datastructures.json;
|
||||
requires transitive org.xbib.content.settings.datastructures;
|
||||
requires org.xbib.datastructures.json.tiny;
|
||||
uses SettingsLoader;
|
||||
provides SettingsLoader with JsonSettingsLoader;
|
||||
}
|
@ -1 +0,0 @@
|
||||
org.xbib.content.settings.datastructures.json.JsonSettingsLoader
|
@ -1,10 +0,0 @@
|
||||
import org.xbib.content.SettingsLoader;
|
||||
import org.xbib.content.settings.datastructures.yaml.YamlSettingsLoader;
|
||||
|
||||
module org.xbib.content.settings.datastructures.yaml {
|
||||
exports org.xbib.content.settings.datastructures.yaml;
|
||||
requires transitive org.xbib.content.settings.datastructures;
|
||||
requires org.xbib.datastructures.yaml.tiny;
|
||||
uses SettingsLoader;
|
||||
provides SettingsLoader with YamlSettingsLoader;
|
||||
}
|
@ -1 +0,0 @@
|
||||
org.xbib.content.settings.datastructures.yaml.YamlSettingsLoader
|
@ -1,15 +0,0 @@
|
||||
import org.xbib.content.SettingsBuilder;
|
||||
import org.xbib.content.SettingsLoader;
|
||||
import org.xbib.content.settings.datastructures.DatastructureSettingsBuilder;
|
||||
import org.xbib.content.settings.datastructures.PropertiesSettingsLoader;
|
||||
|
||||
module org.xbib.content.settings.datastructures {
|
||||
uses SettingsLoader;
|
||||
provides SettingsLoader with PropertiesSettingsLoader;
|
||||
uses SettingsBuilder;
|
||||
provides SettingsBuilder with DatastructureSettingsBuilder;
|
||||
exports org.xbib.content.settings.datastructures;
|
||||
requires transitive org.xbib.content.api;
|
||||
requires org.xbib.datastructures.tiny;
|
||||
requires transitive org.xbib.datastructures.api;
|
||||
}
|
@ -1 +0,0 @@
|
||||
org.xbib.content.settings.datastructures.DatastructureSettingsBuilder
|
@ -1 +0,0 @@
|
||||
org.xbib.content.settings.datastructures.PropertiesSettingsLoader
|
@ -1,15 +0,0 @@
|
||||
import org.xbib.content.SettingsBuilder;
|
||||
import org.xbib.content.SettingsLoader;
|
||||
import org.xbib.content.settings.ContentSettingsBuilder;
|
||||
import org.xbib.content.settings.PropertiesSettingsLoader;
|
||||
|
||||
module org.xbib.content.settings {
|
||||
uses SettingsLoader;
|
||||
provides SettingsLoader with PropertiesSettingsLoader;
|
||||
uses SettingsBuilder;
|
||||
provides SettingsBuilder with ContentSettingsBuilder;
|
||||
exports org.xbib.content.settings;
|
||||
requires org.xbib.content.core;
|
||||
requires org.xbib.datastructures.api;
|
||||
requires transitive org.xbib.datastructures.tiny;
|
||||
}
|
@ -1,4 +0,0 @@
|
||||
/**
|
||||
* Classes for settings.
|
||||
*/
|
||||
package org.xbib.content.settings;
|
@ -1 +0,0 @@
|
||||
org.xbib.content.settings.ContentSettingsBuilder
|
@ -1 +0,0 @@
|
||||
org.xbib.content.settings.PropertiesSettingsLoader
|
@ -1,6 +1,5 @@
|
||||
dependencies {
|
||||
api project(':content-core')
|
||||
api project(':content-settings')
|
||||
api "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${project.property('jackson.version')}"
|
||||
implementation "org.yaml:snakeyaml:${project.property('snakeyaml.version')}"
|
||||
}
|
||||
|
@ -1,12 +1,9 @@
|
||||
import org.xbib.content.SettingsLoader;
|
||||
import org.xbib.content.XContent;
|
||||
|
||||
module org.xbib.content.yaml {
|
||||
exports org.xbib.content.yaml;
|
||||
requires transitive org.xbib.content.core;
|
||||
requires transitive org.xbib.content.settings;
|
||||
requires transitive com.fasterxml.jackson.dataformat.yaml;
|
||||
requires com.fasterxml.jackson.core;
|
||||
provides XContent with org.xbib.content.yaml.YamlXContent;
|
||||
provides SettingsLoader with org.xbib.content.yaml.YamlSettingsLoader;
|
||||
}
|
||||
|
@ -1 +0,0 @@
|
||||
org.xbib.content.yaml.YamlSettingsLoader
|
@ -0,0 +1,10 @@
|
||||
import org.xbib.settings.SettingsBuilder;
|
||||
import org.xbib.settings.SettingsLoader;
|
||||
|
||||
module org.xbib.settings.api {
|
||||
exports org.xbib.settings;
|
||||
uses SettingsBuilder;
|
||||
uses SettingsLoader;
|
||||
requires transitive org.xbib.datastructures.api;
|
||||
requires transitive java.sql;
|
||||
}
|
@ -1,4 +1,4 @@
|
||||
package org.xbib.content;
|
||||
package org.xbib.settings;
|
||||
|
||||
/**
|
||||
* Strategy interface used to resolve replacement values for placeholders contained in Strings.
|
@ -1,4 +1,4 @@
|
||||
package org.xbib.content;
|
||||
package org.xbib.settings;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
@ -1,4 +1,4 @@
|
||||
package org.xbib.content;
|
||||
package org.xbib.settings;
|
||||
|
||||
/**
|
||||
* A generic failure to handle settings.
|
@ -1,4 +1,4 @@
|
||||
package org.xbib.content;
|
||||
package org.xbib.settings;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Map;
|
@ -1,6 +1,4 @@
|
||||
package org.xbib.content.settings.datastructures;
|
||||
|
||||
import org.xbib.content.SettingsLoader;
|
||||
package org.xbib.settings;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
@ -0,0 +1,4 @@
|
||||
/**
|
||||
* Settings API.
|
||||
*/
|
||||
package org.xbib.settings;
|
@ -0,0 +1,4 @@
|
||||
dependencies {
|
||||
api project(':settings-content')
|
||||
api project(':content-json')
|
||||
}
|
@ -0,0 +1,12 @@
|
||||
import org.xbib.settings.SettingsLoader;
|
||||
import org.xbib.settings.content.json.JsonSettingsLoader;
|
||||
|
||||
module org.xbib.settings.content.json {
|
||||
exports org.xbib.settings.content.json;
|
||||
requires transitive org.xbib.settings.content;
|
||||
requires org.xbib.content.api;
|
||||
requires org.xbib.content.json;
|
||||
requires org.xbib.settings.api;
|
||||
uses SettingsLoader;
|
||||
provides SettingsLoader with JsonSettingsLoader;
|
||||
}
|
@ -1,7 +1,8 @@
|
||||
package org.xbib.content.json;
|
||||
package org.xbib.settings.content.json;
|
||||
|
||||
import org.xbib.content.XContent;
|
||||
import org.xbib.content.settings.AbstractSettingsLoader;
|
||||
import org.xbib.content.json.JsonXContent;
|
||||
import org.xbib.settings.content.AbstractSettingsLoader;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
@ -0,0 +1 @@
|
||||
org.xbib.settings.content.json.JsonSettingsLoader
|
@ -0,0 +1,4 @@
|
||||
dependencies {
|
||||
api project(':settings-content')
|
||||
api project(':content-yaml')
|
||||
}
|
@ -0,0 +1,12 @@
|
||||
import org.xbib.settings.SettingsLoader;
|
||||
import org.xbib.settings.content.yaml.YamlSettingsLoader;
|
||||
|
||||
module org.xbib.settings.content.yaml {
|
||||
exports org.xbib.settings.content.yaml;
|
||||
requires transitive org.xbib.settings.content;
|
||||
requires org.xbib.content.api;
|
||||
requires org.xbib.content.yaml;
|
||||
requires org.xbib.settings.api;
|
||||
uses SettingsLoader;
|
||||
provides SettingsLoader with YamlSettingsLoader;
|
||||
}
|
@ -1,7 +1,8 @@
|
||||
package org.xbib.content.yaml;
|
||||
package org.xbib.settings.content.yaml;
|
||||
|
||||
import org.xbib.content.XContent;
|
||||
import org.xbib.content.settings.AbstractSettingsLoader;
|
||||
import org.xbib.content.yaml.YamlXContent;
|
||||
import org.xbib.settings.content.AbstractSettingsLoader;
|
||||
import java.io.IOException;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
@ -0,0 +1 @@
|
||||
org.xbib.settings.content.yaml.YamlSettingsLoader
|
@ -1,5 +1,6 @@
|
||||
dependencies {
|
||||
api project(':settings-api')
|
||||
api project(':content-core')
|
||||
api "org.xbib:datastructures-tiny:${project.property('xbib-datastructures.version')}"
|
||||
testImplementation project(":content-json")
|
||||
testImplementation project(":settings-content-json")
|
||||
}
|
@ -0,0 +1,16 @@
|
||||
import org.xbib.settings.SettingsBuilder;
|
||||
import org.xbib.settings.SettingsLoader;
|
||||
import org.xbib.settings.content.ContentSettingsBuilder;
|
||||
import org.xbib.settings.content.PropertiesSettingsLoader;
|
||||
|
||||
module org.xbib.settings.content {
|
||||
uses SettingsLoader;
|
||||
provides SettingsLoader with PropertiesSettingsLoader;
|
||||
uses SettingsBuilder;
|
||||
provides SettingsBuilder with ContentSettingsBuilder;
|
||||
exports org.xbib.settings.content;
|
||||
requires org.xbib.settings.api;
|
||||
requires org.xbib.content.core;
|
||||
requires org.xbib.datastructures.api;
|
||||
requires transitive org.xbib.datastructures.tiny;
|
||||
}
|
@ -1,6 +1,6 @@
|
||||
package org.xbib.content.settings;
|
||||
package org.xbib.settings.content;
|
||||
|
||||
import org.xbib.content.SettingsLoader;
|
||||
import org.xbib.settings.SettingsLoader;
|
||||
import org.xbib.content.XContent;
|
||||
import org.xbib.content.XContentBuilder;
|
||||
import org.xbib.content.core.DefaultXContentBuilder;
|
@ -1,7 +1,7 @@
|
||||
package org.xbib.content.settings;
|
||||
package org.xbib.settings.content;
|
||||
|
||||
import org.xbib.content.io.BytesReference;
|
||||
import org.xbib.content.SettingsLoader;
|
||||
import org.xbib.settings.SettingsLoader;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStreamReader;
|
||||
import java.io.Reader;
|
@ -0,0 +1,4 @@
|
||||
/**
|
||||
* Classes for settings.
|
||||
*/
|
||||
package org.xbib.settings.content;
|
@ -0,0 +1 @@
|
||||
org.xbib.settings.content.ContentSettingsBuilder
|
@ -0,0 +1 @@
|
||||
org.xbib.settings.content.PropertiesSettingsLoader
|
@ -1,16 +1,16 @@
|
||||
package org.xbib.content.settings.test;
|
||||
package org.xbib.settings.content.test;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.xbib.content.SettingsLoader;
|
||||
import org.xbib.settings.SettingsLoader;
|
||||
import org.xbib.content.core.XContentHelper;
|
||||
import org.xbib.content.io.BytesArray;
|
||||
import org.xbib.content.io.BytesReference;
|
||||
import org.xbib.content.json.JsonSettingsLoader;
|
||||
import org.xbib.settings.content.json.JsonSettingsLoader;
|
||||
import org.xbib.content.json.JsonXContent;
|
||||
import org.xbib.content.Settings;
|
||||
import org.xbib.settings.Settings;
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.StringReader;
|
@ -1,4 +1,4 @@
|
||||
dependencies {
|
||||
api project(':content-settings-datastructures')
|
||||
api project(':settings-datastructures')
|
||||
api "org.xbib:datastructures-json-tiny:${project.property('xbib-datastructures.version')}"
|
||||
}
|
@ -0,0 +1,10 @@
|
||||
import org.xbib.settings.SettingsLoader;
|
||||
import org.xbib.settings.datastructures.json.JsonSettingsLoader;
|
||||
|
||||
module org.xbib.settings.datastructures.json {
|
||||
exports org.xbib.settings.datastructures.json;
|
||||
requires transitive org.xbib.settings.datastructures;
|
||||
requires org.xbib.datastructures.json.tiny;
|
||||
uses SettingsLoader;
|
||||
provides SettingsLoader with JsonSettingsLoader;
|
||||
}
|
@ -1,6 +1,6 @@
|
||||
package org.xbib.content.settings.datastructures.json;
|
||||
package org.xbib.settings.datastructures.json;
|
||||
|
||||
import org.xbib.content.settings.datastructures.AbstractSettingsLoader;
|
||||
import org.xbib.settings.datastructures.AbstractSettingsLoader;
|
||||
import org.xbib.datastructures.api.DataStructure;
|
||||
import org.xbib.datastructures.json.tiny.Json;
|
||||
import java.util.Set;
|
@ -1,4 +1,4 @@
|
||||
/**
|
||||
* JSON settings with the datastructures package.
|
||||
*/
|
||||
package org.xbib.content.settings.datastructures.json;
|
||||
package org.xbib.settings.datastructures.json;
|
@ -0,0 +1 @@
|
||||
org.xbib.settings.datastructures.json.JsonSettingsLoader
|
@ -1,9 +1,9 @@
|
||||
package org.xbib.content.settings.datastructures.json.test;
|
||||
package org.xbib.settings.datastructures.json.test;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.xbib.content.Settings;
|
||||
import org.xbib.content.SettingsLoader;
|
||||
import org.xbib.content.settings.datastructures.json.JsonSettingsLoader;
|
||||
import org.xbib.settings.Settings;
|
||||
import org.xbib.settings.SettingsLoader;
|
||||
import org.xbib.settings.datastructures.json.JsonSettingsLoader;
|
||||
import java.io.IOException;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
@ -1,4 +1,4 @@
|
||||
/**
|
||||
* Testing JSON settings with the datastructures package.
|
||||
*/
|
||||
package org.xbib.content.settings.datastructures.json.test;
|
||||
package org.xbib.settings.datastructures.json.test;
|
@ -1,4 +1,4 @@
|
||||
dependencies {
|
||||
api project(':content-settings-datastructures')
|
||||
api project(':settings-datastructures')
|
||||
api "org.xbib:datastructures-yaml-tiny:${project.property('xbib-datastructures.version')}"
|
||||
}
|
@ -0,0 +1,10 @@
|
||||
import org.xbib.settings.SettingsLoader;
|
||||
import org.xbib.settings.datastructures.yaml.YamlSettingsLoader;
|
||||
|
||||
module org.xbib.settings.datastructures.yaml {
|
||||
exports org.xbib.settings.datastructures.yaml;
|
||||
requires transitive org.xbib.settings.datastructures;
|
||||
requires org.xbib.datastructures.yaml.tiny;
|
||||
uses SettingsLoader;
|
||||
provides SettingsLoader with YamlSettingsLoader;
|
||||
}
|
@ -1,6 +1,6 @@
|
||||
package org.xbib.content.settings.datastructures.yaml;
|
||||
package org.xbib.settings.datastructures.yaml;
|
||||
|
||||
import org.xbib.content.settings.datastructures.AbstractSettingsLoader;
|
||||
import org.xbib.settings.datastructures.AbstractSettingsLoader;
|
||||
import org.xbib.datastructures.api.DataStructure;
|
||||
import org.xbib.datastructures.yaml.tiny.Yaml;
|
||||
|
@ -1,4 +1,4 @@
|
||||
/**
|
||||
* YAML settings with the datastructures package.
|
||||
*/
|
||||
package org.xbib.content.settings.datastructures.yaml;
|
||||
package org.xbib.settings.datastructures.yaml;
|
@ -0,0 +1 @@
|
||||
org.xbib.settings.datastructures.yaml.YamlSettingsLoader
|
@ -1,11 +1,11 @@
|
||||
package org.xbib.content.settings.datastructures.yaml.test;
|
||||
package org.xbib.settings.datastructures.yaml.test;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.xbib.content.Settings;
|
||||
import org.xbib.content.SettingsLoader;
|
||||
import org.xbib.content.settings.datastructures.yaml.YamlSettingsLoader;
|
||||
import org.xbib.settings.Settings;
|
||||
import org.xbib.settings.SettingsLoader;
|
||||
import org.xbib.settings.datastructures.yaml.YamlSettingsLoader;
|
||||
import java.io.IOException;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
@ -1,4 +1,4 @@
|
||||
/**
|
||||
* Testing YAML settings with the datastructures package.
|
||||
*/
|
||||
package org.xbib.content.settings.datastructures.yaml.test;
|
||||
package org.xbib.settings.datastructures.yaml.test;
|
@ -1,4 +1,4 @@
|
||||
dependencies {
|
||||
api project(':content-api')
|
||||
api project(':settings-api')
|
||||
api "org.xbib:datastructures-tiny:${project.property('xbib-datastructures.version')}"
|
||||
}
|
@ -0,0 +1,15 @@
|
||||
import org.xbib.settings.SettingsBuilder;
|
||||
import org.xbib.settings.SettingsLoader;
|
||||
import org.xbib.settings.datastructures.DatastructureSettingsBuilder;
|
||||
import org.xbib.settings.datastructures.PropertiesSettingsLoader;
|
||||
|
||||
module org.xbib.settings.datastructures {
|
||||
uses SettingsLoader;
|
||||
provides SettingsLoader with PropertiesSettingsLoader;
|
||||
uses SettingsBuilder;
|
||||
provides SettingsBuilder with DatastructureSettingsBuilder;
|
||||
exports org.xbib.settings.datastructures;
|
||||
requires transitive org.xbib.settings.api;
|
||||
requires org.xbib.datastructures.tiny;
|
||||
requires transitive org.xbib.datastructures.api;
|
||||
}
|
@ -1,6 +1,6 @@
|
||||
package org.xbib.content.settings.datastructures;
|
||||
package org.xbib.settings.datastructures;
|
||||
|
||||
import org.xbib.content.SettingsLoader;
|
||||
import org.xbib.settings.SettingsLoader;
|
||||
import org.xbib.datastructures.api.Builder;
|
||||
import org.xbib.datastructures.api.DataStructure;
|
||||
import org.xbib.datastructures.api.ListNode;
|
@ -1,6 +1,6 @@
|
||||
package org.xbib.content.settings.datastructures;
|
||||
package org.xbib.settings.datastructures;
|
||||
|
||||
import org.xbib.content.SettingsLoader;
|
||||
import org.xbib.settings.SettingsLoader;
|
||||
import org.xbib.datastructures.tiny.TinyMap;
|
||||
import java.io.IOException;
|
||||
import java.io.StringReader;
|
@ -1,4 +1,4 @@
|
||||
/**
|
||||
* Classes for settings using the datastructures API.
|
||||
*/
|
||||
package org.xbib.content.settings.datastructures;
|
||||
package org.xbib.settings.datastructures;
|
@ -0,0 +1 @@
|
||||
org.xbib.settings.datastructures.DatastructureSettingsBuilder
|
@ -0,0 +1 @@
|
||||
org.xbib.settings.datastructures.PropertiesSettingsLoader
|
@ -1,7 +1,7 @@
|
||||
package org.xbib.content.settings.datastructures.test;
|
||||
package org.xbib.settings.datastructures.test;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.xbib.content.Settings;
|
||||
import org.xbib.settings.Settings;
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.nio.charset.StandardCharsets;
|
Loading…
Reference in New Issue