Skip to content

Commit 7cf70da

Browse files
dizzzzdizzzz
committed
[refactor] Make core more consistent.
1 parent 93fcab6 commit 7cf70da

File tree

9 files changed

+67
-67
lines changed

9 files changed

+67
-67
lines changed

‎exist-core/src/main/java/org/exist/util/Configuration.java‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,49 +1192,49 @@ private void configureIndexer(final Document doc, final Element indexer) throws
11921192
setProperty(IndexManager.PROPERTY_INDEXER_MODULES, modConfig);
11931193
}
11941194

1195-
private void configureGrammarCache(final NodeList grammarPoolNl) {
1196-
if (grammarPoolNl.getLength() == 0) {
1197-
setProperty(GrammarPool.GRAMMAR_POOL, new GrammarPool());
1198-
} else {
1199-
final Element grammarPoolElem = (Element) grammarPoolNl.item(0);
1200-
configureProperty(grammarPoolElem, GrammarPool.ATTRIBUTE_MAXIMUM_SIZE, GrammarPool.PROPERTY_MAXIMUM_SIZE, Configuration::asInteger, null);
1201-
configureProperty(grammarPoolElem, GrammarPool.ATTRIBUTE_EXPIRE_AFTER_ACCESS, GrammarPool.PROPERTY_EXPIRE_AFTER_ACCESS, Configuration::asInteger, null);
1202-
setProperty(GrammarPool.GRAMMAR_POOL, new GrammarPool(getInteger(GrammarPool.PROPERTY_MAXIMUM_SIZE), getInteger(GrammarPool.PROPERTY_EXPIRE_AFTER_ACCESS)));
1203-
}
1204-
}
1205-
12061195
private void configureValidation(final Optional<Path> dbHome, final Element validation) {
12071196
// Determine validation mode
12081197
configureProperty(validation, XMLReaderObjectFactory.VALIDATION_MODE_ATTRIBUTE, PROPERTY_VALIDATION_MODE);
12091198

12101199
// Configure the Entity Resolver
1211-
final NodeList entityResolver = validation.getElementsByTagName(XMLReaderObjectFactory.CONFIGURATION_ENTITY_RESOLVER_ELEMENT_NAME);
1212-
if (entityResolver.getLength() != 0) {
1213-
final Element elemEntityResolver = (Element) entityResolver.item(0);
1214-
setupEntityResolver(dbHome, elemEntityResolver);
1200+
final NodeList entityResolverElements = validation.getElementsByTagName(XMLReaderObjectFactory.CONFIGURATION_ENTITY_RESOLVER_ELEMENT_NAME);
1201+
if (entityResolverElements.getLength() != 0) {
1202+
final Element elemEntityResolver = (Element) entityResolverElements.item(0);
1203+
configureEntityResolver(dbHome, elemEntityResolver);
12151204
}
12161205

12171206
// Configure the grammar pool
1218-
final NodeList grammarPoolNl = validation.getElementsByTagName(GrammarPool.GRAMMAR_POOL);
1219-
configureGrammarCache(grammarPoolNl);
1207+
final NodeList grammarPoolElements = validation.getElementsByTagName(GrammarPool.GRAMMAR_POOL_ELEMENT);
1208+
configureGrammarCache(grammarPoolElements);
12201209

12211210
}
12221211

1223-
private void setupEntityResolver(final Optional<Path> dbHome, final Element elemEntityResolver) {
1224-
LOG.info("Creating xmlresolver.org OASIS Catalog resolver");
1212+
private void configureGrammarCache(final NodeList grammarCacheElements) {
1213+
if (grammarCacheElements.getLength() == 0) {
1214+
setProperty(GrammarPool.GRAMMAR_POOL_ELEMENT, new GrammarPool());
1215+
1216+
} else {
1217+
final Element grammarPoolElem = (Element) grammarCacheElements.item(0);
1218+
configureProperty(grammarPoolElem, GrammarPool.ATTRIBUTE_MAXIMUM_SIZE,
1219+
GrammarPool.PROPERTY_MAXIMUM_SIZE, Configuration::asInteger, null);
1220+
configureProperty(grammarPoolElem, GrammarPool.ATTRIBUTE_EXPIRE_AFTER_ACCESS,
1221+
GrammarPool.PROPERTY_EXPIRE_AFTER_ACCESS, Configuration::asInteger, null);
1222+
setProperty(GrammarPool.GRAMMAR_POOL_ELEMENT,
1223+
new GrammarPool(getInteger(GrammarPool.PROPERTY_MAXIMUM_SIZE), getInteger(GrammarPool.PROPERTY_EXPIRE_AFTER_ACCESS)));
1224+
}
1225+
}
12251226

1226-
final NodeList nlCatalogs = elemEntityResolver.getElementsByTagName(XMLReaderObjectFactory.CONFIGURATION_CATALOG_ELEMENT_NAME);
1227+
private void configureEntityResolver(final Optional<Path> dbHome, final Element entityResolverElement) {
1228+
LOG.info("Creating xmlresolver.org OASIS Catalog resolver");
12271229

1228-
final Path webappHome = getWebappHome(dbHome, nlCatalogs);
1230+
final NodeList catalogElements = entityResolverElement
1231+
.getElementsByTagName(XMLReaderObjectFactory.CONFIGURATION_CATALOG_ELEMENT_NAME);
1232+
final Path webappHome = getWebappHome(dbHome, catalogElements);
12291233

12301234
// Store all configured URIs
1231-
final List<String> catalogUris = getCatalogUris(dbHome, nlCatalogs, webappHome);
1235+
final List<String> catalogUris = getCatalogUris(dbHome, catalogElements, webappHome);
12321236
setProperty(XMLReaderObjectFactory.CATALOG_URIS, catalogUris);
12331237

1234-
setupResolver(catalogUris);
1235-
}
1236-
1237-
private void setupResolver(final List<String> catalogUris) {
12381238
// Create and Store the resolver
12391239
try {
12401240
final List<Tuple2<String, Optional<InputSource>>> catalogs = catalogUris.stream()
@@ -1252,7 +1252,7 @@ private void setupResolver(final List<String> catalogUris) {
12521252
be used at this phase. Trick is to check whether dbHOME is
12531253
pointing to a WEB-INF directory, meaning inside the war file.
12541254
*/
1255-
private static Path getWebappHome(Optional<Path> dbHome, NodeList nlCatalogs) {
1255+
private static Path getWebappHome(final Optional<Path> dbHome, final NodeList catalogElements) {
12561256

12571257
final Path webappHome = dbHome.map(h -> {
12581258
if (FileUtils.fileName(h).endsWith("WEB-INF")) {
@@ -1262,18 +1262,18 @@ private static Path getWebappHome(Optional<Path> dbHome, NodeList nlCatalogs) {
12621262
}).orElse(Paths.get("webapp").toAbsolutePath());
12631263

12641264
if (LOG.isDebugEnabled()) {
1265-
LOG.debug("Found {} catalog uri entries.", nlCatalogs.getLength());
1265+
LOG.debug("Found {} catalog uri entries.", catalogElements.getLength());
12661266
LOG.debug("Using dbHome={}", dbHome);
12671267
LOG.debug("using webappHome={}", webappHome);
12681268
}
12691269
return webappHome;
12701270
}
12711271

1272-
private static List<String> getCatalogUris(Optional<Path> dbHome, NodeList nlCatalogs, Path webappHome) {
1272+
private static List<String> getCatalogUris(final Optional<Path> dbHome, final NodeList catalogElements, final Path webappHome) {
12731273
// Get the Catalog URIs
12741274
final List<String> catalogUris = new ArrayList<>();
1275-
for (int i = 0; i < nlCatalogs.getLength(); i++) {
1276-
final String uriAttributeValue = ((Element) nlCatalogs.item(i)).getAttribute("uri");
1275+
for (int i = 0; i < catalogElements.getLength(); i++) {
1276+
final String uriAttributeValue = ((Element) catalogElements.item(i)).getAttribute("uri");
12771277

12781278
if (!uriAttributeValue.isEmpty()) {
12791279
final String uri;

‎exist-core/src/main/java/org/exist/util/XMLReaderObjectFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public class XMLReaderObjectFactory extends BasePooledObjectFactory<XMLReader> i
8282

8383
@Override
8484
public void configure(final Configuration configuration) {
85-
this.grammarPool = (GrammarPool) configuration.getProperty(GrammarPool.GRAMMAR_POOL);
85+
this.grammarPool = (GrammarPool) configuration.getProperty(GrammarPool.GRAMMAR_POOL_ELEMENT);
8686
this.resolver = (Resolver) configuration.getProperty(CATALOG_RESOLVER);
8787
final String option = (String) configuration.getProperty(PROPERTY_VALIDATION_MODE);
8888
this.validation = VALIDATION_SETTING.fromOption(option);

‎exist-core/src/main/java/org/exist/validation/GrammarPool.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ public class GrammarPool implements XMLGrammarPool {
4343

4444
private static final Logger LOGGER = LogManager.getLogger(GrammarPool.class);
4545

46-
public static final String GRAMMAR_POOL = "grammar-pool";
46+
public static final String GRAMMAR_POOL_ELEMENT = "grammar-cache";
4747

4848
public static final String ATTRIBUTE_MAXIMUM_SIZE = "size";
49-
public static final String PROPERTY_MAXIMUM_SIZE = "grammar-cache.maximum-size";
49+
public static final String PROPERTY_MAXIMUM_SIZE = "validation.grammar-cache.size";
5050

5151
public static final String ATTRIBUTE_EXPIRE_AFTER_ACCESS = "expire";
52-
public static final String PROPERTY_EXPIRE_AFTER_ACCESS = "grammar-cache.expire-after-access";
52+
public static final String PROPERTY_EXPIRE_AFTER_ACCESS = "validation.grammar-cache.expire";
5353

5454
private final Cache<GrammarKey, Grammar> grammarCache;
5555
private boolean isLocked = false;

‎exist-core/src/main/java/org/exist/validation/Validator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public Validator(final BrokerPool brokerPool, final Subject subject) {
9090
final Configuration config = brokerPool.getConfiguration();
9191

9292
// setup grammar brokerPool
93-
this.grammarPool = (GrammarPool) config.getProperty(GrammarPool.GRAMMAR_POOL);
93+
this.grammarPool = (GrammarPool) config.getProperty(GrammarPool.GRAMMAR_POOL_ELEMENT);
9494

9595
// setup system wide catalog resolver
9696
this.systemCatalogResolver = (Resolver) config.getProperty(XMLReaderObjectFactory.CATALOG_RESOLVER);

‎exist-core/src/main/java/org/exist/xquery/functions/validation/GrammarTooling.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import org.exist.dom.memtree.NodeImpl;
3838
import org.exist.storage.BrokerPool;
3939
import org.exist.util.Configuration;
40-
import org.exist.util.XMLReaderObjectFactory;
4140
import org.exist.validation.GrammarPool;
4241
import org.exist.xquery.BasicFunction;
4342
import org.exist.xquery.Cardinality;
@@ -139,7 +138,7 @@ public Sequence eval(Sequence[] args, Sequence contextSequence)
139138
throws XPathException {
140139

141140
final GrammarPool grammarpool
142-
= (GrammarPool) config.getProperty(GrammarPool.GRAMMAR_POOL);
141+
= (GrammarPool) config.getProperty(GrammarPool.GRAMMAR_POOL_ELEMENT);
143142

144143
if (isCalledAs("clear-grammar-cache")){
145144

‎exist-core/src/main/java/org/exist/xquery/functions/validation/Jaxp.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ public Sequence eval(final Sequence[] args, final Sequence contextSequence) thro
283283
if (useCache) {
284284
LOG.debug("Grammar caching enabled.");
285285
final Configuration config = brokerPool.getConfiguration();
286-
final GrammarPool grammarPool = (GrammarPool) config.getProperty(GrammarPool.GRAMMAR_POOL);
286+
final GrammarPool grammarPool = (GrammarPool) config.getProperty(GrammarPool.GRAMMAR_POOL_ELEMENT);
287287
xmlReader.setProperty(XMLReaderObjectFactory.APACHE_PROPERTIES_INTERNAL_GRAMMARPOOL, grammarPool);
288288
}
289289

0 commit comments

Comments
 (0)