diff --git a/configurationService.xsd b/configurationService.xsd new file mode 100755 index 000000000000..1e3672a630c9 --- /dev/null +++ b/configurationService.xsd @@ -0,0 +1,1301 @@ + + + + + + + +If you are declaring a client cache then use this schema: + + + +The contents of a declarative XML file correspond to APIs found in the +org.apache.geode.cache and org.apache.geode.cache.client +packages. A declarative caching XML file is used to populate a Cache +or a ClientCache when it is created. + +The top-level element in this syntax is "cache" or "client-cache". +All elements are listed here in alphabetical order. + +The following conventions apply to all Geode distributed cache +declarative caching XML file elements unless indicated otherwise. + +- In elements that contain PCDATA, leading and trailing whitespace in + the data may be ignored. + +- In elements whose value is an "enumerated type", the value is case + sensitive. + + ]]> + + + + + + + The "cache" element is the root element of the declarative cache file on a peer or server. + This element configures a Geode Cache and describes the root regions it contains, if any. + + + + + + + + + The "gateway-hub" element specifies a Gateway Hub that is + initialized when the Cache is declaratively initialized. + + + + + + + + The "gateway" element specifies a Gateway that is + initialized when a GatewayHub is declaratively initialized. + + + + + + + + + The "gateway-endpoint" element specifies an endpoint that is + initialized when a Gateway is declaratively initialized. + + + + + + + + + + + + The "gateway-listener" element specifies a listener that is + initialized when a Gateway is declaratively initialized. + + + + + + + + + + + + + + The "gateway-queue" element specifies a queue that is initialized when a + Gateway is declaratively initialized. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A "gateway-conflict-resolver" element describes a region's GatewayConflictResolver. + It is used to resolve inter-system concurrency conflicts. + + + + + + + + + + + + + + + + + + + A "async-event-listener" element describes a region's AsyncEventListener. + + + + + + + + + + + + + + + + + + + + + + + The "cache-server" element specifies a Cache Server that will accept requests from + clients and that is started when the Cache is declaratively initialized. + + + + + + + + + + + + + + + + + + + + + + The backup element defines files or directories that should be backed up when the + system wide backup command is invoked. Disk stores with persistent data are + automatically backed up, they do not need to be listed with this element. + + + + + + + + + + + + + + + + + + + + The "client-cache" element is the root element of the declarative cache file on a client. + This element configures a Geode ClientCache and describes the root regions it contains, if any. + + + + + + + + + + + + + + + + + + + + + + + + A "region" element describes a region (and its entries) in Geode distributed cache. + It may be used to create a new region or may be used to add new entries to an existing + region. Note that the "name" attribute specifies the simple name of the region; it + cannot contain a "/". If "refid" is set then it defines the default region attributes + to use for this region. A nested "region-attributes" element can override these defaults. + If the nested "region-attributes" element has its own "refid" then it will cause the + "refid" on the region to be ignored. "refid" can be set to the name of a RegionShortcut + or a ClientRegionShortcut (see the javadocs of those enum classes for their names). + + + + + + + + An "index" element describes an index to be created on a region. + The index node, if any, should all come immediately after the + "region-attributes" node. There can be any number of functional types + of index on a Region, but only at max one index of type "primary-key". The + "name" attribute is a required field which identifies the name of the index. + + + + + + + + A functional type of index needs a from-clause, expression which are mandatory. + The import string is used for specifying the type of Object in the region or + the type of Object which the indexed expression evaluates to. + + + + + + + + + + + + + A primary-key type of index needs a field attribute which is mandatory. + There should be only one or zero primary-index defined for a region + + + + + + + + + + + + + + + + + + + + + + + + + + An "entry" element desribes an entry to be added to a region. Note + that if an entry with the given key already exists in the region, + it will be replaced. + + + + + + + + A "key" element describes the key in a Region entry. + + + + + + + + + + + + + A "value" element describes the value in a Region entry + + + + + + + + + + + + + + + + + + + + + + + + + + + + A "key-constraint" element specifies the name of a class to which the + keys of a region are constrained. + + + + + + + A "value-constraint" element specifies the name of a class to which the + values of a region are constrained. + + + + + + + A "region-time-to-live" element specifies a Region's time to live. + + + + + + + + + + + + + A "region-idle-time" element specifies a Region's idle time. + Note that the APIs that correspond to this element add "out" to their + name. See getRegionIdleTimeout and setRegionIdleTimeout. + + + + + + + + + + + + + A "entry-time-to-live" element specifies a Region's entries' time to + live. + + + + + + + + + + + + + A "entry-idle-time" element specifies a Region's entries' idle time. + Note that the APIs that correspond to this element add "out" to + their name. See getEntryIdleTimeout and setEntryIdleTimeout. + + + + + + + + + + + + + A "partition-attributes" element configures a region for partitioned + data storage. + + local-max-memory attribute added to partition-attributes in release 5.1 + total-max-memory attribute added to partition-attributes in release 5.1 + total-num-buckets attribute added to partition-attributes in release 5.1 + partition-resolver attribute added to partition-attributes in release 5.7 + partition-listener attribute added to partition-attributes in release 6.1 + colocated-with attribute added to partition-attributes in release 5.7 + + + + + + + + A "partition-resolver" element describes a partitioned region's custom + PartitionResolver. + + + + + + + + + + + + + + + A "partition-listener" element describes a partitioned region's custom + PartitionListener. + + + + + + + + + + + + + + A "fixed-partition-attributes" element describes characteristics of a + partition in a Fixed Partitioned Region. + + + + + + + + + + + + + + + + + + + + + + + + A "subscription-attributes" element configures how a region subscribes + to remote distributed regions. + + + + + + + + + + + + + + + + + + + + A "cache-listener" element describes a region's CacheListener. + + + + + + + + + + + + + + A compressor registers a custom class which extends Compressor to support compression on a region. + + + + + + + + + + + + + Create eviction attributes that monitor and control the size of the Region. + + + + + + + + Create an LRU eviction controller which performs the action if the + Region has more than the maximum number of Entries in the Region. + + + + + + + + + + + + Create an LRU which evicts entries using the specified action + when the heap is over the resource manager critical heap/off-heap percentage. + When the threshold has been exceeded each create or put operation + is required to evict the same size of data which was added. The + optional class-name and parameters allow for the declaration + of an ObjectSizer, which will be used to determine data size. + The class must implement the ObjectSizer interface. + + + + + + + + + + + + + + + Create an LRU that performs the action when the memory size of the Region is + over the maximum. The optional class-name and parameters allow for the + declaration an ObjectSizer, which is used to measure the size of each Object + in the Region. The class must implement the ObjectSizer interface. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A "client-subscription" element describes the eviction policy, capacity. + + + + + + + + + + + + + + + + + + + A "custom-load-probe" element describes a callback that reports the load on a cache-server. + + + + + + + + + + + + + + + + + + + + + + + + + + + The "function service" element configures the behavior of the function service. + The function service allows users to execute functions on data stored in Geode. + + + + + + + The "function" element defines a function for registration in the function service. + + + + + + + + + + + + + + + + + A "cache-loader" element describes a region's CacheLoader. + + + + + + + + + + + + A "cache-transaction-manager" element allows insertion of cache-level transaction listeners. + + + + + + + A "transaction-listener" describes a TransactionListener. + + + + + + + + + + + + + A "transaction-writer" describes a TransactionWriter. + + + + + + + + + + + + + + + + A "cache-writer" element describes a region's CacheWriter. + + + + + + + + + + + + A serialization-registration contains a set of serializer or instantiator tags to + register customer DataSerializer extensions or DataSerializable implementations respectively. + + + + + + + A serializer registers a custom class which extends DataSerializer to support custom + serialization of non-modifiable object types inside Geode. The class must have a + public zero-arg constructor. + + + + + + + + + + + + + An instantiator registers a custom class which implements the DataSerializable interface + to support custom object serialization inside Geode. The class must have a public + zero-arg constructor. + + + + + + + + + + The id that the instantiator should associate with the DataSerializable type. + + + + + + + + + + + + A "class-name" element specifies the name of a class, an instance of which is created + when a declarative cache XML file is read. + + + + + + + + + + A "disk-store" element specifies a DiskStore for persistence. + + + + + + + + + + + + + + + + + + + + + A "pdx" element specifies the configuration for the portable data exchange (PDX) method of + serialization. The "read-serialized" attribute is "early access". + + + + + + + A "pdx-serializer" element describes a serializer used to serialize objects in the + portable data exchange format. + + + + + + + + + + + + + + + + + + + + + A "pool" element specifies a client to server connection pool. + + + + + + + A "locator" element specifies the host and port that a server locator is listening on + + + + + + + + + + + A "server" element specifies the host and port that a cache server is listening on + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A "declarable" element specifies a Declarable object to be placed in a Region entry. + + + + + + + + + + + + A "disk-dir" element specifies one of a region or diskstore's disk directories. + + + + + + + + + A "disk-dirs" element specifies the region's disk directories. + + + + + + + + + + + An "expiration-attributes" element describes expiration. + + + + + + + The "custom-expiry" element specifies a callback that specifies + custom expiration attributes. See the CustomExpiry class. + + + + + + + + + + + + + + + + + + + + + + + + + + + + A "initializer" element specifies a Declarable object whose init method + will be called after all other cache.xml initialization is + complete. + + + + + + + + + + + + + + + + + + + A jndi-bindings element will contain the jndi-binding for each of the + datasources which are to be bound with the JNDI Context. + + + + + + + For every datasource which is bound to the JNDI tree, there will exist one + jndi-binding tag. This tag will describe the property and configuration of the + datasource. The attributes of jndi-binding are used for configuration by + Geode, while the property element is used to configure the custom property + for the datasource. + + The "xa-datasource-class" must be set when type is XAPooledDataSource, + "conn-pooled-datasource-class" must be set when type is PooledDataSource, + and "jdbc-driver-class" msut be set when the type is SimpleDataSource. It is + advisable to set the user-name and password as attributes rather than as a + property element. Alternatively, they may both be set as attributes of the + jndi-binding tag as well as an attribute of the property tag. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A "parameter" element describes a parameter used to initialize a Declarable object. + + + + + + + + + + + + + A "string" element specifies a String to be placed in a Region entry. + + + + + + + + + + + Decimal version type. + + + + + + + + + + + diff --git a/connectors-bindings.xjb b/connectors-bindings.xjb new file mode 100755 index 000000000000..49037604bc4e --- /dev/null +++ b/connectors-bindings.xjb @@ -0,0 +1,35 @@ + + + + + + + + + + + + diff --git a/core-bindings.xjb b/core-bindings.xjb new file mode 100755 index 000000000000..fc3a1dae6587 --- /dev/null +++ b/core-bindings.xjb @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/example-bindings.xjb b/etc/example-bindings.xjb new file mode 100755 index 000000000000..0704c8e788c0 --- /dev/null +++ b/etc/example-bindings.xjb @@ -0,0 +1,35 @@ + + + + + + + + + + + + diff --git a/etc/geode-connectors.episode b/etc/geode-connectors.episode new file mode 100644 index 000000000000..6a4274b89e9e --- /dev/null +++ b/etc/geode-connectors.episode @@ -0,0 +1,20 @@ + + + + + + + + + + + + + diff --git a/etc/geode-core.episode b/etc/geode-core.episode new file mode 100644 index 000000000000..266fb4f679c5 --- /dev/null +++ b/etc/geode-core.episode @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/geode-lucene.episode b/etc/geode-lucene.episode new file mode 100644 index 000000000000..90e9ef550b14 --- /dev/null +++ b/etc/geode-lucene.episode @@ -0,0 +1,20 @@ + + + + + + + + + + + + + diff --git a/generate-configuration-container-classes.sh b/generate-configuration-container-classes.sh new file mode 100755 index 000000000000..e1e1c34340a5 --- /dev/null +++ b/generate-configuration-container-classes.sh @@ -0,0 +1,97 @@ +#!/usr/bin/env bash + +echo """ +This file is intended only as a reference or starting-point for extension developers. +It is not supported by Apache Geode in any way. +This is merely the path one developer took in creating an early iteration of Geodes configuration classes. + +Our ultimate goal is to not require an XSD at all and to not use XML as a data container. +For those developers coming from this now-discouraged cache.xml configuration style, however, + this script can assist in generating configuration container classes consistent with the schemas. + +This script expects the configurationService.xsd and all *.xjb files to exist in the Geode root directory. + +The classes are generated from a modified cache xsd. +See comments in the configurationService.xsd for more details. +Additional adjustments are made by the use of JAXB bindings files. +See each *-bindings.xjb for more details. +Even with these generation adjustments, the generated classes require additional, manual adjustment. +To reiterate, this script and style of generation is intended as a _starting point_. + +To avoid redundant generation, you may include the generated etc/*.episode files as additional bindings. +See the geode-connectors and geode-lucene generation methods as an example. +""" + +printf "Press ENTER to generate classes using xjc..." +read +echo + +geodeRoot=$(git rev-parse --show-toplevel) + +generate-core () { + projectDir="${geodeRoot}/geode-core" + + sourceXsd="${geodeRoot}/configurationService.xsd" + classPath="${projectDir}/src/main/java" + jaxBindings="${geodeRoot}/core-bindings.xjb" + + outputDir="${projectDir}/build/generated-src/main/" + outputPackage="org.apache.geode.cache.configuration" + outputEpisode="${geodeRoot}/etc/geode-core.episode" + + mkdir -p ${outputDir} + + command="xjc -extension -p ${outputPackage} -d ${outputDir} -episode ${outputEpisode} -no-header -b ${jaxBindings} -classpath ${classPath} -contentForWildcard -npa ${sourceXsd}" + printf "Executing: '${command}'\nPress ENTER to continue..." + read + ${command} + echo + +} + +generate-connectors () { + projectDir="${geodeRoot}/geode-connectors" + + sourceXsd="${projectDir}/src/main/resources/META-INF/schemas/geode.apache.org/schema/jdbc/jdbc-1.0.xsd" + jaxBindings="${geodeRoot}/connectors-bindings.xjb" + classPath="${geodeRoot}/geode-core/src/main/java" + coreEpisode="${geodeRoot}/etc/geode-core.episode" + + outputDir="${projectDir}/build/generated-src/main/" + outputPackage="org.apache.geode.cache.configuration" + outputEpisode="${geodeRoot}/etc/geode-connectors.episode" + + mkdir -p ${outputDir} + + command="xjc -extension -p ${outputPackage} -d ${outputDir} -episode ${outputEpisode} -no-header -b ${jaxBindings} -classpath ${classPath} -contentForWildcard -npa ${sourceXsd}" + printf "Executing: '${command}'\nPress ENTER to continue..." + read + ${command} + echo + +} + +generate-lucene () { + projectDir="${geodeRoot}/geode-lucene" + + sourceXsd="${projectDir}/src/main/resources/META-INF/schemas/geode.apache.org/schema/lucene/lucene-1.0.xsd" + jaxBindings="${geodeRoot}/lucene-bindings.xjb" + classPath="${geodeRoot}/geode-core/src/main/java" + coreEpisode="${geodeRoot}/etc/geode-core.episode" + + outputDir="${projectDir}/build/generated-src/main/" + outputPackage="org.apache.geode.cache.configuration" + outputEpisode="${projectDir}/../etc/geode-lucene.episode" + + mkdir -p ${outputDir} + + command="xjc -extension -p ${outputPackage} -d ${outputDir} -episode ${outputEpisode} -no-header -b ${coreEpisode} -b ${jaxBindings} -classpath ${classPath} -contentForWildcard -npa ${sourceXsd}" + printf "Executing: '${command}'\nPress ENTER to continue..." + read + ${command} + echo +} + +generate-core +generate-connectors +generate-lucene diff --git a/geode-connectors/build.gradle b/geode-connectors/build.gradle index c5423b93ab10..b18cf3ea6b9a 100644 --- a/geode-connectors/build.gradle +++ b/geode-connectors/build.gradle @@ -41,4 +41,37 @@ dependencies { testCompile files(project(':geode-old-versions').sourceSets.main.output) } + + +task xjc (type: Exec){ + description 'Generates initial, incomplete POJO configuration objects using JAXB / xjc. ' + + 'Use this task as a reference to keep etc/example-bindings.xjb ' + + 'and the etc/*.episode files up to date. ' + + 'Intended as an internal developer tool only.' + dependsOn(':geode-core:xjc') + + def sourceXsd = "${projectDir}/src/main/resources/META-INF/schemas/geode.apache.org/schema/jdbc/jdbc-1.0.xsd" + def jaxBindings = "${projectDir}/src/main/resources/META-INF/schemas/geode.apache.org/schema/jdbc/bindings.xjb" + def classPath = "${projectDir}/../geode-core/src/main/java" + + // It is not currently needed (and is currently breaking) to pass the core episode to this task. + // If it does become necessary, pass it as a binding (an additional -b) in the xjc command. + def coreEpisode = "${projectDir}/../etc/geode-core.episode" + + def outputDir = "${projectDir}/build/generated-src/main/" + def outputPackage = "org.apache.geode.cache.configuration" + def outputEpisode = "${projectDir}/../etc/geode-connectors.episode" + + doFirst{ + workingDir projectDir + mkdir outputDir + } + + workingDir projectDir + commandLine 'sh', '-c', + "xjc -extension -p ${outputPackage} -d ${outputDir} -episode ${outputEpisode} " + + "-no-header -b ${jaxBindings} -classpath ${classPath} -contentForWildcard -npa ${sourceXsd}" + +} + integrationTest.forkEvery 0 diff --git a/geode-core/build.gradle b/geode-core/build.gradle index 3adeebbf527d..0bad6c3c1327 100755 --- a/geode-core/build.gradle +++ b/geode-core/build.gradle @@ -26,8 +26,6 @@ sourceSets { } } - - configurations { //declaring new configuration that will be used to associate with artifacts archives @@ -242,3 +240,28 @@ dependencies { tasks.eclipse.dependsOn(generateGrammarSource) +task xjc (type: Exec){ + description 'Generates initial, incomplete POJO configuration objects using JAXB / xjc. ' + + 'Use this task as a reference to keep etc/example-bindings.xjb ' + + 'and the etc/*.episode files up to date. ' + + 'Intended as an internal developer tool only.' + + def sourceXsd = "${projectDir}/src/main/resources/META-INF/schemas/geode.apache.org/schema/cache/configurationService.xsd" + def classPath = "${projectDir}/src/main/java" + def jaxBindings = "${projectDir}//src/main/resources/META-INF/schemas/geode.apache.org/schema/cache/bindings.xjb" + + def outputDir = "${projectDir}/build/generated-src/main/" + def outputPackage = "org.apache.geode.cache.configuration" + def outputEpisode = "${projectDir}/../etc/geode-core.episode" + + doFirst{ + workingDir projectDir + mkdir outputDir + } + + workingDir projectDir + commandLine 'sh', '-c', + "xjc -extension -p ${outputPackage} -d ${outputDir} -episode ${outputEpisode} " + + "-no-header -b ${jaxBindings} -classpath ${classPath} -contentForWildcard -npa ${sourceXsd}" + +} 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 eb4d58a25321..caa356c39520 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 @@ -1,23 +1,21 @@ - /* - * 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 + * 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. + * 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.cache.configuration; +import java.io.Serializable; import java.math.BigInteger; import java.util.ArrayList; import java.util.List; @@ -38,279 +36,275 @@ /** + * + * The "cache" element is the root element of the declarative cache file on a peer or server. + * This element configures a Geode Cache and describes the root regions it contains, if any. + * + * *

- * Java class for anonymous complex type. + * Java class for cache element declaration. * *

* The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="cache-transaction-manager" type="{http://geode.apache.org/schema/cache}cache-transaction-manager-type" minOccurs="0"/>
- *         <element name="dynamic-region-factory" type="{http://geode.apache.org/schema/cache}dynamic-region-factory-type" minOccurs="0"/>
- *         <element name="gateway-hub" maxOccurs="unbounded" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="gateway" maxOccurs="unbounded" minOccurs="0">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <sequence>
- *                             <choice>
- *                               <element name="gateway-endpoint" maxOccurs="unbounded">
+ * <element name="cache">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *           <element name="cache-transaction-manager" type="{http://geode.apache.org/schema/cache}cache-transaction-manager-type" minOccurs="0"/>
+ *           <element name="gateway-hub" maxOccurs="unbounded" minOccurs="0">
+ *             <complexType>
+ *               <complexContent>
+ *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                   <sequence>
+ *                     <element name="gateway" maxOccurs="unbounded" minOccurs="0">
+ *                       <complexType>
+ *                         <complexContent>
+ *                           <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                             <sequence>
+ *                               <choice>
+ *                                 <element name="gateway-endpoint" maxOccurs="unbounded">
+ *                                   <complexType>
+ *                                     <complexContent>
+ *                                       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                         <attribute name="host" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                                         <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                                         <attribute name="port" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                                       </restriction>
+ *                                     </complexContent>
+ *                                   </complexType>
+ *                                 </element>
+ *                                 <element name="gateway-listener" maxOccurs="unbounded">
+ *                                   <complexType>
+ *                                     <complexContent>
+ *                                       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                         <sequence>
+ *                                           <element name="class-name" type="{http://geode.apache.org/schema/cache}class-name-type"/>
+ *                                           <element name="parameter" type="{http://geode.apache.org/schema/cache}parameter-type" maxOccurs="unbounded" minOccurs="0"/>
+ *                                         </sequence>
+ *                                       </restriction>
+ *                                     </complexContent>
+ *                                   </complexType>
+ *                                 </element>
+ *                               </choice>
+ *                               <element name="gateway-queue" minOccurs="0">
  *                                 <complexType>
  *                                   <complexContent>
  *                                     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                                       <attribute name="host" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                                       <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                                       <attribute name="port" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                                       <attribute name="alert-threshold" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                                       <attribute name="batch-conflation" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *                                       <attribute name="batch-size" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                                       <attribute name="batch-time-interval" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                                       <attribute name="enable-persistence" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *                                       <attribute name="disk-store-name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                                       <attribute name="maximum-queue-memory" type="{http://www.w3.org/2001/XMLSchema}string" />
  *                                     </restriction>
  *                                   </complexContent>
  *                                 </complexType>
  *                               </element>
- *                               <element name="gateway-listener" maxOccurs="unbounded">
- *                                 <complexType>
- *                                   <complexContent>
- *                                     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                                       <sequence>
- *                                         <element name="class-name" type="{http://geode.apache.org/schema/cache}class-name-type"/>
- *                                         <element name="parameter" type="{http://geode.apache.org/schema/cache}parameter-type" maxOccurs="unbounded" minOccurs="0"/>
- *                                       </sequence>
- *                                     </restriction>
- *                                   </complexContent>
- *                                 </complexType>
- *                               </element>
- *                             </choice>
- *                             <element name="gateway-queue" minOccurs="0">
- *                               <complexType>
- *                                 <complexContent>
- *                                   <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                                     <attribute name="alert-threshold" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                                     <attribute name="batch-conflation" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *                                     <attribute name="batch-size" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                                     <attribute name="batch-time-interval" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                                     <attribute name="enable-persistence" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *                                     <attribute name="disk-store-name" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                                     <attribute name="roll-oplogs" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *                                     <attribute name="maximum-queue-memory" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                                     <attribute name="overflow-directory" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                                   </restriction>
- *                                 </complexContent>
- *                               </complexType>
- *                             </element>
- *                           </sequence>
- *                           <attribute name="early-ack" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *                           <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                           <attribute name="socket-buffer-size" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                           <attribute name="socket-read-timeout" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                           <attribute name="concurrency-level" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                           <attribute name="order-policy" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                 </sequence>
- *                 <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="bind-address" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="maximum-time-between-pings" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="port" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="socket-buffer-size" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="startup-policy">
- *                   <simpleType>
- *                     <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                       <enumeration value="primary"/>
- *                       <enumeration value="secondary"/>
- *                       <enumeration value="none"/>
- *                     </restriction>
- *                   </simpleType>
- *                 </attribute>
- *                 <attribute name="manual-start" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *                 <attribute name="max-connections" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="gateway-sender" maxOccurs="unbounded" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="gateway-event-filter" type="{http://geode.apache.org/schema/cache}class-with-parameters-type" maxOccurs="unbounded" minOccurs="0"/>
- *                   <element name="gateway-event-substitution-filter" type="{http://geode.apache.org/schema/cache}class-with-parameters-type" minOccurs="0"/>
- *                   <element name="gateway-transport-filter" type="{http://geode.apache.org/schema/cache}class-with-parameters-type" maxOccurs="unbounded" minOccurs="0"/>
- *                 </sequence>
- *                 <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="remote-distributed-system-id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="parallel" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *                 <attribute name="manual-start" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *                 <attribute name="socket-buffer-size" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="socket-read-timeout" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="enable-batch-conflation" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *                 <attribute name="batch-size" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="batch-time-interval" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="enable-persistence" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *                 <attribute name="disk-store-name" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="disk-synchronous" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *                 <attribute name="maximum-queue-memory" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="alert-threshold" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="dispatcher-threads" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="order-policy" type="{http://www.w3.org/2001/XMLSchema}string" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="gateway-receiver" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="gateway-transport-filter" type="{http://geode.apache.org/schema/cache}class-with-parameters-type" maxOccurs="unbounded" minOccurs="0"/>
- *                 </sequence>
- *                 <attribute name="start-port" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="end-port" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="bind-address" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="maximum-time-between-pings" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="socket-buffer-size" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="hostname-for-senders" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="manual-start" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="gateway-conflict-resolver" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="class-name" type="{http://geode.apache.org/schema/cache}class-name-type"/>
- *                   <element name="parameter" type="{http://geode.apache.org/schema/cache}parameter-type" maxOccurs="unbounded" minOccurs="0"/>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="async-event-queue" maxOccurs="unbounded" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="gateway-event-filter" type="{http://geode.apache.org/schema/cache}class-with-parameters-type" maxOccurs="unbounded" minOccurs="0"/>
- *                   <element name="gateway-event-substitution-filter" type="{http://geode.apache.org/schema/cache}class-with-parameters-type" minOccurs="0"/>
- *                   <element name="async-event-listener" type="{http://geode.apache.org/schema/cache}class-with-parameters-type"/>
- *                 </sequence>
- *                 <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="parallel" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *                 <attribute name="batch-size" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="batch-time-interval" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="enable-batch-conflation" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *                 <attribute name="maximum-queue-memory" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="persistent" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *                 <attribute name="disk-store-name" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="disk-synchronous" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *                 <attribute name="dispatcher-threads" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="order-policy" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="forward-expiration-destroy" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="cache-server" maxOccurs="unbounded" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <extension base="{http://geode.apache.org/schema/cache}server-type">
- *                 <attribute name="tcp-no-delay" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *               </extension>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="pool" type="{http://geode.apache.org/schema/cache}pool-type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="disk-store" type="{http://geode.apache.org/schema/cache}disk-store-type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="pdx" type="{http://geode.apache.org/schema/cache}pdx-type" minOccurs="0"/>
- *         <element name="region-attributes" type="{http://geode.apache.org/schema/cache}region-attributes-type" maxOccurs="unbounded" minOccurs="0"/>
- *         <choice maxOccurs="unbounded" minOccurs="0">
- *           <element name="jndi-bindings" type="{http://geode.apache.org/schema/cache}jndi-bindings-type"/>
- *           <element name="region" type="{http://geode.apache.org/schema/cache}region-type"/>
- *           <element name="vm-root-region" type="{http://geode.apache.org/schema/cache}region-type"/>
- *         </choice>
- *         <element name="function-service" type="{http://geode.apache.org/schema/cache}function-service-type" minOccurs="0"/>
- *         <element name="resource-manager" type="{http://geode.apache.org/schema/cache}resource-manager-type" minOccurs="0"/>
- *         <element name="serialization-registration" type="{http://geode.apache.org/schema/cache}serialization-registration-type" minOccurs="0"/>
- *         <element name="backup" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="initializer" type="{http://geode.apache.org/schema/cache}initializer-type" minOccurs="0"/>
- *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="copy-on-read" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       <attribute name="is-server" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       <attribute name="lock-timeout" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="lock-lease" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="message-sync-interval" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="search-timeout" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="version" use="required" type="{http://geode.apache.org/schema/cache}versionType" fixed="1.0" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ *                             </sequence>
+ *                             <attribute name="early-ack" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *                             <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                             <attribute name="socket-buffer-size" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                             <attribute name="socket-read-timeout" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                             <attribute name="concurrency-level" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                             <attribute name="order-policy" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                           </restriction>
+ *                         </complexContent>
+ *                       </complexType>
+ *                     </element>
+ *                   </sequence>
+ *                   <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                   <attribute name="bind-address" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                   <attribute name="maximum-time-between-pings" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                   <attribute name="port" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                   <attribute name="socket-buffer-size" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                   <attribute name="startup-policy">
+ *                     <simpleType>
+ *                       <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                         <enumeration value="primary"/>
+ *                         <enumeration value="secondary"/>
+ *                         <enumeration value="none"/>
+ *                       </restriction>
+ *                     </simpleType>
+ *                   </attribute>
+ *                   <attribute name="manual-start" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *                   <attribute name="max-connections" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *                 </restriction>
+ *               </complexContent>
+ *             </complexType>
+ *           </element>
+ *           <element name="gateway-sender" maxOccurs="unbounded" minOccurs="0">
+ *             <complexType>
+ *               <complexContent>
+ *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                   <sequence>
+ *                     <element name="gateway-event-filter" type="{http://geode.apache.org/schema/cache}class-with-parameters-type" maxOccurs="unbounded" minOccurs="0"/>
+ *                     <element name="gateway-event-substitution-filter" type="{http://geode.apache.org/schema/cache}class-with-parameters-type" minOccurs="0"/>
+ *                     <element name="gateway-transport-filter" type="{http://geode.apache.org/schema/cache}class-with-parameters-type" maxOccurs="unbounded" minOccurs="0"/>
+ *                   </sequence>
+ *                   <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                   <attribute name="remote-distributed-system-id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                   <attribute name="parallel" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *                   <attribute name="socket-buffer-size" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                   <attribute name="socket-read-timeout" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                   <attribute name="enable-batch-conflation" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *                   <attribute name="batch-size" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                   <attribute name="batch-time-interval" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                   <attribute name="enable-persistence" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *                   <attribute name="disk-store-name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                   <attribute name="disk-synchronous" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *                   <attribute name="maximum-queue-memory" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                   <attribute name="alert-threshold" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                   <attribute name="dispatcher-threads" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                   <attribute name="order-policy" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                 </restriction>
+ *               </complexContent>
+ *             </complexType>
+ *           </element>
+ *           <element name="gateway-receiver" minOccurs="0">
+ *             <complexType>
+ *               <complexContent>
+ *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                   <sequence>
+ *                     <element name="gateway-transport-filter" type="{http://geode.apache.org/schema/cache}class-with-parameters-type" maxOccurs="unbounded" minOccurs="0"/>
+ *                   </sequence>
+ *                   <attribute name="start-port" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                   <attribute name="end-port" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                   <attribute name="bind-address" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                   <attribute name="maximum-time-between-pings" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                   <attribute name="socket-buffer-size" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                   <attribute name="hostname-for-senders" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                   <attribute name="manual-start" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *                 </restriction>
+ *               </complexContent>
+ *             </complexType>
+ *           </element>
+ *           <element name="gateway-conflict-resolver" minOccurs="0">
+ *             <complexType>
+ *               <complexContent>
+ *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                   <sequence>
+ *                     <element name="class-name" type="{http://geode.apache.org/schema/cache}class-name-type"/>
+ *                     <element name="parameter" type="{http://geode.apache.org/schema/cache}parameter-type" maxOccurs="unbounded" minOccurs="0"/>
+ *                   </sequence>
+ *                 </restriction>
+ *               </complexContent>
+ *             </complexType>
+ *           </element>
+ *           <element name="async-event-queue" maxOccurs="unbounded" minOccurs="0">
+ *             <complexType>
+ *               <complexContent>
+ *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                   <sequence>
+ *                     <element name="gateway-event-filter" type="{http://geode.apache.org/schema/cache}class-with-parameters-type" maxOccurs="unbounded" minOccurs="0"/>
+ *                     <element name="gateway-event-substitution-filter" type="{http://geode.apache.org/schema/cache}class-with-parameters-type" minOccurs="0"/>
+ *                     <element name="async-event-listener" type="{http://geode.apache.org/schema/cache}class-with-parameters-type"/>
+ *                   </sequence>
+ *                   <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                   <attribute name="parallel" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *                   <attribute name="batch-size" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                   <attribute name="batch-time-interval" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                   <attribute name="enable-batch-conflation" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *                   <attribute name="maximum-queue-memory" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                   <attribute name="persistent" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *                   <attribute name="disk-store-name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                   <attribute name="disk-synchronous" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *                   <attribute name="dispatcher-threads" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                   <attribute name="order-policy" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                   <attribute name="forward-expiration-destroy" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+ *                 </restriction>
+ *               </complexContent>
+ *             </complexType>
+ *           </element>
+ *           <element name="cache-server" maxOccurs="unbounded" minOccurs="0">
+ *             <complexType>
+ *               <complexContent>
+ *                 <extension base="{http://geode.apache.org/schema/cache}server-type">
+ *                   <attribute name="tcp-no-delay" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *                 </extension>
+ *               </complexContent>
+ *             </complexType>
+ *           </element>
+ *           <element name="pool" type="{http://geode.apache.org/schema/cache}pool-type" maxOccurs="unbounded" minOccurs="0"/>
+ *           <element name="disk-store" type="{http://geode.apache.org/schema/cache}disk-store-type" maxOccurs="unbounded" minOccurs="0"/>
+ *           <element name="pdx" type="{http://geode.apache.org/schema/cache}pdx-type" minOccurs="0"/>
+ *           <element name="region-attributes" type="{http://geode.apache.org/schema/cache}region-attributes-type" maxOccurs="unbounded" minOccurs="0"/>
+ *           <element name="jndi-bindings" type="{http://geode.apache.org/schema/cache}jndi-bindings-type" minOccurs="0"/>
+ *           <element name="region" type="{http://geode.apache.org/schema/cache}region-type" maxOccurs="unbounded" minOccurs="0"/>
+ *           <element name="function-service" type="{http://geode.apache.org/schema/cache}function-service-type" minOccurs="0"/>
+ *           <element name="serialization-registration" type="{http://geode.apache.org/schema/cache}serialization-registration-type" minOccurs="0"/>
+ *           <element name="backup" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *           <element name="initializer" type="{http://geode.apache.org/schema/cache}initializer-type" minOccurs="0"/>
+ *           <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
+ *         </sequence>
+ *         <attribute name="copy-on-read" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *         <attribute name="is-server" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *         <attribute name="lock-timeout" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *         <attribute name="lock-lease" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *         <attribute name="message-sync-interval" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *         <attribute name="search-timeout" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *         <attribute name="version" use="required" type="{http://geode.apache.org/schema/cache}versionType" fixed="1.0" />
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
  *
* * */ @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", "gatewayHubs", "gatewaySenders", "gatewayReceiver", + "gatewayConflictResolver", "asyncEventQueues", "cacheServers", "pools", "diskStores", "pdx", + "regionAttributes", "jndiBindings", "regions", "functionService", + "serializationRegistration", "backups", "initializer", "customCacheElements"}) @XmlRootElement(name = "cache", namespace = "http://geode.apache.org/schema/cache") @Experimental -public class CacheConfig { +public class CacheConfig implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(name = "cache-transaction-manager", namespace = "http://geode.apache.org/schema/cache") protected CacheTransactionManagerType cacheTransactionManager; - @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 gatewayHub; + protected List gatewayHubs; @XmlElement(name = "gateway-sender", namespace = "http://geode.apache.org/schema/cache") - protected List gatewaySender; + protected List 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 CacheConfig.GatewayConflictResolver gatewayConflictResolver; @XmlElement(name = "async-event-queue", namespace = "http://geode.apache.org/schema/cache") - protected List asyncEventQueue; + protected List asyncEventQueues; @XmlElement(name = "cache-server", namespace = "http://geode.apache.org/schema/cache") - protected List cacheServer; - @XmlElement(namespace = "http://geode.apache.org/schema/cache") - protected List pool; + protected List cacheServers; + @XmlElement(name = "pool", namespace = "http://geode.apache.org/schema/cache") + protected List pools; @XmlElement(name = "disk-store", namespace = "http://geode.apache.org/schema/cache") - protected List diskStore; + protected List 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 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 region; + @XmlElement(name = "region", namespace = "http://geode.apache.org/schema/cache") + protected List 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") - protected ResourceManagerType resourceManager; @XmlElement(name = "serialization-registration", namespace = "http://geode.apache.org/schema/cache") protected SerializationRegistrationType serializationRegistration; - @XmlElement(namespace = "http://geode.apache.org/schema/cache") - protected List backup; + @XmlElement(name = "backup", namespace = "http://geode.apache.org/schema/cache") + protected List backups; @XmlElement(namespace = "http://geode.apache.org/schema/cache") protected InitializerType initializer; - @XmlAnyElement(lax = true) - protected List cacheElements; + @XmlAnyElement + protected List customCacheElements; @XmlAttribute(name = "copy-on-read") protected Boolean copyOnRead; @XmlAttribute(name = "is-server") @@ -325,13 +319,7 @@ public class CacheConfig { protected String searchTimeout; @XmlAttribute(name = "version", required = true) @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - protected String version; - - public CacheConfig() {} - - public CacheConfig(String version) { - this.version = version; - } + public static final String VERSION = "1.0"; /** * Gets the value of the cacheTransactionManager property. @@ -356,41 +344,19 @@ public void setCacheTransactionManager(CacheTransactionManagerType value) { } /** - * Gets the value of the dynamicRegionFactory property. - * - * possible object is - * {@link DynamicRegionFactoryType } - * - */ - public DynamicRegionFactoryType getDynamicRegionFactory() { - return dynamicRegionFactory; - } - - /** - * Sets the value of the dynamicRegionFactory property. - * - * allowed object is - * {@link DynamicRegionFactoryType } - * - */ - public void setDynamicRegionFactory(DynamicRegionFactoryType value) { - this.dynamicRegionFactory = value; - } - - /** - * Gets the value of the gatewayHub property. + * Gets the value of the gatewayHubs property. * *

