This is an automated email from the ASF dual-hosted git repository.
prhomberg pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new cd418f0 GEODE-5032: Pluralize configuration class getters and fields
that refer to lists. (#1977)
cd418f0 is described below
commit cd418f09e0eef58897430256346e5930ff6380ac
Author: Patrick Rhomberg <[email protected]>
AuthorDate: Tue May 22 13:51:19 2018 -0700
GEODE-5032: Pluralize configuration class getters and fields that refer to
lists. (#1977)
* Reflect changes in sanctioned-geode-core-serializables.txt
---
.../geode/cache/configuration/CacheConfig.java | 248 ++++++++++-----------
.../configuration/CacheTransactionManagerType.java | 18 +-
.../geode/cache/configuration/DeclarableType.java | 26 +--
.../geode/cache/configuration/DiskDirsType.java | 14 +-
.../cache/configuration/FunctionServiceType.java | 16 +-
.../cache/configuration/JndiBindingsType.java | 36 +--
.../apache/geode/cache/configuration/PoolType.java | 30 +--
.../cache/configuration/RegionAttributesType.java | 42 ++--
.../geode/cache/configuration/RegionConfig.java | 44 ++--
.../SerializationRegistrationType.java | 27 +--
.../geode/cache/configuration/ServerType.java | 16 +-
.../cli/commands/CreateAsyncEventQueueCommand.java | 4 +-
.../cli/commands/CreateGatewayReceiverCommand.java | 2 +-
.../internal/cli/commands/CreateIndexCommand.java | 2 +-
.../cli/commands/CreateJndiBindingCommand.java | 2 +-
.../cli/commands/DescribeJndiBindingCommand.java | 3 +-
.../internal/cli/commands/DestroyIndexCommand.java | 8 +-
.../ExportImportClusterConfigurationCommands.java | 6 +-
.../functions/CreateAsyncEventQueueFunction.java | 4 +-
.../cli/functions/CreateJndiBindingFunction.java | 2 +-
.../cli/functions/GatewayReceiverFunctionArgs.java | 4 +-
.../sanctioned-geode-core-serializables.txt | 8 +-
.../geode/cache/configuration/CacheConfigTest.java | 24 +-
.../cache/configuration/DeclarableTypeTest.java | 14 +-
.../internal/CacheConfigDAODUnitTest.java | 2 +-
...nternalConfigurationPersistenceServiceTest.java | 4 +-
.../geode/internal/config/JAXBServiceTest.java | 2 +-
.../cli/commands/CreateJndiBindingCommandTest.java | 4 +-
.../commands/DestroyIndexCommandsDUnitTest.java | 4 +-
.../functions/DestroyJndiBindingFunctionTest.java | 2 +-
.../cli/functions/ListJndiBindingFunctionTest.java | 4 +-
31 files changed, 312 insertions(+), 310 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/configuration/CacheConfig.java
b/geode-core/src/main/java/org/apache/geode/cache/configuration/CacheConfig.java
index a96904b..899de35 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/configuration/CacheConfig.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/configuration/CacheConfig.java
@@ -264,10 +264,10 @@ import org.apache.geode.cache.Region;
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "",
- propOrder = {"cacheTransactionManager", "dynamicRegionFactory",
"gatewayHub", "gatewaySender",
- "gatewayReceiver", "gatewayConflictResolver", "asyncEventQueue",
"cacheServer", "pool",
- "diskStore", "pdx", "regionAttributes", "jndiBindings", "region",
"functionService",
- "resourceManager", "serializationRegistration", "backup",
"initializer", "cacheElements"})
+ propOrder = {"cacheTransactionManager", "dynamicRegionFactory",
"gatewayHubs", "gatewaySenders",
+ "gatewayReceiver", "gatewayConflictResolver", "asyncEventQueues",
"cacheServers", "pools",
+ "diskStores", "pdx", "regionAttributes", "jndiBindings", "regions",
"functionService",
+ "resourceManager", "serializationRegistration", "backups",
"initializer", "cacheElements"})
@XmlRootElement(name = "cache", namespace =
"http://geode.apache.org/schema/cache";)
@XSDRootElement(namespace = "http://geode.apache.org/schema/cache";,
schemaLocation = "http://geode.apache.org/schema/cache/cache-1.0.xsd";)
@@ -279,30 +279,30 @@ public class CacheConfig {
@XmlElement(name = "dynamic-region-factory", namespace =
"http://geode.apache.org/schema/cache";)
protected DynamicRegionFactoryType dynamicRegionFactory;
@XmlElement(name = "gateway-hub", namespace =
"http://geode.apache.org/schema/cache";)
- protected List<CacheConfig.GatewayHub> gatewayHub;
+ protected List<CacheConfig.GatewayHub> gatewayHubs;
@XmlElement(name = "gateway-sender", namespace =
"http://geode.apache.org/schema/cache";)
- protected List<CacheConfig.GatewaySender> gatewaySender;
+ protected List<CacheConfig.GatewaySender> gatewaySenders;
@XmlElement(name = "gateway-receiver", namespace =
"http://geode.apache.org/schema/cache";)
protected CacheConfig.GatewayReceiver gatewayReceiver;
@XmlElement(name = "gateway-conflict-resolver",
namespace = "http://geode.apache.org/schema/cache";)
protected DeclarableType gatewayConflictResolver;
@XmlElement(name = "async-event-queue", namespace =
"http://geode.apache.org/schema/cache";)
- protected List<CacheConfig.AsyncEventQueue> asyncEventQueue;
+ protected List<CacheConfig.AsyncEventQueue> asyncEventQueues;
@XmlElement(name = "cache-server", namespace =
"http://geode.apache.org/schema/cache";)
- protected List<CacheConfig.CacheServer> cacheServer;
- @XmlElement(namespace = "http://geode.apache.org/schema/cache";)
- protected List<PoolType> pool;
+ protected List<CacheConfig.CacheServer> cacheServers;
+ @XmlElement(name = "pool", namespace =
"http://geode.apache.org/schema/cache";)
+ protected List<PoolType> pools;
@XmlElement(name = "disk-store", namespace =
"http://geode.apache.org/schema/cache";)
- protected List<DiskStoreType> diskStore;
+ protected List<DiskStoreType> diskStores;
@XmlElement(namespace = "http://geode.apache.org/schema/cache";)
protected PdxType pdx;
@XmlElement(name = "region-attributes", namespace =
"http://geode.apache.org/schema/cache";)
protected List<RegionAttributesType> regionAttributes;
@XmlElement(name = "jndi-bindings", namespace =
"http://geode.apache.org/schema/cache";)
protected JndiBindingsType jndiBindings;
- @XmlElement(namespace = "http://geode.apache.org/schema/cache";)
- protected List<RegionConfig> region;
+ @XmlElement(name = "region", namespace =
"http://geode.apache.org/schema/cache";)
+ protected List<RegionConfig> regions;
@XmlElement(name = "function-service", namespace =
"http://geode.apache.org/schema/cache";)
protected FunctionServiceType functionService;
@XmlElement(name = "resource-manager", namespace =
"http://geode.apache.org/schema/cache";)
@@ -310,8 +310,8 @@ public class CacheConfig {
@XmlElement(name = "serialization-registration",
namespace = "http://geode.apache.org/schema/cache";)
protected SerializationRegistrationType serializationRegistration;
- @XmlElement(namespace = "http://geode.apache.org/schema/cache";)
- protected List<String> backup;
+ @XmlElement(name = "backup", namespace =
"http://geode.apache.org/schema/cache";)
+ protected List<String> backups;
@XmlElement(namespace = "http://geode.apache.org/schema/cache";)
protected DeclarableType initializer;
@XmlAnyElement(lax = true)
@@ -383,19 +383,19 @@ public class CacheConfig {
}
/**
- * Gets the value of the gatewayHub property.
+ * Gets the value of the gatewayHubs property.
*
* <p>
* This accessor method returns a reference to the live list,
* not a snapshot. Therefore any modification you make to the
* returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the gatewayHub
property.
+ * This is why there is not a <CODE>set</CODE> method for the gatewayHubs
property.
*
* <p>
* For example, to add a new item, do as follows:
*
* <pre>
- * getGatewayHub().add(newItem);
+ * getGatewayHubs().add(newItem);
* </pre>
*
*
@@ -405,27 +405,27 @@ public class CacheConfig {
*
*
*/
- public List<CacheConfig.GatewayHub> getGatewayHub() {
- if (gatewayHub == null) {
- gatewayHub = new ArrayList<CacheConfig.GatewayHub>();
+ public List<CacheConfig.GatewayHub> getGatewayHubs() {
+ if (gatewayHubs == null) {
+ gatewayHubs = new ArrayList<CacheConfig.GatewayHub>();
}
- return this.gatewayHub;
+ return this.gatewayHubs;
}
/**
- * Gets the value of the gatewaySender property.
+ * Gets the value of the gatewaySenders property.
*
* <p>
* This accessor method returns a reference to the live list,
* not a snapshot. Therefore any modification you make to the
* returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the gatewaySender
property.
+ * This is why there is not a <CODE>set</CODE> method for the gatewaySenders
property.
*
* <p>
* For example, to add a new item, do as follows:
*
* <pre>
- * getGatewaySender().add(newItem);
+ * getGatewaySenders().add(newItem);
* </pre>
*
*
@@ -435,11 +435,11 @@ public class CacheConfig {
*
*
*/
- public List<CacheConfig.GatewaySender> getGatewaySender() {
- if (gatewaySender == null) {
- gatewaySender = new ArrayList<CacheConfig.GatewaySender>();
+ public List<CacheConfig.GatewaySender> getGatewaySenders() {
+ if (gatewaySenders == null) {
+ gatewaySenders = new ArrayList<CacheConfig.GatewaySender>();
}
- return this.gatewaySender;
+ return this.gatewaySenders;
}
/**
@@ -487,19 +487,19 @@ public class CacheConfig {
}
/**
- * Gets the value of the asyncEventQueue property.
+ * Gets the value of the asyncEventQueues property.
*
* <p>
* This accessor method returns a reference to the live list,
* not a snapshot. Therefore any modification you make to the
* returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the
asyncEventQueue property.
+ * This is why there is not a <CODE>set</CODE> method for the
asyncEventQueues property.
*
* <p>
* For example, to add a new item, do as follows:
*
* <pre>
- * getAsyncEventQueue().add(newItem);
+ * getAsyncEventQueues().add(newItem);
* </pre>
*
*
@@ -509,27 +509,27 @@ public class CacheConfig {
*
*
*/
- public List<CacheConfig.AsyncEventQueue> getAsyncEventQueue() {
- if (asyncEventQueue == null) {
- asyncEventQueue = new ArrayList<CacheConfig.AsyncEventQueue>();
+ public List<CacheConfig.AsyncEventQueue> getAsyncEventQueues() {
+ if (asyncEventQueues == null) {
+ asyncEventQueues = new ArrayList<CacheConfig.AsyncEventQueue>();
}
- return this.asyncEventQueue;
+ return this.asyncEventQueues;
}
/**
- * Gets the value of the cacheServer property.
+ * Gets the value of the cacheServers property.
*
* <p>
* This accessor method returns a reference to the live list,
* not a snapshot. Therefore any modification you make to the
* returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the cacheServer
property.
+ * This is why there is not a <CODE>set</CODE> method for the cacheServers
property.
*
* <p>
* For example, to add a new item, do as follows:
*
* <pre>
- * getCacheServer().add(newItem);
+ * getCacheServers().add(newItem);
* </pre>
*
*
@@ -539,11 +539,11 @@ public class CacheConfig {
*
*
*/
- public List<CacheConfig.CacheServer> getCacheServer() {
- if (cacheServer == null) {
- cacheServer = new ArrayList<CacheConfig.CacheServer>();
+ public List<CacheConfig.CacheServer> getCacheServers() {
+ if (cacheServers == null) {
+ cacheServers = new ArrayList<CacheConfig.CacheServer>();
}
- return this.cacheServer;
+ return this.cacheServers;
}
/**
@@ -559,7 +559,7 @@ public class CacheConfig {
* For example, to add a new item, do as follows:
*
* <pre>
- * getPool().add(newItem);
+ * getPools().add(newItem);
* </pre>
*
*
@@ -569,11 +569,11 @@ public class CacheConfig {
*
*
*/
- public List<PoolType> getPool() {
- if (pool == null) {
- pool = new ArrayList<PoolType>();
+ public List<PoolType> getPools() {
+ if (pools == null) {
+ pools = new ArrayList<PoolType>();
}
- return this.pool;
+ return this.pools;
}
/**
@@ -589,7 +589,7 @@ public class CacheConfig {
* For example, to add a new item, do as follows:
*
* <pre>
- * getDiskStore().add(newItem);
+ * getDiskStores().add(newItem);
* </pre>
*
*
@@ -599,11 +599,11 @@ public class CacheConfig {
*
*
*/
- public List<DiskStoreType> getDiskStore() {
- if (diskStore == null) {
- diskStore = new ArrayList<DiskStoreType>();
+ public List<DiskStoreType> getDiskStores() {
+ if (diskStores == null) {
+ diskStores = new ArrayList<DiskStoreType>();
}
- return this.diskStore;
+ return this.diskStores;
}
/**
@@ -685,7 +685,7 @@ public class CacheConfig {
if (jndiBindings == null) {
jndiBindings = new JndiBindingsType();
}
- return jndiBindings.getJndiBinding();
+ return jndiBindings.getJndiBindings();
}
@@ -702,7 +702,7 @@ public class CacheConfig {
* For example, to add a new item, do as follows:
*
* <pre>
- * getRegion().add(newItem);
+ * getRegions().add(newItem);
* </pre>
*
*
@@ -712,11 +712,11 @@ public class CacheConfig {
*
*
*/
- public List<RegionConfig> getRegion() {
- if (region == null) {
- region = new ArrayList<RegionConfig>();
+ public List<RegionConfig> getRegions() {
+ if (regions == null) {
+ regions = new ArrayList<RegionConfig>();
}
- return this.region;
+ return this.regions;
}
/**
@@ -798,7 +798,7 @@ public class CacheConfig {
* For example, to add a new item, do as follows:
*
* <pre>
- * getBackup().add(newItem);
+ * getBackups().add(newItem);
* </pre>
*
*
@@ -808,11 +808,11 @@ public class CacheConfig {
*
*
*/
- public List<String> getBackup() {
- if (backup == null) {
- backup = new ArrayList<String>();
+ public List<String> getBackups() {
+ if (backups == null) {
+ backups = new ArrayList<String>();
}
- return this.backup;
+ return this.backups;
}
/**
@@ -1030,7 +1030,7 @@ public class CacheConfig {
if (regionPath.startsWith(Region.SEPARATOR)) {
regionPath = regionPath.substring(1);
}
- return findElement(getRegion(), regionPath);
+ return findElement(getRegions(), regionPath);
}
public <T extends CacheElement> List<T> findCustomCacheElements(Class<T>
classT) {
@@ -1107,11 +1107,11 @@ public class CacheConfig {
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "",
- propOrder = {"gatewayEventFilter", "gatewayEventSubstitutionFilter",
"asyncEventListener"})
+ propOrder = {"gatewayEventFilters", "gatewayEventSubstitutionFilter",
"asyncEventListener"})
public static class AsyncEventQueue implements Serializable {
@XmlElement(name = "gateway-event-filter", namespace =
"http://geode.apache.org/schema/cache";)
- protected List<DeclarableType> gatewayEventFilter;
+ protected List<DeclarableType> gatewayEventFilters;
@XmlElement(name = "gateway-event-substitution-filter",
namespace = "http://geode.apache.org/schema/cache";)
protected DeclarableType gatewayEventSubstitutionFilter;
@@ -1144,19 +1144,19 @@ public class CacheConfig {
protected Boolean forwardExpirationDestroy;
/**
- * Gets the value of the gatewayEventFilter property.
+ * Gets the value of the gatewayEventFilters property.
*
* <p>
* This accessor method returns a reference to the live list,
* not a snapshot. Therefore any modification you make to the
* returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the
gatewayEventFilter property.
+ * This is why there is not a <CODE>set</CODE> method for the
gatewayEventFilters property.
*
* <p>
* For example, to add a new item, do as follows:
*
* <pre>
- * getGatewayEventFilter().add(newItem);
+ * getGatewayEventFilters().add(newItem);
* </pre>
*
*
@@ -1166,11 +1166,11 @@ public class CacheConfig {
*
*
*/
- public List<DeclarableType> getGatewayEventFilter() {
- if (gatewayEventFilter == null) {
- gatewayEventFilter = new ArrayList<DeclarableType>();
+ public List<DeclarableType> getGatewayEventFilters() {
+ if (gatewayEventFilters == null) {
+ gatewayEventFilters = new ArrayList<DeclarableType>();
}
- return this.gatewayEventFilter;
+ return this.gatewayEventFilters;
}
/**
@@ -1633,11 +1633,11 @@ public class CacheConfig {
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
- @XmlType(name = "", propOrder = {"gateway"})
+ @XmlType(name = "", propOrder = {"gateways"})
public static class GatewayHub {
- @XmlElement(namespace = "http://geode.apache.org/schema/cache";)
- protected List<CacheConfig.GatewayHub.Gateway> gateway;
+ @XmlElement(name = "gateway", namespace =
"http://geode.apache.org/schema/cache";)
+ protected List<CacheConfig.GatewayHub.Gateway> gateways;
@XmlAttribute(name = "id", required = true)
protected String id;
@XmlAttribute(name = "bind-address")
@@ -1679,10 +1679,10 @@ public class CacheConfig {
*
*/
public List<CacheConfig.GatewayHub.Gateway> getGateway() {
- if (gateway == null) {
- gateway = new ArrayList<CacheConfig.GatewayHub.Gateway>();
+ if (gateways == null) {
+ gateways = new ArrayList<CacheConfig.GatewayHub.Gateway>();
}
- return this.gateway;
+ return this.gateways;
}
/**
@@ -1931,13 +1931,13 @@ public class CacheConfig {
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
- @XmlType(name = "", propOrder = {"gatewayEndpoint", "gatewayListener",
"gatewayQueue"})
+ @XmlType(name = "", propOrder = {"gatewayEndpoints", "gatewayListeners",
"gatewayQueue"})
public static class Gateway {
@XmlElement(name = "gateway-endpoint", namespace =
"http://geode.apache.org/schema/cache";)
- protected List<CacheConfig.GatewayHub.Gateway.GatewayEndpoint>
gatewayEndpoint;
+ protected List<CacheConfig.GatewayHub.Gateway.GatewayEndpoint>
gatewayEndpoints;
@XmlElement(name = "gateway-listener", namespace =
"http://geode.apache.org/schema/cache";)
- protected List<DeclarableType> gatewayListener;
+ protected List<DeclarableType> gatewayListeners;
@XmlElement(name = "gateway-queue", namespace =
"http://geode.apache.org/schema/cache";)
protected CacheConfig.GatewayHub.Gateway.GatewayQueue gatewayQueue;
@XmlAttribute(name = "early-ack")
@@ -1954,19 +1954,19 @@ public class CacheConfig {
protected String orderPolicy;
/**
- * Gets the value of the gatewayEndpoint property.
+ * Gets the value of the gatewayEndpoints property.
*
* <p>
* This accessor method returns a reference to the live list,
* not a snapshot. Therefore any modification you make to the
* returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the
gatewayEndpoint property.
+ * This is why there is not a <CODE>set</CODE> method for the
gatewayEndpoints property.
*
* <p>
* For example, to add a new item, do as follows:
*
* <pre>
- * getGatewayEndpoint().add(newItem);
+ * getGatewayEndpoints().add(newItem);
* </pre>
*
*
@@ -1976,27 +1976,27 @@ public class CacheConfig {
*
*
*/
- public List<CacheConfig.GatewayHub.Gateway.GatewayEndpoint>
getGatewayEndpoint() {
- if (gatewayEndpoint == null) {
- gatewayEndpoint = new
ArrayList<CacheConfig.GatewayHub.Gateway.GatewayEndpoint>();
+ public List<CacheConfig.GatewayHub.Gateway.GatewayEndpoint>
getGatewayEndpoints() {
+ if (gatewayEndpoints == null) {
+ gatewayEndpoints = new
ArrayList<CacheConfig.GatewayHub.Gateway.GatewayEndpoint>();
}
- return this.gatewayEndpoint;
+ return this.gatewayEndpoints;
}
/**
- * Gets the value of the gatewayListener property.
+ * Gets the value of the gatewayListeners property.
*
* <p>
* This accessor method returns a reference to the live list,
* not a snapshot. Therefore any modification you make to the
* returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the
gatewayListener property.
+ * This is why there is not a <CODE>set</CODE> method for the
gatewayListeners property.
*
* <p>
* For example, to add a new item, do as follows:
*
* <pre>
- * getGatewayListener().add(newItem);
+ * getGatewayListeners().add(newItem);
* </pre>
*
*
@@ -2006,11 +2006,11 @@ public class CacheConfig {
*
*
*/
- public List<DeclarableType> getGatewayListener() {
- if (gatewayListener == null) {
- gatewayListener = new ArrayList<DeclarableType>();
+ public List<DeclarableType> getGatewayListeners() {
+ if (gatewayListeners == null) {
+ gatewayListeners = new ArrayList<DeclarableType>();
}
- return this.gatewayListener;
+ return this.gatewayListeners;
}
/**
@@ -2552,12 +2552,12 @@ public class CacheConfig {
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
- @XmlType(name = "", propOrder = {"gatewayTransportFilter"})
+ @XmlType(name = "", propOrder = {"gatewayTransportFilters"})
public static class GatewayReceiver {
@XmlElement(name = "gateway-transport-filter",
namespace = "http://geode.apache.org/schema/cache";)
- protected List<DeclarableType> gatewayTransportFilter;
+ protected List<DeclarableType> gatewayTransportFilters;
@XmlAttribute(name = "start-port")
protected String startPort;
@XmlAttribute(name = "end-port")
@@ -2574,19 +2574,19 @@ public class CacheConfig {
protected Boolean manualStart;
/**
- * Gets the value of the gatewayTransportFilter property.
+ * Gets the value of the gatewayTransportFilters property.
*
* <p>
* This accessor method returns a reference to the live list,
* not a snapshot. Therefore any modification you make to the
* returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the
gatewayTransportFilter property.
+ * This is why there is not a <CODE>set</CODE> method for the
gatewayTransportFilters property.
*
* <p>
* For example, to add a new item, do as follows:
*
* <pre>
- * getGatewayTransportFilter().add(newItem);
+ * getGatewayTransportFilters().add(newItem);
* </pre>
*
*
@@ -2596,11 +2596,11 @@ public class CacheConfig {
*
*
*/
- public List<DeclarableType> getGatewayTransportFilter() {
- if (gatewayTransportFilter == null) {
- gatewayTransportFilter = new ArrayList<DeclarableType>();
+ public List<DeclarableType> getGatewayTransportFilters() {
+ if (gatewayTransportFilters == null) {
+ gatewayTransportFilters = new ArrayList<DeclarableType>();
}
- return this.gatewayTransportFilter;
+ return this.gatewayTransportFilters;
}
/**
@@ -2800,18 +2800,18 @@ public class CacheConfig {
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
- @XmlType(name = "", propOrder = {"gatewayEventFilter",
"gatewayEventSubstitutionFilter",
- "gatewayTransportFilter"})
+ @XmlType(name = "", propOrder = {"gatewayEventFilters",
"gatewayEventSubstitutionFilter",
+ "gatewayTransportFilters"})
public static class GatewaySender {
@XmlElement(name = "gateway-event-filter", namespace =
"http://geode.apache.org/schema/cache";)
- protected List<DeclarableType> gatewayEventFilter;
+ protected List<DeclarableType> gatewayEventFilters;
@XmlElement(name = "gateway-event-substitution-filter",
namespace = "http://geode.apache.org/schema/cache";)
protected DeclarableType gatewayEventSubstitutionFilter;
@XmlElement(name = "gateway-transport-filter",
namespace = "http://geode.apache.org/schema/cache";)
- protected List<DeclarableType> gatewayTransportFilter;
+ protected List<DeclarableType> gatewayTransportFilters;
@XmlAttribute(name = "id", required = true)
protected String id;
@XmlAttribute(name = "remote-distributed-system-id", required = true)
@@ -2846,19 +2846,19 @@ public class CacheConfig {
protected String orderPolicy;
/**
- * Gets the value of the gatewayEventFilter property.
+ * Gets the value of the gatewayEventFilters property.
*
* <p>
* This accessor method returns a reference to the live list,
* not a snapshot. Therefore any modification you make to the
* returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the
gatewayEventFilter property.
+ * This is why there is not a <CODE>set</CODE> method for the
gatewayEventFilters property.
*
* <p>
* For example, to add a new item, do as follows:
*
* <pre>
- * getGatewayEventFilter().add(newItem);
+ * getGatewayEventFilters().add(newItem);
* </pre>
*
*
@@ -2868,11 +2868,11 @@ public class CacheConfig {
*
*
*/
- public List<DeclarableType> getGatewayEventFilter() {
- if (gatewayEventFilter == null) {
- gatewayEventFilter = new ArrayList<DeclarableType>();
+ public List<DeclarableType> getGatewayEventFilters() {
+ if (gatewayEventFilters == null) {
+ gatewayEventFilters = new ArrayList<DeclarableType>();
}
- return this.gatewayEventFilter;
+ return this.gatewayEventFilters;
}
/**
@@ -2898,19 +2898,19 @@ public class CacheConfig {
}
/**
- * Gets the value of the gatewayTransportFilter property.
+ * Gets the value of the gatewayTransportFilters property.
*
* <p>
* This accessor method returns a reference to the live list,
* not a snapshot. Therefore any modification you make to the
* returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the
gatewayTransportFilter property.
+ * This is why there is not a <CODE>set</CODE> method for the
gatewayTransportFilters property.
*
* <p>
* For example, to add a new item, do as follows:
*
* <pre>
- * getGatewayTransportFilter().add(newItem);
+ * getGatewayTransportFilters().add(newItem);
* </pre>
*
*
@@ -2920,11 +2920,11 @@ public class CacheConfig {
*
*
*/
- public List<DeclarableType> getGatewayTransportFilter() {
- if (gatewayTransportFilter == null) {
- gatewayTransportFilter = new ArrayList<DeclarableType>();
+ public List<DeclarableType> getGatewayTransportFilters() {
+ if (gatewayTransportFilters == null) {
+ gatewayTransportFilters = new ArrayList<DeclarableType>();
}
- return this.gatewayTransportFilter;
+ return this.gatewayTransportFilters;
}
/**
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/configuration/CacheTransactionManagerType.java
b/geode-core/src/main/java/org/apache/geode/cache/configuration/CacheTransactionManagerType.java
index d048c71..e1c0c43 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/configuration/CacheTransactionManagerType.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/configuration/CacheTransactionManagerType.java
@@ -80,29 +80,29 @@ import org.apache.geode.annotations.Experimental;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "cache-transaction-manager-type",
namespace = "http://geode.apache.org/schema/cache";,
- propOrder = {"transactionListener", "transactionWriter"})
+ propOrder = {"transactionListeners", "transactionWriter"})
@Experimental
public class CacheTransactionManagerType {
@XmlElement(name = "transaction-listener", namespace =
"http://geode.apache.org/schema/cache";)
- protected List<DeclarableType> transactionListener;
+ protected List<DeclarableType> transactionListeners;
@XmlElement(name = "transaction-writer", namespace =
"http://geode.apache.org/schema/cache";)
protected DeclarableType transactionWriter;
/**
- * Gets the value of the transactionListener property.
+ * Gets the value of the transactionListeners property.
*
* <p>
* This accessor method returns a reference to the live list,
* not a snapshot. Therefore any modification you make to the
* returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the
transactionListener property.
+ * This is why there is not a <CODE>set</CODE> method for the
transactionListeners property.
*
* <p>
* For example, to add a new item, do as follows:
*
* <pre>
- * getTransactionListener().add(newItem);
+ * getTransactionListeners().add(newItem);
* </pre>
*
*
@@ -112,11 +112,11 @@ public class CacheTransactionManagerType {
*
*
*/
- public List<DeclarableType> getTransactionListener() {
- if (transactionListener == null) {
- transactionListener = new ArrayList<DeclarableType>();
+ public List<DeclarableType> getTransactionListeners() {
+ if (transactionListeners == null) {
+ transactionListeners = new ArrayList<DeclarableType>();
}
- return this.transactionListener;
+ return this.transactionListeners;
}
/**
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/configuration/DeclarableType.java
b/geode-core/src/main/java/org/apache/geode/cache/configuration/DeclarableType.java
index 0f7de23..0f1c454 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/configuration/DeclarableType.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/configuration/DeclarableType.java
@@ -59,11 +59,11 @@ import
org.apache.geode.management.internal.cli.domain.ClassName;
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "declarable-type", namespace =
"http://geode.apache.org/schema/cache";,
- propOrder = {"parameter"})
+ propOrder = {"parameters"})
@Experimental
public class DeclarableType extends ClassNameType {
- @XmlElement(namespace = "http://geode.apache.org/schema/cache";)
- protected List<ParameterType> parameter;
+ @XmlElement(name = "parameter", namespace =
"http://geode.apache.org/schema/cache";)
+ protected List<ParameterType> parameters;
public DeclarableType() {}
@@ -78,7 +78,7 @@ public class DeclarableType extends ClassNameType {
public DeclarableType(String className, Properties properties) {
this.className = className;
if (properties != null) {
- parameter = properties.stringPropertyNames().stream()
+ parameters = properties.stringPropertyNames().stream()
.map(k -> new ParameterType(k,
properties.getProperty(k))).collect(Collectors.toList());
}
}
@@ -96,7 +96,7 @@ public class DeclarableType extends ClassNameType {
* For example, to add a new item, do as follows:
*
* <pre>
- * getParameter().add(newItem);
+ * getParameters().add(newItem);
* </pre>
*
*
@@ -106,11 +106,11 @@ public class DeclarableType extends ClassNameType {
*
*
*/
- public List<ParameterType> getParameter() {
- if (parameter == null) {
- parameter = new ArrayList<ParameterType>();
+ public List<ParameterType> getParameters() {
+ if (parameters == null) {
+ parameters = new ArrayList<ParameterType>();
}
- return this.parameter;
+ return this.parameters;
}
@Override
@@ -122,21 +122,21 @@ public class DeclarableType extends ClassNameType {
return false;
}
DeclarableType that = (DeclarableType) o;
- return Objects.equals(className, that.className) &&
Objects.equals(parameter, that.parameter);
+ return Objects.equals(className, that.className) &&
Objects.equals(parameters, that.parameters);
}
@Override
public int hashCode() {
- return Objects.hash(className, parameter);
+ return Objects.hash(className, parameters);
}
@Override
public String toString() {
- if (parameter == null) {
+ if (parameters == null) {
return className;
}
return className + "{"
- +
parameter.stream().map(Objects::toString).collect(Collectors.joining(",")) +
"}";
+ +
parameters.stream().map(Objects::toString).collect(Collectors.joining(",")) +
"}";
}
}
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/configuration/DiskDirsType.java
b/geode-core/src/main/java/org/apache/geode/cache/configuration/DiskDirsType.java
index 38d7d35..49d5729 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/configuration/DiskDirsType.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/configuration/DiskDirsType.java
@@ -56,13 +56,13 @@ import org.apache.geode.annotations.Experimental;
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "disk-dirs-type", namespace =
"http://geode.apache.org/schema/cache";,
- propOrder = {"diskDir"})
+ propOrder = {"diskDirs"})
@Experimental
public class DiskDirsType {
@XmlElement(name = "disk-dir", namespace =
"http://geode.apache.org/schema/cache";,
required = true)
- protected List<DiskDirType> diskDir;
+ protected List<DiskDirType> diskDirs;
/**
* Gets the value of the diskDir property.
@@ -77,7 +77,7 @@ public class DiskDirsType {
* For example, to add a new item, do as follows:
*
* <pre>
- * getDiskDir().add(newItem);
+ * getDiskDirs().add(newItem);
* </pre>
*
*
@@ -87,11 +87,11 @@ public class DiskDirsType {
*
*
*/
- public List<DiskDirType> getDiskDir() {
- if (diskDir == null) {
- diskDir = new ArrayList<DiskDirType>();
+ public List<DiskDirType> getDiskDirs() {
+ if (diskDirs == null) {
+ diskDirs = new ArrayList<DiskDirType>();
}
- return this.diskDir;
+ return this.diskDirs;
}
}
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/configuration/FunctionServiceType.java
b/geode-core/src/main/java/org/apache/geode/cache/configuration/FunctionServiceType.java
index 12f5a9d..9477b83 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/configuration/FunctionServiceType.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/configuration/FunctionServiceType.java
@@ -68,12 +68,12 @@ import org.apache.geode.annotations.Experimental;
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "function-service-type", namespace =
"http://geode.apache.org/schema/cache";,
- propOrder = {"function"})
+ propOrder = {"functions"})
@Experimental
public class FunctionServiceType {
- @XmlElement(namespace = "http://geode.apache.org/schema/cache";)
- protected List<DeclarableType> function;
+ @XmlElement(name = "function", namespace =
"http://geode.apache.org/schema/cache";)
+ protected List<DeclarableType> functions;
/**
* Gets the value of the function property.
@@ -88,7 +88,7 @@ public class FunctionServiceType {
* For example, to add a new item, do as follows:
*
* <pre>
- * getFunction().add(newItem);
+ * getFunctions().add(newItem);
* </pre>
*
*
@@ -98,10 +98,10 @@ public class FunctionServiceType {
*
*
*/
- public List<DeclarableType> getFunction() {
- if (function == null) {
- function = new ArrayList<DeclarableType>();
+ public List<DeclarableType> getFunctions() {
+ if (functions == null) {
+ functions = new ArrayList<DeclarableType>();
}
- return this.function;
+ return this.functions;
}
}
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/configuration/JndiBindingsType.java
b/geode-core/src/main/java/org/apache/geode/cache/configuration/JndiBindingsType.java
index 9a4930f..044a7f6 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/configuration/JndiBindingsType.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/configuration/JndiBindingsType.java
@@ -104,27 +104,27 @@ import org.apache.geode.annotations.Experimental;
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "jndi-bindings-type", namespace =
"http://geode.apache.org/schema/cache";,
- propOrder = {"jndiBinding"})
+ propOrder = {"jndiBindings"})
@Experimental
public class JndiBindingsType {
@XmlElement(name = "jndi-binding", namespace =
"http://geode.apache.org/schema/cache";)
- protected List<JndiBindingsType.JndiBinding> jndiBinding;
+ protected List<JndiBindingsType.JndiBinding> jndiBindings;
/**
- * Gets the value of the jndiBinding property.
+ * Gets the value of the jndiBindings property.
*
* <p>
* This accessor method returns a reference to the live list,
* not a snapshot. Therefore any modification you make to the
* returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the jndiBinding
property.
+ * This is why there is not a <CODE>set</CODE> method for the jndiBindings
property.
*
* <p>
* For example, to add a new item, do as follows:
*
* <pre>
- * getJndiBinding().add(newItem);
+ * getJndiBindings().add(newItem);
* </pre>
*
*
@@ -134,11 +134,11 @@ public class JndiBindingsType {
*
*
*/
- public List<JndiBindingsType.JndiBinding> getJndiBinding() {
- if (jndiBinding == null) {
- jndiBinding = new ArrayList<JndiBindingsType.JndiBinding>();
+ public List<JndiBindingsType.JndiBinding> getJndiBindings() {
+ if (jndiBindings == null) {
+ jndiBindings = new ArrayList<JndiBindingsType.JndiBinding>();
}
- return this.jndiBinding;
+ return this.jndiBindings;
}
@@ -200,12 +200,12 @@ public class JndiBindingsType {
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
- @XmlType(name = "", propOrder = {"configProperty"})
+ @XmlType(name = "", propOrder = {"configProperties"})
@Experimental
public static class JndiBinding implements CacheElement {
@XmlElement(name = "config-property", namespace =
"http://geode.apache.org/schema/cache";)
- protected List<JndiBindingsType.JndiBinding.ConfigProperty> configProperty;
+ protected List<JndiBindingsType.JndiBinding.ConfigProperty>
configProperties;
@XmlAttribute(name = "blocking-timeout-seconds")
protected String blockingTimeoutSeconds;
@XmlAttribute(name = "conn-pooled-datasource-class")
@@ -238,19 +238,19 @@ public class JndiBindingsType {
protected String xaDatasourceClass;
/**
- * Gets the value of the configProperty property.
+ * Gets the value of the configProperties property.
*
* <p>
* This accessor method returns a reference to the live list,
* not a snapshot. Therefore any modification you make to the
* returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the
configProperty property.
+ * This is why there is not a <CODE>set</CODE> method for the
configProperties property.
*
* <p>
* For example, to add a new item, do as follows:
*
* <pre>
- * getConfigProperty().add(newItem);
+ * getConfigProperties().add(newItem);
* </pre>
*
*
@@ -260,11 +260,11 @@ public class JndiBindingsType {
*
*
*/
- public List<JndiBindingsType.JndiBinding.ConfigProperty>
getConfigProperty() {
- if (configProperty == null) {
- configProperty = new
ArrayList<JndiBindingsType.JndiBinding.ConfigProperty>();
+ public List<JndiBindingsType.JndiBinding.ConfigProperty>
getConfigProperties() {
+ if (configProperties == null) {
+ configProperties = new
ArrayList<JndiBindingsType.JndiBinding.ConfigProperty>();
}
- return this.configProperty;
+ return this.configProperties;
}
/**
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/configuration/PoolType.java
b/geode-core/src/main/java/org/apache/geode/cache/configuration/PoolType.java
index c7df922..7a2267d 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/configuration/PoolType.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/configuration/PoolType.java
@@ -97,14 +97,14 @@ import org.apache.geode.annotations.Experimental;
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "pool-type", namespace =
"http://geode.apache.org/schema/cache";,
- propOrder = {"locator", "server"})
+ propOrder = {"locators", "servers"})
@Experimental
public class PoolType {
- @XmlElement(namespace = "http://geode.apache.org/schema/cache";)
- protected List<PoolType.Locator> locator;
- @XmlElement(namespace = "http://geode.apache.org/schema/cache";)
- protected List<PoolType.Server> server;
+ @XmlElement(name = "locator", namespace =
"http://geode.apache.org/schema/cache";)
+ protected List<PoolType.Locator> locators;
+ @XmlElement(name = "server", namespace =
"http://geode.apache.org/schema/cache";)
+ protected List<PoolType.Server> servers;
@XmlAttribute(name = "subscription-timeout-multiplier")
protected String subscriptionTimeoutMultiplier;
@XmlAttribute(name = "socket-connect-timeout")
@@ -161,7 +161,7 @@ public class PoolType {
* For example, to add a new item, do as follows:
*
* <pre>
- * getLocator().add(newItem);
+ * getLocators().add(newItem);
* </pre>
*
*
@@ -171,11 +171,11 @@ public class PoolType {
*
*
*/
- public List<PoolType.Locator> getLocator() {
- if (locator == null) {
- locator = new ArrayList<PoolType.Locator>();
+ public List<PoolType.Locator> getLocators() {
+ if (locators == null) {
+ locators = new ArrayList<PoolType.Locator>();
}
- return this.locator;
+ return this.locators;
}
/**
@@ -191,7 +191,7 @@ public class PoolType {
* For example, to add a new item, do as follows:
*
* <pre>
- * getServer().add(newItem);
+ * getServers().add(newItem);
* </pre>
*
*
@@ -201,11 +201,11 @@ public class PoolType {
*
*
*/
- public List<PoolType.Server> getServer() {
- if (server == null) {
- server = new ArrayList<PoolType.Server>();
+ public List<PoolType.Server> getServers() {
+ if (servers == null) {
+ servers = new ArrayList<PoolType.Server>();
}
- return this.server;
+ return this.servers;
}
/**
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/configuration/RegionAttributesType.java
b/geode-core/src/main/java/org/apache/geode/cache/configuration/RegionAttributesType.java
index bd83cfa..e579879 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/configuration/RegionAttributesType.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/configuration/RegionAttributesType.java
@@ -331,7 +331,7 @@ import org.apache.geode.annotations.Experimental;
propOrder = {"keyConstraint", "valueConstraint", "regionTimeToLive",
"regionIdleTime",
"entryTimeToLive", "entryIdleTime", "diskWriteAttributes", "diskDirs",
"partitionAttributes", "membershipAttributes",
"subscriptionAttributes", "cacheLoader",
- "cacheWriter", "cacheListener", "compressor", "evictionAttributes"})
+ "cacheWriter", "cacheListeners", "compressor", "evictionAttributes"})
@Experimental
public class RegionAttributesType {
@@ -362,7 +362,7 @@ public class RegionAttributesType {
@XmlElement(name = "cache-writer", namespace =
"http://geode.apache.org/schema/cache";)
protected DeclarableType cacheWriter;
@XmlElement(name = "cache-listener", namespace =
"http://geode.apache.org/schema/cache";)
- protected List<DeclarableType> cacheListener;
+ protected List<DeclarableType> cacheListeners;
@XmlElement(namespace = "http://geode.apache.org/schema/cache";)
protected ClassNameType compressor;
@XmlElement(name = "eviction-attributes", namespace =
"http://geode.apache.org/schema/cache";)
@@ -723,7 +723,7 @@ public class RegionAttributesType {
* For example, to add a new item, do as follows:
*
* <pre>
- * getCacheListener().add(newItem);
+ * getCacheListeners().add(newItem);
* </pre>
*
*
@@ -733,11 +733,11 @@ public class RegionAttributesType {
*
*
*/
- public List<DeclarableType> getCacheListener() {
- if (cacheListener == null) {
- cacheListener = new ArrayList<DeclarableType>();
+ public List<DeclarableType> getCacheListeners() {
+ if (cacheListeners == null) {
+ cacheListeners = new ArrayList<DeclarableType>();
}
- return this.cacheListener;
+ return this.cacheListeners;
}
/**
@@ -2096,11 +2096,11 @@ public class RegionAttributesType {
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
- @XmlType(name = "", propOrder = {"requiredRole"})
+ @XmlType(name = "", propOrder = {"requiredRoles"})
public static class MembershipAttributes {
@XmlElement(name = "required-role", namespace =
"http://geode.apache.org/schema/cache";)
- protected List<RegionAttributesType.MembershipAttributes.RequiredRole>
requiredRole;
+ protected List<RegionAttributesType.MembershipAttributes.RequiredRole>
requiredRoles;
@XmlAttribute(name = "loss-action")
protected String lossAction;
@XmlAttribute(name = "resumption-action")
@@ -2119,7 +2119,7 @@ public class RegionAttributesType {
* For example, to add a new item, do as follows:
*
* <pre>
- * getRequiredRole().add(newItem);
+ * getRequiredRoles().add(newItem);
* </pre>
*
*
@@ -2129,11 +2129,11 @@ public class RegionAttributesType {
*
*
*/
- public List<RegionAttributesType.MembershipAttributes.RequiredRole>
getRequiredRole() {
- if (requiredRole == null) {
- requiredRole = new
ArrayList<RegionAttributesType.MembershipAttributes.RequiredRole>();
+ public List<RegionAttributesType.MembershipAttributes.RequiredRole>
getRequiredRoles() {
+ if (requiredRoles == null) {
+ requiredRoles = new
ArrayList<RegionAttributesType.MembershipAttributes.RequiredRole>();
}
- return this.requiredRole;
+ return this.requiredRoles;
}
/**
@@ -2299,13 +2299,13 @@ public class RegionAttributesType {
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "",
- propOrder = {"partitionResolver", "partitionListener",
"fixedPartitionAttributes"})
+ propOrder = {"partitionResolver", "partitionListeners",
"fixedPartitionAttributes"})
public static class PartitionAttributes {
@XmlElement(name = "partition-resolver", namespace =
"http://geode.apache.org/schema/cache";)
protected DeclarableType partitionResolver;
@XmlElement(name = "partition-listener", namespace =
"http://geode.apache.org/schema/cache";)
- protected List<DeclarableType> partitionListener;
+ protected List<DeclarableType> partitionListeners;
@XmlElement(name = "fixed-partition-attributes",
namespace = "http://geode.apache.org/schema/cache";)
protected
List<RegionAttributesType.PartitionAttributes.FixedPartitionAttributes>
fixedPartitionAttributes;
@@ -2359,7 +2359,7 @@ public class RegionAttributesType {
* For example, to add a new item, do as follows:
*
* <pre>
- * getPartitionListener().add(newItem);
+ * getPartitionListeners().add(newItem);
* </pre>
*
*
@@ -2369,11 +2369,11 @@ public class RegionAttributesType {
*
*
*/
- public List<DeclarableType> getPartitionListener() {
- if (partitionListener == null) {
- partitionListener = new ArrayList<DeclarableType>();
+ public List<DeclarableType> getPartitionListeners() {
+ if (partitionListeners == null) {
+ partitionListeners = new ArrayList<DeclarableType>();
}
- return this.partitionListener;
+ return this.partitionListeners;
}
/**
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/configuration/RegionConfig.java
b/geode-core/src/main/java/org/apache/geode/cache/configuration/RegionConfig.java
index 3a60ba1..447e88f 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/configuration/RegionConfig.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/configuration/RegionConfig.java
@@ -148,20 +148,20 @@ import org.apache.geode.annotations.Experimental;
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "region-type", namespace =
"http://geode.apache.org/schema/cache";,
- propOrder = {"regionAttributes", "index", "entry", "regionElements",
"region"})
+ propOrder = {"regionAttributes", "indexes", "entries", "regionElements",
"regions"})
@Experimental
public class RegionConfig implements CacheElement {
@XmlElement(name = "region-attributes", namespace =
"http://geode.apache.org/schema/cache";)
protected List<RegionAttributesType> regionAttributes;
- @XmlElement(namespace = "http://geode.apache.org/schema/cache";)
- protected List<RegionConfig.Index> index;
- @XmlElement(namespace = "http://geode.apache.org/schema/cache";)
- protected List<RegionConfig.Entry> entry;
+ @XmlElement(name = "index", namespace =
"http://geode.apache.org/schema/cache";)
+ protected List<RegionConfig.Index> indexes;
+ @XmlElement(name = "entry", namespace =
"http://geode.apache.org/schema/cache";)
+ protected List<RegionConfig.Entry> entries;
@XmlAnyElement(lax = true)
protected List<CacheElement> regionElements;
- @XmlElement(namespace = "http://geode.apache.org/schema/cache";)
- protected List<RegionConfig> region;
+ @XmlElement(name = "region", namespace =
"http://geode.apache.org/schema/cache";)
+ protected List<RegionConfig> regions;
@XmlAttribute(name = "name", required = true)
protected String name;
@XmlAttribute(name = "refid")
@@ -217,7 +217,7 @@ public class RegionConfig implements CacheElement {
* For example, to add a new item, do as follows:
*
* <pre>
- * getIndex().add(newItem);
+ * getIndexes().add(newItem);
* </pre>
*
*
@@ -227,11 +227,11 @@ public class RegionConfig implements CacheElement {
*
*
*/
- public List<RegionConfig.Index> getIndex() {
- if (index == null) {
- index = new ArrayList<RegionConfig.Index>();
+ public List<RegionConfig.Index> getIndexes() {
+ if (indexes == null) {
+ indexes = new ArrayList<RegionConfig.Index>();
}
- return this.index;
+ return this.indexes;
}
/**
@@ -247,7 +247,7 @@ public class RegionConfig implements CacheElement {
* For example, to add a new item, do as follows:
*
* <pre>
- * getEntry().add(newItem);
+ * getEntries().add(newItem);
* </pre>
*
*
@@ -257,11 +257,11 @@ public class RegionConfig implements CacheElement {
*
*
*/
- public List<RegionConfig.Entry> getEntry() {
- if (entry == null) {
- entry = new ArrayList<RegionConfig.Entry>();
+ public List<RegionConfig.Entry> getEntries() {
+ if (entries == null) {
+ entries = new ArrayList<RegionConfig.Entry>();
}
- return this.entry;
+ return this.entries;
}
/**
@@ -308,7 +308,7 @@ public class RegionConfig implements CacheElement {
* For example, to add a new item, do as follows:
*
* <pre>
- * getRegion().add(newItem);
+ * getRegions().add(newItem);
* </pre>
*
*
@@ -318,11 +318,11 @@ public class RegionConfig implements CacheElement {
*
*
*/
- public List<RegionConfig> getRegion() {
- if (region == null) {
- region = new ArrayList<RegionConfig>();
+ public List<RegionConfig> getRegions() {
+ if (regions == null) {
+ regions = new ArrayList<RegionConfig>();
}
- return this.region;
+ return this.regions;
}
/**
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/configuration/SerializationRegistrationType.java
b/geode-core/src/main/java/org/apache/geode/cache/configuration/SerializationRegistrationType.java
index 389783e..ca0b793 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/configuration/SerializationRegistrationType.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/configuration/SerializationRegistrationType.java
@@ -80,14 +80,15 @@ import org.apache.geode.annotations.Experimental;
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "serialization-registration-type",
- namespace = "http://geode.apache.org/schema/cache";, propOrder =
{"serializer", "instantiator"})
+ namespace = "http://geode.apache.org/schema/cache";,
+ propOrder = {"serializers", "instantiators"})
@Experimental
public class SerializationRegistrationType {
- @XmlElement(namespace = "http://geode.apache.org/schema/cache";)
- protected List<SerializationRegistrationType.Serializer> serializer;
- @XmlElement(namespace = "http://geode.apache.org/schema/cache";)
- protected List<SerializationRegistrationType.Instantiator> instantiator;
+ @XmlElement(name = "serializer", namespace =
"http://geode.apache.org/schema/cache";)
+ protected List<SerializationRegistrationType.Serializer> serializers;
+ @XmlElement(name = "instantiator", namespace =
"http://geode.apache.org/schema/cache";)
+ protected List<SerializationRegistrationType.Instantiator> instantiators;
/**
* Gets the value of the serializer property.
@@ -112,11 +113,11 @@ public class SerializationRegistrationType {
*
*
*/
- public List<SerializationRegistrationType.Serializer> getSerializer() {
- if (serializer == null) {
- serializer = new ArrayList<SerializationRegistrationType.Serializer>();
+ public List<SerializationRegistrationType.Serializer> getSerializers() {
+ if (serializers == null) {
+ serializers = new ArrayList<SerializationRegistrationType.Serializer>();
}
- return this.serializer;
+ return this.serializers;
}
/**
@@ -142,11 +143,11 @@ public class SerializationRegistrationType {
*
*
*/
- public List<SerializationRegistrationType.Instantiator> getInstantiator() {
- if (instantiator == null) {
- instantiator = new
ArrayList<SerializationRegistrationType.Instantiator>();
+ public List<SerializationRegistrationType.Instantiator> getInstantiators() {
+ if (instantiators == null) {
+ instantiators = new
ArrayList<SerializationRegistrationType.Instantiator>();
}
- return this.instantiator;
+ return this.instantiators;
}
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/configuration/ServerType.java
b/geode-core/src/main/java/org/apache/geode/cache/configuration/ServerType.java
index 220b66e..2727ac2 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/configuration/ServerType.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/configuration/ServerType.java
@@ -96,13 +96,13 @@ import org.apache.geode.annotations.Experimental;
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "server-type", namespace =
"http://geode.apache.org/schema/cache";,
- propOrder = {"group", "clientSubscription", "customLoadProbe"})
+ propOrder = {"groups", "clientSubscription", "customLoadProbe"})
@XmlSeeAlso({CacheConfig.CacheServer.class})
@Experimental
public class ServerType {
- @XmlElement(namespace = "http://geode.apache.org/schema/cache";)
- protected List<String> group;
+ @XmlElement(name = "group", namespace =
"http://geode.apache.org/schema/cache";)
+ protected List<String> groups;
@XmlElement(name = "client-subscription", namespace =
"http://geode.apache.org/schema/cache";)
protected ServerType.ClientSubscription clientSubscription;
@XmlElement(name = "custom-load-probe", namespace =
"http://geode.apache.org/schema/cache";)
@@ -143,7 +143,7 @@ public class ServerType {
* For example, to add a new item, do as follows:
*
* <pre>
- * getGroup().add(newItem);
+ * getGroups().add(newItem);
* </pre>
*
*
@@ -153,11 +153,11 @@ public class ServerType {
*
*
*/
- public List<String> getGroup() {
- if (group == null) {
- group = new ArrayList<String>();
+ public List<String> getGroups() {
+ if (groups == null) {
+ groups = new ArrayList<String>();
}
- return this.group;
+ return this.groups;
}
/**
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommand.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommand.java
index 7673b33..c9fea50 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommand.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommand.java
@@ -118,7 +118,7 @@ public class CreateAsyncEventQueueCommand extends
SingleGfshCommand {
config.setEnableBatchConflation(enableBatchConflation);
config.setForwardExpirationDestroy(forwardExpirationDestroy);
if (gatewayEventFilters != null) {
- config.getGatewayEventFilter().addAll(Arrays.stream(gatewayEventFilters)
+ config.getGatewayEventFilters().addAll(Arrays.stream(gatewayEventFilters)
.map(classname -> new
DeclarableType((classname))).collect(Collectors.toList()));
}
if (gatewaySubstitutionListener != null) {
@@ -140,6 +140,6 @@ public class CreateAsyncEventQueueCommand extends
SingleGfshCommand {
@Override
public void updateClusterConfig(String group, CacheConfig config, Object
configObject) {
- config.getAsyncEventQueue().add((CacheConfig.AsyncEventQueue)
configObject);
+ config.getAsyncEventQueues().add((CacheConfig.AsyncEventQueue)
configObject);
}
}
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateGatewayReceiverCommand.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateGatewayReceiverCommand.java
index 77c884c..a02fbb7 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateGatewayReceiverCommand.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateGatewayReceiverCommand.java
@@ -118,7 +118,7 @@ public class CreateGatewayReceiverCommand extends
SingleGfshCommand {
thisFilter.setClassName(fullyQualifiedClassName);
return thisFilter;
}).collect(Collectors.toList());
- configuration.getGatewayTransportFilter().addAll(filters);
+ configuration.getGatewayTransportFilters().addAll(filters);
}
if (startPort != null) {
configuration.setStartPort(String.valueOf(startPort));
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateIndexCommand.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateIndexCommand.java
index 3dbf515..7f45366 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateIndexCommand.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateIndexCommand.java
@@ -110,6 +110,6 @@ public class CreateIndexCommand extends SingleGfshCommand {
if (regionConfig == null) {
throw new EntityNotFoundException("Region " + index.getFromClause() + "
not found.");
}
- regionConfig.getIndex().add(index);
+ regionConfig.getIndexes().add(index);
}
}
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommand.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommand.java
index cbb1c21..9dd82fd 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommand.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommand.java
@@ -142,7 +142,7 @@ public class CreateJndiBindingCommand extends
SingleGfshCommand {
configuration.setUserName(username);
configuration.setXaDatasourceClass(xaDataSource);
if (dsConfigProperties != null && dsConfigProperties.length > 0)
-
configuration.getConfigProperty().addAll(Arrays.asList(dsConfigProperties));
+
configuration.getConfigProperties().addAll(Arrays.asList(dsConfigProperties));
InternalConfigurationPersistenceService service =
(InternalConfigurationPersistenceService)
getConfigurationPersistenceService();
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeJndiBindingCommand.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeJndiBindingCommand.java
index 7ebfff7..80ab419 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeJndiBindingCommand.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeJndiBindingCommand.java
@@ -93,7 +93,8 @@ public class DescribeJndiBindingCommand extends
InternalGfshCommand {
addTableRow(tabularData, "login-timeout-seconds",
binding.getLoginTimeoutSeconds());
}
- for (JndiBindingsType.JndiBinding.ConfigProperty confProp :
binding.getConfigProperty()) {
+ for (JndiBindingsType.JndiBinding.ConfigProperty confProp : binding
+ .getConfigProperties()) {
addTableRow(tabularData, confProp.getName(), confProp.getValue());
}
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyIndexCommand.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyIndexCommand.java
index 5509878..da32587 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyIndexCommand.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyIndexCommand.java
@@ -107,14 +107,14 @@ public class DestroyIndexCommand extends
SingleGfshCommand {
}
if (indexName.isEmpty()) {
- regionConfig.getIndex().clear();
+ regionConfig.getIndexes().clear();
} else {
- CacheElement.removeElement(regionConfig.getIndex(), indexName);
+ CacheElement.removeElement(regionConfig.getIndexes(), indexName);
}
} else {
// Need to search for the index name as region was not specified
- for (RegionConfig r : config.getRegion()) {
- CacheElement.removeElement(r.getIndex(), indexName);
+ for (RegionConfig r : config.getRegions()) {
+ CacheElement.removeElement(r.getIndexes(), indexName);
}
}
}
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportImportClusterConfigurationCommands.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportImportClusterConfigurationCommands.java
index 797d935..41e973d 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportImportClusterConfigurationCommands.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportImportClusterConfigurationCommands.java
@@ -151,12 +151,12 @@ public class ExportImportClusterConfigurationCommands
extends InternalGfshComman
for (String groupName : groupNames) {
CacheConfig cacheConfig = sc.getCacheConfig(groupName);
if (cacheConfig != null) {
- if (cacheConfig.getRegion().size() > 0 ||
cacheConfig.getAsyncEventQueue().size() > 0
- || cacheConfig.getDiskStore().size() > 0
+ if (cacheConfig.getRegions().size() > 0 ||
cacheConfig.getAsyncEventQueues().size() > 0
+ || cacheConfig.getDiskStores().size() > 0
|| cacheConfig.getCustomCacheElements().size() > 0
|| cacheConfig.getJndiBindings().size() > 0
|| cacheConfig.getGatewayReceiver() != null
- || cacheConfig.getGatewaySender().size() > 0) {
+ || cacheConfig.getGatewaySenders().size() > 0) {
return ResultBuilder.createGemFireErrorResult(
"Running servers have existing cluster configuration applied
already.");
}
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateAsyncEventQueueFunction.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateAsyncEventQueueFunction.java
index 4fc0f9b..1389cb4 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateAsyncEventQueueFunction.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateAsyncEventQueueFunction.java
@@ -83,7 +83,7 @@ public class CreateAsyncEventQueueFunction extends
CliFunction {
.setDispatcherThreads(Integer.parseInt(config.getDispatcherThreads()))
.setOrderPolicy(OrderPolicy.valueOf(config.getOrderPolicy()));
- String[] gatewayEventFilters = config.getGatewayEventFilter().stream()
+ String[] gatewayEventFilters = config.getGatewayEventFilters().stream()
.map(ClassNameType::getClassName).toArray(String[]::new);
if (gatewayEventFilters != null) {
@@ -106,7 +106,7 @@ public class CreateAsyncEventQueueFunction extends
CliFunction {
Class<?> listenerClass =
InternalDataSerializer.getCachedClass(listenerClassName);
listenerInstance = listenerClass.newInstance();
- List<ParameterType> parameters =
config.getAsyncEventListener().getParameter();
+ List<ParameterType> parameters =
config.getAsyncEventListener().getParameters();
Properties listenerProperties = new Properties();
for (ParameterType p : parameters) {
listenerProperties.put(p.getName(), p.getString());
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateJndiBindingFunction.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateJndiBindingFunction.java
index e94d333..4b9d659 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateJndiBindingFunction.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateJndiBindingFunction.java
@@ -37,7 +37,7 @@ public class CreateJndiBindingFunction extends
CliFunction<JndiBindingsType.Jndi
ResultSender<Object> resultSender = context.getResultSender();
JndiBindingsType.JndiBinding configuration = context.getArguments();
JNDIInvoker.mapDatasource(getParamsAsMap(configuration),
- convert(configuration.getConfigProperty()));
+ convert(configuration.getConfigProperties()));
return new CliFunctionResult(context.getMemberName(), true,
CliStrings.format(RESULT_MESSAGE, configuration.getJndiName(),
context.getMemberName()));
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewayReceiverFunctionArgs.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewayReceiverFunctionArgs.java
index 67bdd94..07d7083 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewayReceiverFunctionArgs.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewayReceiverFunctionArgs.java
@@ -54,8 +54,8 @@ public class GatewayReceiverFunctionArgs implements
Serializable {
? Integer.valueOf(configuration.getSocketBufferSize()) : null;
this.maximumTimeBetweenPings = configuration.getMaximumTimeBetweenPings()
!= null
? Integer.valueOf(configuration.getMaximumTimeBetweenPings()) : null;
- this.gatewayTransportFilters = configuration.getGatewayTransportFilter()
!= null
- ?
configuration.getGatewayTransportFilter().stream().map(DeclarableType::getClassName)
+ this.gatewayTransportFilters = configuration.getGatewayTransportFilters()
!= null
+ ?
configuration.getGatewayTransportFilters().stream().map(DeclarableType::getClassName)
.toArray(String[]::new)
: null;
this.hostnameForSenders = configuration.getHostnameForSenders();
diff --git
a/geode-core/src/main/resources/org/apache/geode/internal/sanctioned-geode-core-serializables.txt
b/geode-core/src/main/resources/org/apache/geode/internal/sanctioned-geode-core-serializables.txt
index afd758e..1d89eb0 100644
---
a/geode-core/src/main/resources/org/apache/geode/internal/sanctioned-geode-core-serializables.txt
+++
b/geode-core/src/main/resources/org/apache/geode/internal/sanctioned-geode-core-serializables.txt
@@ -120,12 +120,12 @@
org/apache/geode/cache/client/SubscriptionNotEnabledException,true,-821244673777
org/apache/geode/cache/client/internal/ContainsKeyOp$MODE,false
org/apache/geode/cache/client/internal/TXSynchronizationOp$CompletionType,false
org/apache/geode/cache/client/internal/pooling/ConnectionDestroyedException,true,-6918516787578041316
-org/apache/geode/cache/configuration/CacheConfig$AsyncEventQueue,false,asyncEventListener:org/apache/geode/cache/configuration/DeclarableType,batchSize:java/lang/String,batchTimeInterval:java/lang/String,diskStoreName:java/lang/String,diskSynchronous:java/lang/Boolean,dispatcherThreads:java/lang/String,enableBatchConflation:java/lang/Boolean,forwardExpirationDestroy:java/lang/Boolean,gatewayEventFilter:java/util/List,gatewayEventSubstitutionFilter:org/apache/geode/cache/configuration/Dec
[...]
+org/apache/geode/cache/configuration/CacheConfig$AsyncEventQueue,false,asyncEventListener:org/apache/geode/cache/configuration/DeclarableType,batchSize:java/lang/String,batchTimeInterval:java/lang/String,diskStoreName:java/lang/String,diskSynchronous:java/lang/Boolean,dispatcherThreads:java/lang/String,enableBatchConflation:java/lang/Boolean,forwardExpirationDestroy:java/lang/Boolean,gatewayEventFilters:java/util/List,gatewayEventSubstitutionFilter:org/apache/geode/cache/configuration/De
[...]
org/apache/geode/cache/configuration/ClassNameType,false,className:java/lang/String
-org/apache/geode/cache/configuration/DeclarableType,false,parameter:java/util/List
+org/apache/geode/cache/configuration/DeclarableType,false,parameters:java/util/List
org/apache/geode/cache/configuration/EnumActionDestroyOverflow,false,value:java/lang/String
org/apache/geode/cache/configuration/EnumReadableWritable,false,value:java/lang/String
-org/apache/geode/cache/configuration/JndiBindingsType$JndiBinding,false,blockingTimeoutSeconds:java/lang/String,configProperty:java/util/List,connPooledDatasourceClass:java/lang/String,connectionUrl:java/lang/String,idleTimeoutSeconds:java/lang/String,initPoolSize:java/lang/String,jdbcDriverClass:java/lang/String,jndiName:java/lang/String,loginTimeoutSeconds:java/lang/String,managedConnFactoryClass:java/lang/String,maxPoolSize:java/lang/String,password:java/lang/String,transactionType:ja
[...]
+org/apache/geode/cache/configuration/JndiBindingsType$JndiBinding,false,blockingTimeoutSeconds:java/lang/String,configProperties:java/util/List,connPooledDatasourceClass:java/lang/String,connectionUrl:java/lang/String,idleTimeoutSeconds:java/lang/String,initPoolSize:java/lang/String,jdbcDriverClass:java/lang/String,jndiName:java/lang/String,loginTimeoutSeconds:java/lang/String,managedConnFactoryClass:java/lang/String,maxPoolSize:java/lang/String,password:java/lang/String,transactionType:
[...]
org/apache/geode/cache/configuration/JndiBindingsType$JndiBinding$ConfigProperty,false,configPropertyName:java/lang/String,configPropertyType:java/lang/String,configPropertyValue:java/lang/String
org/apache/geode/cache/configuration/ObjectType,false,declarable:org/apache/geode/cache/configuration/DeclarableType,string:java/lang/String
org/apache/geode/cache/configuration/ParameterType,false,name:java/lang/String
@@ -135,7 +135,7 @@
org/apache/geode/cache/configuration/RegionAttributesMirrorType,false,value:java
org/apache/geode/cache/configuration/RegionAttributesScope,false,value:java/lang/String
org/apache/geode/cache/configuration/RegionAttributesType$EvictionAttributes$LruHeapPercentage,false,action:org/apache/geode/cache/configuration/EnumActionDestroyOverflow
org/apache/geode/cache/configuration/RegionAttributesType$EvictionAttributes$LruMemorySize,false,maximum:java/lang/String
-org/apache/geode/cache/configuration/RegionConfig,false,entry:java/util/List,index:java/util/List,name:java/lang/String,refid:java/lang/String,region:java/util/List,regionAttributes:java/util/List,regionElements:java/util/List
+org/apache/geode/cache/configuration/RegionConfig,false,entries:java/util/List,indexes:java/util/List,name:java/lang/String,refid:java/lang/String,regionAttributes:java/util/List,regionElements:java/util/List,regions:java/util/List
org/apache/geode/cache/configuration/RegionConfig$Index,false,expression:java/lang/String,fromClause:java/lang/String,imports:java/lang/String,keyIndex:java/lang/Boolean,name:java/lang/String,type:java/lang/String
org/apache/geode/cache/execute/EmptyRegionFunctionException,true,1
org/apache/geode/cache/execute/FunctionAdapter,true,-4891043890440825485
diff --git
a/geode-core/src/test/java/org/apache/geode/cache/configuration/CacheConfigTest.java
b/geode-core/src/test/java/org/apache/geode/cache/configuration/CacheConfigTest.java
index da510ce..04884ac 100644
---
a/geode-core/src/test/java/org/apache/geode/cache/configuration/CacheConfigTest.java
+++
b/geode-core/src/test/java/org/apache/geode/cache/configuration/CacheConfigTest.java
@@ -62,7 +62,7 @@ public class CacheConfigTest {
declarableWithParam = new DeclarableType("my.className");
ParameterType param = new ParameterType("key");
param.setDeclarable(declarableWithString);
- declarableWithParam.getParameter().add(param);
+ declarableWithParam.getParameters().add(param);
declarableWithParamXml = classNameTypeXml + "<parameter
name=\"key\"><declarable>"
+ declarableWithStringXml + "</declarable></parameter>";
}
@@ -80,7 +80,7 @@ public class CacheConfigTest {
+ "</region></cache>";
cacheConfig = service.unMarshall(xml);
- RegionConfig.Index index =
cacheConfig.getRegion().get(0).getIndex().get(0);
+ RegionConfig.Index index =
cacheConfig.getRegions().get(0).getIndexes().get(0);
assertThat(index.isKeyIndex()).isTrue();
assertThat(index.getName()).isEqualTo("indexName");
assertThat(index.getExpression()).isEqualTo("expression");
@@ -96,11 +96,11 @@ public class CacheConfigTest {
+ declarableWithParamXml + "</declarable></value>" + "</entry>" +
"</region></cache>";
cacheConfig = service.unMarshall(xml);
- RegionConfig.Entry entry =
cacheConfig.getRegion().get(0).getEntry().get(0);
+ RegionConfig.Entry entry =
cacheConfig.getRegions().get(0).getEntries().get(0);
assertThat(entry.getKey().toString()).isEqualTo("key1");
assertThat(entry.getValue().getDeclarable()).isEqualTo(declarableWithString);
- entry = cacheConfig.getRegion().get(0).getEntry().get(1);
+ entry = cacheConfig.getRegions().get(0).getEntries().get(1);
assertThat(entry.getKey().toString()).isEqualTo("key2");
assertThat(entry.getValue().getDeclarable()).isEqualTo(declarableWithParam);
}
@@ -115,7 +115,7 @@ public class CacheConfigTest {
cacheConfig = service.unMarshall(xml);
assertThat(cacheConfig.getCacheTransactionManager().getTransactionWriter())
.isEqualTo(declarableWithString);
-
assertThat(cacheConfig.getCacheTransactionManager().getTransactionListener().get(0))
+
assertThat(cacheConfig.getCacheTransactionManager().getTransactionListeners().get(0))
.isEqualTo(declarableWithString);
}
@@ -145,24 +145,24 @@ public class CacheConfigTest {
cacheConfig = service.unMarshall(xml);
assertThat(cacheConfig.getInitializer()).isEqualTo(declarableWithString);
- assertThat(cacheConfig.getFunctionService().getFunction().get(0))
+ assertThat(cacheConfig.getFunctionService().getFunctions().get(0))
.isEqualTo(declarableWithString);
assertThat(cacheConfig.getPdx().getPdxSerializer()).isEqualTo(declarableWithString);
- assertThat(cacheConfig.getCacheServer().get(0).getCustomLoadProbe())
+ assertThat(cacheConfig.getCacheServers().get(0).getCustomLoadProbe())
.isEqualTo(declarableWithString);
assertThat(cacheConfig.getGatewayConflictResolver()).isEqualTo(declarableWithString);
-
assertThat(cacheConfig.getGatewayReceiver().getGatewayTransportFilter().get(0))
+
assertThat(cacheConfig.getGatewayReceiver().getGatewayTransportFilters().get(0))
.isEqualTo(declarableWithString);
-
assertThat(cacheConfig.getGatewayHub().get(0).getGateway().get(0).getGatewayListener().get(0))
+
assertThat(cacheConfig.getGatewayHubs().get(0).getGateway().get(0).getGatewayListeners().get(0))
.isEqualTo(declarableWithString);
- CacheConfig.AsyncEventQueue asyncEventQueue =
cacheConfig.getAsyncEventQueue().get(0);
+ CacheConfig.AsyncEventQueue asyncEventQueue =
cacheConfig.getAsyncEventQueues().get(0);
assertThat(asyncEventQueue.getAsyncEventListener()).isEqualTo(declarableWithString);
-
assertThat(asyncEventQueue.getGatewayEventFilter().get(0)).isEqualTo(declarableWithString);
+
assertThat(asyncEventQueue.getGatewayEventFilters().get(0)).isEqualTo(declarableWithString);
assertThat(asyncEventQueue.getGatewayEventSubstitutionFilter()).isEqualTo(declarableWithString);
RegionAttributesType regionAttributes =
cacheConfig.getRegionAttributes().get(0);
-
assertThat(regionAttributes.getCacheListener().get(0)).isEqualTo(declarableWithString);
+
assertThat(regionAttributes.getCacheListeners().get(0)).isEqualTo(declarableWithString);
assertThat(regionAttributes.getCompressor().toString()).isEqualTo("my.className");
assertThat(regionAttributes.getCacheLoader()).isEqualTo(declarableWithString);
assertThat(regionAttributes.getCacheWriter()).isEqualTo(declarableWithString);
diff --git
a/geode-core/src/test/java/org/apache/geode/cache/configuration/DeclarableTypeTest.java
b/geode-core/src/test/java/org/apache/geode/cache/configuration/DeclarableTypeTest.java
index f14124d..c57fa82 100644
---
a/geode-core/src/test/java/org/apache/geode/cache/configuration/DeclarableTypeTest.java
+++
b/geode-core/src/test/java/org/apache/geode/cache/configuration/DeclarableTypeTest.java
@@ -36,20 +36,20 @@ public class DeclarableTypeTest {
assertThat(declarable).isNotEqualTo(new
DeclarableType("anotherClassName"));
ParameterType parameter = new ParameterType("name", "value");
- declarable.getParameter().add(parameter);
+ declarable.getParameters().add(parameter);
DeclarableType d2 = new DeclarableType("className");
assertThat(declarable).isNotEqualTo(d2);
- d2.getParameter().add(parameter);
+ d2.getParameters().add(parameter);
assertThat(declarable).isEqualTo(d2);
// has one common parameter, but d2 has additional param
- d2.getParameter().add(new ParameterType("name1", "value1"));
+ d2.getParameters().add(new ParameterType("name1", "value1"));
assertThat(declarable).isNotEqualTo(d2);
// same size, but different param value
DeclarableType d3 = new DeclarableType("className");
- d3.getParameter().add(new ParameterType("name", "value1"));
+ d3.getParameters().add(new ParameterType("name", "value1"));
assertThat(declarable).isNotEqualTo(d3);
assertThat(declarable.toString()).isEqualTo("className{name:value}");
@@ -60,19 +60,19 @@ public class DeclarableTypeTest {
DeclarableType declarable = new DeclarableType("className");
ParameterType param = new ParameterType("param1");
param.setDeclarable(new DeclarableType("anotherClassName", "{'k':'v'}"));
- declarable.getParameter().add(param);
+ declarable.getParameters().add(param);
assertThat(declarable.toString()).isEqualTo("className{param1:anotherClassName{k:v}}");
DeclarableType d2 = new DeclarableType("className");
ParameterType p2 = new ParameterType("param1");
p2.setDeclarable(new DeclarableType("anotherClassName", "{'k':'v'}"));
- d2.getParameter().add(p2);
+ d2.getParameters().add(p2);
assertThat(declarable).isEqualTo(d2);
DeclarableType d3 = new DeclarableType("className");
ParameterType p3 = new ParameterType("param1");
p3.setDeclarable(new DeclarableType("anotherClassName", "{'k':'v2'}"));
- d3.getParameter().add(p3);
+ d3.getParameters().add(p3);
assertThat(declarable).isNotEqualTo(d3);
}
}
diff --git
a/geode-core/src/test/java/org/apache/geode/distributed/internal/CacheConfigDAODUnitTest.java
b/geode-core/src/test/java/org/apache/geode/distributed/internal/CacheConfigDAODUnitTest.java
index 71d32fb..24b7a8b 100644
---
a/geode-core/src/test/java/org/apache/geode/distributed/internal/CacheConfigDAODUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/distributed/internal/CacheConfigDAODUnitTest.java
@@ -48,7 +48,7 @@ public class CacheConfigDAODUnitTest {
RegionConfig regionConfig = new RegionConfig();
regionConfig.setName("regionB");
regionConfig.setRefid("REPLICATE");
- cc.getRegion().add(regionConfig);
+ cc.getRegions().add(regionConfig);
return cc;
});
});
diff --git
a/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalConfigurationPersistenceServiceTest.java
b/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalConfigurationPersistenceServiceTest.java
index b0fa995..cbb892b 100644
---
a/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalConfigurationPersistenceServiceTest.java
+++
b/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalConfigurationPersistenceServiceTest.java
@@ -75,7 +75,7 @@ public class InternalConfigurationPersistenceServiceTest {
RegionConfig regionConfig = new RegionConfig();
regionConfig.setName("regionA");
regionConfig.setRefid("REPLICATE");
- cacheConfig.getRegion().add(regionConfig);
+ cacheConfig.getRegions().add(regionConfig);
return cacheConfig;
});
@@ -91,7 +91,7 @@ public class InternalConfigurationPersistenceServiceTest {
jndiBinding.setJndiName("jndiOne");
jndiBinding.setJdbcDriverClass("com.sun.ABC");
jndiBinding.setType("SimpleDataSource");
- jndiBinding.getConfigProperty()
+ jndiBinding.getConfigProperties()
.add(new JndiBindingsType.JndiBinding.ConfigProperty("test", "test",
"test"));
cacheConfig.getJndiBindings().add(jndiBinding);
return cacheConfig;
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/config/JAXBServiceTest.java
b/geode-core/src/test/java/org/apache/geode/internal/config/JAXBServiceTest.java
index 2e9bad2..073874d 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/config/JAXBServiceTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/config/JAXBServiceTest.java
@@ -169,7 +169,7 @@ public class JAXBServiceTest {
RegionConfig region = new RegionConfig();
region.setName("testRegion");
region.setRefid("REPLICATE");
- cache.getRegion().add(region);
+ cache.getRegions().add(region);
}
@XmlAccessorType(XmlAccessType.FIELD)
diff --git
a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommandTest.java
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommandTest.java
index 81eb616..fd6ca25 100644
---
a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommandTest.java
+++
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommandTest.java
@@ -242,7 +242,7 @@ public class CreateJndiBindingCommandTest {
assertThat(function.getValue()).isInstanceOf(CreateJndiBindingFunction.class);
assertThat(jndiConfig.getValue()).isNotNull();
assertThat(jndiConfig.getValue().getJndiName()).isEqualTo("name");
-
assertThat(jndiConfig.getValue().getConfigProperty().get(0).getName()).isEqualTo("name1");
+
assertThat(jndiConfig.getValue().getConfigProperties().get(0).getName()).isEqualTo("name1");
assertThat(targetMembers.getValue()).isEqualTo(members);
}
@@ -290,7 +290,7 @@ public class CreateJndiBindingCommandTest {
assertThat(function.getValue()).isInstanceOf(CreateJndiBindingFunction.class);
assertThat(jndiConfig.getValue()).isNotNull();
assertThat(jndiConfig.getValue().getJndiName()).isEqualTo("name");
-
assertThat(jndiConfig.getValue().getConfigProperty().get(0).getName()).isEqualTo("name1");
+
assertThat(jndiConfig.getValue().getConfigProperties().get(0).getName()).isEqualTo("name1");
assertThat(targetMembers.getValue()).isEqualTo(members);
}
}
diff --git
a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyIndexCommandsDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyIndexCommandsDUnitTest.java
index 5af582a..072eeb8 100644
---
a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyIndexCommandsDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyIndexCommandsDUnitTest.java
@@ -233,7 +233,7 @@ public class DestroyIndexCommandsDUnitTest {
InternalConfigurationPersistenceService svc =
ClusterStartupRule.getLocator().getConfigurationPersistenceService();
RegionConfig regionConfig =
svc.getCacheConfig("cluster").findRegionConfiguration(REGION_1);
- assertThat(regionConfig.getIndex().size()).isEqualTo(2);
+ assertThat(regionConfig.getIndexes().size()).isEqualTo(2);
});
}
@@ -273,7 +273,7 @@ public class DestroyIndexCommandsDUnitTest {
InternalConfigurationPersistenceService svc =
ClusterStartupRule.getLocator().getConfigurationPersistenceService();
RegionConfig regionConfig =
svc.getCacheConfig("cluster").findRegionConfiguration(region);
- assertThat(regionConfig.getIndex().size()).isEqualTo(indexCount);
+ assertThat(regionConfig.getIndexes().size()).isEqualTo(indexCount);
});
}
}
diff --git
a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DestroyJndiBindingFunctionTest.java
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DestroyJndiBindingFunctionTest.java
index 17bf32e..58f8639 100644
---
a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DestroyJndiBindingFunctionTest.java
+++
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DestroyJndiBindingFunctionTest.java
@@ -66,7 +66,7 @@ public class DestroyJndiBindingFunctionTest {
config.setJdbcDriverClass("org.apache.derby.jdbc.EmbeddedDriver");
config.setConnectionUrl("jdbc:derby:newDB;create=true");
JNDIInvoker.mapDatasource(CreateJndiBindingFunction.getParamsAsMap(config),
- CreateJndiBindingFunction.convert(config.getConfigProperty()));
+ CreateJndiBindingFunction.convert(config.getConfigProperties()));
}
@Test
diff --git
a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListJndiBindingFunctionTest.java
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListJndiBindingFunctionTest.java
index bba1aed..9e03b76 100644
---
a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListJndiBindingFunctionTest.java
+++
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ListJndiBindingFunctionTest.java
@@ -64,10 +64,10 @@ public class ListJndiBindingFunctionTest {
config.setType(CreateJndiBindingCommand.DATASOURCE_TYPE.SIMPLE.getType());
config.setJdbcDriverClass("org.apache.derby.jdbc.EmbeddedDriver");
config.setConnectionUrl("jdbc:derby:newDB;create=true");
- config.getConfigProperty()
+ config.getConfigProperties()
.add(new JndiBindingsType.JndiBinding.ConfigProperty("test", "test",
"test"));
JNDIInvoker.mapDatasource(CreateJndiBindingFunction.getParamsAsMap(config),
- CreateJndiBindingFunction.convert(config.getConfigProperty()));
+ CreateJndiBindingFunction.convert(config.getConfigProperties()));
}
@Test
--
To stop receiving notification emails like this one, please contact
[email protected].
