You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by nr...@apache.org on 2017/11/22 16:54:24 UTC
[geode] branch feature/GEODE-3824 updated: Add support for
connection parameters
This is an automated email from the ASF dual-hosted git repository.
nreich pushed a commit to branch feature/GEODE-3824
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-3824 by this push:
new 8d24c99 Add support for connection parameters
8d24c99 is described below
commit 8d24c99f8a4da0426b465247a4e112ea69d266d1
Author: Nick Reich <nr...@pivotal.io>
AuthorDate: Wed Nov 22 08:53:55 2017 -0800
Add support for connection parameters
---
.../jdbc/internal/ConnectionConfigBuilder.java | 19 +-
.../jdbc/internal/ConnectionConfiguration.java | 38 +++-
.../jdbc/internal/ConnectionManager.java | 2 +-
.../jdbc/internal/cli/CreateConnectionCommand.java | 9 +-
.../internal/cli/CreateConnectionFunction.java | 1 -
.../connectors/jdbc/internal/xml/ElementType.java | 8 +
.../xml/JdbcConnectorServiceXmlGenerator.java | 19 ++
.../xml/JdbcConnectorServiceXmlParser.java | 2 +
.../jdbc/internal/ConnectionConfigurationTest.java | 22 +-
.../jdbc/internal/ConnectionManagerUnitTest.java | 2 +-
.../jdbc/internal/TestConfigService.java | 2 +-
.../cli/CreateConnectionCommandDUnitTest.java | 35 ++-
.../CreateConnectionCommandIntegrationTest.java | 12 +-
.../internal/xml/ConnectionConfigBuilderTest.java | 3 +-
...onnectorServiceXmlGeneratorIntegrationTest.java | 41 +---
.../JdbcConnectorServiceXmlIntegrationTest.java | 3 +-
.../connectors/jdbc/internal/xml/XPathTest.java | 251 ---------------------
.../internal/configuration/domain/XmlEntity.java | 4 -
18 files changed, 139 insertions(+), 334 deletions(-)
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/ConnectionConfigBuilder.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/ConnectionConfigBuilder.java
index 093b7fb..b510fab 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/ConnectionConfigBuilder.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/ConnectionConfigBuilder.java
@@ -14,13 +14,18 @@
*/
package org.apache.geode.connectors.jdbc.internal;
-import java.io.Serializable;
+import static org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.PARAMS_DELIMITER;
+
+import java.util.HashMap;
+import java.util.Map;
public class ConnectionConfigBuilder {
+
private String name;
private String url;
private String user;
private String password;
+ private Map<String, String> parameters = new HashMap<>();
public ConnectionConfigBuilder withName(String name) {
this.name = name;
@@ -42,7 +47,17 @@ public class ConnectionConfigBuilder {
return this;
}
+ public ConnectionConfigBuilder withParameters(String[] params) {
+ for (String param : params) {
+ String[] keyValuePair = param.split(PARAMS_DELIMITER);
+ if (keyValuePair.length == 2) {
+ parameters.put(keyValuePair[0], keyValuePair[1]);
+ }
+ }
+ return this;
+ }
+
public ConnectionConfiguration build() {
- return new ConnectionConfiguration(name, url, user, password);
+ return new ConnectionConfiguration(name, url, user, password, parameters);
}
}
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/ConnectionConfiguration.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/ConnectionConfiguration.java
index f417077..bd2a597 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/ConnectionConfiguration.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/ConnectionConfiguration.java
@@ -15,19 +15,27 @@
package org.apache.geode.connectors.jdbc.internal;
import java.io.Serializable;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
public class ConnectionConfiguration implements Serializable {
+ private static final Object USER = "user";
+ private static final Object PASSWORD = "password";
private final String name;
private final String url;
private final String user;
private final String password;
+ private final Map<String, String> parameters;
- public ConnectionConfiguration(String name, String url, String user, String password) {
+ public ConnectionConfiguration(String name, String url, String user, String password, Map<String, String> parameters) {
this.name = name;
this.url = url;
this.user = user;
this.password = password;
+ this.parameters = parameters == null ? new HashMap<>() : Collections.unmodifiableMap(parameters);
}
public String getName() {
@@ -46,6 +54,19 @@ public class ConnectionConfiguration implements Serializable {
return password;
}
+ public Properties getConnectionProperties() {
+ Properties properties = new Properties();
+
+ properties.putAll(parameters);
+ if (user != null) {
+ properties.put(USER, user);
+ }
+ if (password != null) {
+ properties.put(PASSWORD, password);
+ }
+ return properties;
+ }
+
@Override
public boolean equals(Object o) {
if (this == o) {
@@ -66,7 +87,10 @@ public class ConnectionConfiguration implements Serializable {
if (user != null ? !user.equals(that.user) : that.user != null) {
return false;
}
- return password != null ? password.equals(that.password) : that.password == null;
+ if (password != null ? !password.equals(that.password) : that.password != null) {
+ return false;
+ }
+ return parameters != null ? parameters.equals(that.parameters) : that.parameters == null;
}
@Override
@@ -75,12 +99,18 @@ public class ConnectionConfiguration implements Serializable {
result = 31 * result + (url != null ? url.hashCode() : 0);
result = 31 * result + (user != null ? user.hashCode() : 0);
result = 31 * result + (password != null ? password.hashCode() : 0);
+ result = 31 * result + (parameters != null ? parameters.hashCode() : 0);
return result;
}
@Override
public String toString() {
- return "ConnectionConfiguration{" + "name='" + name + '\'' + ", url='" + url + '\'' + ", user='"
- + user + '\'' + ", password='" + password + '\'' + '}';
+ return "ConnectionConfiguration{" +
+ "name='" + name + '\'' +
+ ", url='" + url + '\'' +
+ ", user='" + user + '\'' +
+ ", password='" + password + '\'' +
+ ", parameters=" + parameters +
+ '}';
}
}
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/ConnectionManager.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/ConnectionManager.java
index d382112..30d030f 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/ConnectionManager.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/ConnectionManager.java
@@ -99,7 +99,7 @@ class ConnectionManager {
// package protected for testing purposes only
Connection getSQLConnection(ConnectionConfiguration config) throws SQLException {
- return DriverManager.getConnection(config.getUrl(), config.getUser(), config.getPassword());
+ return DriverManager.getConnection(config.getUrl(), config.getConnectionProperties());
}
private synchronized Connection getNewConnection(ConnectionConfiguration config) {
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommand.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommand.java
index b281d9d..269dd6d 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommand.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommand.java
@@ -14,7 +14,6 @@
*/
package org.apache.geode.connectors.jdbc.internal.cli;
-import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
@@ -27,7 +26,6 @@ import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfigBuilder;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfiguration;
import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.management.cli.CliMetaData;
import org.apache.geode.management.cli.Result;
@@ -61,7 +59,6 @@ public class CreateConnectionCommand implements GfshCommand {
private static final String ERROR_PREFIX = "ERROR: ";
-
@CliCommand(value = CREATE_CONNECTION, help = CREATE_CONNECTION__HELP)
@CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_REGION,
interceptor = "org.apache.geode.connectors.jdbc.internal.cli.CreateConnectionInterceptor")
@@ -80,9 +77,9 @@ public class CreateConnectionCommand implements GfshCommand {
Set<DistributedMember> membersToCreateConnectionOn = getMembers(null, null);
- // TODO: add support for params to ConnectionConfigBuilder
- ConnectionConfiguration configuration = new ConnectionConfigBuilder().withName(name)
- .withUrl(url).withUser(user).withPassword(password).build();
+ ConnectionConfigBuilder builder = new ConnectionConfigBuilder().withName(name)
+ .withUrl(url).withUser(user).withPassword(password).withParameters(params);
+ ConnectionConfiguration configuration = builder.build();
ResultCollector<?, ?> resultCollector =
executeFunction(new CreateConnectionFunction(), configuration, membersToCreateConnectionOn);
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionFunction.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionFunction.java
index 3a1b00a..73cb4bb 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionFunction.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionFunction.java
@@ -30,7 +30,6 @@ import org.apache.geode.internal.cache.xmlcache.CacheXml;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.management.internal.cli.CliUtil;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.configuration.domain.XmlEntity;
public class CreateConnectionFunction implements Function<ConnectionConfiguration>, InternalEntity {
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/ElementType.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/ElementType.java
index 1641b7b..c7ef034 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/ElementType.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/ElementType.java
@@ -55,9 +55,17 @@ public enum ElementType {
.withUrl(attributes.getValue(JdbcConnectorServiceXmlParser.URL))
.withUser(attributes.getValue(JdbcConnectorServiceXmlParser.USER))
.withPassword(attributes.getValue(JdbcConnectorServiceXmlParser.PASSWORD));
+ addParameters(connectionConfig, attributes.getValue(JdbcConnectorServiceXmlParser.PARAMETERS));
stack.push(connectionConfig);
}
+ private void addParameters(ConnectionConfigBuilder connectionConfig, String value) {
+ if (value == null) {
+ return;
+ }
+ connectionConfig.withParameters(value.split(","));
+ }
+
@Override
void endElement(Stack<Object> stack) {
ConnectionConfiguration config = ((ConnectionConfigBuilder) stack.pop()).build();
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlGenerator.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlGenerator.java
index b1e3430..afc929b 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlGenerator.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlGenerator.java
@@ -19,6 +19,8 @@ import static org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorService
import static org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.FIELD_NAME;
import static org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.NAME;
import static org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.NAMESPACE;
+import static org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.PARAMETERS;
+import static org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.PARAMS_DELIMITER;
import static org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.PASSWORD;
import static org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.PDX_CLASS;
import static org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.PRIMARY_KEY_IN_VALUE;
@@ -30,6 +32,7 @@ import static org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorService
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
+import java.util.Properties;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -99,6 +102,7 @@ public class JdbcConnectorServiceXmlGenerator implements XmlGenerator<Cache> {
XmlGeneratorUtils.addAttribute(attributes, URL, config.getUrl());
XmlGeneratorUtils.addAttribute(attributes, USER, config.getUser());
XmlGeneratorUtils.addAttribute(attributes, PASSWORD, config.getPassword());
+ XmlGeneratorUtils.addAttribute(attributes, PARAMETERS, createParametersString(config));
XmlGeneratorUtils.emptyElement(handler, PREFIX, ElementType.CONNECTION.getTypeName(),
attributes);
}
@@ -129,4 +133,19 @@ public class JdbcConnectorServiceXmlGenerator implements XmlGenerator<Cache> {
fieldAttributes);
}
}
+
+ private String createParametersString(ConnectionConfiguration config) {
+ Properties properties = config.getConnectionProperties();
+ StringBuilder stringBuilder = new StringBuilder();
+ for (Map.Entry<Object, Object> entry : properties.entrySet()) {
+ Object key = entry.getKey();
+ if (!key.equals(USER) && !key.equals(PASSWORD)) {
+ if (stringBuilder.length() > 0) {
+ stringBuilder.append(",");
+ }
+ stringBuilder.append(key).append(PARAMS_DELIMITER).append(entry.getValue());
+ }
+ }
+ return stringBuilder.toString();
+ }
}
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlParser.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlParser.java
index 656bc9c..7fdd691 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlParser.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlParser.java
@@ -21,10 +21,12 @@ import org.apache.geode.internal.cache.xmlcache.AbstractXmlParser;
public class JdbcConnectorServiceXmlParser extends AbstractXmlParser {
public static final String NAMESPACE = "http://geode.apache.org/schema/jdbc";
+ public static final String PARAMS_DELIMITER = ":";
static final String NAME = "name";
static final String URL = "url";
static final String USER = "user";
static final String PASSWORD = "password";
+ static final String PARAMETERS = "parameters";
static final String REGION = "region";
static final String CONNECTION_NAME = "connection-name";
static final String TABLE = "table";
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/ConnectionConfigurationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/ConnectionConfigurationTest.java
index 639e278..a563d64 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/ConnectionConfigurationTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/ConnectionConfigurationTest.java
@@ -16,6 +16,9 @@ package org.apache.geode.connectors.jdbc.internal;
import static org.assertj.core.api.Assertions.assertThat;
+import java.util.HashMap;
+import java.util.Map;
+
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -26,7 +29,7 @@ public class ConnectionConfigurationTest {
@Test
public void initiatedWithNullValues() {
- ConnectionConfiguration config = new ConnectionConfiguration(null, null, null, null);
+ ConnectionConfiguration config = new ConnectionConfiguration(null, null, null, null, null);
assertThat(config.getName()).isNull();
assertThat(config.getUrl()).isNull();
assertThat(config.getUser()).isNull();
@@ -36,28 +39,37 @@ public class ConnectionConfigurationTest {
@Test
public void hasCorrectName() {
String name = "name";
- ConnectionConfiguration config = new ConnectionConfiguration(name, null, null, null);
+ ConnectionConfiguration config = new ConnectionConfiguration(name, null, null, null, null);
assertThat(config.getName()).isEqualTo(name);
}
@Test
public void hasCorrectUrl() {
String url = "url";
- ConnectionConfiguration config = new ConnectionConfiguration(null, url, null, null);
+ ConnectionConfiguration config = new ConnectionConfiguration(null, url, null, null, null);
assertThat(config.getUrl()).isEqualTo(url);
}
@Test
public void hasCorrectUser() {
String user = "user";
- ConnectionConfiguration config = new ConnectionConfiguration(null, null, user, null);
+ ConnectionConfiguration config = new ConnectionConfiguration(null, null, user, null, null);
assertThat(config.getUser()).isEqualTo(user);
}
@Test
public void hasCorrectPassword() {
String password = "password";
- ConnectionConfiguration config = new ConnectionConfiguration(null, null, null, password);
+ ConnectionConfiguration config = new ConnectionConfiguration(null, null, null, password, null);
assertThat(config.getPassword()).isEqualTo(password);
}
+
+ @Test
+ public void hasCorrectProperties() {
+ Map<String, String> parameters = new HashMap<>();
+ parameters.put("param1", "value1");
+ parameters.put("param2", "value2");
+ ConnectionConfiguration config = new ConnectionConfiguration(null, null, "username", "secret", parameters);
+ assertThat(config.getConnectionProperties()).containsEntry("user", "username").containsEntry("password", "secret").containsEntry("param1", "value1").containsEntry("param2", "value2");
+ }
}
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/ConnectionManagerUnitTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/ConnectionManagerUnitTest.java
index 8358d1c..b6b4a67 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/ConnectionManagerUnitTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/ConnectionManagerUnitTest.java
@@ -233,7 +233,7 @@ public class ConnectionManagerUnitTest {
private ConnectionConfiguration getTestConnectionConfig(String name, String url, String user,
String password) {
- ConnectionConfiguration config = new ConnectionConfiguration(name, url, user, password);
+ ConnectionConfiguration config = new ConnectionConfiguration(name, url, user, password, null);
return config;
}
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TestConfigService.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TestConfigService.java
index b387d72..15370f4 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TestConfigService.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TestConfigService.java
@@ -49,6 +49,6 @@ public class TestConfigService {
}
private static ConnectionConfiguration createConnectionConfig() {
- return new ConnectionConfiguration(CONNECTION_CONFIG_NAME, CONNECTION_URL, null, null);
+ return new ConnectionConfiguration(CONNECTION_CONFIG_NAME, CONNECTION_URL, null, null, null);
}
}
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandDUnitTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandDUnitTest.java
index 8b1e842..f58a33b 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandDUnitTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandDUnitTest.java
@@ -16,39 +16,30 @@
*/
package org.apache.geode.connectors.jdbc.internal.cli;
-import static org.apache.geode.connectors.jdbc.internal.cli.CreateConnectionCommand.*;
-import static org.apache.geode.distributed.ConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION;
-import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Matchers.*;
-import static org.mockito.Mockito.*;
+import static org.apache.geode.connectors.jdbc.internal.cli.CreateConnectionCommand.CREATE_CONNECTION;
+import static org.apache.geode.connectors.jdbc.internal.cli.CreateConnectionCommand.CREATE_CONNECTION__NAME;
+import static org.apache.geode.connectors.jdbc.internal.cli.CreateConnectionCommand.CREATE_CONNECTION__PARAMS;
+import static org.apache.geode.connectors.jdbc.internal.cli.CreateConnectionCommand.CREATE_CONNECTION__PASSWORD;
+import static org.apache.geode.connectors.jdbc.internal.cli.CreateConnectionCommand.CREATE_CONNECTION__URL;
+import static org.apache.geode.connectors.jdbc.internal.cli.CreateConnectionCommand.CREATE_CONNECTION__USER;
+import static org.assertj.core.api.Assertions.assertThat;
-import java.util.Map;
-import java.util.Properties;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.Region;
-import org.apache.geode.compression.SnappyCompressor;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfiguration;
import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
-import org.apache.geode.management.internal.configuration.domain.Configuration;
-import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.UnitTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
@Category(DistributedTest.class)
public class CreateConnectionCommandDUnitTest {
@@ -79,7 +70,7 @@ public class CreateConnectionCommandDUnitTest {
csb.addOption(CREATE_CONNECTION__URL, "url");
csb.addOption(CREATE_CONNECTION__USER, "username");
csb.addOption(CREATE_CONNECTION__PASSWORD, "secret");
- csb.addOption(CREATE_CONNECTION__PARAMS, "param1,param2");
+ csb.addOption(CREATE_CONNECTION__PARAMS, "param1:value1,param2:value2");
gfsh.executeAndAssertThat(csb.toString())
.statusIsSuccess();
@@ -94,7 +85,7 @@ public class CreateConnectionCommandDUnitTest {
assertThat(config.getUrl()).isEqualTo("url");
assertThat(config.getUser()).isEqualTo("username");
assertThat(config.getPassword()).isEqualTo("secret");
- //TODO add params
+ assertThat(config.getConnectionProperties()).containsEntry("param1", "value1").containsEntry("param2", "value2");
});
}
}
\ No newline at end of file
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandIntegrationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandIntegrationTest.java
index c3c2818..fbc5e78 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandIntegrationTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandIntegrationTest.java
@@ -19,6 +19,7 @@ package org.apache.geode.connectors.jdbc.internal.cli;
import static org.apache.geode.distributed.ConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION;
import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -43,7 +44,7 @@ public class CreateConnectionCommandIntegrationTest {
private String[] params;
@Before
- public void setUp() throws Exception {
+ public void setup() throws Exception {
cache = (InternalCache) new CacheFactory().set(ENABLE_CLUSTER_CONFIGURATION, "true").create();
createConnectionCommand = new CreateConnectionCommand();
@@ -51,7 +52,12 @@ public class CreateConnectionCommandIntegrationTest {
url = "url";
user = "user";
password = "password";
- params = new String[] { "params1", "params2" };
+ params = new String[] { "param1:value1", "param2:value2" };
+ }
+
+ @After
+ public void tearDown() {
+ cache.close();
}
@Test
@@ -68,6 +74,6 @@ public class CreateConnectionCommandIntegrationTest {
assertThat(connectionConfig.getUrl()).isEqualTo(url);
assertThat(connectionConfig.getUser()).isEqualTo(user);
assertThat(connectionConfig.getPassword()).isEqualTo(password);
- //assertThat(connectionConfig.getParams()).contains(params);
+ assertThat(connectionConfig.getConnectionProperties()).containsEntry("param1", "value1").containsEntry("param2", "value2");
}
}
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/ConnectionConfigBuilderTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/ConnectionConfigBuilderTest.java
index bf193b2..b1de311 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/ConnectionConfigBuilderTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/ConnectionConfigBuilderTest.java
@@ -37,11 +37,12 @@ public class ConnectionConfigBuilderTest {
@Test
public void createsObjectWithCorrectValues() {
ConnectionConfigBuilder builder = new ConnectionConfigBuilder();
- builder.withName("name").withUrl("url").withUser("user").withPassword("password");
+ builder.withName("name").withUrl("url").withUser("user").withPassword("password").withParameters(new String[] {"param1:value1", "param2:value2"});
ConnectionConfiguration config = builder.build();
assertThat(config.getName()).isEqualTo("name");
assertThat(config.getUrl()).isEqualTo("url");
assertThat(config.getUser()).isEqualTo("user");
assertThat(config.getPassword()).isEqualTo("password");
+ assertThat(config.getConnectionProperties()).containsEntry("param1", "value1").containsEntry("param2", "value2");
}
}
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlGeneratorIntegrationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlGeneratorIntegrationTest.java
index ba22544..252aab7 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlGeneratorIntegrationTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlGeneratorIntegrationTest.java
@@ -52,7 +52,6 @@ import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
@@ -72,18 +71,21 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
public class JdbcConnectorServiceXmlGeneratorIntegrationTest {
private InternalCache cache;
+ private File cacheXmlFile;
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@Before
- public void setup() {
+ public void setup() throws IOException {
cache = (InternalCache) new CacheFactory().create();
+ cacheXmlFile = temporaryFolder.newFile("cache.xml");
}
@After
public void tearDown() {
cache.close();
+ cache = null;
}
@Test
@@ -167,9 +169,8 @@ public class JdbcConnectorServiceXmlGeneratorIntegrationTest {
service.addOrUpdateConnectionConfig(config);
generateXml();
- File cacheXml = new File(temporaryFolder.getRoot(), "cache.xml");
cache.close();
- cache = (InternalCache) new CacheFactory().set(CACHE_XML_FILE, cacheXml.getAbsolutePath()).create();
+ cache = (InternalCache) new CacheFactory().set(CACHE_XML_FILE, cacheXmlFile.getAbsolutePath()).create();
service = cache.getService(InternalJdbcConnectorService.class);
@@ -184,8 +185,7 @@ public class JdbcConnectorServiceXmlGeneratorIntegrationTest {
service.addOrUpdateConnectionConfig(config);
generateXml();
- File cacheXml = new File(temporaryFolder.getRoot(), "cache.xml");
- for(String line : Files.readAllLines(cacheXml.toPath())) {
+ for(String line : Files.readAllLines(cacheXmlFile.toPath())) {
System.out.println(line);
}
@@ -195,7 +195,7 @@ public class JdbcConnectorServiceXmlGeneratorIntegrationTest {
DocumentBuilder builder = factory.newDocumentBuilder();
builder.setEntityResolver(new CacheXmlParser());
- Document document = builder.parse(cacheXml);
+ Document document = builder.parse(cacheXmlFile);
System.out.println(document.getDocumentElement());
XmlUtils.XPathContext xpathContext = new XmlUtils.XPathContext();
xpathContext.addNamespace(CacheXml.PREFIX, CacheXml.GEODE_NAMESPACE);
@@ -221,9 +221,8 @@ public class JdbcConnectorServiceXmlGeneratorIntegrationTest {
service.addOrUpdateRegionMapping(mapping);
generateXml();
- File cacheXml = new File(temporaryFolder.getRoot(), "cache.xml");
cache.close();
- cache = (InternalCache) new CacheFactory().set(CACHE_XML_FILE, cacheXml.getAbsolutePath()).create();
+ cache = (InternalCache) new CacheFactory().set(CACHE_XML_FILE, cacheXmlFile.getAbsolutePath()).create();
service = cache.getService(InternalJdbcConnectorService.class);
@@ -244,9 +243,8 @@ public class JdbcConnectorServiceXmlGeneratorIntegrationTest {
service.addOrUpdateRegionMapping(mapping);
generateXml();
- File cacheXml = new File(temporaryFolder.getRoot(), "cache.xml");
cache.close();
- cache = (InternalCache) new CacheFactory().set(CACHE_XML_FILE, cacheXml.getAbsolutePath()).create();
+ cache = (InternalCache) new CacheFactory().set(CACHE_XML_FILE, cacheXmlFile.getAbsolutePath()).create();
service = cache.getService(InternalJdbcConnectorService.class);
@@ -282,35 +280,18 @@ public class JdbcConnectorServiceXmlGeneratorIntegrationTest {
private Document getCacheXmlDocument()
throws IOException, SAXException, ParserConfigurationException {
- File cacheXml = new File(temporaryFolder.getRoot(), "cache.xml");
DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
dbFactory.setNamespaceAware(false);
dbFactory.setValidating(false);
DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
- Document document = dBuilder.parse(cacheXml);
+ Document document = dBuilder.parse(cacheXmlFile);
document.getDocumentElement().normalize();
return document;
}
- private void printXml()
- throws IOException, SAXException, ParserConfigurationException {
- File cacheXml = new File(temporaryFolder.getRoot(), "cache.xml");
- for (String line : Files.readAllLines(cacheXml.toPath())) {
- System.out.println(line);
- }
- }
-
private void generateXml() throws IOException {
- File cacheXml = new File(temporaryFolder.getRoot(), "cache.xml");
- PrintWriter printWriter = new PrintWriter(new FileWriter(cacheXml));
+ PrintWriter printWriter = new PrintWriter(new FileWriter(cacheXmlFile));
CacheXmlGenerator.generate(cache, printWriter, true, false, false);
printWriter.flush();
}
-
- private void writeXml(File cacheXml, String xml) throws IOException {
- PrintWriter printWriter = new PrintWriter(new FileWriter(cacheXml));
- printWriter.print(xml);
- printWriter.flush();
- }
-
}
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlIntegrationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlIntegrationTest.java
index 4dee67b..9693201 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlIntegrationTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlIntegrationTest.java
@@ -21,7 +21,6 @@ import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
-import java.nio.file.Files;
import org.junit.After;
import org.junit.Before;
@@ -84,7 +83,7 @@ public class JdbcConnectorServiceXmlIntegrationTest {
private void configureService() {
InternalJdbcConnectorService service = cache.getService(InternalJdbcConnectorService.class);
config1 = new ConnectionConfigBuilder().withName("connection1").withUrl("url1")
- .withUser("username1").withPassword("secret1").build();
+ .withUser("username1").withPassword("secret1").withParameters(new String[]{"param1:value1", "param2:value2"}).build();
config2 = new ConnectionConfigBuilder().withName("connection2").withUrl("url2")
.withUser("username2").withPassword("secret2").build();
service.addOrUpdateConnectionConfig(config1);
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/XPathTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/XPathTest.java
deleted file mode 100644
index 300d505..0000000
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/XPathTest.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geode.connectors.jdbc.internal.xml;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.nio.file.Files;
-import java.util.Iterator;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpression;
-import javax.xml.xpath.XPathFactory;
-
-import com.sun.org.apache.xpath.internal.NodeSet;
-import com.sun.xml.internal.bind.v2.runtime.NamespaceContext2;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.internal.cache.xmlcache.CacheXmlGenerator;
-import org.apache.geode.internal.cache.xmlcache.CacheXmlParser;
-import org.apache.geode.management.internal.configuration.utils.XmlUtils;
-
-public class XPathTest {
-
- private InternalCache cache;
-
- @Rule
- public TemporaryFolder temporaryFolder = new TemporaryFolder();
-
-// @Before
-// public void setup() {
-// cache = (InternalCache) new CacheFactory().create();
-// }
-//
-// @After
-// public void tearDown() {
-// cache.close();
-// }
-
- @Test
- public void test() throws Exception {
- StringBuilder xmlBuilder = new StringBuilder();
-// xmlBuilder.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
- xmlBuilder.append("<cache xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns=\"http://geode.apache.org/schema/cache\" xsi:schemaLocation=\"http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd\" version=\"1.0\">");
- xmlBuilder.append("<jdbc:connector-service xmlns:jdbc=\"http://geode.apache.org/schema/jdbc\">");
-
-// xmlBuilder.append("<cache xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns=\"http://geode.apache.org/schema/cache\" xmlns:jdbc=\"http://geode.apache.org/schema/jdbc\" xsi:schemaLocation=\"http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd\" version=\"1.0\">");
-// xmlBuilder.append("<jdbc:connector-service>");
-
- xmlBuilder.append("<jdbc:connection name=\"name\" url=\"url\" user=\"username\" password=\"secret\"/>");
- xmlBuilder.append("</jdbc:connector-service>");
- xmlBuilder.append("</cache>");
-
- System.out.println("xmlBuilder: " + xmlBuilder.toString());
-
- File cacheXml = new File(temporaryFolder.getRoot(), "cache.xml");
- writeXml(cacheXml, xmlBuilder.toString());
-
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- factory.setNamespaceAware(true);
-
- DocumentBuilder builder = factory.newDocumentBuilder();
- builder.setEntityResolver(new CacheXmlParser());
-
- Document document = builder.parse(cacheXml);
- System.out.println("document: " + document);
- System.out.println("document.getDocumentElement().getTagName(): " + document.getDocumentElement().getTagName());
- //System.out.println("document.getDocumentElement().getTagName(): " + document.getDocumentElement().getChildNodes());
- NodeList nodeList = document.getDocumentElement().getChildNodes();
- print(nodeList);
-
-// XmlUtils.XPathContext xpathContext = new XmlUtils.XPathContext();
-// xpathContext.addNamespace(CacheXml.PREFIX, CacheXml.GEODE_NAMESPACE);
-// xpathContext.addNamespace(PREFIX, NAMESPACE); // TODO: wrap this line with conditional
-
- // Create an XPathContext here
- String expression = "cache";
- XPath xpath = XPathFactory.newInstance().newXPath();
-// xpath.setNamespaceContext(xpathContext);
- Object result = xpath.evaluate(expression, document, XPathConstants.NODE);
-
- //Node element = XmlUtils.querySingleElement(document, "//cache/jdbc:connector-service", xpathContext);
- // Must copy to preserve namespaces.
- if (result == null) {
- System.out.println("RESULT = " + result);
- } else {
- System.out.println("RESULT = " + XmlUtils.elementToString((Element) result));
- }
- }
-
- @Test
- public void test2() throws Exception {
- StringBuilder xmlBuilder = new StringBuilder();
- xmlBuilder.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-// xmlBuilder.append("<catalog xmlns:journal=\"http://www.w3.org/2001/XMLSchema-Instance\" >");
-// xmlBuilder.append("<journal:journal title=\"XML\" publisher=\"IBM developerWorks\">");
- xmlBuilder.append("<catalog>");
- xmlBuilder.append("<journal:journal xmlns:journal=\"http://www.w3.org/2001/XMLSchema-Instance\" title=\"XML\" publisher=\"IBM developerWorks\">");
- xmlBuilder.append("<article journal:level=\"Intermediate\" date=\"February-2003\">");
- xmlBuilder.append("<title>Design XML Schemas Using UML</title>");
- xmlBuilder.append("<author>Ayesha Malik</author>");
- xmlBuilder.append("</article>");
- xmlBuilder.append("</journal:journal>");
- /*xmlBuilder.append("<journal title=\"Java Technology\" publisher=\"IBM developerWorks\">");
- xmlBuilder.append("<article level=\"Advanced\" date=\"January-2004\">");
- xmlBuilder.append("<title>Design service-oriented architecture frameworks with J2EE technology</title>");
- xmlBuilder.append("<author>Naveen Balani </author>");
- xmlBuilder.append("</article>");
- xmlBuilder.append("<article level=\"Advanced\" date=\"October-2003\">");
- xmlBuilder.append("<title>Advance DAO Programming</title>");
- xmlBuilder.append("<author>Sean Sullivan </author>");
- xmlBuilder.append("</article>");
- xmlBuilder.append("</journal>");*/
- xmlBuilder.append("</catalog>");
-
- System.out.println("xmlBuilder: " + xmlBuilder.toString());
-
- File fileXml = new File(temporaryFolder.getRoot(), "file.xml");
- writeXml(fileXml, xmlBuilder.toString());
-
- XPathFactory factory=XPathFactory.newInstance();
-
- XPath xPath=factory.newXPath();
-
- XPathExpression xPathExpression= xPath.compile("/catalog/journal/article[@date='January-2004']/title");
-
- InputSource inputSource = new InputSource(new FileInputStream(fileXml));
-
-// String title = xPathExpression.evaluate(inputSource);
-//
-// String publisher = xPath.evaluate("/catalog/journal/@publisher", inputSource);
-
- //String expression="/catalog/journal/article";
-
- String expression="//catalog/*[name()='journal']";
- NodeList nodes = (NodeList) xPath.evaluate(expression, inputSource, XPathConstants.NODESET);
-
- NodeList nodeList=(NodeList)nodes;
- System.out.println(nodeList.item(0).getNodeName());
- }
-
- @Test
- public void test3() throws Exception {
- StringBuilder xmlBuilder = new StringBuilder();
- xmlBuilder.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
- xmlBuilder.append("<cache> xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns=\"http://geode.apache.org/schema/cache\" xsi:schemaLocation=\"http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd\" version=\"1.0\">");
- xmlBuilder.append("<jdbc:connector-service xmlns:jdbc=\"http://geode.apache.org/schema/jdbc\">");
-
-// xmlBuilder.append("<cache xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns=\"http://geode.apache.org/schema/cache\" xmlns:jdbc=\"http://geode.apache.org/schema/jdbc\" xsi:schemaLocation=\"http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd\" version=\"1.0\">");
-// xmlBuilder.append("<jdbc:connector-service>");
-
- xmlBuilder.append("<jdbc:connection name=\"name\" url=\"url\" user=\"username\" password=\"secret\"/>");
- xmlBuilder.append("</jdbc:connector-service>");
- xmlBuilder.append("</cache>");
-
- System.out.println("xmlBuilder: " + xmlBuilder.toString());
-
- File fileXml = new File(temporaryFolder.getRoot(), "file.xml");
- writeXml(fileXml, xmlBuilder.toString());
-
- XPathFactory factory=XPathFactory.newInstance();
-
- XPath xPath=factory.newXPath();
-
- InputSource inputSource = new InputSource(new FileInputStream(fileXml));
-
-// String title = xPathExpression.evaluate(inputSource);
-//
-// String publisher = xPath.evaluate("/catalog/journal/@publisher", inputSource);
-
- //String expression="/catalog/journal/article";
- XmlUtils.XPathContext context = new XmlUtils.XPathContext();
- context.addNamespace("cache", "http://geode.apache.org/schema/cache");
- context.addNamespace("jdbc", "http://geode.apache.org/schema/jdbc");
- xPath.setNamespaceContext(context);
- String expression="//cache/jdbc:connector-service";
-
- NodeList nodes = (NodeList) xPath.evaluate(expression, inputSource, XPathConstants.NODESET);
-
- NodeList nodeList=(NodeList)nodes;
- System.out.println(nodeList.getLength());
- System.out.println(nodeList.item(0).getNodeName());
- inputSource = new InputSource(new FileInputStream(fileXml));
- Document document = XmlUtils.getDocumentBuilder().parse(inputSource);
- Node element = XmlUtils.querySingleElement(document, expression, context);
- System.out.println(element.getNodeName());
- }
-
- private void print(NodeList nodeList) {
- for (int i = 0; i < nodeList.getLength(); i++) {
- System.out.println("node[" + i + "]:" + nodeList.item(i).getNodeName());
- if (nodeList.item(i).getChildNodes().getLength() > 0) {
- print(nodeList.item(i).getChildNodes());
- }
- }
- }
-
- private void printXml()
- throws IOException, SAXException, ParserConfigurationException {
- File cacheXml = new File(temporaryFolder.getRoot(), "cache.xml");
- for (String line : Files.readAllLines(cacheXml.toPath())) {
- System.out.println(line);
- }
- }
-
- private void writeXml(File cacheXml, String xml) throws IOException {
- PrintWriter printWriter = new PrintWriter(new FileWriter(cacheXml));
- printWriter.print(xml);
- printWriter.flush();
- }
-
- private void generateXml() throws IOException {
- File cacheXml = new File(temporaryFolder.getRoot(), "cache.xml");
- PrintWriter printWriter = new PrintWriter(new FileWriter(cacheXml));
- CacheXmlGenerator.generate(cache, printWriter, true, false, false);
- printWriter.flush();
- }
-
-}
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
index 83c9963..db370a2 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java
@@ -25,19 +25,15 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
-import javax.swing.text.html.parser.Parser;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactoryConfigurationError;
import javax.xml.xpath.XPathExpressionException;
-import com.sun.org.apache.xml.internal.serialize.OutputFormat;
-import com.sun.org.apache.xml.internal.serialize.XMLSerializer;
import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.Logger;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
--
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <co...@geode.apache.org>'].