* 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 set method for the gatewayHub property. + * This is why there is not a set method for the gatewayHubs property. * *

* For example, to add a new item, do as follows: * * 

-   * getGatewayHub().add(newItem);
+   * getGatewayHubs().add(newItem);
    *
* * @@ -400,27 +366,27 @@ public void setDynamicRegionFactory(DynamicRegionFactoryType value) { * * */ - public List getGatewayHub() { - if (gatewayHub == null) { - gatewayHub = new ArrayList(); + public List getGatewayHubs() { + if (gatewayHubs == null) { + gatewayHubs = new ArrayList(); } - return this.gatewayHub; + return this.gatewayHubs; } /** - * Gets the value of the gatewaySender property. + * Gets the value of the gatewaySenders property. * *

* 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 set method for the gatewaySender property. + * This is why there is not a set method for the gatewaySenders property. * *

* For example, to add a new item, do as follows: * * 

-   * getGatewaySender().add(newItem);
+   * getGatewaySenders().add(newItem);
    *
* * @@ -430,11 +396,11 @@ public List getGatewayHub() { * * */ - public List getGatewaySender() { - if (gatewaySender == null) { - gatewaySender = new ArrayList(); + public List getGatewaySenders() { + if (gatewaySenders == null) { + gatewaySenders = new ArrayList(); } - return this.gatewaySender; + return this.gatewaySenders; } /** @@ -482,19 +448,19 @@ public void setGatewayConflictResolver(CacheConfig.GatewayConflictResolver value } /** - * Gets the value of the asyncEventQueue property. + * Gets the value of the asyncEventQueues property. * *

* 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 set method for the asyncEventQueue property. + * This is why there is not a set method for the asyncEventQueues property. * *

* For example, to add a new item, do as follows: * * 

-   * getAsyncEventQueue().add(newItem);
+   * getAsyncEventQueues().add(newItem);
    *
* * @@ -504,27 +470,27 @@ public void setGatewayConflictResolver(CacheConfig.GatewayConflictResolver value * * */ - public List getAsyncEventQueue() { - if (asyncEventQueue == null) { - asyncEventQueue = new ArrayList(); + public List getAsyncEventQueues() { + if (asyncEventQueues == null) { + asyncEventQueues = new ArrayList(); } - return this.asyncEventQueue; + return this.asyncEventQueues; } /** - * Gets the value of the cacheServer property. + * Gets the value of the cacheServers property. * *

* 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 set method for the cacheServer property. + * This is why there is not a set method for the cacheServers property. * *

* For example, to add a new item, do as follows: * * 

-   * getCacheServer().add(newItem);
+   * getCacheServers().add(newItem);
    *
* * @@ -534,27 +500,27 @@ public List getAsyncEventQueue() { * * */ - public List getCacheServer() { - if (cacheServer == null) { - cacheServer = new ArrayList(); + public List getCacheServers() { + if (cacheServers == null) { + cacheServers = new ArrayList(); } - return this.cacheServer; + return this.cacheServers; } /** - * Gets the value of the pool property. + * Gets the value of the pools property. * *

* 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 set method for the pool property. + * This is why there is not a set method for the pools property. * *

* For example, to add a new item, do as follows: * * 

-   * getPool().add(newItem);
+   * getPools().add(newItem);
    *
* * @@ -564,27 +530,27 @@ public List getCacheServer() { * * */ - public List getPool() { - if (pool == null) { - pool = new ArrayList(); + public List getPools() { + if (pools == null) { + pools = new ArrayList(); } - return this.pool; + return this.pools; } /** - * Gets the value of the diskStore property. + * Gets the value of the diskStores property. * *

* 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 set method for the diskStore property. + * This is why there is not a set method for the diskStores property. * *

* For example, to add a new item, do as follows: * * 

-   * getDiskStore().add(newItem);
+   * getDiskStores().add(newItem);
    *
* * @@ -594,11 +560,11 @@ public List getPool() { * * */ - public List getDiskStore() { - if (diskStore == null) { - diskStore = new ArrayList(); + public List getDiskStores() { + if (diskStores == null) { + diskStores = new ArrayList(); } - return this.diskStore; + return this.diskStores; } /** @@ -653,51 +619,27 @@ public List getRegionAttributes() { return this.regionAttributes; } - /** - * Gets the value of the jndiBindings property. - * - *

- * 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 set method for the jndiBindings property. - * - *

- * For example, to add a new item, do as follows: - * - * 

-   * getJndiBindings().add(newItem);
-   *
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link JndiBindingsType } - * - * - */ public List getJndiBindings() { if (jndiBindings == null) { jndiBindings = new JndiBindingsType(); } - return jndiBindings.getJndiBinding(); + return jndiBindings.getJndiBindings(); } - /** - * Gets the value of the region property. + * Gets the value of the regions property. * *

* 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 set method for the region property. + * This is why there is not a set method for the regions property. * *

* For example, to add a new item, do as follows: * * 

-   * getRegion().add(newItem);
+   * getRegions().add(newItem);
    *
* * @@ -707,11 +649,11 @@ public List getJndiBindings() { * * */ - public List getRegion() { - if (region == null) { - region = new ArrayList(); + public List getRegions() { + if (regions == null) { + regions = new ArrayList(); } - return this.region; + return this.regions; } /** @@ -736,28 +678,6 @@ public void setFunctionService(FunctionServiceType value) { this.functionService = value; } - /** - * Gets the value of the resourceManager property. - * - * possible object is - * {@link ResourceManagerType } - * - */ - public ResourceManagerType getResourceManager() { - return resourceManager; - } - - /** - * Sets the value of the resourceManager property. - * - * allowed object is - * {@link ResourceManagerType } - * - */ - public void setResourceManager(ResourceManagerType value) { - this.resourceManager = value; - } - /** * Gets the value of the serializationRegistration property. * @@ -781,19 +701,19 @@ public void setSerializationRegistration(SerializationRegistrationType value) { } /** - * Gets the value of the backup property. + * Gets the value of the backups property. * *

* 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 set method for the backup property. + * This is why there is not a set method for the backups property. * *

* For example, to add a new item, do as follows: * * 

-   * getBackup().add(newItem);
+   * getBackups().add(newItem);
    *
* * @@ -803,11 +723,11 @@ public void setSerializationRegistration(SerializationRegistrationType value) { * * */ - public List getBackup() { - if (backup == null) { - backup = new ArrayList(); + public List getBackups() { + if (backups == null) { + backups = new ArrayList(); } - return this.backup; + return this.backups; } /** @@ -833,13 +753,13 @@ public void setInitializer(InitializerType value) { } /** - * Gets the value of the any property. + * Gets the value of the customCacheElements property. * *

* 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 set method for the any property. + * This is why there is not a set method for the customCacheElements property. * *

* For example, to add a new item, do as follows: @@ -852,15 +772,14 @@ public void setInitializer(InitializerType value) { *

* Objects of the following type(s) are allowed in the list * {@link Element } - * {@link CacheElement } * * */ public List getCustomCacheElements() { - if (cacheElements == null) { - cacheElements = new ArrayList(); + if (customCacheElements == null) { + customCacheElements = new ArrayList(); } - return this.cacheElements; + return this.customCacheElements; } /** @@ -995,32 +914,6 @@ public void setSearchTimeout(String value) { this.searchTimeout = value; } - /** - * Gets the value of the version property. - * - * possible object is - * {@link String } - * - */ - public String getVersion() { - if (version == null) { - return "1.0"; - } else { - return version; - } - } - - /** - * Sets the value of the version property. - * - * allowed object is - * {@link String } - * - */ - public void setVersion(String value) { - this.version = value; - } - /** *

@@ -1059,11 +952,12 @@ public void setVersion(String value) { */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", - propOrder = {"gatewayEventFilter", "gatewayEventSubstitutionFilter", "asyncEventListener"}) - public static class AsyncEventQueue { + propOrder = {"gatewayEventFilters", "gatewayEventSubstitutionFilter", "asyncEventListener"}) + public static class AsyncEventQueue implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(name = "gateway-event-filter", namespace = "http://geode.apache.org/schema/cache") - protected List gatewayEventFilter; + protected List gatewayEventFilters; @XmlElement(name = "gateway-event-substitution-filter", namespace = "http://geode.apache.org/schema/cache") protected ClassWithParametersType gatewayEventSubstitutionFilter; @@ -1096,19 +990,19 @@ public static class AsyncEventQueue { protected Boolean forwardExpirationDestroy; /** - * Gets the value of the gatewayEventFilter property. + * Gets the value of the gatewayEventFilters property. * *

* 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 set method for the gatewayEventFilter property. + * This is why there is not a set method for the gatewayEventFilters property. * *

* For example, to add a new item, do as follows: * * 

-     * getGatewayEventFilter().add(newItem);
+     * getGatewayEventFilters().add(newItem);
      *
* * @@ -1118,11 +1012,11 @@ public static class AsyncEventQueue { * * */ - public List getGatewayEventFilter() { - if (gatewayEventFilter == null) { - gatewayEventFilter = new ArrayList(); + public List getGatewayEventFilters() { + if (gatewayEventFilters == null) { + gatewayEventFilters = new ArrayList(); } - return this.gatewayEventFilter; + return this.gatewayEventFilters; } /** @@ -1461,8 +1355,9 @@ public void setForwardExpirationDestroy(Boolean value) { */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "") - public static class CacheServer extends ServerType { + public static class CacheServer extends ServerType implements Serializable { + private static final long serialVersionUID = 1L; @XmlAttribute(name = "tcp-no-delay") protected Boolean tcpNoDelay; @@ -1514,14 +1409,15 @@ public void setTcpNoDelay(Boolean value) { * */ @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = {"className", "parameter"}) - public static class GatewayConflictResolver { + @XmlType(name = "", propOrder = {"className", "parameters"}) + public static class GatewayConflictResolver implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(name = "class-name", namespace = "http://geode.apache.org/schema/cache", required = true) protected String className; - @XmlElement(namespace = "http://geode.apache.org/schema/cache") - protected List parameter; + @XmlElement(name = "parameter", namespace = "http://geode.apache.org/schema/cache") + protected List parameters; /** * Gets the value of the className property. @@ -1546,19 +1442,19 @@ public void setClassName(String value) { } /** - * Gets the value of the parameter property. + * Gets the value of the parameters property. * *

* 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 set method for the parameter property. + * This is why there is not a set method for the parameters property. * *

* For example, to add a new item, do as follows: * * 

-     * getParameter().add(newItem);
+     * getParameters().add(newItem);
      *
* * @@ -1568,11 +1464,11 @@ public void setClassName(String value) { * * */ - public List getParameter() { - if (parameter == null) { - parameter = new ArrayList(); + public List getParameters() { + if (parameters == null) { + parameters = new ArrayList(); } - return this.parameter; + return this.parameters; } } @@ -1630,9 +1526,7 @@ public List getParameter() { * <attribute name="batch-time-interval" type="{http://www.w3.org/2001/XMLSchema}string" /> * <attribute name="enable-persistence" type="{http://www.w3.org/2001/XMLSchema}boolean" /> * <attribute name="disk-store-name" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="roll-oplogs" type="{http://www.w3.org/2001/XMLSchema}boolean" /> * <attribute name="maximum-queue-memory" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="overflow-directory" type="{http://www.w3.org/2001/XMLSchema}string" /> * </restriction> * </complexContent> * </complexType> @@ -1673,11 +1567,12 @@ public List getParameter() { * */ @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = {"gateway"}) - public static class GatewayHub { + @XmlType(name = "", propOrder = {"gateways"}) + public static class GatewayHub implements Serializable { - @XmlElement(namespace = "http://geode.apache.org/schema/cache") - protected List gateway; + private static final long serialVersionUID = 1L; + @XmlElement(name = "gateway", namespace = "http://geode.apache.org/schema/cache") + protected List gateways; @XmlAttribute(name = "id", required = true) protected String id; @XmlAttribute(name = "bind-address") @@ -1696,19 +1591,19 @@ public static class GatewayHub { protected BigInteger maxConnections; /** - * Gets the value of the gateway property. + * Gets the value of the gateways property. * *

* 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 set method for the gateway property. + * This is why there is not a set method for the gateways property. * *

* For example, to add a new item, do as follows: * * 

-     * getGateway().add(newItem);
+     * getGateways().add(newItem);
      *
* * @@ -1718,11 +1613,11 @@ public static class GatewayHub { * * */ - public List getGateway() { - if (gateway == null) { - gateway = new ArrayList(); + public List getGateways() { + if (gateways == null) { + gateways = new ArrayList(); } - return this.gateway; + return this.gateways; } /** @@ -1949,9 +1844,7 @@ public void setMaxConnections(BigInteger value) { * <attribute name="batch-time-interval" type="{http://www.w3.org/2001/XMLSchema}string" /> * <attribute name="enable-persistence" type="{http://www.w3.org/2001/XMLSchema}boolean" /> * <attribute name="disk-store-name" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="roll-oplogs" type="{http://www.w3.org/2001/XMLSchema}boolean" /> * <attribute name="maximum-queue-memory" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="overflow-directory" type="{http://www.w3.org/2001/XMLSchema}string" /> * </restriction> * </complexContent> * </complexType> @@ -1971,13 +1864,14 @@ public void setMaxConnections(BigInteger value) { * */ @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = {"gatewayEndpoint", "gatewayListener", "gatewayQueue"}) - public static class Gateway { + @XmlType(name = "", propOrder = {"gatewayListeners", "gatewayEndpoints", "gatewayQueue"}) + public static class Gateway implements Serializable { - @XmlElement(name = "gateway-endpoint", namespace = "http://geode.apache.org/schema/cache") - protected List gatewayEndpoint; + private static final long serialVersionUID = 1L; @XmlElement(name = "gateway-listener", namespace = "http://geode.apache.org/schema/cache") - protected List gatewayListener; + protected List gatewayListeners; + @XmlElement(name = "gateway-endpoint", namespace = "http://geode.apache.org/schema/cache") + protected List gatewayEndpoints; @XmlElement(name = "gateway-queue", namespace = "http://geode.apache.org/schema/cache") protected CacheConfig.GatewayHub.Gateway.GatewayQueue gatewayQueue; @XmlAttribute(name = "early-ack") @@ -1994,63 +1888,63 @@ public static class Gateway { protected String orderPolicy; /** - * Gets the value of the gatewayEndpoint property. + * Gets the value of the gatewayListeners property. * *

* 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 set method for the gatewayEndpoint property. + * This is why there is not a set method for the gatewayListeners property. * *

* For example, to add a new item, do as follows: * * 

-       * getGatewayEndpoint().add(newItem);
+       * getGatewayListeners().add(newItem);
        *
* * *

* Objects of the following type(s) are allowed in the list - * {@link CacheConfig.GatewayHub.Gateway.GatewayEndpoint } + * {@link CacheConfig.GatewayHub.Gateway.GatewayListener } * * */ - public List getGatewayEndpoint() { - if (gatewayEndpoint == null) { - gatewayEndpoint = new ArrayList(); + public List getGatewayListeners() { + if (gatewayListeners == null) { + gatewayListeners = new ArrayList(); } - return this.gatewayEndpoint; + return this.gatewayListeners; } /** - * Gets the value of the gatewayListener property. + * Gets the value of the gatewayEndpoints property. * *

* 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 set method for the gatewayListener property. + * This is why there is not a set method for the gatewayEndpoints property. * *

* For example, to add a new item, do as follows: * * 

-       * getGatewayListener().add(newItem);
+       * getGatewayEndpoints().add(newItem);
        *
* * *

* Objects of the following type(s) are allowed in the list - * {@link CacheConfig.GatewayHub.Gateway.GatewayListener } + * {@link CacheConfig.GatewayHub.Gateway.GatewayEndpoint } * * */ - public List getGatewayListener() { - if (gatewayListener == null) { - gatewayListener = new ArrayList(); + public List getGatewayEndpoints() { + if (gatewayEndpoints == null) { + gatewayEndpoints = new ArrayList(); } - return this.gatewayListener; + return this.gatewayEndpoints; } /** @@ -2231,8 +2125,9 @@ public void setOrderPolicy(String value) { */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "") - public static class GatewayEndpoint { + public static class GatewayEndpoint implements Serializable { + private static final long serialVersionUID = 1L; @XmlAttribute(name = "host", required = true) protected String host; @XmlAttribute(name = "id", required = true) @@ -2332,14 +2227,15 @@ public void setPort(String value) { * */ @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = {"className", "parameter"}) - public static class GatewayListener { + @XmlType(name = "", propOrder = {"className", "parameters"}) + public static class GatewayListener implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(name = "class-name", namespace = "http://geode.apache.org/schema/cache", required = true) protected String className; - @XmlElement(namespace = "http://geode.apache.org/schema/cache") - protected List parameter; + @XmlElement(name = "parameter", namespace = "http://geode.apache.org/schema/cache") + protected List parameters; /** * Gets the value of the className property. @@ -2364,19 +2260,19 @@ public void setClassName(String value) { } /** - * Gets the value of the parameter property. + * Gets the value of the parameters property. * *

* 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 set method for the parameter property. + * This is why there is not a set method for the parameters property. * *

* For example, to add a new item, do as follows: * * 

-         * getParameter().add(newItem);
+         * getParameters().add(newItem);
          *
* * @@ -2386,11 +2282,11 @@ public void setClassName(String value) { * * */ - public List getParameter() { - if (parameter == null) { - parameter = new ArrayList(); + public List getParameters() { + if (parameters == null) { + parameters = new ArrayList(); } - return this.parameter; + return this.parameters; } } @@ -2413,9 +2309,7 @@ public List getParameter() { * <attribute name="batch-time-interval" type="{http://www.w3.org/2001/XMLSchema}string" /> * <attribute name="enable-persistence" type="{http://www.w3.org/2001/XMLSchema}boolean" /> * <attribute name="disk-store-name" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="roll-oplogs" type="{http://www.w3.org/2001/XMLSchema}boolean" /> * <attribute name="maximum-queue-memory" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="overflow-directory" type="{http://www.w3.org/2001/XMLSchema}string" /> * </restriction> * </complexContent> * </complexType> @@ -2425,8 +2319,9 @@ public List getParameter() { */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "") - public static class GatewayQueue { + public static class GatewayQueue implements Serializable { + private static final long serialVersionUID = 1L; @XmlAttribute(name = "alert-threshold") protected String alertThreshold; @XmlAttribute(name = "batch-conflation") @@ -2439,12 +2334,8 @@ public static class GatewayQueue { protected Boolean enablePersistence; @XmlAttribute(name = "disk-store-name") protected String diskStoreName; - @XmlAttribute(name = "roll-oplogs") - protected Boolean rollOplogs; @XmlAttribute(name = "maximum-queue-memory") protected String maximumQueueMemory; - @XmlAttribute(name = "overflow-directory") - protected String overflowDirectory; /** * Gets the value of the alertThreshold property. @@ -2578,28 +2469,6 @@ public void setDiskStoreName(String value) { this.diskStoreName = value; } - /** - * Gets the value of the rollOplogs property. - * - * possible object is - * {@link Boolean } - * - */ - public Boolean isRollOplogs() { - return rollOplogs; - } - - /** - * Sets the value of the rollOplogs property. - * - * allowed object is - * {@link Boolean } - * - */ - public void setRollOplogs(Boolean value) { - this.rollOplogs = value; - } - /** * Gets the value of the maximumQueueMemory property. * @@ -2622,28 +2491,6 @@ public void setMaximumQueueMemory(String value) { this.maximumQueueMemory = value; } - /** - * Gets the value of the overflowDirectory property. - * - * possible object is - * {@link String } - * - */ - public String getOverflowDirectory() { - return overflowDirectory; - } - - /** - * Sets the value of the overflowDirectory property. - * - * allowed object is - * {@link String } - * - */ - public void setOverflowDirectory(String value) { - this.overflowDirectory = value; - } - } } @@ -2680,12 +2527,13 @@ public void setOverflowDirectory(String value) { * */ @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = {"gatewayTransportFilter"}) - public static class GatewayReceiver { + @XmlType(name = "", propOrder = {"gatewayTransportFilters"}) + public static class GatewayReceiver implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(name = "gateway-transport-filter", namespace = "http://geode.apache.org/schema/cache") - protected List gatewayTransportFilter; + protected List gatewayTransportFilters; @XmlAttribute(name = "start-port") protected String startPort; @XmlAttribute(name = "end-port") @@ -2702,19 +2550,19 @@ public static class GatewayReceiver { protected Boolean manualStart; /** - * Gets the value of the gatewayTransportFilter property. + * Gets the value of the gatewayTransportFilters property. * *

* 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 set method for the gatewayTransportFilter property. + * This is why there is not a set method for the gatewayTransportFilters property. * *

* For example, to add a new item, do as follows: * * 

-     * getGatewayTransportFilter().add(newItem);
+     * getGatewayTransportFilters().add(newItem);
      *
* * @@ -2724,11 +2572,11 @@ public static class GatewayReceiver { * * */ - public List getGatewayTransportFilter() { - if (gatewayTransportFilter == null) { - gatewayTransportFilter = new ArrayList(); + public List getGatewayTransportFilters() { + if (gatewayTransportFilters == null) { + gatewayTransportFilters = new ArrayList(); } - return this.gatewayTransportFilter; + return this.gatewayTransportFilters; } /** @@ -2907,7 +2755,6 @@ public void setManualStart(Boolean value) { * <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> * <attribute name="remote-distributed-system-id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> * <attribute name="parallel" type="{http://www.w3.org/2001/XMLSchema}boolean" /> - * <attribute name="manual-start" type="{http://www.w3.org/2001/XMLSchema}boolean" /> * <attribute name="socket-buffer-size" type="{http://www.w3.org/2001/XMLSchema}string" /> * <attribute name="socket-read-timeout" type="{http://www.w3.org/2001/XMLSchema}string" /> * <attribute name="enable-batch-conflation" type="{http://www.w3.org/2001/XMLSchema}boolean" /> @@ -2928,26 +2775,25 @@ public void setManualStart(Boolean value) { * */ @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = {"gatewayEventFilter", "gatewayEventSubstitutionFilter", - "gatewayTransportFilter"}) - public static class GatewaySender { + @XmlType(name = "", propOrder = {"gatewayEventFilters", "gatewayEventSubstitutionFilter", + "gatewayTransportFilters"}) + public static class GatewaySender implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(name = "gateway-event-filter", namespace = "http://geode.apache.org/schema/cache") - protected List gatewayEventFilter; + protected List gatewayEventFilters; @XmlElement(name = "gateway-event-substitution-filter", namespace = "http://geode.apache.org/schema/cache") protected ClassWithParametersType gatewayEventSubstitutionFilter; @XmlElement(name = "gateway-transport-filter", namespace = "http://geode.apache.org/schema/cache") - protected List gatewayTransportFilter; + protected List gatewayTransportFilters; @XmlAttribute(name = "id", required = true) protected String id; @XmlAttribute(name = "remote-distributed-system-id", required = true) protected String remoteDistributedSystemId; @XmlAttribute(name = "parallel") protected Boolean parallel; - @XmlAttribute(name = "manual-start") - protected Boolean manualStart; @XmlAttribute(name = "socket-buffer-size") protected String socketBufferSize; @XmlAttribute(name = "socket-read-timeout") @@ -2974,19 +2820,19 @@ public static class GatewaySender { protected String orderPolicy; /** - * Gets the value of the gatewayEventFilter property. + * Gets the value of the gatewayEventFilters property. * *

* 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 set method for the gatewayEventFilter property. + * This is why there is not a set method for the gatewayEventFilters property. * *

* For example, to add a new item, do as follows: * * 

-     * getGatewayEventFilter().add(newItem);
+     * getGatewayEventFilters().add(newItem);
      *
* * @@ -2996,11 +2842,11 @@ public static class GatewaySender { * * */ - public List getGatewayEventFilter() { - if (gatewayEventFilter == null) { - gatewayEventFilter = new ArrayList(); + public List getGatewayEventFilters() { + if (gatewayEventFilters == null) { + gatewayEventFilters = new ArrayList(); } - return this.gatewayEventFilter; + return this.gatewayEventFilters; } /** @@ -3026,19 +2872,19 @@ public void setGatewayEventSubstitutionFilter(ClassWithParametersType value) { } /** - * Gets the value of the gatewayTransportFilter property. + * Gets the value of the gatewayTransportFilters property. * *

* 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 set method for the gatewayTransportFilter property. + * This is why there is not a set method for the gatewayTransportFilters property. * *

* For example, to add a new item, do as follows: * * 

-     * getGatewayTransportFilter().add(newItem);
+     * getGatewayTransportFilters().add(newItem);
      *
* * @@ -3048,11 +2894,11 @@ public void setGatewayEventSubstitutionFilter(ClassWithParametersType value) { * * */ - public List getGatewayTransportFilter() { - if (gatewayTransportFilter == null) { - gatewayTransportFilter = new ArrayList(); + public List getGatewayTransportFilters() { + if (gatewayTransportFilters == null) { + gatewayTransportFilters = new ArrayList(); } - return this.gatewayTransportFilter; + return this.gatewayTransportFilters; } /** @@ -3121,28 +2967,6 @@ public void setParallel(Boolean value) { this.parallel = value; } - /** - * Gets the value of the manualStart property. - * - * possible object is - * {@link Boolean } - * - */ - public Boolean isManualStart() { - return manualStart; - } - - /** - * Sets the value of the manualStart property. - * - * allowed object is - * {@link Boolean } - * - */ - public void setManualStart(Boolean value) { - this.manualStart = value; - } - /** * Gets the value of the socketBufferSize property. * diff --git a/geode-core/src/main/java/org/apache/geode/cache/configuration/CacheElement.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/CacheElement.java index e0f17772c046..88aace17647e 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/configuration/CacheElement.java +++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/CacheElement.java @@ -36,7 +36,7 @@ static void removeElement(List list, String id) { } static RegionConfig findRegionConfiguration(CacheConfig cacheConfig, String regionPath) { - return findElement(cacheConfig.getRegion(), regionPath); + return findElement(cacheConfig.getRegions(), regionPath); } static List findCustomCacheElements(CacheConfig cacheConfig, diff --git a/geode-core/src/main/java/org/apache/geode/cache/configuration/CacheLoaderType.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/CacheLoaderType.java index 8789573be30f..6e3668370e29 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/configuration/CacheLoaderType.java +++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/CacheLoaderType.java @@ -1,23 +1,21 @@ - /* - * 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 + * 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. + * 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.cache.configuration; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -57,15 +55,16 @@ */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "cache-loader-type", namespace = "http://geode.apache.org/schema/cache", - propOrder = {"className", "parameter"}) + propOrder = {"className", "parameters"}) @Experimental -public class CacheLoaderType { +public class CacheLoaderType implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(name = "class-name", namespace = "http://geode.apache.org/schema/cache", required = true) protected String className; - @XmlElement(namespace = "http://geode.apache.org/schema/cache") - protected List parameter; + @XmlElement(name = "parameter", namespace = "http://geode.apache.org/schema/cache") + protected List parameters; /** * Gets the value of the className property. @@ -90,19 +89,19 @@ public void setClassName(String value) { } /** - * Gets the value of the parameter property. + * Gets the value of the parameters property. * *

* 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 set method for the parameter property. + * This is why there is not a set method for the parameters property. * *

* For example, to add a new item, do as follows: * * 

-   * getParameter().add(newItem);
+   * getParameters().add(newItem);
    *
* * @@ -112,11 +111,11 @@ public void setClassName(String value) { * * */ - public List getParameter() { - if (parameter == null) { - parameter = new ArrayList(); + public List getParameters() { + if (parameters == null) { + parameters = new ArrayList(); } - return this.parameter; + return this.parameters; } } 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 5956983d4acd..f240dadaa9b5 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 @@ -1,23 +1,21 @@ - /* - * 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 + * 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. + * 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.cache.configuration; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -80,29 +78,30 @@ @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 { +public class CacheTransactionManagerType implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(name = "transaction-listener", namespace = "http://geode.apache.org/schema/cache") - protected List transactionListener; + protected List transactionListeners; @XmlElement(name = "transaction-writer", namespace = "http://geode.apache.org/schema/cache") protected CacheTransactionManagerType.TransactionWriter transactionWriter; /** - * Gets the value of the transactionListener property. + * Gets the value of the transactionListeners property. * *

* 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 set method for the transactionListener property. + * This is why there is not a set method for the transactionListeners property. * *

* For example, to add a new item, do as follows: * * 

-   * getTransactionListener().add(newItem);
+   * getTransactionListeners().add(newItem);
    *
* * @@ -112,11 +111,11 @@ public class CacheTransactionManagerType { * * */ - public List getTransactionListener() { - if (transactionListener == null) { - transactionListener = new ArrayList(); + public List getTransactionListeners() { + if (transactionListeners == null) { + transactionListeners = new ArrayList(); } - return this.transactionListener; + return this.transactionListeners; } /** @@ -165,14 +164,15 @@ public void setTransactionWriter(CacheTransactionManagerType.TransactionWriter v * */ @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = {"className", "parameter"}) - public static class TransactionListener { + @XmlType(name = "", propOrder = {"className", "parameters"}) + public static class TransactionListener implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(name = "class-name", namespace = "http://geode.apache.org/schema/cache", required = true) protected String className; - @XmlElement(namespace = "http://geode.apache.org/schema/cache") - protected List parameter; + @XmlElement(name = "parameter", namespace = "http://geode.apache.org/schema/cache") + protected List parameters; /** * Gets the value of the className property. @@ -197,19 +197,19 @@ public void setClassName(String value) { } /** - * Gets the value of the parameter property. + * Gets the value of the parameters property. * *

* 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 set method for the parameter property. + * This is why there is not a set method for the parameters property. * *

* For example, to add a new item, do as follows: * * 

-     * getParameter().add(newItem);
+     * getParameters().add(newItem);
      *
* * @@ -219,11 +219,11 @@ public void setClassName(String value) { * * */ - public List getParameter() { - if (parameter == null) { - parameter = new ArrayList(); + public List getParameters() { + if (parameters == null) { + parameters = new ArrayList(); } - return this.parameter; + return this.parameters; } } @@ -252,14 +252,15 @@ public List getParameter() { * */ @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = {"className", "parameter"}) - public static class TransactionWriter { + @XmlType(name = "", propOrder = {"className", "parameters"}) + public static class TransactionWriter implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(name = "class-name", namespace = "http://geode.apache.org/schema/cache", required = true) protected String className; - @XmlElement(namespace = "http://geode.apache.org/schema/cache") - protected List parameter; + @XmlElement(name = "parameter", namespace = "http://geode.apache.org/schema/cache") + protected List parameters; /** * Gets the value of the className property. @@ -284,19 +285,19 @@ public void setClassName(String value) { } /** - * Gets the value of the parameter property. + * Gets the value of the parameters property. * *

* 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 set method for the parameter property. + * This is why there is not a set method for the parameters property. * *

* For example, to add a new item, do as follows: * * 

-     * getParameter().add(newItem);
+     * getParameters().add(newItem);
      *
* * @@ -306,11 +307,11 @@ public void setClassName(String value) { * * */ - public List getParameter() { - if (parameter == null) { - parameter = new ArrayList(); + public List getParameters() { + if (parameters == null) { + parameters = new ArrayList(); } - return this.parameter; + return this.parameters; } } diff --git a/geode-core/src/main/java/org/apache/geode/cache/configuration/CacheWriterType.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/CacheWriterType.java index e5d3cc4194df..7755106c97e5 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/configuration/CacheWriterType.java +++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/CacheWriterType.java @@ -1,23 +1,21 @@ - /* - * 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 + * 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. + * 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.cache.configuration; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -57,15 +55,16 @@ */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "cache-writer-type", namespace = "http://geode.apache.org/schema/cache", - propOrder = {"className", "parameter"}) + propOrder = {"className", "parameters"}) @Experimental -public class CacheWriterType { +public class CacheWriterType implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(name = "class-name", namespace = "http://geode.apache.org/schema/cache", required = true) protected String className; - @XmlElement(namespace = "http://geode.apache.org/schema/cache") - protected List parameter; + @XmlElement(name = "parameter", namespace = "http://geode.apache.org/schema/cache") + protected List parameters; /** * Gets the value of the className property. @@ -90,19 +89,19 @@ public void setClassName(String value) { } /** - * Gets the value of the parameter property. + * Gets the value of the parameters property. * *

* 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 set method for the parameter property. + * This is why there is not a set method for the parameters property. * *

* For example, to add a new item, do as follows: * * 

-   * getParameter().add(newItem);
+   * getParameters().add(newItem);
    *
* * @@ -112,11 +111,11 @@ public void setClassName(String value) { * * */ - public List getParameter() { - if (parameter == null) { - parameter = new ArrayList(); + public List getParameters() { + if (parameters == null) { + parameters = new ArrayList(); } - return this.parameter; + return this.parameters; } } diff --git a/geode-core/src/main/java/org/apache/geode/cache/configuration/ClassWithParametersType.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/ClassWithParametersType.java index 121a2c7155c1..1e24cdf28bf4 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/configuration/ClassWithParametersType.java +++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/ClassWithParametersType.java @@ -1,23 +1,21 @@ - /* - * 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 + * 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. + * 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.cache.configuration; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -53,15 +51,16 @@ */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "class-with-parameters-type", namespace = "http://geode.apache.org/schema/cache", - propOrder = {"className", "parameter"}) + propOrder = {"className", "parameters"}) @Experimental -public class ClassWithParametersType { +public class ClassWithParametersType implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(name = "class-name", namespace = "http://geode.apache.org/schema/cache", required = true) protected String className; - @XmlElement(namespace = "http://geode.apache.org/schema/cache") - protected List parameter; + @XmlElement(name = "parameter", namespace = "http://geode.apache.org/schema/cache") + protected List parameters; /** * Gets the value of the className property. @@ -86,19 +85,19 @@ public void setClassName(String value) { } /** - * Gets the value of the parameter property. + * Gets the value of the parameters property. * *

* 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 set method for the parameter property. + * This is why there is not a set method for the parameters property. * *

* For example, to add a new item, do as follows: * * 

-   * getParameter().add(newItem);
+   * getParameters().add(newItem);
    *
* * @@ -108,11 +107,11 @@ public void setClassName(String value) { * * */ - public List getParameter() { - if (parameter == null) { - parameter = new ArrayList(); + public List getParameters() { + if (parameters == null) { + parameters = new ArrayList(); } - return this.parameter; + return this.parameters; } } 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 f06b9ac1cb3a..24c57288f73a 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 @@ -1,23 +1,21 @@ - /* - * 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 + * 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. + * 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.cache.configuration; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -57,15 +55,16 @@ */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "declarable-type", namespace = "http://geode.apache.org/schema/cache", - propOrder = {"className", "parameter"}) + propOrder = {"className", "parameters"}) @Experimental -public class DeclarableType { +public class DeclarableType implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(name = "class-name", namespace = "http://geode.apache.org/schema/cache", required = true) protected String className; - @XmlElement(namespace = "http://geode.apache.org/schema/cache") - protected List parameter; + @XmlElement(name = "parameter", namespace = "http://geode.apache.org/schema/cache") + protected List parameters; /** * Gets the value of the className property. @@ -90,19 +89,19 @@ public void setClassName(String value) { } /** - * Gets the value of the parameter property. + * Gets the value of the parameters property. * *

* 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 set method for the parameter property. + * This is why there is not a set method for the parameters property. * *

* For example, to add a new item, do as follows: * * 

-   * getParameter().add(newItem);
+   * getParameters().add(newItem);
    *
* * @@ -112,11 +111,11 @@ public void setClassName(String value) { * * */ - public List getParameter() { - if (parameter == null) { - parameter = new ArrayList(); + public List getParameters() { + if (parameters == null) { + parameters = new ArrayList(); } - return this.parameter; + return this.parameters; } } diff --git a/geode-core/src/main/java/org/apache/geode/cache/configuration/DiskDirType.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/DiskDirType.java index 723983971f53..154f7f36ed4b 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/configuration/DiskDirType.java +++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/DiskDirType.java @@ -1,23 +1,22 @@ - /* - * 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 + * 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. + * 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.cache.configuration; +import java.io.Serializable; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; @@ -54,8 +53,9 @@ @XmlType(name = "disk-dir-type", namespace = "http://geode.apache.org/schema/cache", propOrder = {"content"}) @Experimental -public class DiskDirType { +public class DiskDirType implements Serializable { + private static final long serialVersionUID = 1L; @XmlValue protected String content; @XmlAttribute(name = "dir-size") 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 38d7d35596f7..e2345dfb4e28 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 @@ -1,23 +1,21 @@ - /* - * 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 + * 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. + * 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.cache.configuration; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -56,28 +54,29 @@ */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "disk-dirs-type", namespace = "http://geode.apache.org/schema/cache", - propOrder = {"diskDir"}) + propOrder = {"diskDirs"}) @Experimental -public class DiskDirsType { +public class DiskDirsType implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(name = "disk-dir", namespace = "http://geode.apache.org/schema/cache", required = true) - protected List diskDir; + protected List diskDirs; /** - * Gets the value of the diskDir property. + * Gets the value of the diskDirs property. * *

* 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 set method for the diskDir property. + * This is why there is not a set method for the diskDirs property. * *

* For example, to add a new item, do as follows: * * 

-   * getDiskDir().add(newItem);
+   * getDiskDirs().add(newItem);
    *
* * @@ -87,11 +86,11 @@ public class DiskDirsType { * * */ - public List getDiskDir() { - if (diskDir == null) { - diskDir = new ArrayList(); + public List getDiskDirs() { + if (diskDirs == null) { + diskDirs = new ArrayList(); } - return this.diskDir; + return this.diskDirs; } } diff --git a/geode-core/src/main/java/org/apache/geode/cache/configuration/DiskStoreType.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/DiskStoreType.java index 0ecb168ace3d..bb4982a406de 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/configuration/DiskStoreType.java +++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/DiskStoreType.java @@ -1,23 +1,21 @@ - /* - * 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 + * 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. + * 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.cache.configuration; +import java.io.Serializable; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; @@ -66,8 +64,9 @@ @XmlType(name = "disk-store-type", namespace = "http://geode.apache.org/schema/cache", propOrder = {"diskDirs"}) @Experimental -public class DiskStoreType { +public class DiskStoreType implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(name = "disk-dirs", namespace = "http://geode.apache.org/schema/cache") protected DiskDirsType diskDirs; @XmlAttribute(name = "name", required = true) diff --git a/geode-core/src/main/java/org/apache/geode/cache/configuration/DynamicRegionFactoryType.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/DynamicRegionFactoryType.java index b1a4e648f899..768dcc3bfee5 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/configuration/DynamicRegionFactoryType.java +++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/DynamicRegionFactoryType.java @@ -1,23 +1,22 @@ - /* - * 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 + * 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. + * 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.cache.configuration; +import java.io.Serializable; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; @@ -72,8 +71,9 @@ @XmlType(name = "dynamic-region-factory-type", namespace = "http://geode.apache.org/schema/cache", propOrder = {"diskDir"}) @Experimental -public class DynamicRegionFactoryType { +public class DynamicRegionFactoryType implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(name = "disk-dir", namespace = "http://geode.apache.org/schema/cache") protected DiskDirType diskDir; @XmlAttribute(name = "disable-persist-backup") diff --git a/geode-core/src/main/java/org/apache/geode/cache/configuration/EnumActionDestroyOverflow.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/EnumActionDestroyOverflow.java index 4d2cc1f31332..9a9a79fc7f28 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/configuration/EnumActionDestroyOverflow.java +++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/EnumActionDestroyOverflow.java @@ -1,19 +1,16 @@ - /* - * 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 + * 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. + * 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.cache.configuration; diff --git a/geode-core/src/main/java/org/apache/geode/cache/configuration/EnumReadableWritable.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/EnumReadableWritable.java index 52d8ade67606..3408912a1a5d 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/configuration/EnumReadableWritable.java +++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/EnumReadableWritable.java @@ -1,19 +1,16 @@ - /* - * 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 + * 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. + * 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.cache.configuration; diff --git a/geode-core/src/main/java/org/apache/geode/cache/configuration/ExpirationAttributesType.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/ExpirationAttributesType.java index 87eec06857d8..1b0f568d9330 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/configuration/ExpirationAttributesType.java +++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/ExpirationAttributesType.java @@ -1,23 +1,21 @@ - /* - * 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 + * 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. + * 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.cache.configuration; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -81,8 +79,9 @@ @XmlType(name = "expiration-attributes-type", namespace = "http://geode.apache.org/schema/cache", propOrder = {"customExpiry"}) @Experimental -public class ExpirationAttributesType { +public class ExpirationAttributesType implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(name = "custom-expiry", namespace = "http://geode.apache.org/schema/cache") protected ExpirationAttributesType.CustomExpiry customExpiry; @XmlAttribute(name = "action") @@ -180,14 +179,15 @@ public void setTimeout(String value) { * */ @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = {"className", "parameter"}) - public static class CustomExpiry { + @XmlType(name = "", propOrder = {"className", "parameters"}) + public static class CustomExpiry implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(name = "class-name", namespace = "http://geode.apache.org/schema/cache", required = true) protected String className; - @XmlElement(namespace = "http://geode.apache.org/schema/cache") - protected List parameter; + @XmlElement(name = "parameter", namespace = "http://geode.apache.org/schema/cache") + protected List parameters; /** * Gets the value of the className property. @@ -212,19 +212,19 @@ public void setClassName(String value) { } /** - * Gets the value of the parameter property. + * Gets the value of the parameters property. * *

* 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 set method for the parameter property. + * This is why there is not a set method for the parameters property. * *

* For example, to add a new item, do as follows: * * 

-     * getParameter().add(newItem);
+     * getParameters().add(newItem);
      *
* * @@ -234,11 +234,11 @@ public void setClassName(String value) { * * */ - public List getParameter() { - if (parameter == null) { - parameter = new ArrayList(); + public List getParameters() { + if (parameters == null) { + parameters = new ArrayList(); } - return this.parameter; + return this.parameters; } } 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 3875ba92f444..fa4c4989fba5 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 @@ -1,23 +1,21 @@ - /* - * 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 + * 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. + * 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.cache.configuration; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -68,27 +66,28 @@ */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "function-service-type", namespace = "http://geode.apache.org/schema/cache", - propOrder = {"function"}) + propOrder = {"functions"}) @Experimental -public class FunctionServiceType { +public class FunctionServiceType implements Serializable { - @XmlElement(namespace = "http://geode.apache.org/schema/cache") - protected List function; + private static final long serialVersionUID = 1L; + @XmlElement(name = "function", namespace = "http://geode.apache.org/schema/cache") + protected List functions; /** - * Gets the value of the function property. + * Gets the value of the functions property. * *

* 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 set method for the function property. + * This is why there is not a set method for the functions property. * *

* For example, to add a new item, do as follows: * * 

-   * getFunction().add(newItem);
+   * getFunctions().add(newItem);
    *
* * @@ -98,11 +97,11 @@ public class FunctionServiceType { * * */ - public List getFunction() { - if (function == null) { - function = new ArrayList(); + public List getFunctions() { + if (functions == null) { + functions = new ArrayList(); } - return this.function; + return this.functions; } @@ -129,14 +128,15 @@ public List getFunction() { * */ @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = {"className", "parameter"}) - public static class Function { + @XmlType(name = "", propOrder = {"className", "parameters"}) + public static class Function implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(name = "class-name", namespace = "http://geode.apache.org/schema/cache", required = true) protected String className; - @XmlElement(namespace = "http://geode.apache.org/schema/cache") - protected List parameter; + @XmlElement(name = "parameter", namespace = "http://geode.apache.org/schema/cache") + protected List parameters; /** * Gets the value of the className property. @@ -161,19 +161,19 @@ public void setClassName(String value) { } /** - * Gets the value of the parameter property. + * Gets the value of the parameters property. * *

* 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 set method for the parameter property. + * This is why there is not a set method for the parameters property. * *

* For example, to add a new item, do as follows: * * 

-     * getParameter().add(newItem);
+     * getParameters().add(newItem);
      *
* * @@ -183,11 +183,11 @@ public void setClassName(String value) { * * */ - public List getParameter() { - if (parameter == null) { - parameter = new ArrayList(); + public List getParameters() { + if (parameters == null) { + parameters = new ArrayList(); } - return this.parameter; + return this.parameters; } } diff --git a/geode-core/src/main/java/org/apache/geode/cache/configuration/InitializerType.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/InitializerType.java index d655904c75ca..a1bb8cc126c5 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/configuration/InitializerType.java +++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/InitializerType.java @@ -1,23 +1,21 @@ - /* - * 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 + * 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. + * 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.cache.configuration; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -59,15 +57,16 @@ */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "initializer-type", namespace = "http://geode.apache.org/schema/cache", - propOrder = {"className", "parameter"}) + propOrder = {"className", "parameters"}) @Experimental -public class InitializerType { +public class InitializerType implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(name = "class-name", namespace = "http://geode.apache.org/schema/cache", required = true) protected String className; - @XmlElement(namespace = "http://geode.apache.org/schema/cache") - protected List parameter; + @XmlElement(name = "parameter", namespace = "http://geode.apache.org/schema/cache") + protected List parameters; /** * Gets the value of the className property. @@ -92,19 +91,19 @@ public void setClassName(String value) { } /** - * Gets the value of the parameter property. + * Gets the value of the parameters property. * *

* 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 set method for the parameter property. + * This is why there is not a set method for the parameters property. * *

* For example, to add a new item, do as follows: * * 

-   * getParameter().add(newItem);
+   * getParameters().add(newItem);
    *
* * @@ -114,11 +113,11 @@ public void setClassName(String value) { * * */ - public List getParameter() { - if (parameter == null) { - parameter = new ArrayList(); + public List getParameters() { + if (parameters == null) { + parameters = new ArrayList(); } - return this.parameter; + return this.parameters; } } 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 9a4930fd9150..69c8d572e431 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 @@ -1,23 +1,21 @@ - /* - * 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 + * 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. + * 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.cache.configuration; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -104,27 +102,28 @@ */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "jndi-bindings-type", namespace = "http://geode.apache.org/schema/cache", - propOrder = {"jndiBinding"}) + propOrder = {"jndiBindings"}) @Experimental -public class JndiBindingsType { +public class JndiBindingsType implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(name = "jndi-binding", namespace = "http://geode.apache.org/schema/cache") - protected List jndiBinding; + protected List jndiBindings; /** - * Gets the value of the jndiBinding property. + * Gets the value of the jndiBindings property. * *

* 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 set method for the jndiBinding property. + * This is why there is not a set method for the jndiBindings property. * *

* For example, to add a new item, do as follows: * * 

-   * getJndiBinding().add(newItem);
+   * getJndiBindings().add(newItem);
    *
* * @@ -134,11 +133,11 @@ public class JndiBindingsType { * * */ - public List getJndiBinding() { - if (jndiBinding == null) { - jndiBinding = new ArrayList(); + public List getJndiBindings() { + if (jndiBindings == null) { + jndiBindings = new ArrayList(); } - return this.jndiBinding; + return this.jndiBindings; } @@ -200,12 +199,12 @@ public List getJndiBinding() { * */ @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = {"configProperty"}) - @Experimental + @XmlType(name = "", propOrder = {"configProperties"}) public static class JndiBinding implements CacheElement { + private static final long serialVersionUID = 1L; @XmlElement(name = "config-property", namespace = "http://geode.apache.org/schema/cache") - protected List configProperty; + protected List configProperties; @XmlAttribute(name = "blocking-timeout-seconds") protected String blockingTimeoutSeconds; @XmlAttribute(name = "conn-pooled-datasource-class") @@ -238,19 +237,19 @@ public static class JndiBinding implements CacheElement { protected String xaDatasourceClass; /** - * Gets the value of the configProperty property. + * Gets the value of the configProperties property. * *

* 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 set method for the configProperty property. + * This is why there is not a set method for the configProperties property. * *

* For example, to add a new item, do as follows: * * 

-     * getConfigProperty().add(newItem);
+     * getConfigProperties().add(newItem);
      *
* * @@ -260,11 +259,11 @@ public static class JndiBinding implements CacheElement { * * */ - public List getConfigProperty() { - if (configProperty == null) { - configProperty = new ArrayList(); + public List getConfigProperties() { + if (configProperties == null) { + configProperties = new ArrayList(); } - return this.configProperty; + return this.configProperties; } /** @@ -627,104 +626,90 @@ public String getId() { * */ @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", - propOrder = {"configPropertyName", "configPropertyType", "configPropertyValue"}) + @XmlType(name = "", propOrder = {"name", "type", "value"}) public static class ConfigProperty implements CacheElement { + private static final long serialVersionUID = 1L; @XmlElement(name = "config-property-name", namespace = "http://geode.apache.org/schema/cache", required = true) - protected String configPropertyName; + protected String name; @XmlElement(name = "config-property-type", namespace = "http://geode.apache.org/schema/cache", required = true) - protected String configPropertyType; + protected String type; @XmlElement(name = "config-property-value", namespace = "http://geode.apache.org/schema/cache", required = true) - protected String configPropertyValue; - - public ConfigProperty() {}; - - public ConfigProperty(String name, String type, String value) { - this.configPropertyName = name; - this.configPropertyType = type; - this.configPropertyValue = value; - } - - /** - * Get the id of the element. The id is the same as the name. - * - * @return the id of the element - */ - @Override - public String getId() { - return getName(); - } + protected String value; /** - * Gets the value of the configPropertyName property. + * Gets the value of the name property. * * possible object is * {@link String } * */ public String getName() { - return configPropertyName; + return name; } /** - * Sets the value of the configPropertyName property. + * Sets the value of the name property. * * allowed object is * {@link String } * */ public void setName(String value) { - this.configPropertyName = value; + this.name = value; } /** - * Gets the value of the configPropertyType property. + * Gets the value of the type property. * * possible object is * {@link String } * */ public String getType() { - return configPropertyType; + return type; } /** - * Sets the value of the configPropertyType property. + * Sets the value of the type property. * * allowed object is * {@link String } * */ public void setType(String value) { - this.configPropertyType = value; + this.type = value; } /** - * Gets the value of the configPropertyValue property. + * Gets the value of the value property. * * possible object is * {@link String } * */ public String getValue() { - return configPropertyValue; + return value; } /** - * Sets the value of the configPropertyValue property. + * Sets the value of the value property. * * allowed object is * {@link String } * */ public void setValue(String value) { - this.configPropertyValue = value; + this.value = value; } + @Override + public String getId() { + return getName(); + } } } diff --git a/geode-core/src/main/java/org/apache/geode/cache/configuration/ObjectFactory.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/ObjectFactory.java new file mode 100644 index 000000000000..fc1cd08e9560 --- /dev/null +++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/ObjectFactory.java @@ -0,0 +1,571 @@ +/* + * 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.cache.configuration; + +import javax.xml.bind.annotation.XmlRegistry; + +import org.apache.geode.annotations.Experimental; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the org.apache.geode.cache.configuration package. + *

+ * An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +@Experimental +public class ObjectFactory { + + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes + * for package: org.apache.geode.cache.configuration + * + */ + public ObjectFactory() {} + + /** + * Create an instance of {@link RegionAttributesType } + * + */ + public RegionAttributesType createRegionAttributesType() { + return new RegionAttributesType(); + } + + /** + * Create an instance of {@link RegionAttributesType.EvictionAttributes } + * + */ + public RegionAttributesType.EvictionAttributes createRegionAttributesTypeEvictionAttributes() { + return new RegionAttributesType.EvictionAttributes(); + } + + /** + * Create an instance of {@link RegionAttributesType.PartitionAttributes } + * + */ + public RegionAttributesType.PartitionAttributes createRegionAttributesTypePartitionAttributes() { + return new RegionAttributesType.PartitionAttributes(); + } + + /** + * Create an instance of {@link PoolType } + * + */ + public PoolType createPoolType() { + return new PoolType(); + } + + /** + * Create an instance of {@link FunctionServiceType } + * + */ + public FunctionServiceType createFunctionServiceType() { + return new FunctionServiceType(); + } + + /** + * Create an instance of {@link JndiBindingsType } + * + */ + public JndiBindingsType createJndiBindingsType() { + return new JndiBindingsType(); + } + + /** + * Create an instance of {@link JndiBindingsType.JndiBinding } + * + */ + public JndiBindingsType.JndiBinding createJndiBindingsTypeJndiBinding() { + return new JndiBindingsType.JndiBinding(); + } + + /** + * Create an instance of {@link RegionConfig } + * + */ + public RegionConfig createRegionConfig() { + return new RegionConfig(); + } + + /** + * Create an instance of {@link RegionConfig.Entry } + * + */ + public RegionConfig.Entry createRegionConfigEntry() { + return new RegionConfig.Entry(); + } + + /** + * Create an instance of {@link RegionConfig.Index } + * + */ + public RegionConfig.Index createRegionConfigIndex() { + return new RegionConfig.Index(); + } + + /** + * Create an instance of {@link SerializationRegistrationType } + * + */ + public SerializationRegistrationType createSerializationRegistrationType() { + return new SerializationRegistrationType(); + } + + /** + * Create an instance of {@link ExpirationAttributesType } + * + */ + public ExpirationAttributesType createExpirationAttributesType() { + return new ExpirationAttributesType(); + } + + /** + * Create an instance of {@link ServerType } + * + */ + public ServerType createServerType() { + return new ServerType(); + } + + /** + * Create an instance of {@link PdxType } + * + */ + public PdxType createPdxType() { + return new PdxType(); + } + + /** + * Create an instance of {@link CacheTransactionManagerType } + * + */ + public CacheTransactionManagerType createCacheTransactionManagerType() { + return new CacheTransactionManagerType(); + } + + /** + * Create an instance of {@link CacheConfig } + * + */ + public CacheConfig createCacheConfig() { + return new CacheConfig(); + } + + /** + * Create an instance of {@link CacheConfig.GatewayHub } + * + */ + public CacheConfig.GatewayHub createCacheConfigGatewayHub() { + return new CacheConfig.GatewayHub(); + } + + /** + * Create an instance of {@link CacheConfig.GatewayHub.Gateway } + * + */ + public CacheConfig.GatewayHub.Gateway createCacheConfigGatewayHubGateway() { + return new CacheConfig.GatewayHub.Gateway(); + } + + /** + * Create an instance of {@link CacheWriterType } + * + */ + public CacheWriterType createCacheWriterType() { + return new CacheWriterType(); + } + + /** + * Create an instance of {@link DiskDirsType } + * + */ + public DiskDirsType createDiskDirsType() { + return new DiskDirsType(); + } + + /** + * Create an instance of {@link StringType } + * + */ + public StringType createStringType() { + return new StringType(); + } + + /** + * Create an instance of {@link ParameterType } + * + */ + public ParameterType createParameterType() { + return new ParameterType(); + } + + /** + * Create an instance of {@link ClassWithParametersType } + * + */ + public ClassWithParametersType createClassWithParametersType() { + return new ClassWithParametersType(); + } + + /** + * Create an instance of {@link InitializerType } + * + */ + public InitializerType createInitializerType() { + return new InitializerType(); + } + + /** + * Create an instance of {@link DeclarableType } + * + */ + public DeclarableType createDeclarableType() { + return new DeclarableType(); + } + + /** + * Create an instance of {@link CacheLoaderType } + * + */ + public CacheLoaderType createCacheLoaderType() { + return new CacheLoaderType(); + } + + /** + * Create an instance of {@link DiskDirType } + * + */ + public DiskDirType createDiskDirType() { + return new DiskDirType(); + } + + /** + * Create an instance of {@link DiskStoreType } + * + */ + public DiskStoreType createDiskStoreType() { + return new DiskStoreType(); + } + + /** + * Create an instance of {@link RegionAttributesType.RegionTimeToLive } + * + */ + public RegionAttributesType.RegionTimeToLive createRegionAttributesTypeRegionTimeToLive() { + return new RegionAttributesType.RegionTimeToLive(); + } + + /** + * Create an instance of {@link RegionAttributesType.RegionIdleTime } + * + */ + public RegionAttributesType.RegionIdleTime createRegionAttributesTypeRegionIdleTime() { + return new RegionAttributesType.RegionIdleTime(); + } + + /** + * Create an instance of {@link RegionAttributesType.EntryTimeToLive } + * + */ + public RegionAttributesType.EntryTimeToLive createRegionAttributesTypeEntryTimeToLive() { + return new RegionAttributesType.EntryTimeToLive(); + } + + /** + * Create an instance of {@link RegionAttributesType.EntryIdleTime } + * + */ + public RegionAttributesType.EntryIdleTime createRegionAttributesTypeEntryIdleTime() { + return new RegionAttributesType.EntryIdleTime(); + } + + /** + * Create an instance of {@link RegionAttributesType.SubscriptionAttributes } + * + */ + public RegionAttributesType.SubscriptionAttributes createRegionAttributesTypeSubscriptionAttributes() { + return new RegionAttributesType.SubscriptionAttributes(); + } + + /** + * Create an instance of {@link RegionAttributesType.CacheListener } + * + */ + public RegionAttributesType.CacheListener createRegionAttributesTypeCacheListener() { + return new RegionAttributesType.CacheListener(); + } + + /** + * Create an instance of {@link RegionAttributesType.Compressor } + * + */ + public RegionAttributesType.Compressor createRegionAttributesTypeCompressor() { + return new RegionAttributesType.Compressor(); + } + + /** + * Create an instance of {@link RegionAttributesType.EvictionAttributes.LruMemorySize } + * + */ + public RegionAttributesType.EvictionAttributes.LruMemorySize createRegionAttributesTypeEvictionAttributesLruMemorySize() { + return new RegionAttributesType.EvictionAttributes.LruMemorySize(); + } + + /** + * Create an instance of {@link RegionAttributesType.EvictionAttributes.LruHeapPercentage } + * + */ + public RegionAttributesType.EvictionAttributes.LruHeapPercentage createRegionAttributesTypeEvictionAttributesLruHeapPercentage() { + return new RegionAttributesType.EvictionAttributes.LruHeapPercentage(); + } + + /** + * Create an instance of {@link RegionAttributesType.EvictionAttributes.LruEntryCount } + * + */ + public RegionAttributesType.EvictionAttributes.LruEntryCount createRegionAttributesTypeEvictionAttributesLruEntryCount() { + return new RegionAttributesType.EvictionAttributes.LruEntryCount(); + } + + /** + * Create an instance of {@link RegionAttributesType.PartitionAttributes.PartitionResolver } + * + */ + public RegionAttributesType.PartitionAttributes.PartitionResolver createRegionAttributesTypePartitionAttributesPartitionResolver() { + return new RegionAttributesType.PartitionAttributes.PartitionResolver(); + } + + /** + * Create an instance of {@link RegionAttributesType.PartitionAttributes.PartitionListener } + * + */ + public RegionAttributesType.PartitionAttributes.PartitionListener createRegionAttributesTypePartitionAttributesPartitionListener() { + return new RegionAttributesType.PartitionAttributes.PartitionListener(); + } + + /** + * Create an instance of + * {@link RegionAttributesType.PartitionAttributes.FixedPartitionAttributes } + * + */ + public RegionAttributesType.PartitionAttributes.FixedPartitionAttributes createRegionAttributesTypePartitionAttributesFixedPartitionAttributes() { + return new RegionAttributesType.PartitionAttributes.FixedPartitionAttributes(); + } + + /** + * Create an instance of {@link PoolType.Server } + * + */ + public PoolType.Server createPoolTypeServer() { + return new PoolType.Server(); + } + + /** + * Create an instance of {@link PoolType.Locator } + * + */ + public PoolType.Locator createPoolTypeLocator() { + return new PoolType.Locator(); + } + + /** + * Create an instance of {@link FunctionServiceType.Function } + * + */ + public FunctionServiceType.Function createFunctionServiceTypeFunction() { + return new FunctionServiceType.Function(); + } + + /** + * Create an instance of {@link JndiBindingsType.JndiBinding.ConfigProperty } + * + */ + public JndiBindingsType.JndiBinding.ConfigProperty createJndiBindingsTypeJndiBindingConfigProperty() { + return new JndiBindingsType.JndiBinding.ConfigProperty(); + } + + /** + * Create an instance of {@link RegionConfig.Entry.Key } + * + */ + public RegionConfig.Entry.Key createRegionConfigEntryKey() { + return new RegionConfig.Entry.Key(); + } + + /** + * Create an instance of {@link RegionConfig.Entry.Value } + * + */ + public RegionConfig.Entry.Value createRegionConfigEntryValue() { + return new RegionConfig.Entry.Value(); + } + + /** + * Create an instance of {@link RegionConfig.Index.PrimaryKey } + * + */ + public RegionConfig.Index.PrimaryKey createRegionConfigIndexPrimaryKey() { + return new RegionConfig.Index.PrimaryKey(); + } + + /** + * Create an instance of {@link RegionConfig.Index.Functional } + * + */ + public RegionConfig.Index.Functional createRegionConfigIndexFunctional() { + return new RegionConfig.Index.Functional(); + } + + /** + * Create an instance of {@link SerializationRegistrationType.Serializer } + * + */ + public SerializationRegistrationType.Serializer createSerializationRegistrationTypeSerializer() { + return new SerializationRegistrationType.Serializer(); + } + + /** + * Create an instance of {@link SerializationRegistrationType.Instantiator } + * + */ + public SerializationRegistrationType.Instantiator createSerializationRegistrationTypeInstantiator() { + return new SerializationRegistrationType.Instantiator(); + } + + /** + * Create an instance of {@link ExpirationAttributesType.CustomExpiry } + * + */ + public ExpirationAttributesType.CustomExpiry createExpirationAttributesTypeCustomExpiry() { + return new ExpirationAttributesType.CustomExpiry(); + } + + /** + * Create an instance of {@link ServerType.ClientSubscription } + * + */ + public ServerType.ClientSubscription createServerTypeClientSubscription() { + return new ServerType.ClientSubscription(); + } + + /** + * Create an instance of {@link ServerType.CustomLoadProbe } + * + */ + public ServerType.CustomLoadProbe createServerTypeCustomLoadProbe() { + return new ServerType.CustomLoadProbe(); + } + + /** + * Create an instance of {@link PdxType.PdxSerializer } + * + */ + public PdxType.PdxSerializer createPdxTypePdxSerializer() { + return new PdxType.PdxSerializer(); + } + + /** + * Create an instance of {@link CacheTransactionManagerType.TransactionListener } + * + */ + public CacheTransactionManagerType.TransactionListener createCacheTransactionManagerTypeTransactionListener() { + return new CacheTransactionManagerType.TransactionListener(); + } + + /** + * Create an instance of {@link CacheTransactionManagerType.TransactionWriter } + * + */ + public CacheTransactionManagerType.TransactionWriter createCacheTransactionManagerTypeTransactionWriter() { + return new CacheTransactionManagerType.TransactionWriter(); + } + + /** + * Create an instance of {@link CacheConfig.GatewaySender } + * + */ + public CacheConfig.GatewaySender createCacheConfigGatewaySender() { + return new CacheConfig.GatewaySender(); + } + + /** + * Create an instance of {@link CacheConfig.GatewayReceiver } + * + */ + public CacheConfig.GatewayReceiver createCacheConfigGatewayReceiver() { + return new CacheConfig.GatewayReceiver(); + } + + /** + * Create an instance of {@link CacheConfig.GatewayConflictResolver } + * + */ + public CacheConfig.GatewayConflictResolver createCacheConfigGatewayConflictResolver() { + return new CacheConfig.GatewayConflictResolver(); + } + + /** + * Create an instance of {@link CacheConfig.AsyncEventQueue } + * + */ + public CacheConfig.AsyncEventQueue createCacheConfigAsyncEventQueue() { + return new CacheConfig.AsyncEventQueue(); + } + + /** + * Create an instance of {@link CacheConfig.CacheServer } + * + */ + public CacheConfig.CacheServer createCacheConfigCacheServer() { + return new CacheConfig.CacheServer(); + } + + /** + * Create an instance of {@link CacheConfig.GatewayHub.Gateway.GatewayListener } + * + */ + public CacheConfig.GatewayHub.Gateway.GatewayListener createCacheConfigGatewayHubGatewayGatewayListener() { + return new CacheConfig.GatewayHub.Gateway.GatewayListener(); + } + + /** + * Create an instance of {@link CacheConfig.GatewayHub.Gateway.GatewayEndpoint } + * + */ + public CacheConfig.GatewayHub.Gateway.GatewayEndpoint createCacheConfigGatewayHubGatewayGatewayEndpoint() { + return new CacheConfig.GatewayHub.Gateway.GatewayEndpoint(); + } + + /** + * Create an instance of {@link CacheConfig.GatewayHub.Gateway.GatewayQueue } + * + */ + public CacheConfig.GatewayHub.Gateway.GatewayQueue createCacheConfigGatewayHubGatewayGatewayQueue() { + return new CacheConfig.GatewayHub.Gateway.GatewayQueue(); + } + +} diff --git a/geode-core/src/main/java/org/apache/geode/cache/configuration/ParameterType.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/ParameterType.java index 08c358623755..bea62f02f855 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/configuration/ParameterType.java +++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/ParameterType.java @@ -1,23 +1,22 @@ - /* - * 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 + * 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. + * 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.cache.configuration; +import java.io.Serializable; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; @@ -56,59 +55,60 @@ */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "parameter-type", namespace = "http://geode.apache.org/schema/cache", - propOrder = {"string", "declarable"}) + propOrder = {"declarable", "string"}) @Experimental -public class ParameterType { +public class ParameterType implements Serializable { - @XmlElement(namespace = "http://geode.apache.org/schema/cache") - protected StringType string; + private static final long serialVersionUID = 1L; @XmlElement(namespace = "http://geode.apache.org/schema/cache") protected DeclarableType declarable; + @XmlElement(namespace = "http://geode.apache.org/schema/cache") + protected StringType string; @XmlAttribute(name = "name", required = true) protected String name; /** - * Gets the value of the string property. + * Gets the value of the declarable property. * * possible object is - * {@link StringType } + * {@link DeclarableType } * */ - public StringType getString() { - return string; + public DeclarableType getDeclarable() { + return declarable; } /** - * Sets the value of the string property. + * Sets the value of the declarable property. * * allowed object is - * {@link StringType } + * {@link DeclarableType } * */ - public void setString(StringType value) { - this.string = value; + public void setDeclarable(DeclarableType value) { + this.declarable = value; } /** - * Gets the value of the declarable property. + * Gets the value of the string property. * * possible object is - * {@link DeclarableType } + * {@link StringType } * */ - public DeclarableType getDeclarable() { - return declarable; + public StringType getString() { + return string; } /** - * Sets the value of the declarable property. + * Sets the value of the string property. * * allowed object is - * {@link DeclarableType } + * {@link StringType } * */ - public void setDeclarable(DeclarableType value) { - this.declarable = value; + public void setString(StringType value) { + this.string = value; } /** diff --git a/geode-core/src/main/java/org/apache/geode/cache/configuration/PdxType.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/PdxType.java index ffcdabeab237..39a1d3f4bb87 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/configuration/PdxType.java +++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/PdxType.java @@ -1,23 +1,21 @@ - /* - * 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 + * 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. + * 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.cache.configuration; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -75,8 +73,9 @@ @XmlType(name = "pdx-type", namespace = "http://geode.apache.org/schema/cache", propOrder = {"pdxSerializer"}) @Experimental -public class PdxType { +public class PdxType implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(name = "pdx-serializer", namespace = "http://geode.apache.org/schema/cache") protected PdxType.PdxSerializer pdxSerializer; @XmlAttribute(name = "read-serialized") @@ -222,14 +221,15 @@ public void setDiskStoreName(String value) { * */ @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = {"className", "parameter"}) - public static class PdxSerializer { + @XmlType(name = "", propOrder = {"className", "parameters"}) + public static class PdxSerializer implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(name = "class-name", namespace = "http://geode.apache.org/schema/cache", required = true) protected String className; - @XmlElement(namespace = "http://geode.apache.org/schema/cache") - protected List parameter; + @XmlElement(name = "parameter", namespace = "http://geode.apache.org/schema/cache") + protected List parameters; /** * Gets the value of the className property. @@ -254,19 +254,19 @@ public void setClassName(String value) { } /** - * Gets the value of the parameter property. + * Gets the value of the parameters property. * *

* 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 set method for the parameter property. + * This is why there is not a set method for the parameters property. * *

* For example, to add a new item, do as follows: * * 

-     * getParameter().add(newItem);
+     * getParameters().add(newItem);
      *
* * @@ -276,11 +276,11 @@ public void setClassName(String value) { * * */ - public List getParameter() { - if (parameter == null) { - parameter = new ArrayList(); + public List getParameters() { + if (parameters == null) { + parameters = new ArrayList(); } - return this.parameter; + return this.parameters; } } 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 c7df9222e0aa..2c0a4da74b94 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 @@ -1,23 +1,21 @@ - /* - * 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 + * 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. + * 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.cache.configuration; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -97,14 +95,15 @@ */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "pool-type", namespace = "http://geode.apache.org/schema/cache", - propOrder = {"locator", "server"}) + propOrder = {"servers", "locators"}) @Experimental -public class PoolType { +public class PoolType implements Serializable { - @XmlElement(namespace = "http://geode.apache.org/schema/cache") - protected List locator; - @XmlElement(namespace = "http://geode.apache.org/schema/cache") - protected List server; + private static final long serialVersionUID = 1L; + @XmlElement(name = "server", namespace = "http://geode.apache.org/schema/cache") + protected List servers; + @XmlElement(name = "locator", namespace = "http://geode.apache.org/schema/cache") + protected List locators; @XmlAttribute(name = "subscription-timeout-multiplier") protected String subscriptionTimeoutMultiplier; @XmlAttribute(name = "socket-connect-timeout") @@ -149,63 +148,63 @@ public class PoolType { protected Boolean multiuserAuthentication; /** - * Gets the value of the locator property. + * Gets the value of the servers property. * *

* 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 set method for the locator property. + * This is why there is not a set method for the servers property. * *

* For example, to add a new item, do as follows: * * 

-   * getLocator().add(newItem);
+   * getServers().add(newItem);
    *
* * *

* Objects of the following type(s) are allowed in the list - * {@link PoolType.Locator } + * {@link PoolType.Server } * * */ - public List getLocator() { - if (locator == null) { - locator = new ArrayList(); + public List getServers() { + if (servers == null) { + servers = new ArrayList(); } - return this.locator; + return this.servers; } /** - * Gets the value of the server property. + * Gets the value of the locators property. * *

* 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 set method for the server property. + * This is why there is not a set method for the locators property. * *

* For example, to add a new item, do as follows: * * 

-   * getServer().add(newItem);
+   * getLocators().add(newItem);
    *
* * *

* Objects of the following type(s) are allowed in the list - * {@link PoolType.Server } + * {@link PoolType.Locator } * * */ - public List getServer() { - if (server == null) { - server = new ArrayList(); + public List getLocators() { + if (locators == null) { + locators = new ArrayList(); } - return this.server; + return this.locators; } /** @@ -693,8 +692,9 @@ public void setMultiuserAuthentication(Boolean value) { */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "") - public static class Locator { + public static class Locator implements Serializable { + private static final long serialVersionUID = 1L; @XmlAttribute(name = "host", required = true) protected String host; @XmlAttribute(name = "port", required = true) @@ -769,8 +769,9 @@ public void setPort(String value) { */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "") - public static class Server { + public static class Server implements Serializable { + private static final long serialVersionUID = 1L; @XmlAttribute(name = "host", required = true) protected String host; @XmlAttribute(name = "port", required = true) diff --git a/geode-core/src/main/java/org/apache/geode/cache/configuration/RegionAttributesDataPolicy.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/RegionAttributesDataPolicy.java index 8e780167faaf..5a6bb345150a 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/configuration/RegionAttributesDataPolicy.java +++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/RegionAttributesDataPolicy.java @@ -1,19 +1,16 @@ - /* - * 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 + * 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. + * 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.cache.configuration; diff --git a/geode-core/src/main/java/org/apache/geode/cache/configuration/RegionAttributesIndexUpdateType.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/RegionAttributesIndexUpdateType.java index b9972482cec5..6296c96ea0d4 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/configuration/RegionAttributesIndexUpdateType.java +++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/RegionAttributesIndexUpdateType.java @@ -1,19 +1,16 @@ - /* - * 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 + * 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. + * 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.cache.configuration; diff --git a/geode-core/src/main/java/org/apache/geode/cache/configuration/RegionAttributesMirrorType.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/RegionAttributesMirrorType.java index 0dec7115126c..112894e0a6c3 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/configuration/RegionAttributesMirrorType.java +++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/RegionAttributesMirrorType.java @@ -1,19 +1,16 @@ - /* - * 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 + * 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. + * 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.cache.configuration; diff --git a/geode-core/src/main/java/org/apache/geode/cache/configuration/RegionAttributesScope.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/RegionAttributesScope.java index b140101fe439..e2b492ae0822 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/configuration/RegionAttributesScope.java +++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/RegionAttributesScope.java @@ -1,19 +1,16 @@ - /* - * 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 + * 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. + * 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.cache.configuration; 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 a8296299ed0d..62f89eb24aff 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 @@ -1,23 +1,21 @@ - /* - * 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 + * 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. + * 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.cache.configuration; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -88,30 +86,6 @@ * </complexContent> * </complexType> * </element> - * <element name="disk-write-attributes" minOccurs="0"> - * <complexType> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <choice> - * <element name="asynchronous-writes"> - * <complexType> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <attribute name="bytes-threshold" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="time-interval" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> - * </restriction> - * </complexContent> - * </complexType> - * </element> - * <element name="synchronous-writes" type="{http://www.w3.org/2001/XMLSchema}anyType"/> - * </choice> - * <attribute name="max-oplog-size" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="roll-oplogs" type="{http://www.w3.org/2001/XMLSchema}string" /> - * </restriction> - * </complexContent> - * </complexType> - * </element> - * <element name="disk-dirs" type="{http://geode.apache.org/schema/cache}disk-dirs-type" minOccurs="0"/> * <element name="partition-attributes" minOccurs="0"> * <complexType> * <complexContent> @@ -165,43 +139,6 @@ * </complexContent> * </complexType> * </element> - * <element name="membership-attributes" minOccurs="0"> - * <complexType> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="required-role" maxOccurs="unbounded" minOccurs="0"> - * <complexType> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> - * </restriction> - * </complexContent> - * </complexType> - * </element> - * </sequence> - * <attribute name="loss-action"> - * <simpleType> - * <restriction base="{http://www.w3.org/2001/XMLSchema}string"> - * <enumeration value="full-access"/> - * <enumeration value="limited-access"/> - * <enumeration value="no-access"/> - * <enumeration value="reconnect"/> - * </restriction> - * </simpleType> - * </attribute> - * <attribute name="resumption-action"> - * <simpleType> - * <restriction base="{http://www.w3.org/2001/XMLSchema}string"> - * <enumeration value="none"/> - * <enumeration value="reinitialize"/> - * </restriction> - * </simpleType> - * </attribute> - * </restriction> - * </complexContent> - * </complexType> - * </element> * <element name="subscription-attributes" minOccurs="0"> * <complexType> * <complexContent> @@ -329,12 +266,12 @@ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "region-attributes-type", namespace = "http://geode.apache.org/schema/cache", propOrder = {"keyConstraint", "valueConstraint", "regionTimeToLive", "regionIdleTime", - "entryTimeToLive", "entryIdleTime", "diskWriteAttributes", "diskDirs", - "partitionAttributes", "membershipAttributes", "subscriptionAttributes", "cacheLoader", - "cacheWriter", "cacheListener", "compressor", "evictionAttributes"}) + "entryTimeToLive", "entryIdleTime", "partitionAttributes", "subscriptionAttributes", + "cacheLoader", "cacheWriter", "cacheListeners", "compressor", "evictionAttributes"}) @Experimental -public class RegionAttributesType { +public class RegionAttributesType implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(name = "key-constraint", namespace = "http://geode.apache.org/schema/cache") protected Object keyConstraint; @XmlElement(name = "value-constraint", namespace = "http://geode.apache.org/schema/cache") @@ -347,14 +284,8 @@ public class RegionAttributesType { protected RegionAttributesType.EntryTimeToLive entryTimeToLive; @XmlElement(name = "entry-idle-time", namespace = "http://geode.apache.org/schema/cache") protected RegionAttributesType.EntryIdleTime entryIdleTime; - @XmlElement(name = "disk-write-attributes", namespace = "http://geode.apache.org/schema/cache") - protected RegionAttributesType.DiskWriteAttributes diskWriteAttributes; - @XmlElement(name = "disk-dirs", namespace = "http://geode.apache.org/schema/cache") - protected DiskDirsType diskDirs; @XmlElement(name = "partition-attributes", namespace = "http://geode.apache.org/schema/cache") protected RegionAttributesType.PartitionAttributes partitionAttributes; - @XmlElement(name = "membership-attributes", namespace = "http://geode.apache.org/schema/cache") - protected RegionAttributesType.MembershipAttributes membershipAttributes; @XmlElement(name = "subscription-attributes", namespace = "http://geode.apache.org/schema/cache") protected RegionAttributesType.SubscriptionAttributes subscriptionAttributes; @XmlElement(name = "cache-loader", namespace = "http://geode.apache.org/schema/cache") @@ -362,7 +293,7 @@ public class RegionAttributesType { @XmlElement(name = "cache-writer", namespace = "http://geode.apache.org/schema/cache") protected CacheWriterType cacheWriter; @XmlElement(name = "cache-listener", namespace = "http://geode.apache.org/schema/cache") - protected List cacheListener; + protected List cacheListeners; @XmlElement(namespace = "http://geode.apache.org/schema/cache") protected RegionAttributesType.Compressor compressor; @XmlElement(name = "eviction-attributes", namespace = "http://geode.apache.org/schema/cache") @@ -556,50 +487,6 @@ public void setEntryIdleTime(RegionAttributesType.EntryIdleTime value) { this.entryIdleTime = value; } - /** - * Gets the value of the diskWriteAttributes property. - * - * possible object is - * {@link RegionAttributesType.DiskWriteAttributes } - * - */ - public RegionAttributesType.DiskWriteAttributes getDiskWriteAttributes() { - return diskWriteAttributes; - } - - /** - * Sets the value of the diskWriteAttributes property. - * - * allowed object is - * {@link RegionAttributesType.DiskWriteAttributes } - * - */ - public void setDiskWriteAttributes(RegionAttributesType.DiskWriteAttributes value) { - this.diskWriteAttributes = value; - } - - /** - * Gets the value of the diskDirs property. - * - * possible object is - * {@link DiskDirsType } - * - */ - public DiskDirsType getDiskDirs() { - return diskDirs; - } - - /** - * Sets the value of the diskDirs property. - * - * allowed object is - * {@link DiskDirsType } - * - */ - public void setDiskDirs(DiskDirsType value) { - this.diskDirs = value; - } - /** * Gets the value of the partitionAttributes property. * @@ -622,28 +509,6 @@ public void setPartitionAttributes(RegionAttributesType.PartitionAttributes valu this.partitionAttributes = value; } - /** - * Gets the value of the membershipAttributes property. - * - * possible object is - * {@link RegionAttributesType.MembershipAttributes } - * - */ - public RegionAttributesType.MembershipAttributes getMembershipAttributes() { - return membershipAttributes; - } - - /** - * Sets the value of the membershipAttributes property. - * - * allowed object is - * {@link RegionAttributesType.MembershipAttributes } - * - */ - public void setMembershipAttributes(RegionAttributesType.MembershipAttributes value) { - this.membershipAttributes = value; - } - /** * Gets the value of the subscriptionAttributes property. * @@ -711,19 +576,19 @@ public void setCacheWriter(CacheWriterType value) { } /** - * Gets the value of the cacheListener property. + * Gets the value of the cacheListeners property. * *

* 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 set method for the cacheListener property. + * This is why there is not a set method for the cacheListeners property. * *

* For example, to add a new item, do as follows: * * 

-   * getCacheListener().add(newItem);
+   * getCacheListeners().add(newItem);
    *
* * @@ -733,11 +598,11 @@ public void setCacheWriter(CacheWriterType value) { * * */ - public List getCacheListener() { - if (cacheListener == null) { - cacheListener = new ArrayList(); + public List getCacheListeners() { + if (cacheListeners == null) { + cacheListeners = new ArrayList(); } - return this.cacheListener; + return this.cacheListeners; } /** @@ -1428,14 +1293,15 @@ public void setOffHeap(Boolean value) { * */ @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = {"className", "parameter"}) - public static class CacheListener { + @XmlType(name = "", propOrder = {"className", "parameters"}) + public static class CacheListener implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(name = "class-name", namespace = "http://geode.apache.org/schema/cache", required = true) protected String className; - @XmlElement(namespace = "http://geode.apache.org/schema/cache") - protected List parameter; + @XmlElement(name = "parameter", namespace = "http://geode.apache.org/schema/cache") + protected List parameters; /** * Gets the value of the className property. @@ -1460,19 +1326,19 @@ public void setClassName(String value) { } /** - * Gets the value of the parameter property. + * Gets the value of the parameters property. * *

* 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 set method for the parameter property. + * This is why there is not a set method for the parameters property. * *

* For example, to add a new item, do as follows: * * 

-     * getParameter().add(newItem);
+     * getParameters().add(newItem);
      *
* * @@ -1482,11 +1348,11 @@ public void setClassName(String value) { * * */ - public List getParameter() { - if (parameter == null) { - parameter = new ArrayList(); + public List getParameters() { + if (parameters == null) { + parameters = new ArrayList(); } - return this.parameter; + return this.parameters; } } @@ -1515,8 +1381,9 @@ public List getParameter() { */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = {"className"}) - public static class Compressor { + public static class Compressor implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(name = "class-name", namespace = "http://geode.apache.org/schema/cache", required = true) protected String className; @@ -1546,220 +1413,6 @@ public void setClassName(String value) { } - /** - *

- * Java class for anonymous complex type. - * - *

- * The following schema fragment specifies the expected content contained within this class. - * - * 

-   * <complexType>
-   *   <complexContent>
-   *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-   *       <choice>
-   *         <element name="asynchronous-writes">
-   *           <complexType>
-   *             <complexContent>
-   *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-   *                 <attribute name="bytes-threshold" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-   *                 <attribute name="time-interval" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-   *               </restriction>
-   *             </complexContent>
-   *           </complexType>
-   *         </element>
-   *         <element name="synchronous-writes" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
-   *       </choice>
-   *       <attribute name="max-oplog-size" type="{http://www.w3.org/2001/XMLSchema}string" />
-   *       <attribute name="roll-oplogs" type="{http://www.w3.org/2001/XMLSchema}string" />
-   *     </restriction>
-   *   </complexContent>
-   * </complexType>
-   *
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = {"asynchronousWrites", "synchronousWrites"}) - public static class DiskWriteAttributes { - - @XmlElement(name = "asynchronous-writes", namespace = "http://geode.apache.org/schema/cache") - protected RegionAttributesType.DiskWriteAttributes.AsynchronousWrites asynchronousWrites; - @XmlElement(name = "synchronous-writes", namespace = "http://geode.apache.org/schema/cache") - protected Object synchronousWrites; - @XmlAttribute(name = "max-oplog-size") - protected String maxOplogSize; - @XmlAttribute(name = "roll-oplogs") - protected String rollOplogs; - - /** - * Gets the value of the asynchronousWrites property. - * - * possible object is - * {@link RegionAttributesType.DiskWriteAttributes.AsynchronousWrites } - * - */ - public RegionAttributesType.DiskWriteAttributes.AsynchronousWrites getAsynchronousWrites() { - return asynchronousWrites; - } - - /** - * Sets the value of the asynchronousWrites property. - * - * allowed object is - * {@link RegionAttributesType.DiskWriteAttributes.AsynchronousWrites } - * - */ - public void setAsynchronousWrites( - RegionAttributesType.DiskWriteAttributes.AsynchronousWrites value) { - this.asynchronousWrites = value; - } - - /** - * Gets the value of the synchronousWrites property. - * - * possible object is - * {@link Object } - * - */ - public Object getSynchronousWrites() { - return synchronousWrites; - } - - /** - * Sets the value of the synchronousWrites property. - * - * allowed object is - * {@link Object } - * - */ - public void setSynchronousWrites(Object value) { - this.synchronousWrites = value; - } - - /** - * Gets the value of the maxOplogSize property. - * - * possible object is - * {@link String } - * - */ - public String getMaxOplogSize() { - return maxOplogSize; - } - - /** - * Sets the value of the maxOplogSize property. - * - * allowed object is - * {@link String } - * - */ - public void setMaxOplogSize(String value) { - this.maxOplogSize = value; - } - - /** - * Gets the value of the rollOplogs property. - * - * possible object is - * {@link String } - * - */ - public String getRollOplogs() { - return rollOplogs; - } - - /** - * Sets the value of the rollOplogs property. - * - * allowed object is - * {@link String } - * - */ - public void setRollOplogs(String value) { - this.rollOplogs = value; - } - - - /** - *

- * Java class for anonymous complex type. - * - *

- * The following schema fragment specifies the expected content contained within this class. - * - * 

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <attribute name="bytes-threshold" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *       <attribute name="time-interval" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     *
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class AsynchronousWrites { - - @XmlAttribute(name = "bytes-threshold", required = true) - protected String bytesThreshold; - @XmlAttribute(name = "time-interval", required = true) - protected String timeInterval; - - /** - * Gets the value of the bytesThreshold property. - * - * possible object is - * {@link String } - * - */ - public String getBytesThreshold() { - return bytesThreshold; - } - - /** - * Sets the value of the bytesThreshold property. - * - * allowed object is - * {@link String } - * - */ - public void setBytesThreshold(String value) { - this.bytesThreshold = value; - } - - /** - * Gets the value of the timeInterval property. - * - * possible object is - * {@link String } - * - */ - public String getTimeInterval() { - return timeInterval; - } - - /** - * Sets the value of the timeInterval property. - * - * allowed object is - * {@link String } - * - */ - public void setTimeInterval(String value) { - this.timeInterval = value; - } - - } - - } - - /** *

* Java class for anonymous complex type. @@ -1783,8 +1436,9 @@ public void setTimeInterval(String value) { */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = {"expirationAttributes"}) - public static class EntryIdleTime { + public static class EntryIdleTime implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(name = "expiration-attributes", namespace = "http://geode.apache.org/schema/cache", required = true) protected ExpirationAttributesType expirationAttributes; @@ -1837,8 +1491,9 @@ public void setExpirationAttributes(ExpirationAttributesType value) { */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = {"expirationAttributes"}) - public static class EntryTimeToLive { + public static class EntryTimeToLive implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(name = "expiration-attributes", namespace = "http://geode.apache.org/schema/cache", required = true) protected ExpirationAttributesType expirationAttributes; @@ -1926,36 +1581,37 @@ public void setExpirationAttributes(ExpirationAttributesType value) { * */ @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = {"lruEntryCount", "lruHeapPercentage", "lruMemorySize"}) - public static class EvictionAttributes { + @XmlType(name = "", propOrder = {"lruMemorySize", "lruHeapPercentage", "lruEntryCount"}) + public static class EvictionAttributes implements Serializable { - @XmlElement(name = "lru-entry-count", namespace = "http://geode.apache.org/schema/cache") - protected RegionAttributesType.EvictionAttributes.LruEntryCount lruEntryCount; - @XmlElement(name = "lru-heap-percentage", namespace = "http://geode.apache.org/schema/cache") - protected RegionAttributesType.EvictionAttributes.LruHeapPercentage lruHeapPercentage; + private static final long serialVersionUID = 1L; @XmlElement(name = "lru-memory-size", namespace = "http://geode.apache.org/schema/cache") protected RegionAttributesType.EvictionAttributes.LruMemorySize lruMemorySize; + @XmlElement(name = "lru-heap-percentage", namespace = "http://geode.apache.org/schema/cache") + protected RegionAttributesType.EvictionAttributes.LruHeapPercentage lruHeapPercentage; + @XmlElement(name = "lru-entry-count", namespace = "http://geode.apache.org/schema/cache") + protected RegionAttributesType.EvictionAttributes.LruEntryCount lruEntryCount; /** - * Gets the value of the lruEntryCount property. + * Gets the value of the lruMemorySize property. * * possible object is - * {@link RegionAttributesType.EvictionAttributes.LruEntryCount } + * {@link RegionAttributesType.EvictionAttributes.LruMemorySize } * */ - public RegionAttributesType.EvictionAttributes.LruEntryCount getLruEntryCount() { - return lruEntryCount; + public RegionAttributesType.EvictionAttributes.LruMemorySize getLruMemorySize() { + return lruMemorySize; } /** - * Sets the value of the lruEntryCount property. + * Sets the value of the lruMemorySize property. * * allowed object is - * {@link RegionAttributesType.EvictionAttributes.LruEntryCount } + * {@link RegionAttributesType.EvictionAttributes.LruMemorySize } * */ - public void setLruEntryCount(RegionAttributesType.EvictionAttributes.LruEntryCount value) { - this.lruEntryCount = value; + public void setLruMemorySize(RegionAttributesType.EvictionAttributes.LruMemorySize value) { + this.lruMemorySize = value; } /** @@ -1982,25 +1638,25 @@ public void setLruHeapPercentage( } /** - * Gets the value of the lruMemorySize property. + * Gets the value of the lruEntryCount property. * * possible object is - * {@link RegionAttributesType.EvictionAttributes.LruMemorySize } + * {@link RegionAttributesType.EvictionAttributes.LruEntryCount } * */ - public RegionAttributesType.EvictionAttributes.LruMemorySize getLruMemorySize() { - return lruMemorySize; + public RegionAttributesType.EvictionAttributes.LruEntryCount getLruEntryCount() { + return lruEntryCount; } /** - * Sets the value of the lruMemorySize property. + * Sets the value of the lruEntryCount property. * * allowed object is - * {@link RegionAttributesType.EvictionAttributes.LruMemorySize } + * {@link RegionAttributesType.EvictionAttributes.LruEntryCount } * */ - public void setLruMemorySize(RegionAttributesType.EvictionAttributes.LruMemorySize value) { - this.lruMemorySize = value; + public void setLruEntryCount(RegionAttributesType.EvictionAttributes.LruEntryCount value) { + this.lruEntryCount = value; } @@ -2026,8 +1682,9 @@ public void setLruMemorySize(RegionAttributesType.EvictionAttributes.LruMemorySi */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "") - public static class LruEntryCount { + public static class LruEntryCount implements Serializable { + private static final long serialVersionUID = 1L; @XmlAttribute(name = "action") protected EnumActionDestroyOverflow action; @XmlAttribute(name = "maximum") @@ -2104,13 +1761,14 @@ public void setMaximum(String value) { * */ @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = {"className", "parameter"}) - public static class LruHeapPercentage { + @XmlType(name = "", propOrder = {"className", "parameters"}) + public static class LruHeapPercentage implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(name = "class-name", namespace = "http://geode.apache.org/schema/cache") protected String className; - @XmlElement(namespace = "http://geode.apache.org/schema/cache") - protected List parameter; + @XmlElement(name = "parameter", namespace = "http://geode.apache.org/schema/cache") + protected List parameters; @XmlAttribute(name = "action") protected EnumActionDestroyOverflow action; @@ -2137,19 +1795,19 @@ public void setClassName(String value) { } /** - * Gets the value of the parameter property. + * Gets the value of the parameters property. * *

* 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 set method for the parameter property. + * This is why there is not a set method for the parameters property. * *

* For example, to add a new item, do as follows: * * 

-       * getParameter().add(newItem);
+       * getParameters().add(newItem);
        *
* * @@ -2159,11 +1817,11 @@ public void setClassName(String value) { * * */ - public List getParameter() { - if (parameter == null) { - parameter = new ArrayList(); + public List getParameters() { + if (parameters == null) { + parameters = new ArrayList(); } - return this.parameter; + return this.parameters; } /** @@ -2216,13 +1874,14 @@ public void setAction(EnumActionDestroyOverflow value) { * */ @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = {"className", "parameter"}) - public static class LruMemorySize { + @XmlType(name = "", propOrder = {"className", "parameters"}) + public static class LruMemorySize implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(name = "class-name", namespace = "http://geode.apache.org/schema/cache") protected String className; - @XmlElement(namespace = "http://geode.apache.org/schema/cache") - protected List parameter; + @XmlElement(name = "parameter", namespace = "http://geode.apache.org/schema/cache") + protected List parameters; @XmlAttribute(name = "action") protected EnumActionDestroyOverflow action; @XmlAttribute(name = "maximum") @@ -2251,19 +1910,19 @@ public void setClassName(String value) { } /** - * Gets the value of the parameter property. + * Gets the value of the parameters property. * *

* 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 set method for the parameter property. + * This is why there is not a set method for the parameters property. * *

* For example, to add a new item, do as follows: * * 

-       * getParameter().add(newItem);
+       * getParameters().add(newItem);
        *
* * @@ -2273,11 +1932,11 @@ public void setClassName(String value) { * * */ - public List getParameter() { - if (parameter == null) { - parameter = new ArrayList(); + public List getParameters() { + if (parameters == null) { + parameters = new ArrayList(); } - return this.parameter; + return this.parameters; } /** @@ -2329,192 +1988,6 @@ public void setMaximum(String value) { } - /** - *

- * Java class for anonymous complex type. - * - *

- * The following schema fragment specifies the expected content contained within this class. - * - * 

-   * <complexType>
-   *   <complexContent>
-   *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-   *       <sequence>
-   *         <element name="required-role" maxOccurs="unbounded" minOccurs="0">
-   *           <complexType>
-   *             <complexContent>
-   *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-   *                 <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-   *               </restriction>
-   *             </complexContent>
-   *           </complexType>
-   *         </element>
-   *       </sequence>
-   *       <attribute name="loss-action">
-   *         <simpleType>
-   *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-   *             <enumeration value="full-access"/>
-   *             <enumeration value="limited-access"/>
-   *             <enumeration value="no-access"/>
-   *             <enumeration value="reconnect"/>
-   *           </restriction>
-   *         </simpleType>
-   *       </attribute>
-   *       <attribute name="resumption-action">
-   *         <simpleType>
-   *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-   *             <enumeration value="none"/>
-   *             <enumeration value="reinitialize"/>
-   *           </restriction>
-   *         </simpleType>
-   *       </attribute>
-   *     </restriction>
-   *   </complexContent>
-   * </complexType>
-   *
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = {"requiredRole"}) - public static class MembershipAttributes { - - @XmlElement(name = "required-role", namespace = "http://geode.apache.org/schema/cache") - protected List requiredRole; - @XmlAttribute(name = "loss-action") - protected String lossAction; - @XmlAttribute(name = "resumption-action") - protected String resumptionAction; - - /** - * Gets the value of the requiredRole property. - * - *

- * 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 set method for the requiredRole property. - * - *

- * For example, to add a new item, do as follows: - * - * 

-     * getRequiredRole().add(newItem);
-     *
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link RegionAttributesType.MembershipAttributes.RequiredRole } - * - * - */ - public List getRequiredRole() { - if (requiredRole == null) { - requiredRole = new ArrayList(); - } - return this.requiredRole; - } - - /** - * Gets the value of the lossAction property. - * - * possible object is - * {@link String } - * - */ - public String getLossAction() { - return lossAction; - } - - /** - * Sets the value of the lossAction property. - * - * allowed object is - * {@link String } - * - */ - public void setLossAction(String value) { - this.lossAction = value; - } - - /** - * Gets the value of the resumptionAction property. - * - * possible object is - * {@link String } - * - */ - public String getResumptionAction() { - return resumptionAction; - } - - /** - * Sets the value of the resumptionAction property. - * - * allowed object is - * {@link String } - * - */ - public void setResumptionAction(String value) { - this.resumptionAction = value; - } - - - /** - *

- * Java class for anonymous complex type. - * - *

- * The following schema fragment specifies the expected content contained within this class. - * - * 

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     *
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class RequiredRole { - - @XmlAttribute(name = "name", required = true) - protected String name; - - /** - * Gets the value of the name property. - * - * possible object is - * {@link String } - * - */ - public String getName() { - return name; - } - - /** - * Sets the value of the name property. - * - * allowed object is - * {@link String } - * - */ - public void setName(String value) { - this.name = value; - } - - } - - } - - /** *

* Java class for anonymous complex type. @@ -2580,13 +2053,14 @@ public void setName(String value) { */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", - propOrder = {"partitionResolver", "partitionListener", "fixedPartitionAttributes"}) - public static class PartitionAttributes { + propOrder = {"partitionResolver", "partitionListeners", "fixedPartitionAttributes"}) + public static class PartitionAttributes implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(name = "partition-resolver", namespace = "http://geode.apache.org/schema/cache") protected RegionAttributesType.PartitionAttributes.PartitionResolver partitionResolver; @XmlElement(name = "partition-listener", namespace = "http://geode.apache.org/schema/cache") - protected List partitionListener; + protected List partitionListeners; @XmlElement(name = "fixed-partition-attributes", namespace = "http://geode.apache.org/schema/cache") protected List fixedPartitionAttributes; @@ -2629,19 +2103,19 @@ public void setPartitionResolver( } /** - * Gets the value of the partitionListener property. + * Gets the value of the partitionListeners property. * *

* 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 set method for the partitionListener property. + * This is why there is not a set method for the partitionListeners property. * *

* For example, to add a new item, do as follows: * * 

-     * getPartitionListener().add(newItem);
+     * getPartitionListeners().add(newItem);
      *
* * @@ -2651,12 +2125,12 @@ public void setPartitionResolver( * * */ - public List getPartitionListener() { - if (partitionListener == null) { - partitionListener = + public List getPartitionListeners() { + if (partitionListeners == null) { + partitionListeners = new ArrayList(); } - return this.partitionListener; + return this.partitionListeners; } /** @@ -2868,8 +2342,9 @@ public void setColocatedWith(String value) { */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "") - public static class FixedPartitionAttributes { + public static class FixedPartitionAttributes implements Serializable { + private static final long serialVersionUID = 1L; @XmlAttribute(name = "partition-name", required = true) protected String partitionName; @XmlAttribute(name = "is-primary") @@ -2969,14 +2444,15 @@ public void setNumBuckets(String value) { * */ @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = {"className", "parameter"}) - public static class PartitionListener { + @XmlType(name = "", propOrder = {"className", "parameters"}) + public static class PartitionListener implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(name = "class-name", namespace = "http://geode.apache.org/schema/cache", required = true) protected String className; - @XmlElement(namespace = "http://geode.apache.org/schema/cache") - protected List parameter; + @XmlElement(name = "parameter", namespace = "http://geode.apache.org/schema/cache") + protected List parameters; /** * Gets the value of the className property. @@ -3001,19 +2477,19 @@ public void setClassName(String value) { } /** - * Gets the value of the parameter property. + * Gets the value of the parameters property. * *

* 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 set method for the parameter property. + * This is why there is not a set method for the parameters property. * *

* For example, to add a new item, do as follows: * * 

-       * getParameter().add(newItem);
+       * getParameters().add(newItem);
        *
* * @@ -3023,11 +2499,11 @@ public void setClassName(String value) { * * */ - public List getParameter() { - if (parameter == null) { - parameter = new ArrayList(); + public List getParameters() { + if (parameters == null) { + parameters = new ArrayList(); } - return this.parameter; + return this.parameters; } } @@ -3057,14 +2533,15 @@ public List getParameter() { * */ @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = {"className", "parameter"}) - public static class PartitionResolver { + @XmlType(name = "", propOrder = {"className", "parameters"}) + public static class PartitionResolver implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(name = "class-name", namespace = "http://geode.apache.org/schema/cache", required = true) protected String className; - @XmlElement(namespace = "http://geode.apache.org/schema/cache") - protected List parameter; + @XmlElement(name = "parameter", namespace = "http://geode.apache.org/schema/cache") + protected List parameters; @XmlAttribute(name = "name") protected String name; @@ -3091,19 +2568,19 @@ public void setClassName(String value) { } /** - * Gets the value of the parameter property. + * Gets the value of the parameters property. * *

* 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 set method for the parameter property. + * This is why there is not a set method for the parameters property. * *

* For example, to add a new item, do as follows: * * 

-       * getParameter().add(newItem);
+       * getParameters().add(newItem);
        *
* * @@ -3113,11 +2590,11 @@ public void setClassName(String value) { * * */ - public List getParameter() { - if (parameter == null) { - parameter = new ArrayList(); + public List getParameters() { + if (parameters == null) { + parameters = new ArrayList(); } - return this.parameter; + return this.parameters; } /** @@ -3170,8 +2647,9 @@ public void setName(String value) { */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = {"expirationAttributes"}) - public static class RegionIdleTime { + public static class RegionIdleTime implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(name = "expiration-attributes", namespace = "http://geode.apache.org/schema/cache", required = true) protected ExpirationAttributesType expirationAttributes; @@ -3224,8 +2702,9 @@ public void setExpirationAttributes(ExpirationAttributesType value) { */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = {"expirationAttributes"}) - public static class RegionTimeToLive { + public static class RegionTimeToLive implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(name = "expiration-attributes", namespace = "http://geode.apache.org/schema/cache", required = true) protected ExpirationAttributesType expirationAttributes; @@ -3283,8 +2762,9 @@ public void setExpirationAttributes(ExpirationAttributesType value) { */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "") - public static class SubscriptionAttributes { + public static class SubscriptionAttributes implements Serializable { + private static final long serialVersionUID = 1L; @XmlAttribute(name = "interest-policy") protected String interestPolicy; 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 8af552b27c64..377d5943486c 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 @@ -1,23 +1,21 @@ - /* - * 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 + * 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. + * 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.cache.configuration; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -148,20 +146,21 @@ */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "region-type", namespace = "http://geode.apache.org/schema/cache", - propOrder = {"regionAttributes", "index", "entry", "regionElements", "region"}) + propOrder = {"regionAttributes", "indices", "entries", "customRegionElements", "regions"}) @Experimental public class RegionConfig implements CacheElement { + private static final long serialVersionUID = 1L; @XmlElement(name = "region-attributes", namespace = "http://geode.apache.org/schema/cache") protected List regionAttributes; - @XmlElement(namespace = "http://geode.apache.org/schema/cache") - protected List index; - @XmlElement(namespace = "http://geode.apache.org/schema/cache") - protected List entry; - @XmlAnyElement(lax = true) - protected List regionElements; - @XmlElement(namespace = "http://geode.apache.org/schema/cache") - protected List region; + @XmlElement(name = "index", namespace = "http://geode.apache.org/schema/cache") + protected List indices; + @XmlElement(name = "entry", namespace = "http://geode.apache.org/schema/cache") + protected List entries; + @XmlAnyElement + protected List customRegionElements; + @XmlElement(name = "region", namespace = "http://geode.apache.org/schema/cache") + protected List regions; @XmlAttribute(name = "name", required = true) protected String name; @XmlAttribute(name = "refid") @@ -198,19 +197,19 @@ public List getRegionAttributes() { } /** - * Gets the value of the index property. + * Gets the value of the indices property. * *

* 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 set method for the index property. + * This is why there is not a set method for the indices property. * *

* For example, to add a new item, do as follows: * * 

-   * getIndex().add(newItem);
+   * getIndices().add(newItem);
    *
* * @@ -220,27 +219,27 @@ public List getRegionAttributes() { * * */ - public List getIndex() { - if (index == null) { - index = new ArrayList(); + public List getIndices() { + if (indices == null) { + indices = new ArrayList(); } - return this.index; + return this.indices; } /** - * Gets the value of the entry property. + * Gets the value of the entries property. * *

* 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 set method for the entry property. + * This is why there is not a set method for the entries property. * *

* For example, to add a new item, do as follows: * * 

-   * getEntry().add(newItem);
+   * getEntries().add(newItem);
    *
* * @@ -250,21 +249,21 @@ public List getIndex() { * * */ - public List getEntry() { - if (entry == null) { - entry = new ArrayList(); + public List getEntries() { + if (entries == null) { + entries = new ArrayList(); } - return this.entry; + return this.entries; } /** - * Gets the value of the any property. + * Gets the value of the customRegionElements property. * *

* 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 set method for the any property. + * This is why there is not a set method for the customRegionElements property. * *

* For example, to add a new item, do as follows: @@ -277,31 +276,30 @@ public List getEntry() { *

* Objects of the following type(s) are allowed in the list * {@link Element } - * {@link CacheElement } * * */ public List getCustomRegionElements() { - if (regionElements == null) { - regionElements = new ArrayList<>(); + if (customRegionElements == null) { + customRegionElements = new ArrayList(); } - return this.regionElements; + return this.customRegionElements; } /** - * Gets the value of the region property. + * Gets the value of the regions property. * *

* 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 set method for the region property. + * This is why there is not a set method for the regions property. * *

* For example, to add a new item, do as follows: * * 

-   * getRegion().add(newItem);
+   * getRegions().add(newItem);
    *
* * @@ -311,11 +309,11 @@ public List getCustomRegionElements() { * * */ - public List getRegion() { - if (region == null) { - region = new ArrayList(); + public List getRegions() { + if (regions == null) { + regions = new ArrayList(); } - return this.region; + return this.regions; } /** @@ -414,8 +412,9 @@ public String getId() { */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = {"key", "value"}) - public static class Entry { + public static class Entry implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(namespace = "http://geode.apache.org/schema/cache", required = true) protected RegionConfig.Entry.Key key; @XmlElement(namespace = "http://geode.apache.org/schema/cache", required = true) @@ -489,56 +488,57 @@ public void setValue(RegionConfig.Entry.Value value) { * */ @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = {"string", "declarable"}) - public static class Key { + @XmlType(name = "", propOrder = {"declarable", "string"}) + public static class Key implements Serializable { - @XmlElement(namespace = "http://geode.apache.org/schema/cache") - protected StringType string; + private static final long serialVersionUID = 1L; @XmlElement(namespace = "http://geode.apache.org/schema/cache") protected DeclarableType declarable; + @XmlElement(namespace = "http://geode.apache.org/schema/cache") + protected StringType string; /** - * Gets the value of the string property. + * Gets the value of the declarable property. * * possible object is - * {@link StringType } + * {@link DeclarableType } * */ - public StringType getString() { - return string; + public DeclarableType getDeclarable() { + return declarable; } /** - * Sets the value of the string property. + * Sets the value of the declarable property. * * allowed object is - * {@link StringType } + * {@link DeclarableType } * */ - public void setString(StringType value) { - this.string = value; + public void setDeclarable(DeclarableType value) { + this.declarable = value; } /** - * Gets the value of the declarable property. + * Gets the value of the string property. * * possible object is - * {@link DeclarableType } + * {@link StringType } * */ - public DeclarableType getDeclarable() { - return declarable; + public StringType getString() { + return string; } /** - * Sets the value of the declarable property. + * Sets the value of the string property. * * allowed object is - * {@link DeclarableType } + * {@link StringType } * */ - public void setDeclarable(DeclarableType value) { - this.declarable = value; + public void setString(StringType value) { + this.string = value; } } @@ -567,56 +567,57 @@ public void setDeclarable(DeclarableType value) { * */ @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = {"string", "declarable"}) - public static class Value { + @XmlType(name = "", propOrder = {"declarable", "string"}) + public static class Value implements Serializable { - @XmlElement(namespace = "http://geode.apache.org/schema/cache") - protected StringType string; + private static final long serialVersionUID = 1L; @XmlElement(namespace = "http://geode.apache.org/schema/cache") protected DeclarableType declarable; + @XmlElement(namespace = "http://geode.apache.org/schema/cache") + protected StringType string; /** - * Gets the value of the string property. + * Gets the value of the declarable property. * * possible object is - * {@link StringType } + * {@link DeclarableType } * */ - public StringType getString() { - return string; + public DeclarableType getDeclarable() { + return declarable; } /** - * Sets the value of the string property. + * Sets the value of the declarable property. * * allowed object is - * {@link StringType } + * {@link DeclarableType } * */ - public void setString(StringType value) { - this.string = value; + public void setDeclarable(DeclarableType value) { + this.declarable = value; } /** - * Gets the value of the declarable property. + * Gets the value of the string property. * * possible object is - * {@link DeclarableType } + * {@link StringType } * */ - public DeclarableType getDeclarable() { - return declarable; + public StringType getString() { + return string; } /** - * Sets the value of the declarable property. + * Sets the value of the string property. * * allowed object is - * {@link DeclarableType } + * {@link StringType } * */ - public void setDeclarable(DeclarableType value) { - this.declarable = value; + public void setString(StringType value) { + this.string = value; } } @@ -678,13 +679,14 @@ public void setDeclarable(DeclarableType value) { * */ @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = {"functional", "primaryKey"}) - public static class Index { + @XmlType(name = "", propOrder = {"primaryKey", "functional"}) + public static class Index implements Serializable { - @XmlElement(namespace = "http://geode.apache.org/schema/cache") - protected RegionConfig.Index.Functional functional; + private static final long serialVersionUID = 1L; @XmlElement(name = "primary-key", namespace = "http://geode.apache.org/schema/cache") protected RegionConfig.Index.PrimaryKey primaryKey; + @XmlElement(namespace = "http://geode.apache.org/schema/cache") + protected RegionConfig.Index.Functional functional; @XmlAttribute(name = "name", required = true) protected String name; @XmlAttribute(name = "expression") @@ -699,47 +701,47 @@ public static class Index { protected String type; /** - * Gets the value of the functional property. + * Gets the value of the primaryKey property. * * possible object is - * {@link RegionConfig.Index.Functional } + * {@link RegionConfig.Index.PrimaryKey } * */ - public RegionConfig.Index.Functional getFunctional() { - return functional; + public RegionConfig.Index.PrimaryKey getPrimaryKey() { + return primaryKey; } /** - * Sets the value of the functional property. + * Sets the value of the primaryKey property. * * allowed object is - * {@link RegionConfig.Index.Functional } + * {@link RegionConfig.Index.PrimaryKey } * */ - public void setFunctional(RegionConfig.Index.Functional value) { - this.functional = value; + public void setPrimaryKey(RegionConfig.Index.PrimaryKey value) { + this.primaryKey = value; } /** - * Gets the value of the primaryKey property. + * Gets the value of the functional property. * * possible object is - * {@link RegionConfig.Index.PrimaryKey } + * {@link RegionConfig.Index.Functional } * */ - public RegionConfig.Index.PrimaryKey getPrimaryKey() { - return primaryKey; + public RegionConfig.Index.Functional getFunctional() { + return functional; } /** - * Sets the value of the primaryKey property. + * Sets the value of the functional property. * * allowed object is - * {@link RegionConfig.Index.PrimaryKey } + * {@link RegionConfig.Index.Functional } * */ - public void setPrimaryKey(RegionConfig.Index.PrimaryKey value) { - this.primaryKey = value; + public void setFunctional(RegionConfig.Index.Functional value) { + this.functional = value; } /** @@ -902,8 +904,9 @@ public void setType(String value) { */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "") - public static class Functional { + public static class Functional implements Serializable { + private static final long serialVersionUID = 1L; @XmlAttribute(name = "expression", required = true) protected String expression; @XmlAttribute(name = "from-clause", required = true) @@ -1001,8 +1004,9 @@ public void setImports(String value) { */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "") - public static class PrimaryKey { + public static class PrimaryKey implements Serializable { + private static final long serialVersionUID = 1L; @XmlAttribute(name = "field", required = true) protected String field; diff --git a/geode-core/src/main/java/org/apache/geode/cache/configuration/ResourceManagerType.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/ResourceManagerType.java index 345826bc21ca..7911db3704e1 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/configuration/ResourceManagerType.java +++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/ResourceManagerType.java @@ -1,23 +1,22 @@ - /* - * 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 + * 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. + * 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.cache.configuration; +import java.io.Serializable; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; @@ -56,8 +55,9 @@ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "resource-manager-type", namespace = "http://geode.apache.org/schema/cache") @Experimental -public class ResourceManagerType { +public class ResourceManagerType implements Serializable { + private static final long serialVersionUID = 1L; @XmlAttribute(name = "critical-heap-percentage") protected String criticalHeapPercentage; @XmlAttribute(name = "eviction-heap-percentage") 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 389783e7d8e1..5ad9331d757b 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 @@ -1,23 +1,21 @@ - /* - * 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 + * 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. + * 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.cache.configuration; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -80,29 +78,31 @@ */ @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 { +public class SerializationRegistrationType implements Serializable { - @XmlElement(namespace = "http://geode.apache.org/schema/cache") - protected List serializer; - @XmlElement(namespace = "http://geode.apache.org/schema/cache") - protected List instantiator; + private static final long serialVersionUID = 1L; + @XmlElement(name = "serializer", namespace = "http://geode.apache.org/schema/cache") + protected List serializers; + @XmlElement(name = "instantiator", namespace = "http://geode.apache.org/schema/cache") + protected List instantiators; /** - * Gets the value of the serializer property. + * Gets the value of the serializers property. * *

* 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 set method for the serializer property. + * This is why there is not a set method for the serializers property. * *

* For example, to add a new item, do as follows: * * 

-   * getSerializer().add(newItem);
+   * getSerializers().add(newItem);
    *
* * @@ -112,27 +112,27 @@ public class SerializationRegistrationType { * * */ - public List getSerializer() { - if (serializer == null) { - serializer = new ArrayList(); + public List getSerializers() { + if (serializers == null) { + serializers = new ArrayList(); } - return this.serializer; + return this.serializers; } /** - * Gets the value of the instantiator property. + * Gets the value of the instantiators property. * *

* 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 set method for the instantiator property. + * This is why there is not a set method for the instantiators property. * *

* For example, to add a new item, do as follows: * * 

-   * getInstantiator().add(newItem);
+   * getInstantiators().add(newItem);
    *
* * @@ -142,11 +142,11 @@ public List getSerializer() { * * */ - public List getInstantiator() { - if (instantiator == null) { - instantiator = new ArrayList(); + public List getInstantiators() { + if (instantiators == null) { + instantiators = new ArrayList(); } - return this.instantiator; + return this.instantiators; } @@ -174,8 +174,9 @@ public List getInstantiator() { */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = {"className"}) - public static class Instantiator { + public static class Instantiator implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(name = "class-name", namespace = "http://geode.apache.org/schema/cache", required = true) protected String className; @@ -252,8 +253,9 @@ public void setId(String value) { */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = {"className"}) - public static class Serializer { + public static class Serializer implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(name = "class-name", namespace = "http://geode.apache.org/schema/cache", required = true) protected String className; 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 d7bf7d5be6dd..5a4277e0c0df 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 @@ -1,23 +1,21 @@ - /* - * 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 + * 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. + * 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.cache.configuration; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -43,7 +41,6 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="group" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/> * <element name="client-subscription" minOccurs="0"> * <complexType> * <complexContent> @@ -58,7 +55,6 @@ * </attribute> * <attribute name="capacity" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> * <attribute name="disk-store-name" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="overflow-directory" type="{http://www.w3.org/2001/XMLSchema}string" /> * </restriction> * </complexContent> * </complexType> @@ -96,13 +92,12 @@ */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "server-type", namespace = "http://geode.apache.org/schema/cache", - propOrder = {"group", "clientSubscription", "customLoadProbe"}) -@XmlSeeAlso({CacheConfig.CacheServer.class}) + propOrder = {"clientSubscription", "customLoadProbe"}) +@XmlSeeAlso({org.apache.geode.cache.configuration.CacheConfig.CacheServer.class}) @Experimental -public class ServerType { +public class ServerType implements Serializable { - @XmlElement(namespace = "http://geode.apache.org/schema/cache") - protected List group; + private static final long serialVersionUID = 1L; @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") @@ -130,36 +125,6 @@ public class ServerType { @XmlAttribute(name = "load-poll-interval") protected String loadPollInterval; - /** - * Gets the value of the group property. - * - *

- * 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 set method for the group property. - * - *

- * For example, to add a new item, do as follows: - * - * 

-   * getGroup().add(newItem);
-   *
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link String } - * - * - */ - public List getGroup() { - if (group == null) { - group = new ArrayList(); - } - return this.group; - } - /** * Gets the value of the clientSubscription property. * @@ -468,7 +433,6 @@ public void setLoadPollInterval(String value) { * </attribute> * <attribute name="capacity" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> * <attribute name="disk-store-name" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="overflow-directory" type="{http://www.w3.org/2001/XMLSchema}string" /> * </restriction> * </complexContent> * </complexType> @@ -478,16 +442,15 @@ public void setLoadPollInterval(String value) { */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "") - public static class ClientSubscription { + public static class ClientSubscription implements Serializable { + private static final long serialVersionUID = 1L; @XmlAttribute(name = "eviction-policy", required = true) protected String evictionPolicy; @XmlAttribute(name = "capacity", required = true) protected String capacity; @XmlAttribute(name = "disk-store-name") protected String diskStoreName; - @XmlAttribute(name = "overflow-directory") - protected String overflowDirectory; /** * Gets the value of the evictionPolicy property. @@ -555,28 +518,6 @@ public void setDiskStoreName(String value) { this.diskStoreName = value; } - /** - * Gets the value of the overflowDirectory property. - * - * possible object is - * {@link String } - * - */ - public String getOverflowDirectory() { - return overflowDirectory; - } - - /** - * Sets the value of the overflowDirectory property. - * - * allowed object is - * {@link String } - * - */ - public void setOverflowDirectory(String value) { - this.overflowDirectory = value; - } - } @@ -603,14 +544,15 @@ public void setOverflowDirectory(String value) { * */ @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = {"className", "parameter"}) - public static class CustomLoadProbe { + @XmlType(name = "", propOrder = {"className", "parameters"}) + public static class CustomLoadProbe implements Serializable { + private static final long serialVersionUID = 1L; @XmlElement(name = "class-name", namespace = "http://geode.apache.org/schema/cache", required = true) protected String className; - @XmlElement(namespace = "http://geode.apache.org/schema/cache") - protected List parameter; + @XmlElement(name = "parameter", namespace = "http://geode.apache.org/schema/cache") + protected List parameters; /** * Gets the value of the className property. @@ -635,19 +577,19 @@ public void setClassName(String value) { } /** - * Gets the value of the parameter property. + * Gets the value of the parameters property. * *

* 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 set method for the parameter property. + * This is why there is not a set method for the parameters property. * *

* For example, to add a new item, do as follows: * * 

-     * getParameter().add(newItem);
+     * getParameters().add(newItem);
      *
* * @@ -657,11 +599,11 @@ public void setClassName(String value) { * * */ - public List getParameter() { - if (parameter == null) { - parameter = new ArrayList(); + public List getParameters() { + if (parameters == null) { + parameters = new ArrayList(); } - return this.parameter; + return this.parameters; } } diff --git a/geode-core/src/main/java/org/apache/geode/cache/configuration/StringType.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/StringType.java index 4fa5e196e5c8..5f6949d2be09 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/configuration/StringType.java +++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/StringType.java @@ -1,23 +1,22 @@ - /* - * 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 + * 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. + * 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.cache.configuration; +import java.io.Serializable; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlType; @@ -52,8 +51,9 @@ @XmlType(name = "string-type", namespace = "http://geode.apache.org/schema/cache", propOrder = {"value"}) @Experimental -public class StringType { +public class StringType implements Serializable { + private static final long serialVersionUID = 1L; @XmlValue protected String value; diff --git a/geode-core/src/main/java/org/apache/geode/cache/configuration/package-info.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/package-info.java deleted file mode 100644 index c97d8926a0db..000000000000 --- a/geode-core/src/main/java/org/apache/geode/cache/configuration/package-info.java +++ /dev/null @@ -1,25 +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. - */ - -@XmlSchema(namespace = "http://geode.apache.org/schema/cache", - xmlns = {@XmlNs(prefix = "", namespaceURI = "http://geode.apache.org/schema/cache")}, - elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) - -package org.apache.geode.cache.configuration; - -import javax.xml.bind.annotation.XmlNs; -import javax.xml.bind.annotation.XmlSchema; diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalClusterConfigurationService.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalClusterConfigurationService.java index 459d6e3e7406..bd1df938a5e6 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalClusterConfigurationService.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalClusterConfigurationService.java @@ -856,7 +856,7 @@ public void updateCacheConfig(String group, UnaryOperator mutator) try { CacheConfig cacheConfig = getCacheConfig(group); if (cacheConfig == null) { - cacheConfig = new CacheConfig("1.0"); + cacheConfig = new CacheConfig(); } cacheConfig = mutator.apply(cacheConfig); if (cacheConfig == null) { 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 e940dc945a66..025a87729989 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 @@ -144,7 +144,7 @@ public Result createJDNIBinding( configuration.setUserName(username); configuration.setXaDatasourceClass(xaDataSource); if (dsConfigProperties != null && dsConfigProperties.length > 0) - configuration.getConfigProperty().addAll(Arrays.asList(dsConfigProperties)); + configuration.getConfigProperties().addAll(Arrays.asList(dsConfigProperties)); Result result; boolean persisted = false; 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 3e00ea2a82d5..e5c76113684e 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 @@ -95,7 +95,8 @@ public Result describeJndiBinding(@CliOption(key = "name", mandatory = true, 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/ExportImportClusterConfigurationCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportImportClusterConfigurationCommands.java index f92ef8fdb199..417bd6d50585 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 @@ -149,12 +149,12 @@ public Result importSharedConfig( 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/CreateJndiBindingFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateJndiBindingFunction.java index 2765713f39ae..659bf9e75479 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 void execute(FunctionContext context) { ResultSender resultSender = context.getResultSender(); JndiBindingsType.JndiBinding configuration = context.getArguments(); JNDIInvoker.mapDatasource(getParamsAsMap(configuration), - convert(configuration.getConfigProperty())); + convert(configuration.getConfigProperties())); resultSender.lastResult(new CliFunctionResult(context.getMemberName(), true, CliStrings.format(RESULT_MESSAGE, configuration.getJndiName(), context.getMemberName()))); diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/CacheConfigIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/CacheConfigIntegrationTest.java index 72cb4f84f00e..a4eda757c53d 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/CacheConfigIntegrationTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/CacheConfigIntegrationTest.java @@ -44,7 +44,6 @@ public class CacheConfigIntegrationTest { public void testXmlCreatedByCacheConfigCanBeUsedToStartupServer() throws Exception { xmlFile = temporaryFolder.newFile("cache.xml"); CacheConfig cacheConfig = new CacheConfig(); - cacheConfig.setVersion("1.0"); JAXBService service = new JAXBService(); String xml = service.marshall(cacheConfig); FileUtils.writeStringToFile(xmlFile, xml, "UTF-8"); diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/ClusterConfigurationServiceDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/ClusterConfigurationServiceDUnitTest.java index c2809d2d55d0..36d635e6bd02 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/ClusterConfigurationServiceDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/ClusterConfigurationServiceDUnitTest.java @@ -48,7 +48,7 @@ public void xmlCreatedByCCServiceCanBeLoadedByServer() { 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/InternalClusterConfigurationServiceTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalClusterConfigurationServiceTest.java index e18bda41f3c5..143d4f4bb2e3 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalClusterConfigurationServiceTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalClusterConfigurationServiceTest.java @@ -36,6 +36,7 @@ import org.apache.geode.cache.Region; import org.apache.geode.cache.configuration.CacheConfig; import org.apache.geode.cache.configuration.JndiBindingsType; +import org.apache.geode.cache.configuration.JndiBindingsType.JndiBinding.ConfigProperty; import org.apache.geode.cache.configuration.RegionConfig; import org.apache.geode.internal.config.JAXBServiceTest; import org.apache.geode.internal.config.JAXBServiceTest.ElementOne; @@ -71,7 +72,7 @@ public void updateRegionConfig() { RegionConfig regionConfig = new RegionConfig(); regionConfig.setName("regionA"); regionConfig.setRefid("REPLICATE"); - cacheConfig.getRegion().add(regionConfig); + cacheConfig.getRegions().add(regionConfig); return cacheConfig; }); @@ -87,8 +88,12 @@ public void jndiBindings() { jndiBinding.setJndiName("jndiOne"); jndiBinding.setJdbcDriverClass("com.sun.ABC"); jndiBinding.setType("SimpleDataSource"); - jndiBinding.getConfigProperty() - .add(new JndiBindingsType.JndiBinding.ConfigProperty("test", "test", "test")); + + ConfigProperty configProperty = new ConfigProperty(); + configProperty.setName("test"); + configProperty.setType("test"); + configProperty.setValue("test"); + jndiBinding.getConfigProperties().add(configProperty); 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 0593f199a55c..921039f757aa 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 @@ -151,18 +151,18 @@ public static void setBasicValues(CacheConfig cache) { receiver.setManualStart(false); receiver.setStartPort("6000"); cache.setGatewayReceiver(receiver); - cache.setVersion("1.0"); RegionConfig region = new RegionConfig(); region.setName("testRegion"); region.setRefid("REPLICATE"); - cache.getRegion().add(region); + cache.getRegions().add(region); } @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = {"id", "value"}) @XmlRootElement(name = "custom-one", namespace = "http://geode.apache.org/schema/CustomOne") public static class ElementOne implements CacheElement { + private static final long serialVersionUID = 5385622917240503975L; @XmlElement(name = "id", namespace = "http://geode.apache.org/schema/CustomOne") private String id; @XmlElement(name = "value", namespace = "http://geode.apache.org/schema/CustomOne") @@ -195,6 +195,7 @@ public void setId(String value) { @XmlType(name = "", propOrder = {"id", "value"}) @XmlRootElement(name = "custom-two", namespace = "http://geode.apache.org/schema/CustomTwo") public static class ElementTwo implements CacheElement { + private static final long serialVersionUID = 1623166601787822155L; @XmlElement(name = "id", namespace = "http://geode.apache.org/schema/CustomTwo") private String id; @XmlElement(name = "value", namespace = "http://geode.apache.org/schema/CustomTwo") 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 642ce6de9700..465917939bcc 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 @@ -235,7 +235,7 @@ public void whenMembersFoundAndNoClusterConfigRunningThenOnlyInvokeFunction() { 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); } @@ -278,7 +278,7 @@ public void whenMembersFoundAndClusterConfigRunningThenUpdateClusterConfigAndInv 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/functions/CreateJndiBindingFunctionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/CreateJndiBindingFunctionTest.java index 3a428703ef80..b153ec5a9f92 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/CreateJndiBindingFunctionTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/CreateJndiBindingFunctionTest.java @@ -93,7 +93,10 @@ public void createJndiBindingIsSuccessful() throws Exception { @Test public void convert() { JndiBindingsType.JndiBinding.ConfigProperty propA = - new JndiBindingsType.JndiBinding.ConfigProperty("name", "type", "value"); + new JndiBindingsType.JndiBinding.ConfigProperty(); + propA.setName("name"); + propA.setType("type"); + propA.setValue("value"); List converted = CreateJndiBindingFunction.convert(Collections.singletonList(propA)); 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 17bf32ed35ff..58f86392f7f3 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 void setup() { 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 bba1aed404f7..f73100743f40 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 @@ -29,6 +29,7 @@ import org.mockito.ArgumentCaptor; import org.apache.geode.cache.configuration.JndiBindingsType; +import org.apache.geode.cache.configuration.JndiBindingsType.JndiBinding.ConfigProperty; import org.apache.geode.cache.execute.FunctionContext; import org.apache.geode.cache.execute.ResultSender; import org.apache.geode.distributed.DistributedSystem; @@ -64,10 +65,13 @@ public void setup() { config.setType(CreateJndiBindingCommand.DATASOURCE_TYPE.SIMPLE.getType()); config.setJdbcDriverClass("org.apache.derby.jdbc.EmbeddedDriver"); config.setConnectionUrl("jdbc:derby:newDB;create=true"); - config.getConfigProperty() - .add(new JndiBindingsType.JndiBinding.ConfigProperty("test", "test", "test")); + ConfigProperty configProperty = new ConfigProperty(); + configProperty.setName("test"); + configProperty.setType("test"); + configProperty.setValue("test"); + config.getConfigProperties().add(configProperty); JNDIInvoker.mapDatasource(CreateJndiBindingFunction.getParamsAsMap(config), - CreateJndiBindingFunction.convert(config.getConfigProperty())); + CreateJndiBindingFunction.convert(config.getConfigProperties())); } @Test diff --git a/geode-lucene/build.gradle b/geode-lucene/build.gradle index f86eb5d35902..31fdc5590bca 100644 --- a/geode-lucene/build.gradle +++ b/geode-lucene/build.gradle @@ -42,3 +42,30 @@ dependencies { //The lucene integration tests don't have any issues that requiring forking integrationTest.forkEvery 0 + +task xjc (type: Exec){ + description 'Generates initial, incomplete POJO configuration objects using JAXB / xjc. ' + + 'Use this task as a reference to keep etc/example-bindings.xjb ' + + 'and the etc/*.episode files up to date.' + dependsOn(':geode-core:xjc') + + def sourceXsd = "${projectDir}/src/main/resources/META-INF/schemas/geode.apache.org/schema/lucene/lucene-1.0.xsd" + def jaxBindings = "${projectDir}/src/main/resources/META-INF/schemas/geode.apache.org/schema/lucene/bindings.xjb" + def classPath = "${projectDir}/../geode-core/src/main/java" + def coreEpisode = "${projectDir}/../etc/geode-core.episode" + + def outputDir = "${projectDir}/build/generated-src/main/" + def outputPackage = "org.apache.geode.cache.configuration" + def outputEpisode = "${projectDir}/../etc/geode-lucene.episode" + + doFirst{ + workingDir projectDir + mkdir outputDir + } + + workingDir projectDir + commandLine 'sh', '-c', + "xjc -extension -p ${outputPackage} -d ${outputDir} -episode ${outputEpisode} " + + "-no-header -b ${coreEpisode} -b ${jaxBindings} -classpath ${classPath} " + + "-contentForWildcard -npa ${sourceXsd}" +} diff --git a/lucene-bindings.xjb b/lucene-bindings.xjb new file mode 100755 index 000000000000..0a3562a1335c --- /dev/null +++ b/lucene-bindings.xjb @@ -0,0 +1,35 @@ + + + + + + + + + + + + diff --git a/tmp.sh b/tmp.sh new file mode 100755 index 000000000000..1de0fd616c62 --- /dev/null +++ b/tmp.sh @@ -0,0 +1 @@ +echo $(dirname $0)