Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Minor] Code cleanup in StrolchBootstrapper

This commit is contained in:
Robert von Burg 2020-03-12 10:14:07 +01:00
parent 898afd98b9
commit 0417a4ebdf
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
li.strolch.agent/src/main/java/li/strolch/agent/api/StrolchBootstrapper.java
View File

@ -1,17 +1,13 @@
package li.strolch.agent.api; package li.strolch.agent.api;
import static java.util.Objects.requireNonNull;
import java.io.File; import java.io.File;
import java.io.InputStream; import java.io.InputStream;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.Arrays; import java.util.Arrays;
import java.util.Properties; import java.util.Properties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
import li.strolch.runtime.configuration.ConfigurationParser; import li.strolch.runtime.configuration.ConfigurationParser;
import li.strolch.runtime.configuration.StrolchConfigurationException; import li.strolch.runtime.configuration.StrolchConfigurationException;
import li.strolch.runtime.configuration.StrolchEnvironment; import li.strolch.runtime.configuration.StrolchEnvironment;
@ -19,6 +15,11 @@ import li.strolch.utils.dbc.DBC;
import li.strolch.utils.helper.FileHelper; import li.strolch.utils.helper.FileHelper;
import li.strolch.utils.helper.StringHelper; import li.strolch.utils.helper.StringHelper;
import li.strolch.utils.helper.XmlHelper; import li.strolch.utils.helper.XmlHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
public class StrolchBootstrapper extends DefaultHandler { public class StrolchBootstrapper extends DefaultHandler {
@ -74,6 +75,7 @@ public class StrolchBootstrapper extends DefaultHandler {
* </p> * </p>
* *
* @param appVersion * @param appVersion
* the app's version
*/ */
public StrolchBootstrapper(StrolchVersion appVersion) { public StrolchBootstrapper(StrolchVersion appVersion) {
DBC.PRE.assertNotNull("appVersion must be set!", appVersion); DBC.PRE.assertNotNull("appVersion must be set!", appVersion);
@ -100,8 +102,7 @@ public class StrolchBootstrapper extends DefaultHandler {
"Could not find resource " + APP_VERSION_PROPERTIES + " on ClassLoader of class " + appClass); "Could not find resource " + APP_VERSION_PROPERTIES + " on ClassLoader of class " + appClass);
} }
StrolchVersion appVersion = new StrolchVersion(env); this.appVersion = new StrolchVersion(env);
this.appVersion = appVersion;
} }
public void setEnvironmentOverride(String environmentOverride) { public void setEnvironmentOverride(String environmentOverride) {
@ -163,7 +164,7 @@ public class StrolchBootstrapper extends DefaultHandler {
msg = MessageFormat.format(msg, environment, rootDstPath.getAbsolutePath()); msg = MessageFormat.format(msg, environment, rootDstPath.getAbsolutePath());
throw new StrolchConfigurationException(msg); throw new StrolchConfigurationException(msg);
} }
if (rootDstPath.list().length != 0) { if (requireNonNull(rootDstPath.list()).length != 0) {
String msg = "[{0}] Destination root exists and is not empty at {1}"; //$NON-NLS-1$ String msg = "[{0}] Destination root exists and is not empty at {1}"; //$NON-NLS-1$
msg = MessageFormat.format(msg, environment, rootDstPath.getAbsolutePath()); msg = MessageFormat.format(msg, environment, rootDstPath.getAbsolutePath());
throw new StrolchConfigurationException(msg); throw new StrolchConfigurationException(msg);
@ -328,7 +329,6 @@ public class StrolchBootstrapper extends DefaultHandler {
} }
private void parseBoostrapFile(File bootstrapFile) { private void parseBoostrapFile(File bootstrapFile) {
// parse the document using ourselves as the DefaultHandler // parse the document using ourselves as the DefaultHandler
XmlHelper.parseDocument(bootstrapFile, this); XmlHelper.parseDocument(bootstrapFile, this);